diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm index c665cadbd2..a053d952ef 100644 --- a/_maps/shuttles/hunter_russian.dmm +++ b/_maps/shuttles/hunter_russian.dmm @@ -65,7 +65,8 @@ /area/shuttle/hunter) "o" = ( /obj/effect/mob_spawn/human/fugitive/russian{ - dir = 4 + dir = 4; + short_desc = null }, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/hunter) diff --git a/_maps/shuttles/hunter_space_cop.dmm b/_maps/shuttles/hunter_space_cop.dmm index 9bc1cf13ec..44eb5052b2 100644 --- a/_maps/shuttles/hunter_space_cop.dmm +++ b/_maps/shuttles/hunter_space_cop.dmm @@ -92,9 +92,6 @@ /area/shuttle/hunter) "gi" = ( /obj/structure/table, -/obj/effect/mob_spawn/human/fugitive/spacepol{ - dir = 8 - }, /turf/open/floor/mineral/titanium/blue, /area/shuttle/hunter) "hB" = ( diff --git a/code/datums/hud.dm b/code/datums/hud.dm index ea4f1672c0..c1811fb9b3 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_INIT(huds, list( ANTAG_HUD_CLOCKWORK = new/datum/atom_hud/antag(), ANTAG_HUD_BROTHER = new/datum/atom_hud/antag/hidden(), ANTAG_HUD_BLOODSUCKER = new/datum/atom_hud/antag/bloodsucker(), - ANTAG_HUD_HIVEAWAKE = new/datum/atom_hud/antag() + ANTAG_HUD_FUGITIVE = new/datum/atom_hud/antag() )) /datum/atom_hud diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index b43133b840..4c8379d14f 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -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) - . = ..() \ No newline at end of file + . = ..() diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi index 03b7a9e44f..b93f878c9e 100644 Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ