Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

capsaicin no longer straight up kills you #3150

Merged
merged 1 commit into from
Jul 12, 2024

Conversation

generalthrax
Copy link
Contributor

About The Pull Request

removes the body temperature increase from capsaicin

Why It's Good For The Game

eats two chili peppers
starts running a fever 30C over the boiling point of water

nacho

Changelog

🆑
del: Capsaicin no longer Boils you
/:cl:

@github-actions github-actions bot added the Code change Watch something violently break. label Jun 24, 2024
@FalloutFalcon
Copy link
Contributor

just give it the coffee heat amount.. that one seems fine

/datum/reagent/consumable/coffee/on_mob_life(mob/living/carbon/M)
	M.dizziness = max(0,M.dizziness-5)
	M.drowsyness = max(0,M.drowsyness-3)
	M.AdjustSleeping(-40)
	//310.15 is the normal bodytemp.
	M.adjust_bodytemperature(25 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
	if(holder.has_reagent(/datum/reagent/consumable/frostoil))
		holder.remove_reagent(/datum/reagent/consumable/frostoil, 5)
	..()
	. = 1

@generalthrax
Copy link
Contributor Author

just give it the coffee heat amount.. that one seems fine

/datum/reagent/consumable/coffee/on_mob_life(mob/living/carbon/M)
	M.dizziness = max(0,M.dizziness-5)
	M.drowsyness = max(0,M.drowsyness-3)
	M.AdjustSleeping(-40)
	//310.15 is the normal bodytemp.
	M.adjust_bodytemperature(25 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
	if(holder.has_reagent(/datum/reagent/consumable/frostoil))
		holder.remove_reagent(/datum/reagent/consumable/frostoil, 5)
	..()
	. = 1

This doesn't really do much besides heat you up when you're already cold. Which spicy food doesn't even do. I just didn't like the implication that it is physically heating up your body when that just isn't the case.

@Latentish
Copy link
Member

@Imaginos16
Copy link
Member

LGTM

@Imaginos16 Imaginos16 added this pull request to the merge queue Jul 12, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 12, 2024
@rye-rice rye-rice added this pull request to the merge queue Jul 12, 2024
Merged via the queue into shiptest-ss13:master with commit 72f65e6 Jul 12, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Jul 13, 2024
## About The Pull Request

removes the body temperature increase from capsaicin

## Why It's Good For The Game

>eats two chili peppers
>starts running a fever 30C over the boiling point of water


![nacho](https://github.com/shiptest-ss13/Shiptest/assets/139387950/4ee8470c-f220-4181-83ab-a0d78755aa12)


## Changelog

:cl:
del: Capsaicin no longer Boils you
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants