mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-13 08:56:49 +01:00
Antag Dirty Bombs & Bodyhorror Parasites (#16317)
* dirty bombs & bodyhorror * clean up + extra flavour CE_ANTIEMETIC taken into account in the delayed_vomit() proc. doesn't need to subtract from CE_EMETIC anymore. * desc. fix, TC tweak, syringe gun kit * dirty bomb tweaks radiation remains for as long as advertised (~8mins in an open space) it also actually leaves behind the green goo now.
This commit is contained in:
@@ -973,6 +973,10 @@
|
||||
|
||||
if(stomach.ingested.total_volume)
|
||||
stomach.ingested.trans_to_obj(splat, min(15, stomach.ingested.total_volume))
|
||||
for(var/obj/item/organ/internal/parasite/P in src.internal_organs)
|
||||
if(P)
|
||||
if(P.egg && (P.stage == P.max_stage))
|
||||
splat.reagents.add_reagent(P.egg, 2)
|
||||
handle_additional_vomit_reagents(splat)
|
||||
splat.update_icon()
|
||||
|
||||
@@ -985,6 +989,10 @@
|
||||
if(!check_has_mouth() || isSynthetic() || !timevomit || !level || stat == DEAD || lastpuke)
|
||||
return
|
||||
|
||||
if(chem_effects[CE_ANTIEMETIC])
|
||||
to_chat(src, SPAN_WARNING("You feel a very brief wave of nausea, but it quickly disapparates."))
|
||||
return
|
||||
|
||||
if(deliberate)
|
||||
if(incapacitated())
|
||||
to_chat(src, SPAN_WARNING("You cannot do that right now."))
|
||||
|
||||
@@ -605,10 +605,7 @@
|
||||
adjustToxLoss(chem_effects[CE_TOXIN])
|
||||
|
||||
if(CE_EMETIC in chem_effects)
|
||||
var/nausea = chem_effects[CE_EMETIC]
|
||||
if(CE_ANTIEMETIC in chem_effects)
|
||||
nausea -= min(nausea, chem_effects[CE_ANTIEMETIC]) // so it can only go down to 0
|
||||
if(prob(nausea))
|
||||
if(prob(chem_effects[CE_EMETIC]))
|
||||
delayed_vomit()
|
||||
|
||||
if(CE_ITCH in chem_effects)
|
||||
|
||||
@@ -731,6 +731,10 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT)
|
||||
return
|
||||
if(stat == DEAD)
|
||||
return
|
||||
if(chem_effects[CE_ANTIEMETIC])
|
||||
to_chat(src, SPAN_WARNING("You feel a very brief wave of nausea, but it quickly disapparates."))
|
||||
return
|
||||
|
||||
if(!lastpuke)
|
||||
lastpuke = 1
|
||||
to_chat(src, "<span class='warning'>You feel nauseous...</span>")
|
||||
|
||||
Reference in New Issue
Block a user