mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-09 00:43:55 +00:00
Some Fixes (#8395)
This commit is contained in:
@@ -502,7 +502,7 @@
|
||||
required = /obj/item/slime_extract/dream
|
||||
|
||||
/decl/chemical_reaction/instant/slime/dreamscale/on_reaction(var/datum/reagents/holder)
|
||||
new /obj/item/stack/material/uranium(get_turf(holder.my_atom), 10)
|
||||
new /obj/item/stack/material/dreamscale(get_turf(holder.my_atom), 10)
|
||||
..()
|
||||
|
||||
/decl/chemical_reaction/instant/slime/nightmareslime
|
||||
@@ -542,16 +542,28 @@
|
||||
for(var/mob/living/carbon/L in view(src, 3))
|
||||
if(L.stat == DEAD)
|
||||
continue
|
||||
L.add_modifier(/datum/modifier/doomed, null, src)
|
||||
L.add_modifier(/datum/modifier/dreamarmor, null, src)
|
||||
L.add_modifier(/datum/modifier/aura/dreamarmor, null, src)
|
||||
|
||||
/datum/modifier/dreamarmor
|
||||
/datum/modifier/aura/dreamarmor
|
||||
name = "dream armor"
|
||||
desc = "You are highly resistant to damage."
|
||||
stacks = MODIFIER_STACK_FORBID
|
||||
|
||||
mob_overlay_state = "cult_aura"
|
||||
incoming_damage_percent = 0.3
|
||||
incoming_damage_percent = 0.5
|
||||
|
||||
/datum/modifier/aura/dreamarmor/tick()
|
||||
if(holder.stat == DEAD)
|
||||
expire()
|
||||
|
||||
if(ishuman(holder)) // Robolimbs need this code sadly.
|
||||
var/mob/living/carbon/human/H = holder
|
||||
for(var/obj/item/organ/external/E in H.organs)
|
||||
var/obj/item/organ/external/O = E
|
||||
O.heal_damage(-2, -2, 0, -1)
|
||||
else
|
||||
holder.adjustBruteLoss(5)
|
||||
holder.adjustFireLoss(5)
|
||||
|
||||
/obj/item/slime_extract/nightmare
|
||||
name = "nightmare slime extract"
|
||||
|
||||
@@ -152,7 +152,6 @@
|
||||
..()
|
||||
|
||||
/mob/living/simple_mob/vore/spacecritter/livingice/proc/cold_aura()
|
||||
for(var/mob/living/L in view(2, src))
|
||||
var/turf/T = get_turf(src)
|
||||
var/datum/gas_mixture/env = T.return_air()
|
||||
if(env)
|
||||
|
||||
Reference in New Issue
Block a user