diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 246a5083565..ae1e0ae3c2b 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -148,13 +148,13 @@ desc = "An aura of time-bluespace energy." icon = 'icons/effects/effects.dmi' icon_state = "chronofield" - density = 1 + density = 0 anchored = 1 unacidable = 1 blend_mode = BLEND_MULTIPLY var/mob/living/captured = null var/obj/item/weapon/gun/energy/chrono_gun/gun = null - var/tickstokill = 30 + var/tickstokill = 15 var/image/mob_underlay = null var/preloaded = 0 var/RPpos = null @@ -210,12 +210,8 @@ qdel(src) else captured.Paralyse(4) - if(captured.reagents) - captured.reagents.del_reagent("synaptizine") //you pesky thing you - if(captured.loc != src) //If they manage to escape, immediately kill them, this is so that even if there IS a way to get out, they won't use it + if(captured.loc != src) captured.loc = src - tickstokill = 0 - return .() update_icon() if(gun) if(gun.field_check(src)) diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index c59e0ef4c62..04679faa2c5 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -25,6 +25,7 @@ action_button_name = "Toggle Chronosuit" slowdown = 2 armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 30, bio = 90, rad = 90) + var/list/chronosafe_items = list(/obj/item/weapon/chrono_eraser, /obj/item/weapon/gun/energy/chrono_gun) var/obj/item/clothing/head/helmet/space/chronos/helmet = null var/obj/effect/chronos_cam/camera = null var/activating = 0 @@ -74,6 +75,13 @@ var/turf/to_turf = from_turf var/atom/movable/overlay/phaseanim = new(from_turf) var/obj/holder = new(camera) + + var/list/nonsafe_slots = list(slot_belt, slot_back, slot_l_hand, slot_r_hand) + for(var/slot in nonsafe_slots) + var/obj/item/slot_item = user.get_item_by_slot(slot) + if(slot_item && !(slot_item.type in chronosafe_items) && user.unEquip(slot_item)) + user << "Your [slot_item.name] got left behind." + phaseanim.name = "phasing [user.name]" phaseanim.icon = 'icons/mob/mob.dmi' phaseanim.icon_state = "chronostuck"