Proto-kinetic crushers are significantly better

This commit is contained in:
CitadelStationBot
2017-05-20 12:42:11 -05:00
parent 186a63ad34
commit 448dc20c2b
5 changed files with 82 additions and 48 deletions
+27 -1
View File
@@ -166,4 +166,30 @@
/datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
id = "cult_ghost"
duration = -1
alert_type = null
alert_type = null
/datum/status_effect/crusher_mark
id = "crusher_mark"
duration = 600 //if you leave for a minute you lose the mark, deal with it
status_type = STATUS_EFFECT_REPLACE
alert_type = null
var/mutable_appearance/marked_underlay
var/obj/item/weapon/twohanded/required/mining_hammer/hammer_synced
/datum/status_effect/crusher_mark/on_apply()
if(owner.mob_size >= MOB_SIZE_LARGE)
marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2")
marked_underlay.pixel_x = -owner.pixel_x
marked_underlay.pixel_y = -owner.pixel_y
owner.underlays += marked_underlay
return FALSE
/datum/status_effect/crusher_mark/Destroy()
hammer_synced = null
if(owner)
owner.underlays -= marked_underlay
QDEL_NULL(marked_underlay)
return ..()
/datum/status_effect/crusher_mark/be_replaced()
owner.underlays -= marked_underlay //if this is being called, we should have an owner at this point.
..()
+10
View File
@@ -0,0 +1,10 @@
diff a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm (rejected hunks)
@@ -170,7 +170,7 @@
/datum/status_effect/crusher_mark
id = "crusher_mark"
- duration = 600 //if you leave for a minute you lose the mark, deal with it
+ duration = 300 //if you leave for 30 seconds you lose the mark, deal with it
status_type = STATUS_EFFECT_REPLACE
alert_type = null
var/mutable_appearance/marked_underlay