shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into unarmed_parry

Browse Source
This commit is contained in:
silicons
2020-07-07 21:07:58 -07:00
parent bd8cc4791f bfa54f7e23
commit 6cbab55ef8
99 changed files with 2195 additions and 1778 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_master.dm
+2 -2
View File
@@ -258,9 +258,9 @@
var/amount = text2num(params["amount"])
if(amount == null)
amount = text2num(input(usr,
"Max 10. Buffer content will be split evenly.",
"Max 20. Buffer content will be split evenly.",
"How many to make?", 1))
amount = clamp(round(amount), 0, 10)
amount = clamp(round(amount), 0, 20)
if (amount <= 0)
return FALSE
// Get units per item
code/modules/reagents/chemistry/reagents/food_reagents.dm
+3 -3
View File
@@ -132,8 +132,8 @@
"<span class='userdanger'>You're covered in boiling oil!</span>")
M.emote("scream")
playsound(M, 'sound/machines/fryer/deep_fryer_emerge.ogg', 25, TRUE)
var/oil_damage = (holder.chem_temp / fry_temperature) * 0.33 //Damage taken per unit
M.adjustFireLoss(min(35, oil_damage * reac_volume)) //Damage caps at 35
var/oil_damage = max((holder.chem_temp / fry_temperature) * 0.33,1) //Damage taken per unit
M.adjustFireLoss(oil_damage * max(reac_volume,20)) //Damage caps at 20
else
..()
return TRUE
@@ -866,4 +866,4 @@
taste_mult = 2
taste_description = "fizzy sweetness"
value = REAGENT_VALUE_COMMON
code/modules/reagents/chemistry/reagents/other_reagents.dm
+3 -1
View File
@@ -71,7 +71,9 @@
if(data["blood_DNA"])
B.blood_DNA[data["blood_DNA"]] = data["blood_type"]
if(!B.blood_DNA["color"])
B.blood_DNA["color"] = list(data["bloodcolor"])
B.blood_DNA["color"] = data["bloodcolor"]
else
B.blood_DNA["color"] = BlendRGB(B.blood_DNA["color"], data["bloodcolor"])
if(B.reagents)
B.reagents.add_reagent(type, reac_volume)
B.update_icon()