diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index c02d782612b..2fc85d6fe4a 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -237,6 +237,9 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob) set category = "Object" set name = "Make Deployable" set src in oview(1) + + if(usr.stat || !usr.canmove || usr.restrained()) + return if (src.deployable) usr << "\red You close several panels to make [src] undeployable." diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index fc7a294309e..a471cc13ebb 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -255,7 +255,7 @@ var/list/world_uplinks = list() //Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it) /obj/item/device/radio/headset/syndicate/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - if(istype(W, /obj/item/weapon/antag_spawner/borg_tele)) + if(istype(W, /obj/item/weapon/antag_spawner/borg_tele) && hidden_uplink) var/obj/item/weapon/antag_spawner/borg_tele/S = W if(!S.used && !S.checking) hidden_uplink.uses += S.TC_cost @@ -263,6 +263,8 @@ var/list/world_uplinks = list() user << "Teleporter refunded." else user << "This teleporter is already used, or is currently being used." + return + ..() /obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/antag_spawner/borg_tele)) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index ef8d3dd15e4..3ed779f7189 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -11,10 +11,10 @@ /obj/structure/lattice/New() ..() if(!(istype(src.loc, /turf/space))) - del(src) + qdel(src) for(var/obj/structure/lattice/LAT in src.loc) if(LAT != src) - del(LAT) + qdel(LAT) icon = 'icons/obj/smoothlattice.dmi' icon_state = "latticeblank" updateOverlays() @@ -33,7 +33,7 @@ ..() /obj/structure/lattice/blob_act() - del(src) + qdel(src) return /obj/structure/lattice/ex_act(severity) @@ -80,4 +80,5 @@ dir_sum += direction icon_state = "lattice[dir_sum]" - return \ No newline at end of file + return + \ No newline at end of file diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 0aae7a28e69..90e31356d0b 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -65,8 +65,9 @@ var/list/wood_icons = list("wood","wood-broken") if(1.0) switch(pick(1,2;75,3)) if (1) - src.ReplaceWithLattice() - if(prob(33)) new /obj/item/stack/sheet/metal(src) + spawn(0) + src.ReplaceWithLattice() + if(prob(33)) new /obj/item/stack/sheet/metal(src) if(2) src.ChangeTurf(/turf/space) if(3)