cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removes a duplicate definition of Hot Chocolate (#20836)

Browse Source 
* Merge this

* Move that
This commit is contained in:
Nathan Winters
2023-04-08 20:49:57 +02:00
committed by GitHub
parent ced990a21c
commit ddbae79e7a
2 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+10 -2
View File
@@ -264,14 +264,22 @@
/datum/reagent/consumable/drink/hot_coco
name = "Hot Chocolate"
id = "hot_coco"
description = "Made with love! And coco beans."
nutriment_factor = 3 * REAGENTS_METABOLISM
description = "Made with love! And cocoa beans."
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#401101"
drink_icon = "hot_coco"
drink_name = "Glass of hot coco"
drink_desc = "Delicious and cozy."
taste_description = "chocolate"
/datum/reagent/consumable/drink/hot_coco/on_mob_life(mob/living/M)
if(M.bodytemperature < 310) // 310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
var/update_flags = STATUS_UPDATE_NONE
if(isvulpkanin(M) || istajaran(M) || isfarwa(M) || iswolpin(M))
update_flags |= M.adjustToxLoss(2, FALSE)
return ..() | update_flags
/datum/reagent/consumable/drink/coffee
name = "Coffee"
id = "coffee"
code/modules/reagents/chemistry/reagents/food_reagents.dm
-17
View File
@@ -330,23 +330,6 @@
color = "#FEFEFE"
taste_description = "bitter vanilla"
/datum/reagent/consumable/hot_coco
name = "Hot Chocolate"
id = "hot_coco"
description = "Made with love! And cocoa beans."
reagent_state = LIQUID
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#403010" // rgb: 64, 48, 16
taste_description = "chocolate"
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M)
if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
var/update_flags = STATUS_UPDATE_NONE
if(isvulpkanin(M) || istajaran(M) || isfarwa(M) || iswolpin(M))
update_flags |= M.adjustToxLoss(2, FALSE)
return ..() | update_flags
/datum/reagent/consumable/garlic
name = "Garlic Juice"
id = "garlic"