diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 2c3758ba8e..f8f8a9c21e 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -294,5 +294,5 @@ if(stored_material[mat] > S.perunit) S.amount = round(stored_material[mat] / S.perunit) else - del(S) + qdel(S) ..() diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index ee8ca69ed0..36e37cb9c6 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -11,7 +11,7 @@ /obj/item/frame/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) new refund_type( get_turf(src.loc), refund_amt) - del(src) + qdel(src) return ..() @@ -43,7 +43,7 @@ M.fingerprints = src.fingerprints M.fingerprintshidden = src.fingerprintshidden M.fingerprintslast = src.fingerprintslast - del(src) + qdel(src) /obj/item/frame/fire_alarm name = "fire alarm frame" diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 9bea66110c..e8cb65a33d 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -140,7 +140,7 @@ if(wall_fake) T.can_open = 1 T.add_hiddenprint(usr) - del(src) + qdel(src) return else if(istype(W, /obj/item/pipe)) @@ -236,7 +236,7 @@ /obj/structure/girder/cult/dismantle() new /obj/effect/decal/remains/human(get_turf(src)) - del(src) + qdel(src) /obj/structure/girder/cult/attackby(obj/item/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/wrench)) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 17b2646fb9..695b11db95 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -123,7 +123,7 @@ if(istype(M)) for(var/i = (devastated? 1 : 3), i <= oreAmount, i++) new M.stack_type(get_turf(src)) - del(src) + qdel(src) ex_act(severity = 1) switch(severity) diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index 8d625a99af..4d86d70877 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -104,7 +104,7 @@ user << "You burn away the fungi with \the [WT]." playsound(src, 'sound/items/Welder.ogg', 10, 1) for(var/obj/effect/overlay/wallrot/WR in src) - del(WR) + qdel(WR) return else if(!is_sharp(W) && W.force >= 10 || W.force >= 20) user << "\The [src] crumbles away under the force of your [W.name]." diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index b04bb4749d..4596512fe4 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -65,7 +65,7 @@ var/list/global/wall_cache = list() /turf/simulated/wall/proc/clear_plants() for(var/obj/effect/overlay/wallrot/WR in src) - del(WR) + qdel(WR) for(var/obj/effect/plant/plant in range(src, 1)) if(!plant.floor) //shrooms drop to the floor plant.floor = 1 @@ -215,7 +215,8 @@ var/list/global/wall_cache = list() user << "The thermite starts melting through the wall." spawn(100) - if(O) del(O) + if(O) + qdel(O) // F.sd_LumReset() //TODO: ~Carn return diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index fb30591746..97eb175277 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -270,60 +270,3 @@ desc = "A set of implantable lenses designed to augment your vision" icon_state = "thermalimplants" item_state = "syringe_kit" - -/* These do not currently work, commenting out pending fixes. -/obj/item/clothing/glasses/minerals - name = "resonance scanners" - desc = "A set of goggles geared towards detecting different concentrations of minerals." - icon_state = "material" - item_state = "glasses" - icon_action_button = "action_material" - toggleable = 1 - active = 0 - - var/mob/living/carbon/human/wearer - var/list/ore_nodes = list() - -/obj/item/clothing/glasses/minerals/New() - ..() - if(!active) - icon_state = off_state - processing_objects |= src - -/obj/item/clothing/glasses/minerals/Del() - processing_objects -= src - ..() - -/obj/item/clothing/glasses/minerals/equipped(var/mob/living/carbon/human/M) - ..() - remove_ore_images() - wearer = null - if(istype(M) && M.glasses == src) - wearer = M - -/obj/item/clothing/glasses/minerals/dropped() - ..() - remove_ore_images() - wearer = null - -/obj/item/clothing/glasses/minerals/process() - remove_ore_images() - if(active) - if(!wearer || wearer.glasses != src) - return - for(var/obj/effect/mineral/M in range(wearer,6)) - // Maybe make a cache for this so multiple miners aren't spawning copies. - ore_nodes |= M.get_scan_overlay() - if(wearer.client) - wearer.client.images |= ore_nodes - -/obj/item/clothing/glasses/minerals/proc/remove_ore_images() - if(!ore_nodes) - ore_nodes = list() - if(ore_nodes.len) - if(wearer && wearer.client) - for(var/image/I in ore_nodes) - wearer.client.images -= I - del(I) - ore_nodes.Cut() -*/ \ No newline at end of file diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 434eef3d4f..649dee1e1e 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -154,7 +154,7 @@ if(!isnull(ores_stored[O.material])) ores_stored[O.material]++ - del(O) + qdel(O) if(!active) return diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index fa6fb8d164..80a19e7b96 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -236,7 +236,7 @@ /turf/simulated/mineral/proc/clear_ore_effects() for(var/obj/effect/mineral/M in contents) - del(M) + qdel(M) /turf/simulated/mineral/proc/DropMineral() if(!mineral) diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index 95ee36b1f6..7a4c184ca7 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -1,6 +1,6 @@ /mob/living/carbon/process_resist() - + //drop && roll if(on_fire) fire_stacks -= 2 //reduced @@ -18,34 +18,34 @@ ) ExtinguishMob() return - + if(handcuffed) spawn() escape_handcuffs() else if(legcuffed) spawn() escape_legcuffs() - + ..() /mob/living/carbon/proc/escape_handcuffs() if(!(last_special <= world.time)) return - + next_move = world.time + 100 last_special = world.time + 100 if(can_break_cuffs()) //Don't want to do a lot of logic gating here. break_handcuffs() return - + var/obj/item/weapon/handcuffs/HC = handcuffed - + //A default in case you are somehow handcuffed with something that isn't an obj/item/weapon/handcuffs type - var/breakouttime = 1200 + var/breakouttime = 1200 var/displaytime = 2 //Minutes to display in the "this will take X minutes." //If you are handcuffed with actual handcuffs... Well what do I know, maybe someone will want to handcuff you with toilet paper in the future... if(istype(HC)) breakouttime = HC.breakouttime displaytime = breakouttime / 600 //Minutes - + visible_message( "[src] attempts to remove \the [HC]!", "You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)" @@ -62,7 +62,7 @@ /mob/living/carbon/proc/escape_legcuffs() if(!(last_special <= world.time)) return - + next_move = world.time + 100 last_special = world.time + 100 @@ -71,7 +71,7 @@ return var/obj/item/weapon/legcuffs/HC = legcuffed - + //A default in case you are somehow legcuffed with something that isn't an obj/item/weapon/legcuffs type var/breakouttime = 1200 var/displaytime = 2 //Minutes to display in the "this will take X minutes." @@ -79,20 +79,20 @@ if(istype(HC)) breakouttime = HC.breakouttime displaytime = breakouttime / 600 //Minutes - - visible_message( - "[usr] attempts to remove \the [HC]!", + + visible_message( + "[usr] attempts to remove \the [HC]!", "You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)" ) if(do_after(src, breakouttime)) if(!legcuffed || buckled) - return + return visible_message( - "[src] manages to remove \the [legcuffed]!", + "[src] manages to remove \the [legcuffed]!", "You successfully remove \the [legcuffed]." ) - + drop_from_inventory(legcuffed) legcuffed = null update_inv_legcuffed() @@ -106,18 +106,18 @@ "[src] is trying to break \the [handcuffed]!", "You attempt to break your [handcuffed.name]. (This will take around 5 seconds and you need to stand still)" ) - + if(do_after(src, 50)) if(!handcuffed || buckled) return - + visible_message( - "[src] manages to break \the [handcuffed]!", + "[src] manages to break \the [handcuffed]!", "You successfully break your [handcuffed.name]." ) - + say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - + del(handcuffed) handcuffed = null if(buckled && buckled.buckle_require_restraints) @@ -131,14 +131,14 @@ if(do_after(src, 50)) if(!legcuffed || buckled) return - + visible_message( "[src] manages to break the legcuffs!", "You successfully break your legcuffs." ) - + say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) - + del(legcuffed) legcuffed = null update_inv_legcuffed()