final fixes

This commit is contained in:
Timothy Teakettle
2020-06-16 23:47:22 +01:00
parent 89bd474192
commit 2d1d2eeda6
5 changed files with 7 additions and 7 deletions
+4 -2
View File
@@ -80,10 +80,11 @@
name = "shock trap"
desc = "A trap that will shock and render you immobile. You'd better avoid it."
icon_state = "trap-shock"
var/stun_time = 100
/obj/structure/trap/stun/trap_effect(mob/living/L)
L.electrocute_act(30, src, flags = SHOCK_NOGLOVES) // electrocute act does a message.
L.DefaultCombatKnockdown(100)
L.Paralyze(stun_time)
/obj/structure/trap/fire
name = "flame trap"
@@ -158,6 +159,7 @@
desc = "A trap that only goes off when a fugitive steps on it, announcing the location and stunning the target. You'd better avoid it."
icon = 'icons/obj/objects.dmi'
icon_state = "bounty_trap_on"
stun_time = 200
var/obj/item/bountytrap/stored_item
var/caught = FALSE
@@ -221,4 +223,4 @@
qdel(stored_trap)
QDEL_NULL(radio)
QDEL_NULL(spark_system)
. = ..()
. = ..()