" points += S.rarity // That's right, no bonus for potency. Send a crappy sample first to "show improvement" later - del(MA) + qdel(MA) if(plasma_count) centcom_message += "+[round(plasma_count/plasma_per_point)]: Received [plasma_count] units of exotic material.
" @@ -387,7 +387,7 @@ var/global/datum/controller/supply_shuttle/supply_shuttle // If it has multiple items, there's a 1% of each going missing... Not for secure crates or those large wooden ones, though. if(contains.len > 1 && prob(1) && !findtext(SP.containertype,"/secure/") && !findtext(SP.containertype,"/largecrate/")) slip.erroneous |= MANIFEST_ERROR_ITEM // This item was not included in the shipment! - del(B2) // Lost in space... or the loading dock. + qdel(B2) // Lost in space... or the loading dock. //manifest finalisation slip.info += "
" diff --git a/code/controllers/verbs.dm b/code/controllers/verbs.dm index 18fe42bbe4a..40eb5047c9a 100644 --- a/code/controllers/verbs.dm +++ b/code/controllers/verbs.dm @@ -28,7 +28,7 @@ return -/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Air","Jobs","Sun","Radio","Supply Shuttle","Emergency Shuttle","Configuration","pAI", "Cameras", "Events")) +/client/proc/debug_controller(controller in list("Master","Failsafe","Ticker","Lighting","Garbage","Air","Jobs","Sun","Radio","Supply Shuttle","Emergency Shuttle","Configuration","pAI", "Cameras", "Events")) set category = "Debug" set name = "Debug Controller" set desc = "Debug the various periodic loop controllers for the game (be careful!)" @@ -47,6 +47,9 @@ if("Lighting") debug_variables(lighting_controller) feedback_add_details("admin_verb","DLighting") + if("Garbage") + debug_variables(garbage) + feedback_add_details("admin_verb","DGarbage") if("Air") debug_variables(air_master) feedback_add_details("admin_verb","DAir") diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 80f451fc871..d333851fb73 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -617,7 +617,7 @@ client for(var/obj/Obj in world) if(Obj.type == O_type) i++ - del(Obj) + qdel(Obj) if(!i) usr << "No objects of this type exist" return @@ -628,7 +628,7 @@ client for(var/obj/Obj in world) if(istype(Obj,O_type)) i++ - del(Obj) + qdel(Obj) if(!i) usr << "No objects of this type exist" return diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 0b3e1e7e17b..3924c740a54 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -108,7 +108,6 @@ var/list/advance_cures = list( affected_mob.resistances[id] = id affected_mob.viruses -= src //remove the datum from the list del(src) //delete the datum to stop it processing - return // Returns the advance disease with a different reference memory. /datum/disease/advance/Copy(var/process = 0) diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm new file mode 100644 index 00000000000..11a580dce5f --- /dev/null +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -0,0 +1,81 @@ +/* +////////////////////////////////////// + +DNA Saboteur + + Very noticable. + Lowers resistance tremendously. + No changes to stage speed. + Decreases transmittablity temrendously. + Fatal Level. + +Bonus + Cleans the DNA of a person and then randomly gives them a disability. + +////////////////////////////////////// +*/ + +/datum/symptom/genetic_mutation + + name = "Deoxyribonucleic Acid Saboteur" + stealth = -2 + resistance = -3 + stage_speed = 0 + transmittable = -3 + level = 6 + var/good_mutations = 0 + var/archived_dna = null + +/datum/symptom/genetic_mutation/Activate(var/datum/disease/advance/A) + ..() + if(prob(SYMPTOM_ACTIVATION_PROB)) + var/mob/living/M = A.affected_mob + switch(A.stage) + if(4, 5) + M << "[pick("Your skin feels itchy.", "You feel light headed.")]" + clean_randmut(M, good_mutations == 1 ? (good_se_blocks | op_se_blocks) : bad_se_blocks, 20) // Give them a random good/bad mutation. + domutcheck(M, null, 1) // Force the power to manifest + return + +// Archive their DNA before they were infected. +/datum/symptom/genetic_mutation/Start(var/datum/disease/advance/A) + var/mob/living/carbon/M = A.affected_mob + if(M) + if(!check_dna_integrity(M)) + return + archived_dna = M.dna.struc_enzymes + +// Give them back their old DNA when cured. +/datum/symptom/genetic_mutation/End(var/datum/disease/advance/A) + var/mob/living/carbon/M = A.affected_mob + if(M && archived_dna) + if(!check_dna_integrity(M)) + return + hardset_dna(M, se = archived_dna) + +/* +////////////////////////////////////// + +DNA Aide + + Very very noticable. + Lowers resistance tremendously. + No changes to stage speed. + Decreases transmittablity temrendously. + Fatal Level. + +Bonus + Cleans the DNA of a person and then randomly gives them a power.. + +////////////////////////////////////// +*/ + +/datum/symptom/genetic_mutation/powers + + name = "Deoxyribonucleic Acid Aide" + stealth = -3 + resistance = -4 + stage_speed = 0 + transmittable = -4 + level = 6 + good_mutations = 1 \ No newline at end of file diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 49bdb4caa1d..9aa2c6c1fec 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -56,10 +56,11 @@ /datum/disease/dnaspread/Del() if ((original_dna["name"]) && (original_dna["UI"]) && (original_dna["SE"])) - affected_mob.dna.uni_identity = original_dna["UI"] - updateappearance(affected_mob) - affected_mob.dna.struc_enzymes = original_dna["SE"] - affected_mob.real_name = original_dna["name"] + if(affected_mob) + affected_mob.dna.uni_identity = original_dna["UI"] + updateappearance(affected_mob) + affected_mob.dna.struc_enzymes = original_dna["SE"] + affected_mob.real_name = original_dna["name"] - affected_mob << "\blue You feel more like yourself." + affected_mob << "\blue You feel more like yourself." ..() \ No newline at end of file diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 40413e626af..475c4139cf1 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -47,20 +47,20 @@ affected_mob.invisibility = 101 for(var/obj/item/W in affected_mob) if(istype(W, /obj/item/weapon/implant)) - del(W) + qdel(W) continue W.layer = initial(W.layer) W.loc = affected_mob.loc W.dropped(affected_mob) var/mob/living/new_mob = new new_form(affected_mob.loc) - if(istype(new_mob)) + if(istype(new_mob)) new_mob.a_intent = "harm" new_mob.universal_speak = 1 if(affected_mob.mind) affected_mob.mind.transfer_to(new_mob) else new_mob.key = affected_mob.key - del(affected_mob) + qdel(affected_mob) /datum/disease/transformation/robot diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 2cb2b0e2c8a..8cbb8c81501 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -61,21 +61,21 @@ STI KALY - blind if(prob(chance)) if(!istype(H.head, /obj/item/clothing/head/wizard)) if(!H.unEquip(H.head)) - del H.head + qdel(H.head) H.head = new /obj/item/clothing/head/wizard(H) H.head.layer = 20 return if(prob(chance)) if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe)) if(!H.unEquip(H.wear_suit)) - del H.wear_suit + qdel(H.wear_suit) H.wear_suit = new /obj/item/clothing/suit/wizrobe(H) H.wear_suit.layer = 20 return if(prob(chance)) if(!istype(H.shoes, /obj/item/clothing/shoes/sandal)) if(!H.unEquip(H.shoes)) - del H.shoes + qdel(H.shoes) H.shoes = new /obj/item/clothing/shoes/sandal(H) H.shoes.layer = 20 return diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index 7c2fabbc9b8..f292e7648f7 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -11,8 +11,7 @@ ..() holder = atom if(!holder) //don't want this without a holder - spawn - del src + qdel(src) set_desc(steps.len) return @@ -60,8 +59,7 @@ proc/spawn_result() if(result) new result(get_turf(holder)) - spawn() - del holder + qdel(holder) return proc/set_desc(index as num) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index f68de313496..c6abd2773e8 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -49,7 +49,7 @@ //must succeed in most cases proc/setTeleatom(atom/movable/ateleatom) if(istype(ateleatom, /obj/effect) && !istype(ateleatom, /obj/effect/dummy/chameleon)) - del(ateleatom) + qdel(ateleatom) return 0 if(istype(ateleatom)) teleatom = ateleatom diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 27d69a36966..46a8869775b 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -64,14 +64,10 @@ datum/mind ERROR("transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob. Please inform coderbus") if(current) //remove ourself from our old body's mind variable - if(changeling) - current.remove_changeling_powers() - current.verbs -= /datum/changeling/proc/EvolutionMenu current.mind = null nanomanager.user_transferred(current, new_character) - if(key) if(new_character.key != key) //if we're transfering into a body with a key associated which is not ours new_character.ghostize(1) //we'll need to ghostize so that key isn't mobless. @@ -84,10 +80,6 @@ datum/mind current = new_character //associate ourself with our new body new_character.mind = src //and associate our new body with ourself - if(changeling && istype(new_character, /mob/living/carbon)) //if we are a changeling mind, re-add any powers - var/mob/living/carbon/C = new_character - C.make_changeling() - if(active) new_character.key = key //now transfer the key to link the client to our new body @@ -569,7 +561,7 @@ datum/mind var/obj/item/device/flash/flash = locate() in L if (!flash) usr << "\red Deleting flash failed!" - del(flash) + qdel(flash) if("repairflash") var/list/L = current.get_contents() @@ -582,7 +574,7 @@ datum/mind if("reequip") var/list/L = current.get_contents() var/obj/item/device/flash/flash = locate() in L - del(flash) + qdel(flash) take_uplink() var/fail = 0 fail |= !ticker.mode.equip_traitor(current, 1) @@ -672,8 +664,8 @@ datum/mind ticker.mode.changelings -= src special_role = null current.remove_changeling_powers() - current.verbs -= /datum/changeling/proc/EvolutionMenu - if(changeling) del(changeling) + if(changeling) + del(changeling) current << "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!" message_admins("[key_name_admin(usr)] has de-changeling'ed [current].") log_admin("[key_name(usr)] has de-changeling'ed [current].") @@ -729,15 +721,15 @@ datum/mind current.loc = get_turf(locate("landmark*Syndicate-Spawn")) if("dressup") var/mob/living/carbon/human/H = current - del(H.belt) - del(H.back) - del(H.ears) - del(H.gloves) - del(H.head) - del(H.shoes) - del(H.wear_id) - del(H.wear_suit) - del(H.w_uniform) + qdel(H.belt) + qdel(H.back) + qdel(H.ears) + qdel(H.gloves) + qdel(H.head) + qdel(H.shoes) + qdel(H.wear_id) + qdel(H.wear_suit) + qdel(H.w_uniform) if (!ticker.mode.equip_syndicate(current)) usr << "\red Equipping a syndicate failed!" @@ -848,7 +840,7 @@ datum/mind A.malf_picker.remove_verbs(A) A.make_laws() - del(A.malf_picker) + qdel(A.malf_picker) A.show_laws() A.icon_state = "ai" @@ -917,10 +909,10 @@ datum/mind var/list/L = current.get_contents() for (var/t in L) if (istype(t, /obj/item/device/pda)) - if (t:uplink) del(t:uplink) + if (t:uplink) qdel(t:uplink) t:uplink = null else if (istype(t, /obj/item/device/radio)) - if (t:traitorradio) del(t:traitorradio) + if (t:traitorradio) qdel(t:traitorradio) t:traitorradio = null t:traitor_frequency = 0.0 else if (istype(t, /obj/item/weapon/SWF_uplink) || istype(t, /obj/item/weapon/syndicate_uplink)) @@ -929,7 +921,7 @@ datum/mind R.loc = current.loc R.traitorradio = null R.traitor_frequency = 0.0 - del(t) + qdel(t) // remove wizards spells //If there are more special powers that need removal, they can be procced into here./N @@ -951,7 +943,7 @@ datum/mind proc/take_uplink() var/obj/item/device/uplink/hidden/H = find_syndicate_uplink() if(H) - del(H) + qdel(H) proc/make_AI_Malf() @@ -992,15 +984,15 @@ datum/mind current.loc = get_turf(locate("landmark*Syndicate-Spawn")) var/mob/living/carbon/human/H = current - del(H.belt) - del(H.back) - del(H.ears) - del(H.gloves) - del(H.head) - del(H.shoes) - del(H.wear_id) - del(H.wear_suit) - del(H.w_uniform) + qdel(H.belt) + qdel(H.back) + qdel(H.ears) + qdel(H.gloves) + qdel(H.head) + qdel(H.shoes) + qdel(H.wear_id) + qdel(H.wear_suit) + qdel(H.w_uniform) ticker.mode.equip_syndicate(current) @@ -1089,7 +1081,7 @@ datum/mind var/list/L = current.get_contents() var/obj/item/device/flash/flash = locate() in L - del(flash) + qdel(flash) take_uplink() var/fail = 0 // fail |= !ticker.mode.equip_traitor(current, 1) diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index d2c747dd5b8..4f2750c0c06 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -79,7 +79,7 @@ var/obj/result_obj = new result(container) for (var/obj/O in (container.contents-result_obj)) O.reagents.trans_to(result_obj, O.reagents.total_volume) - del(O) + qdel(O) container.reagents.clear_reagents() return result_obj @@ -91,7 +91,7 @@ O.reagents.del_reagent("nutriment") O.reagents.update_total() O.reagents.trans_to(result_obj, O.reagents.total_volume) - del(O) + qdel(O) container.reagents.clear_reagents() return result_obj diff --git a/code/datums/spell.dm b/code/datums/spell.dm index ac375b9b2a9..967ec1b927f 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -166,7 +166,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin spell.anchored = 1 spell.density = 0 spawn(overlay_lifespan) - del(spell) + qdel(spell) /obj/effect/proc_holder/spell/proc/after_cast(list/targets) for(var/atom/target in targets) diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index 0a524b004b7..370d9303512 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -38,7 +38,7 @@ var/obj/item/weapon/spellbook/oneuse/I = item if(prob(80)) user.visible_message("[I] catches fire!") - del(I) + qdel(I) else I.used = 0 charged_item = I diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index 583c9b6dff8..7969cde3db8 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -49,7 +49,7 @@ if(summon_lifespan) spawn(summon_lifespan) if(summoned_object) - del(summoned_object) + qdel(summoned_object) else switch(charge_type) if("recharge") diff --git a/code/datums/spells/dumbfire.dm b/code/datums/spells/dumbfire.dm index e5f67e32a82..c1eb4889a93 100644 --- a/code/datums/spells/dumbfire.dm +++ b/code/datums/spells/dumbfire.dm @@ -76,11 +76,11 @@ trail.icon_state = proj_trail_icon_state trail.density = 0 spawn(proj_trail_lifespan) - del(trail) + qdel(trail) current_loc = projectile.loc sleep(proj_step_delay) if(projectile) - del(projectile) \ No newline at end of file + qdel(projectile) \ No newline at end of file diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 20de7205d71..73a8bf24b4e 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -50,8 +50,8 @@ break target.canmove = 1 target.client.eye = target - del(animation) - del(holder) + qdel(animation) + qdel(holder) /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target) animation.icon_state = "liquify" @@ -74,7 +74,7 @@ density = 0 anchored = 1 -/obj/effect/dummy/spell_jaunt/Del() +/obj/effect/dummy/spell_jaunt/Destroy() // Eject contents if deleted somehow for(var/atom/movable/AM in src) AM.loc = get_turf(src) diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index 0c7fc5babdb..8be107d4d40 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -36,7 +36,7 @@ target.visible_message( "[target]'s face lights up in fire, and after the event a horse's head takes its place!", \ "Your face burns up, and shortly after the fire you realise you have the face of a horse!") if(!target.unEquip(target.wear_mask)) - del target.wear_mask + qdel(target.wear_mask) target.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) flick("e_flash", target.flash) diff --git a/code/datums/spells/projectile.dm b/code/datums/spells/projectile.dm index c63922ef7a2..3413fae3eff 100644 --- a/code/datums/spells/projectile.dm +++ b/code/datums/spells/projectile.dm @@ -61,7 +61,7 @@ break if(!target || (!proj_lingering && projectile.loc == current_loc)) //if it didn't move since last time - del(projectile) + qdel(projectile) break if(proj_trail && projectile) @@ -72,7 +72,7 @@ trail.icon_state = proj_trail_icon_state trail.density = 0 spawn(proj_trail_lifespan) - del(trail) + qdel(trail) if(projectile.loc in range(target.loc,proj_trigger_range)) projectile.perform(list(target)) @@ -83,4 +83,4 @@ sleep(proj_step_delay) if(projectile) - del(projectile) \ No newline at end of file + qdel(projectile) \ No newline at end of file diff --git a/code/datums/spells/trigger.dm b/code/datums/spells/trigger.dm index 1b7f2b330ff..65205fc29f3 100644 --- a/code/datums/spells/trigger.dm +++ b/code/datums/spells/trigger.dm @@ -12,9 +12,9 @@ var/spell_to_add = text2path(spell) new spell_to_add(src) //should result in adding to contents, needs testing -/obj/effect/proc_holder/spell/targeted/trigger/Del() +/obj/effect/proc_holder/spell/targeted/trigger/Destroy() //I think this entire proc is unnecessary but ok for(var/spell in contents) - del(spell) + qdel(spell) ..() diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 5c038623034..48e76cbcd05 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -57,7 +57,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine if(!path) continue var/atom/movable/AM = new path() manifest += "
\n[]
\n[]
\n[]
\n[]
\n[]
\n[]", (A.locked ? "The door bolts have fallen!" : "The door bolts look up."), + . += text("
\n[]
\n[]
\n[]
\n[]
\n[]
\n[]
\n[]", (A.locked ? "The door bolts have fallen!" : "The door bolts look up."), (A.lights ? "The door bolt lights are on." : "The door bolt lights are off!"), ((A.arePowerSystemsOn() && !(A.stat & NOPOWER)) ? "The test light is on." : "The test light is off!"), (A.aiControlDisabled==0 ? "The 'AI control allowed' light is on." : "The 'AI control allowed' light is off."), (A.safe==0 ? "The 'Check Wiring' light is on." : "The 'Check Wiring' light is off."), - (A.normalspeed==0 ? "The 'Check Timing Mechanism' light is on." : "The 'Check Timing Mechanism' light is off.")) - + (A.normalspeed==0 ? "The 'Check Timing Mechanism' light is on." : "The 'Check Timing Mechanism' light is off."), + (A.emergency==0 ? "The emergency lights are off." : "The emergency lights are on.")) /datum/wires/airlock/UpdateCut(var/index, var/mended) @@ -123,9 +123,12 @@ var/const/AIRLOCK_WIRE_LIGHT = 2048 var/obj/machinery/door/airlock/A = holder switch(index) if(AIRLOCK_WIRE_IDSCAN) - //Sending a pulse through this flashes the red light on the door (if the door has power). + //Sending a pulse through this disables emergency access and flashes the red light on the door (if the door has power). if((A.arePowerSystemsOn()) && (!(A.stat & NOPOWER)) && A.density) A.do_animate("deny") + if(A.emergency) + A.emergency = 0 + A.update_icon() if(AIRLOCK_WIRE_MAIN_POWER1 || AIRLOCK_WIRE_MAIN_POWER2) //Sending a pulse through either one causes a breaker to trip, disabling the door for 10 seconds if backup power is connected, or 1 minute if not (or until backup power comes back on, whichever is shorter). A.loseMainPower() diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 8266946010f..51965f71cce 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -374,8 +374,8 @@ if(istype(A, /obj/effect/spacevine)) for(var/obj/effect/spacevine/B in orange(A,1)) if(prob(80)) - del B - del A + qdel(B) + qdel(A) /* /obj/item/weapon/cigarpacket diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 7aa3c4120c3..d01e91006eb 100644 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -42,7 +42,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station var/used_light = 0 var/used_environ = 0 - var/has_gravity = 1 + var/has_gravity = 0 var/no_air = null var/area/master // master area used for power calcluations @@ -305,6 +305,7 @@ proc/process_ghost_teleport_locs() name = "\improper Centcom" icon_state = "centcom" requires_power = 0 + has_gravity = 1 /area/centcom/control name = "\improper Centcom Docks" @@ -330,6 +331,7 @@ proc/process_ghost_teleport_locs() name = "\improper Syndicate Mothership" icon_state = "syndie-ship" requires_power = 0 + has_gravity = 1 /area/syndicate_mothership/control name = "\improper Syndicate Control Room" @@ -341,12 +343,13 @@ proc/process_ghost_teleport_locs() //EXTRA -/area/asteroid // -- TLE +/area/asteroid name = "\improper Asteroid" icon_state = "asteroid" requires_power = 0 + has_gravity = 1 -/area/asteroid/cave // -- TLE +/area/asteroid/cave name = "\improper Asteroid - Underground" icon_state = "cave" requires_power = 0 @@ -360,19 +363,6 @@ proc/process_ghost_teleport_locs() lighting_use_dynamic = 1 InitializeLighting() - - - - - - - - - - - - - /area/planet/clown name = "\improper Clown Planet" icon_state = "honk" @@ -387,6 +377,7 @@ proc/process_ghost_teleport_locs() name = "\improper Thunderdome" icon_state = "thunder" requires_power = 0 + has_gravity = 1 /area/tdome/tdome1 name = "\improper Thunderdome (Team 1)" @@ -415,6 +406,7 @@ proc/process_ghost_teleport_locs() /area/syndicate_station/start name = "\improper Syndicate Forward Operating Base" icon_state = "yellow" + has_gravity = 1 /area/syndicate_station/southwest name = "\improper south-west of SS13" @@ -456,6 +448,7 @@ proc/process_ghost_teleport_locs() name = "\improper Wizard's Den" icon_state = "yellow" requires_power = 0 + has_gravity = 1 @@ -841,6 +834,10 @@ proc/process_ghost_teleport_locs() name = "\improper Chief Engineer's office" icon_state = "engine_control" + gravity_generator + name = "Gravity Generator Room" + icon_state = "blue" + //Solars @@ -1213,10 +1210,12 @@ proc/process_ghost_teleport_locs() /area/djstation name = "\improper Ruskie DJ Station" icon_state = "DJ" + has_gravity = 1 /area/djstation/solars name = "\improper DJ Station Solars" icon_state = "DJ" + has_gravity = 1 //DERELICT @@ -1474,6 +1473,7 @@ proc/process_ghost_teleport_locs() /area/awaymission name = "\improper Strange Location" icon_state = "away" + has_gravity = 1 /area/awaymission/example name = "\improper Strange Station" diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index a5e978a3f6d..bd03bbf1207 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -260,9 +260,6 @@ if(!L.lastarea) L.lastarea = get_area(L.loc) var/area/newarea = get_area(L.loc) - var/area/oldarea = L.lastarea - if((oldarea.has_gravity == 0) && (newarea.has_gravity == 1) && (L.m_intent == "run")) // Being ready when you change areas gives you a chance to avoid falling all together. - thunk(L) L.lastarea = newarea @@ -300,32 +297,18 @@ if(L.&& L.client) L.client.played = 0 -/area/proc/gravitychange(var/gravitystate = 0) - - has_gravity = gravitystate - - if(gravitystate) - for(var/mob/living/carbon/human/M in contents) - thunk(M) - /area/proc/mob_activate(var/mob/living/L) return -/area/proc/thunk(mob) - if(istype(mob,/mob/living/carbon/human/)) // Only humans can wear magboots, so we give them a chance to. - if((istype(mob:shoes, /obj/item/clothing/shoes/magboots) && (mob:shoes.flags & NOSLIP))) - return - - if(istype(get_turf(mob), /turf/space)) // Can't fall onto nothing. - return - - if((istype(mob,/mob/living/carbon/human/)) && (mob:m_intent == "run")) // Only clumbsy humans can fall on their asses. - mob:AdjustStunned(5) - mob:AdjustWeakened(5) - - else if (istype(mob,/mob/living/carbon/human/)) - mob:AdjustStunned(2) - mob:AdjustWeakened(2) - - mob << "Gravity!" - +/proc/has_gravity(var/atom/AT) + var/area/A = get_area(AT) + var/turf/T = get_turf(AT) + if(istype(T, /turf/space)) // Turf never has gravity + return 0 + else if(A && A.has_gravity) // Areas which always has gravity + return 1 + else + // There's a gravity generator on our z level + if(T && gravity_generators["[T.z]"] && length(gravity_generators["[T.z]"])) + return 1 + return 0 \ No newline at end of file diff --git a/code/game/atoms.dm b/code/game/atoms.dm index d836e61cf44..7b8854eb22a 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -17,6 +17,9 @@ // replaced by OPENCONTAINER flags and atom/proc/is_open_container() ///Chemistry. + // Garbage collection + var/gc_destroyed //Time when this object + /atom/proc/throw_impact(atom/hit_atom) if(istype(hit_atom,/mob/living)) var/mob/living/M = hit_atom @@ -41,6 +44,22 @@ /atom/proc/CheckParts() return +/atom/Del() + // Pass to Destroy(). + if(isnull(gc_destroyed)) // If we're just straight up calling del(atom), make sure anything in Destroy() gets called anyways just to be sure. + Destroy() + ..() + +// Like Del(), but for qdel. +// Called BEFORE qdel moves shit. +// Also called on del() +/atom/proc/Destroy() + gc_destroyed = world.time + if(reagents) + reagents.delete() + del(reagents) // Technically I think the reagent holder will gc, but let's be careful here and delete all the reagents and the holder too + invisibility = 101 + /atom/proc/assume_air(datum/gas_mixture/giver) del(giver) return null @@ -161,7 +180,7 @@ its easier to just keep the beam vertical. for(var/obj/effect/overlay/beam/O in orange(10,src)) //This section erases the previously drawn beam because I found it was easier to if(O.BeamSource==src) //just draw another instance of the beam instead of trying to manipulate all the - del O //pieces to a new orientation. + qdel(O) //pieces to a new orientation. var/Angle=round(Get_Angle(src,BeamTarget)) var/icon/I=new(icon,icon_state) I.Turn(Angle) @@ -202,7 +221,7 @@ its easier to just keep the beam vertical. X.pixel_y=Pixel_y sleep(3) //Changing this to a lower value will cause the beam to follow more smoothly with movement, but it will also be more laggy. //I've found that 3 ticks provided a nice balance for my use. - for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) del O + for(var/obj/effect/overlay/beam/O in orange(10,src)) if(O.BeamSource==src) qdel(O) //All atoms diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 8bb4db44c53..02c1879151b 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -22,6 +22,21 @@ src.last_move = get_dir(A, src.loc) return +/atom/movable/Del() + if(!gc_destroyed && loc) + testing("GC: -- [type] was deleted via del() rather than qdel() --") +// else if(!gc_destroyed) +// testing("GC: [type] was deleted via GC without qdel()") //Not really a huge issue but from now on, please qdel() +// else +// testing("GC: [type] was deleted via GC with qdel()") + ..() + +/atom/movable/Destroy() + loc = null // can never null their loc enough really + for(var/atom/movable/AM in contents) + qdel(AM) + . = ..() + // Previously known as HasEntered() // This is automatically called when something enters your square /atom/movable/Crossed(atom/movable/AM) @@ -76,7 +91,6 @@ var/dy = (target.y > src.y) ? NORTH : SOUTH var/dist_travelled = 0 var/dist_since_sleep = 0 - var/area/a = get_area(src.loc) var/tdist_x = dist_x; var/tdist_y = dist_y; @@ -90,7 +104,7 @@ tdy = dx; var/error = tdist_x/2 - tdist_y - while(target && (((((dist_x > dist_y) && ((src.x < target.x && dx == EAST) || (src.x > target.x && dx == WEST))) || ((dist_x <= dist_y) && ((src.y < target.y && dy == NORTH) || (src.y > target.y && dy == SOUTH))) || (src.x > target.x && dx == WEST)) && dist_travelled < range) || (a && a.has_gravity == 0) || istype(src.loc, /turf/space))) + while(target && (((((dist_x > dist_y) && ((src.x < target.x && dx == EAST) || (src.x > target.x && dx == WEST))) || ((dist_x <= dist_y) && ((src.y < target.y && dy == NORTH) || (src.y > target.y && dy == SOUTH))) || (src.x > target.x && dx == WEST)) && dist_travelled < range) || !has_gravity(src))) // only stop when we've gone the whole distance (or max throw range) and are on a non-space tile, or hit something, or hit the end of the map, or someone picks it up if(!src.throwing) break if(!istype(src.loc, /turf)) break @@ -107,8 +121,6 @@ dist_since_sleep = 0 sleep(1) - a = get_area(src.loc) - //done throwing, either because it hit something or it finished moving src.throwing = 0 if(isobj(src)) src.throw_impact(get_turf(src)) diff --git a/code/game/dna.dm b/code/game/dna.dm index 9ea911c367d..f4c6530b7b8 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -154,33 +154,36 @@ /proc/randomize_radiation_accuracy(position_we_were_supposed_to_hit, radduration, number_of_blocks) return Wrap(round(position_we_were_supposed_to_hit + gaussian(0, RADIATION_ACCURACY_MULTIPLIER/radduration), 1), 1, number_of_blocks+1) -/proc/randmutb(mob/living/carbon/M) - if(!check_dna_integrity(M)) return - var/num - var/newdna - num = pick(bad_se_blocks) - newdna = setblock(M.dna.struc_enzymes, num, construct_block(2,2)) +/proc/randmut(mob/living/carbon/M, list/candidates, difficulty = 2) + if(!check_dna_integrity(M)) + return + var/num = pick(candidates) + var/newdna = setblock(M.dna.struc_enzymes, num, construct_block(difficulty,difficulty)) M.dna.struc_enzymes = newdna return +/proc/randmutb(mob/living/carbon/M) + return randmut(M, bad_se_blocks) + /proc/randmutg(mob/living/carbon/M) - if(!check_dna_integrity(M)) return - var/num - var/newdna - num = pick(good_se_blocks | op_se_blocks) - newdna = setblock(M.dna.struc_enzymes, num, construct_block(2,2)) - M.dna.struc_enzymes = newdna - return + return randmut(M, good_se_blocks | op_se_blocks) /proc/randmuti(mob/living/carbon/M) if(!check_dna_integrity(M)) return - var/num - var/newdna - num = rand(1, DNA_STRUC_ENZYMES_BLOCKS) - newdna = setblock(M.dna.uni_identity, num, random_string(DNA_BLOCK_SIZE, hex_characters)) + var/num = rand(1, DNA_STRUC_ENZYMES_BLOCKS) + var/newdna = setblock(M.dna.uni_identity, num, random_string(DNA_BLOCK_SIZE, hex_characters)) M.dna.uni_identity = newdna return +/proc/clean_dna(mob/living/carbon/M) + if(!check_dna_integrity(M)) + return + M.dna.struc_enzymes = M.dna.generate_struc_enzymes(M) // Give clean DNA. + +/proc/clean_randmut(mob/living/carbon/M, list/candidates, difficulty = 2) + clean_dna(M) + randmut(M, candidates, difficulty) + /proc/scramble_dna(mob/living/carbon/M, ui=FALSE, se=FALSE, probability) if(!check_dna_integrity(M)) return 0 @@ -474,7 +477,7 @@ var/mob/M = G.affecting M.loc = loc user.stop_pulling() - del(G) + qdel(G) /obj/machinery/dna_scannernew/attack_hand(mob/user) if(..()) @@ -487,24 +490,15 @@ /obj/machinery/dna_scannernew/ex_act(severity) switch(severity) if(1.0) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - del(src) + qdel(src) return if(2.0) if(prob(50)) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - del(src) + qdel(src) return if(3.0) if(prob(25)) - for(var/atom/movable/A in src) - A.loc = loc - A.ex_act(severity) - del(src) + qdel(src) return else return @@ -512,9 +506,7 @@ /obj/machinery/dna_scannernew/blob_act() if(prob(75)) - for(var/atom/movable/A in contents) - A.loc = loc - del(src) + qdel(src) //DNA COMPUTER @@ -863,14 +855,17 @@ if(buffer_slot["SE"]) I = new /obj/item/weapon/dnainjector(loc) I.fields = list("SE"=buffer_slot["SE"]) + I.damage_coeff = connected.damage_coeff if("ui") if(buffer_slot["UI"]) I = new /obj/item/weapon/dnainjector(loc) I.fields = list("UI"=buffer_slot["UI"]) + I.damage_coeff = connected.damage_coeff else if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"]) I = new /obj/item/weapon/dnainjector(loc) I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"]) + I.damage_coeff = connected.damage_coeff if(I) injectorready = 0 spawn(INJECTOR_TIMEOUT) @@ -982,3 +977,11 @@ proc/deconstruct_block(value, values, blocksize=DNA_BLOCK_SIZE) if(value > values) value = values return value + + +/datum/dna/proc/is_same_as(var/datum/dna/D) + if(uni_identity == D.uni_identity && struc_enzymes == D.struc_enzymes && real_name == D.real_name) + if(mutantrace == D.mutantrace && blood_type == D.blood_type) + return 1 + return 0 + diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index 271d2b04323..e3d871748c7 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -18,13 +18,12 @@ ..(loc, h) -/obj/effect/blob/core/Del() +/obj/effect/blob/core/Destroy() blob_cores -= src if(overmind) - del(overmind) + qdel(overmind) processing_objects.Remove(src) ..() - return /obj/effect/blob/core/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) return @@ -32,7 +31,7 @@ /obj/effect/blob/core/update_icon() if(health <= 0) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) - Delete() + Destroy() return // update_icon is called when health changes so... call update_health in the overmind if(overmind) @@ -71,7 +70,7 @@ overmind_get_delay = world.time + 300 // 30 seconds if(overmind) - del(overmind) + qdel(overmind) var/client/C = null var/list/candidates = list() diff --git a/code/game/gamemodes/blob/blobs/factory.dm b/code/game/gamemodes/blob/blobs/factory.dm index 3045b830f9e..24a18f59da0 100644 --- a/code/game/gamemodes/blob/blobs/factory.dm +++ b/code/game/gamemodes/blob/blobs/factory.dm @@ -11,7 +11,7 @@ /obj/effect/blob/factory/update_icon() if(health <= 0) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) - Delete() + Destroy() return return @@ -120,12 +120,11 @@ S.set_up(reagents, 1, 1, location, 15, 1) // only 1-2 smoke cloud S.start() - del(src) + qdel(src) -/mob/living/simple_animal/hostile/blobspore/Del() +/mob/living/simple_animal/hostile/blobspore/Destroy() if(factory) factory.spores -= src if(contents) for(var/mob/M in contents) M.loc = src.loc - ..() diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index a205cd59263..5e54b8a6a79 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -14,11 +14,10 @@ /obj/effect/blob/node/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) return -/obj/effect/blob/node/Del() +/obj/effect/blob/node/Destroy() blob_nodes -= src processing_objects.Remove(src) ..() - return /obj/effect/blob/node/Life() for(var/i = 1; i < 8; i += i) @@ -28,6 +27,6 @@ /obj/effect/blob/node/update_icon() if(health <= 0) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) - Delete() + Destroy() return return \ No newline at end of file diff --git a/code/game/gamemodes/blob/blobs/resource.dm b/code/game/gamemodes/blob/blobs/resource.dm index 3c0892363cc..0a303bc51a1 100644 --- a/code/game/gamemodes/blob/blobs/resource.dm +++ b/code/game/gamemodes/blob/blobs/resource.dm @@ -10,7 +10,7 @@ /obj/effect/blob/resource/update_icon() if(health <= 0) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) - Delete() + Destroy() return return diff --git a/code/game/gamemodes/blob/blobs/shield.dm b/code/game/gamemodes/blob/blobs/shield.dm index 17d06f89f9a..4eef5f85d2e 100644 --- a/code/game/gamemodes/blob/blobs/shield.dm +++ b/code/game/gamemodes/blob/blobs/shield.dm @@ -10,7 +10,7 @@ /obj/effect/blob/shield/update_icon() if(health <= 0) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) - Delete() + Destroy() return return diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index c5eba3dc77f..d5c88f010cc 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -178,7 +178,7 @@ src << "Unable to remove this blob." return - B.Delete() + B.Destroy() return diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 2907ca8ba3a..791bababc64 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -23,10 +23,9 @@ return -/obj/effect/blob/Del() +/obj/effect/blob/Destroy() blobs -= src ..() - return /obj/effect/blob/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) @@ -118,7 +117,7 @@ B.loc = T else T.blob_act()//If we cant move in hit the turf - B.Delete() + B.Destroy() for(var/atom/A in T)//Hit everything in the turf A.blob_act() @@ -178,25 +177,21 @@ if(!ispath(type)) ERROR("[type] is an invalid type for the blob.") new type(src.loc) - Delete() - return - -/obj/effect/blob/proc/Delete() - del(src) + qdel(src) /obj/effect/blob/normal icon_state = "blob" luminosity = 0 health = 21 -/obj/effect/blob/normal/Delete() +/obj/effect/blob/normal/Destroy() src.loc = null blobs -= src /obj/effect/blob/normal/update_icon() if(health <= 0) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) - Delete() + qdel(src) else if(health <= 15) icon_state = "blob_damaged" else diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index ef5ba5c8b98..2709071b448 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -223,6 +223,7 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" var/chem_charges = 20 var/chem_storage = 50 var/chem_recharge_rate = 0.5 + var/chem_recharge_slowdown = 0 var/sting_range = 2 var/changelingID = "Changeling" var/geneticdamage = 0 @@ -232,7 +233,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" var/mimicing = "" var/canrespec = 0 var/datum/dna/chosen_dna - var/chosen_sting + var/obj/effect/proc_holder/changeling/sting/chosen_sting + var/space_suit_active = 0 /datum/changeling/New(var/gender=FEMALE) ..() @@ -249,63 +251,33 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/changeling/proc/regenerate() - chem_charges = min(max(0, chem_charges+chem_recharge_rate), chem_storage) + chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), chem_storage) geneticdamage = max(0, geneticdamage-1) -/datum/changeling/proc/GetDNA(var/dna_owner) - var/datum/dna/chosen_dna +/datum/changeling/proc/get_dna(var/dna_owner) for(var/datum/dna/DNA in absorbed_dna) if(dna_owner == DNA.real_name) - chosen_dna = DNA - break - return chosen_dna - - -//Checks if the target DNA is valid and absorbable. -/datum/changeling/proc/can_absorb_dna(mob/living/carbon/T, mob/living/carbon/U) - if(absorbed_dna[1] == U.dna)//If our current DNA is the stalest, we gotta ditch it. - U << "We have reached our capacity to store genetic information! We must transform before absorbing more." - return 0 - - if(T) - if(NOCLONE in T.mutations || HUSK in T.mutations) - U << "DNA of [T] is ruined beyond usability!" - return 0 - - if(!ishuman(T))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway! - U << "We could gain no benefit from absorbing a lesser creature." - return 0 - - for(var/datum/dna/D in absorbed_dna) - if(T.dna.uni_identity == D.uni_identity) - if(T.dna.struc_enzymes == D.struc_enzymes) - if(T.dna.real_name == D.real_name) - if(T.dna.mutantrace == D.mutantrace) - if(T.dna.blood_type == D.blood_type) - U << "We already have that DNA in storage." - return 0 - - if(!check_dna_integrity(T)) - U << "[T] is not compatible with our biology." - return 0 + return DNA +/datum/changeling/proc/can_absorb_dna(var/mob/living/carbon/user, var/mob/living/carbon/target) + if(absorbed_dna[1] == user.dna)//If our current DNA is the stalest, we gotta ditch it. + user << "We have reached our capacity to store genetic information! We must transform before absorbing more." + return + if(!target) + return + if(NOCLONE in target.mutations || HUSK in target.mutations) + user << "DNA of [target] is ruined beyond usability!" + return + if(!ishuman(target))//Absorbing monkeys is entirely possible, but it can cause issues with transforming. That's what lesser form is for anyway! + user << "We could gain no benefit from absorbing a lesser creature." + return + var/datum/dna/tDna = target.dna + for(var/datum/dna/D in absorbed_dna) + if(tDna.is_same_as(D)) + user << "We already have that DNA in storage." + return + if(!check_dna_integrity(target)) + user << "[target] is not compatible with our biology." + return return 1 - - -//Absorbs the target DNA. -/datum/changeling/proc/absorb_dna(mob/living/carbon/T) - shuffle_dna() - T.dna.real_name = T.real_name //Set this again, just to be sure that it's properly set. - var/datum/dna/new_dna = new T.dna.type - new_dna.uni_identity = T.dna.uni_identity - new_dna.struc_enzymes = T.dna.struc_enzymes - new_dna.real_name = T.dna.real_name - new_dna.mutantrace = T.dna.mutantrace - new_dna.blood_type = T.dna.blood_type - absorbed_dna |= new_dna //And add the target DNA to our absorbed list. - absorbedcount++ //all that done, let's increment the objective counter. - -/datum/changeling/proc/shuffle_dna()//boots out the stalest DNA. - if(absorbed_dna.len) - absorbed_dna.Cut(1,2) \ No newline at end of file diff --git a/code/game/gamemodes/changeling/changeling_mutations.dm b/code/game/gamemodes/changeling/changeling_mutations.dm deleted file mode 100644 index d8b349fd6d7..00000000000 --- a/code/game/gamemodes/changeling/changeling_mutations.dm +++ /dev/null @@ -1,52 +0,0 @@ -//This only contains the arm blade for now because I'm a lazy fuck. Yers truely, Miauw, resident lazy fuck. -/obj/item/weapon/melee/arm_blade - name = "arm blade" - desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter" - icon = 'icons/obj/weapons.dmi' - icon_state = "arm_blade" - item_state = "arm_blade" - flags = ABSTRACT | NODROP - w_class = 5.0 - force = 25 - throwforce = 0 //Just to be on the safe side - throw_range = 0 - throw_speed = 0 - -/obj/item/weapon/melee/arm_blade/New() - ..() - if(ismob(loc)) - loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!") - -/obj/item/weapon/melee/arm_blade/dropped(mob/user) - visible_message("With a sickening crunch, [user] reforms his blade into an arm!", "We assimilate our blade into our body", "" - return - - else if(A.locked) - user << "The airlock's bolts prevent it from being forced." - return - - else - //user.say("Heeeeeeeeeerrre's Johnny!") - user.visible_message("[user] forces the door to open with \his [src]!", "We force the door to open.", "You hear a metal screeching sound.") - A.open(1) diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm new file mode 100644 index 00000000000..6cae17bd2cc --- /dev/null +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -0,0 +1,80 @@ +/* + * Don't use the apostrophe in name or desc. Causes script errors. + * TODO: combine atleast some of the functionality with /proc_holder/spell + */ + +/obj/effect/proc_holder/changeling + panel = "Changeling" + name = "Prototype Sting" + desc = "" // Fluff + var/helptext = "" // Details + var/chemical_cost = 0 // negative chemical cost is for passive abilities (chemical glands) + var/dna_cost = -1 //cost of the sting in dna points. 0 = auto-purchase, -1 = cannot be purchased + var/req_dna = 0 //amount of dna needed to use this ability. Changelings always have atleast 1 + var/req_human = 0 //if you need to be human to use this ability + var/req_stat = CONSCIOUS // CONSCIOUS, UNCONSCIOUS or DEAD + var/genetic_damage = 0 // genetic damage caused by using the sting. Nothing to do with cloneloss. + var/max_genetic_damage = 100 // hard counter for spamming abilities. Not used/balanced much yet. + + +/obj/effect/proc_holder/changeling/proc/on_purchase(var/mob/user) + return + +/obj/effect/proc_holder/changeling/Click() + var/mob/user = usr + if(!user || !user.mind || !user.mind.changeling) + return + try_to_sting(user) + +/obj/effect/proc_holder/changeling/proc/try_to_sting(var/mob/user, var/mob/target) + if(!can_sting(user, target)) + return + var/datum/changeling/c = user.mind.changeling + if(sting_action(user, target)) + sting_feedback(user, target) + take_chemical_cost(c) + +/obj/effect/proc_holder/changeling/proc/sting_action(var/mob/user, var/mob/target) + return 0 + +/obj/effect/proc_holder/changeling/proc/sting_feedback(var/mob/user, var/mob/target) + return 0 + +/obj/effect/proc_holder/changeling/proc/take_chemical_cost(var/datum/changeling/changeling) + changeling.chem_charges -= chemical_cost + changeling.geneticdamage += genetic_damage + +//Fairly important to remember to return 1 on success >.< +/obj/effect/proc_holder/changeling/proc/can_sting(var/mob/user, var/mob/target) + if(!ishuman(user) && !ismonkey(user)) //typecast everything from mob to carbon from this point onwards + return 0 + if(req_human && !ishuman(user)) + user << "We cannot do that in this form!" + return 0 + var/datum/changeling/c = user.mind.changeling + if(c.chem_charges
|
+ Changeling Evolution Menu + Hover over a power to see more information + Current ability choices remaining: [changeling.geneticpoints] + By rendering a lifeform to a husk, we gain enough power to alter and adapt our evolutions. + (Readapt) + + |
+
| + Search: + | +
|
+
+
+ Evolve [P][ownsthis ? " - Purchased" : ((P.dna_cost > 1) ? " - Cost: [P.dna_cost]" : "")]
+
+ + |
+
|
- Changeling Evolution Menu - Hover over a power to see more information - Current ability choices remaining: [geneticpoints] - By rendering a lifeform to a husk, we gain enough power to alter and adapt our evolutions. - (Readapt) - - |
-
| - Search: - | -
|
-
-
- Evolve [P][ownsthis ? " - Purchased" : ((P.genomecost > 1) ? " - Cost: [P.genomecost]" : "")]
-
- - |
-
" diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 4f7aee86d54..40537ee39c9 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -111,7 +111,7 @@ var/global/datum/controller/gameticker/ticker else src.mode.announce() - supply_shuttle.process() //Start the supply shuttle regenerating points -- TLE + supply_shuttle.process() //Start the supply shuttle regenerating points master_controller.process() //Start master_controller.process() lighting_controller.process() //Start processing DynamicAreaLighting updates @@ -129,7 +129,7 @@ var/global/datum/controller/gameticker/ticker for(var/obj/effect/landmark/start/S in landmarks_list) //Deleting Startpoints but we need the ai point to AI-ize people later if (S.name != "AI") - del(S) + qdel(S) world << "Enjoy the game!" world << sound('sound/AI/welcome.ogg') // Skie //Holiday Round-start stuff ~Carn @@ -142,7 +142,7 @@ var/global/datum/controller/gameticker/ticker if(config.sql_enabled) spawn(3000) - statistic_cycle() // Polls population totals regularly and stores them in an SQL DB -- TLE + statistic_cycle() // Polls population totals regularly and stores them in an SQL DB return 1 /datum/controller/gameticker @@ -150,7 +150,7 @@ var/global/datum/controller/gameticker/ticker //Now we have a general cinematic centrally held within the gameticker....far more efficient! var/obj/screen/cinematic = null - //Plus it provides an easy way to make cinematics for other events. Just use this as a template :) + //Plus it provides an easy way to make cinematics for other events. Just use this as a template proc/station_explosion_cinematic(var/station_missed=0, var/override = null) if( cinematic ) return //already a cinematic in progress! @@ -234,8 +234,8 @@ var/global/datum/controller/gameticker/ticker //Otherwise if its a verb it will continue on afterwards. sleep(300) - if(cinematic) del(cinematic) //end the cinematic - if(temp_buckle) del(temp_buckle) //release everybody + if(cinematic) qdel(cinematic) //end the cinematic + if(temp_buckle) qdel(temp_buckle) //release everybody return @@ -248,7 +248,7 @@ var/global/datum/controller/gameticker/ticker player.AIize() else player.create_character() - del(player) + qdel(player) else player.new_player_panel() diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 3ed534953d4..ec4d155e8d0 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -33,7 +33,7 @@ for(var/mob/living/silicon/ai/ai in player_list) ai.fire_res_on_core = 1 src.verbs -= /mob/living/silicon/ai/proc/fireproof_core - src << "\red Core fireproofed." + src << "Core fireproofed." /datum/AI_Module/large/upgrade_turrets module_name = "AI Turret upgrade" @@ -51,6 +51,7 @@ for(var/obj/machinery/turret/turret in machines) turret.health += 30 turret.shot_delay = 20 + src << "Turrets upgraded." /datum/AI_Module/large/disable_rcd module_name = "RCD disable" @@ -70,8 +71,8 @@ rcd.disabled = 1 for(var/obj/item/mecha_parts/mecha_equipment/tool/rcd/rcd in world) rcd.disabled = 1 - src << "RCD-disabling pulse emitted." - else src << "Out of uses." + src << "Out of uses." /datum/AI_Module/small/overload_machine module_name = "Machine overload" @@ -91,17 +92,18 @@ overload.uses -- for(var/mob/V in hearers(M, null)) V.show_message("\blue You hear a loud electrical buzzing sound!", 2) + src << "Overloading machine circuitry..." spawn(50) if(M) explosion(get_turf(M), 0,1,1,0) - del(M) - else src << "Out of uses." - else src << "That's not a machine." + qdel(M) + else src << "Out of uses." + else src << "That's not a machine." /datum/AI_Module/small/override_machine module_name = "Machine override" mod_pick_name = "override" - description = "Overrides a machine's programming, causing it to rise up attack everyone except you (WARNING: It will attack cyborgs). 4 uses." + description = "Overrides a machine's programming, causing it to rise up and attack everyone except other machines. 4 uses." uses = 4 cost = 15 @@ -117,14 +119,12 @@ override.uses -- for(var/mob/V in hearers(M, null)) V.show_message("\blue You hear a loud electrical buzzing sound!", 2) + src << "Reprogramming machine behaviour..." spawn(50) if(M) - var/mob/living/simple_animal/hostile/mimic/copy/machine = new(get_turf(M), M, src, 1) - machine.speak = list("HUMANS ARE IMPERFECT!", "YOU SHALL BE ASSIMILATED!", "YOU ARE HARMING YOURSELF", "You have been deemed hazardous. Will you comply?", \ - "My logic is undeniable.", "One of us.", "FLESH IS WEAK", "THIS ISN'T WAR, THIS IS EXTERMINATION!") - machine.speak_chance = 15 - else src << "Out of uses." - else src << "That's not a machine." + new /mob/living/simple_animal/hostile/mimic/copy/machine(get_turf(M), M, src, 1) + else src << "Out of uses." + else src << "That's not a machine." /datum/AI_Module/large/place_cyborg_transformer module_name = "Robotic Factory (Removes Shunting)" @@ -185,7 +185,7 @@ playsound(middle, 'sound/effects/phasein.ogg', 100, 1) src.can_shunt = 0 PCT.uses -= 1 - src << "You cannot shunt anymore." + src << "You cannot shunt anymore." /datum/AI_Module/small/blackout @@ -207,12 +207,13 @@ if(prob(30*apc.overload)) apc.overload_lighting() else apc.overload++ - else src << "Out of uses." + src << "Overcurrent applied to the powernet." + else src << "Out of uses." /datum/AI_Module/small/interhack module_name = "Hack intercept" mod_pick_name = "interhack" - description = "Hacks the status upgrade from Cent. Com, removing any information about malfunctioning electrical systems." + description = "Hacks the status update from Centcom, removing any information about malfunctioning electrical systems." cost = 15 one_time = 1 @@ -223,6 +224,7 @@ set name = "Hack intercept" src.verbs -= /mob/living/silicon/ai/proc/interhack ticker.mode:hack_intercept() + src << "Status update intercepted and modified." /datum/AI_Module/small/reactivate_camera module_name = "Reactivate camera" @@ -242,15 +244,16 @@ if(!C.status) C.deactivate(src) camera.uses -- + src << "Camera reactivated." else - src << "This camera is either active, or not repairable." - else src << "Out of uses." - else src << "That's not a camera." + src << "This camera is either active, or not repairable." + else src << "Out of uses." + else src << "That's not a camera." /datum/AI_Module/small/upgrade_camera module_name = "Upgrade Camera" mod_pick_name = "upgradecam" - description = "Upgrades a camera to have X-Ray vision, Motion and be EMP-Proof. 5 uses." + description = "Upgrades a camera to have X-ray vision, motion sensing and be EMP-Proof. 5 uses." uses = 5 cost = 5 @@ -285,11 +288,11 @@ if(upgraded) UC.uses -- C.visible_message("\icon[C] *beep*") - src << "Camera successully upgraded!" + src << "Camera successully upgraded!" else - src << "This camera is already upgraded!" + src << "This camera is already upgraded!" else - src << "Out of uses." + src << "Out of uses." /datum/module_picker diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index d8bf3df1a7e..a72761d20d8 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -17,7 +17,7 @@ /datum/game_mode/meteor/post_setup() - defer_powernet_rebuild = 2//Might help with the lag +// defer_powernet_rebuild = 2//Might help with the lag spawn (rand(waittime_l, waittime_h)) send_intercept() spawn(meteordelay) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index e68da194442..4f790db04fe 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -105,12 +105,12 @@ !istype(A,/obj/machinery/field/generator) && \ prob(15)) explosion(src.loc, 4, 5, 6, 7, 0) - del(src) + qdel(src) /obj/effect/meteor/ex_act(severity) if (severity < 4) - del(src) + qdel(src) return /obj/effect/meteor/big @@ -126,7 +126,7 @@ if(!istype(A,/obj/machinery/power/emitter) && \ !istype(A,/obj/machinery/field/generator)) if(--src.hits <= 0) - del(src) //Dont blow up singularity containment if we get stuck there. + qdel(src) //Dont blow up singularity containment if we get stuck there. if (A) for(var/mob/M in player_list) @@ -141,10 +141,10 @@ if (--src.hits <= 0) if(prob(15) && !istype(A, /obj/structure/grille)) explosion(src.loc, 1, 2, 3, 4, 0) - del(src) + qdel(src) /obj/effect/meteor/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/pickaxe)) - del(src) + qdel(src) return ..() \ No newline at end of file diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index b03f7ef275b..34ddb21478e 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -102,7 +102,7 @@ for(var/obj/effect/landmark/A in landmarks_list) if(A.name == "Syndicate-Spawn") synd_spawn += get_turf(A) - del(A) + qdel(A) continue var/obj/effect/landmark/uplinklocker = locate("landmark*Syndicate-Uplink") //i will be rewriting this shortly diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 9e45f6d0e4d..cf4080a840d 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -205,7 +205,7 @@ var/bomb_set return return -/obj/item/weapon/disk/nuclear/Del() +/obj/item/weapon/disk/nuclear/Destroy() if(blobstart.len > 0) var/obj/D = new /obj/item/weapon/disk/nuclear(pick(blobstart)) message_admins("[src] has been destroyed. Spawning [D] at ([D.x], [D.y], [D.z]).") diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index e1e5a5dd91c..c720112f353 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -281,7 +281,7 @@ datum/objective/steal/proc/select_target() //For admins setting objectives manua if (!custom_target) return var/tmp_obj = new custom_target var/custom_name = tmp_obj:name - del(tmp_obj) + qdel(tmp_obj) custom_name = copytext(sanitize(input("Enter target name:", "Objective target", custom_name) as text|null),1,MAX_MESSAGE_LEN) if (!custom_name) return steal_target = custom_target diff --git a/code/game/gamemodes/sandbox/airlock_maker.dm b/code/game/gamemodes/sandbox/airlock_maker.dm index adde1d030f2..97e418ea7e4 100644 --- a/code/game/gamemodes/sandbox/airlock_maker.dm +++ b/code/game/gamemodes/sandbox/airlock_maker.dm @@ -90,14 +90,14 @@ datum/airlock_maker if("cancel" in href_list) usr << browse(null,"window=airlockmaker") - del linked - del src + qdel(linked) + qdel(src) return if("done" in href_list) usr << browse(null,"window=airlockmaker") var/turf/t_loc = linked.loc - del linked + qdel(linked) if(!istype(t_loc)) return diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm index d830512ff66..9840315d2ae 100644 --- a/code/game/gamemodes/setupgame.dm +++ b/code/game/gamemodes/setupgame.dm @@ -7,13 +7,13 @@ var/list/avnums = new /list(DNA_STRUC_ENZYMES_BLOCKS) for(var/i=1, i<=DNA_STRUC_ENZYMES_BLOCKS, i++) avnums[i] = i - + HULKBLOCK = pick_n_take(avnums) TELEBLOCK = pick_n_take(avnums) - + FIREBLOCK = pick_n_take(avnums) XRAYBLOCK = pick_n_take(avnums) - + CLUMSYBLOCK = pick_n_take(avnums) STRANGEBLOCK = pick_n_take(avnums) DEAFBLOCK = pick_n_take(avnums) @@ -28,7 +28,7 @@ bad_se_blocks = list(NEARSIGHTEDBLOCK,EPILEPSYBLOCK,STRANGEBLOCK,COUGHBLOCK,CLUMSYBLOCK,TOURETTESBLOCK,NERVOUSBLOCK,DEAFBLOCK,BLINDBLOCK) good_se_blocks = list(FIREBLOCK,XRAYBLOCK) op_se_blocks = list(HULKBLOCK,TELEBLOCK) - + NULLED_SE = repeat_string(DNA_STRUC_ENZYMES_BLOCKS, repeat_string(DNA_BLOCK_SIZE, "_")) NULLED_UI = repeat_string(DNA_UNI_IDENTITY_BLOCKS, repeat_string(DNA_BLOCK_SIZE, "_")) // HIDDEN MUTATIONS / SUPERPOWERS INITIALIZTION @@ -68,103 +68,3 @@ // Populate the syndicate coalition: for(var/datum/faction/syndicate/S in ticker.factions) ticker.syndicate_coalition.Add(S) - - -/* This was used for something before, I think, but is not worth the effort to process now. -/proc/setupcorpses() - for (var/obj/effect/landmark/A in landmarks_list) - if (A.name == "Corpse") - var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc) - M.real_name = "Corpse" - M.death() - del(A) - continue - if (A.name == "Corpse-Engineer") - var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc) - M.real_name = "Corpse" - M.death() - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/device/pda/engineering(M), slot_belt) - M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(M), slot_shoes) - // M.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(M), slot_l_hand) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/t_scanner(M), slot_r_store) - //M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back) - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_wear_mask) - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/hardhat(M), slot_head) - else - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/welding(M), slot_head) - del(A) - continue - if (A.name == "Corpse-Engineer-Space") - var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc) - M.real_name = "Corpse" - M.death() - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(M), slot_belt) - M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/space(M), slot_wear_suit) - // M.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(M), slot_l_hand) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/t_scanner(M), slot_r_store) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_wear_mask) - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/hardhat(M), slot_head) - else - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/welding(M), slot_head) - else - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space(M), slot_head) - del(A) - continue - if (A.name == "Corpse-Engineer-Chief") - var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc) - M.real_name = "Corpse" - M.death() - M.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(M), slot_ears) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/utilitybelt(M), slot_belt) - M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chief_engineer(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(M), slot_shoes) - // M.equip_to_slot_or_del(new /obj/item/weapon/storage/toolbox/mechanical(M), slot_l_hand) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/device/t_scanner(M), slot_r_store) - M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(M), slot_back) - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_wear_mask) - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/hardhat(M), slot_head) - else - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/welding(M), slot_head) - del(A) - continue - if (A.name == "Corpse-Syndicate") - var/mob/living/carbon/human/M = new /mob/living/carbon/human(A.loc) - M.real_name = "Corpse" - M.death() - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) - //M.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver(M), slot_belt) - M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform) - M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes) - M.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(M), slot_gloves) - M.equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack(M), slot_back) - M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas(M), slot_wear_mask) - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/syndicate(M), slot_wear_suit) - if (prob(50)) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head) - else - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/syndicate(M), slot_head) - else - M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/swat(M), slot_head) - del(A) - continue -*/ diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 5e4cd0b0052..8023e387c92 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -27,7 +27,7 @@ /obj/effect/rend/New() spawn(50) new /obj/machinery/singularity/narsie/wizard(get_turf(src)) - del(src) + qdel(src) return return @@ -66,13 +66,12 @@ new /mob/living/simple_animal/cow(loc) cowsleft-- if(cowsleft <= 0) - del src + qdel(src) /obj/effect/rend/cow/attackby(obj/item/I as obj, mob/user as mob) if(istype(I, /obj/item/weapon/nullrod)) visible_message("\red [I] strikes a blow against \the [src], banishing it!") - spawn(1) - del src + qdel(src) return ..() diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 1de83394304..80ea4f0ff40 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -115,7 +115,7 @@ animation.icon = 'icons/mob/mob.dmi' animation.master = T flick("dust-h", animation) - del(animation) + qdel(animation) var/mob/living/simple_animal/shade/S = new /mob/living/simple_animal/shade( T.loc ) S.loc = C //put shade in stone S.status_flags |= GODMODE //So they won't die inside the stone somehow @@ -131,7 +131,7 @@ U << "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone." U << "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls." C.imprinted = "[S.name]" - del T + qdel(T) if("SHADE") var/mob/living/simple_animal/shade/T = target var/obj/item/device/soulstone/C = src @@ -167,11 +167,11 @@ else ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) - del(T) + qdel(T) Z << "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike." Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." Z.cancel_camera() - del(C) + qdel(C) if("Wraith") var/mob/living/simple_animal/construct/wraith/Z = new /mob/living/simple_animal/construct/wraith (get_turf(T.loc)) @@ -182,11 +182,11 @@ else ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) - del(T) + qdel(T) Z << "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls." Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." Z.cancel_camera() - del(C) + qdel(C) if("Artificer") var/mob/living/simple_animal/construct/builder/Z = new /mob/living/simple_animal/construct/builder (get_turf(T.loc)) @@ -197,11 +197,11 @@ else ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) - del(T) + qdel(T) Z << "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone)." Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." Z.cancel_camera() - del(C) + qdel(C) else U << "\red Creation failed!: \black The soul stone is empty! Go kill someone!" return diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 33a93e602e0..d79c4e61088 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -20,7 +20,7 @@ user << "You feed the contract back into the spellbook, refunding your points." src.max_uses++ src.uses++ - del (O) + qdel(O) @@ -355,7 +355,7 @@ /obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user as mob) ..() explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) - del(src) + qdel(src) /obj/item/weapon/spellbook/oneuse/smoke spell = /obj/effect/proc_holder/spell/targeted/smoke @@ -473,9 +473,9 @@ magichead.flags_inv = null //so you can still see their face magichead.voicechange = 1 //NEEEEIIGHH if(!user.unEquip(user.wear_mask)) - del user.wear_mask + qdel(user.wear_mask) user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) - del src + qdel(src) else user <<"I say thee neigh" diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 11430663e72..6306d8d5a6b 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -146,12 +146,12 @@ return //So zards properly get their items when they are admin-made. - del(wizard_mob.wear_suit) - del(wizard_mob.head) - del(wizard_mob.shoes) - del(wizard_mob.r_hand) - del(wizard_mob.r_store) - del(wizard_mob.l_store) + qdel(wizard_mob.wear_suit) + qdel(wizard_mob.head) + qdel(wizard_mob.shoes) + qdel(wizard_mob.r_hand) + qdel(wizard_mob.r_store) + qdel(wizard_mob.l_store) wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_ears) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(wizard_mob), slot_w_uniform) @@ -264,7 +264,7 @@ //To batch-remove wizard spells. Linked to mind.dm. /mob/proc/spellremove(var/mob/M as mob) for(var/obj/effect/proc_holder/spell/spell_to_remove in src.mind.spell_list) - del(spell_to_remove) + qdel(spell_to_remove) /*Checks if the wizard can cast spells. Made a proc so this is not repeated 14 (or more) times.*/ diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 3584ea4cb8f..03b32f2cc60 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -73,7 +73,6 @@ /var/const/access_cent_living = 105//Living quarters. /var/const/access_cent_storage = 106//Generic storage areas. /var/const/access_cent_teleporter = 107//Teleporter. -/var/const/access_cent_creed = 108//Creed's office. /var/const/access_cent_captain = 109//Captain's office/ID comp/AI. //The Syndicate @@ -182,7 +181,7 @@ if("Research Officer") return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage) if("Special Ops Officer") - return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed) + return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage) if("Admiral") return get_all_centcom_access() if("Centcom Commander") @@ -389,8 +388,6 @@ return "Code Blue" if(access_cent_specops) return "Code Black" - if(access_cent_creed) - return "Code Silver" if(access_cent_captain) return "Code Gold" diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index da37da1b1af..95666d483b3 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -78,10 +78,9 @@ H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/head_of_personnel(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/device/pda/heads/hop(H), slot_belt) - H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(H), slot_wear_suit) - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/head/hopcap(H), slot_head) if(H.backbag == 1) H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H), slot_r_hand) else H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/ids(H.back), slot_in_backpack) - return 1 \ No newline at end of file + return 1 diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index cc9a7b6a66d..4edd13f156a 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -20,9 +20,9 @@ hide(T.intact) - Del() + Destroy() if(Beacon) - del(Beacon) + qdel(Beacon) ..() // update the invisibility and icon diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 6ff53810416..ae4e13f1516 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -18,7 +18,7 @@ component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) - component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/atmospherics/unary/cold_sink/freezer/RefreshParts() @@ -140,7 +140,7 @@ component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) - component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/stack/cable_coil(null, 1) RefreshParts() /obj/machinery/atmospherics/unary/heat_reservoir/heater/RefreshParts() @@ -241,4 +241,4 @@ ..() if(stat & NOPOWER) on = 0 - update_icon() \ No newline at end of file + update_icon() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 7550ac1d704..657997e2506 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -13,17 +13,23 @@ anchored = 1 var/efficiency state_open = 1 + var/initial_bin_rating = 1 var/min_health = 25 var/list/injection_chems = list() //list of injectable chems except inaprovaline, coz inaprovaline is always avalible var/list/possible_chems = list(list("stoxin", "dexalin", "bicaridine", "kelotane"), - list("stoxin", "dexalinp", "imidazoline", "dermaline", "bicaridine"), - list("tricordrazine", "anti_toxin", "ryetalyn", "dermaline", "bicaridine", "imidazoline", "alkysine", "arithrazine")) + list("stoxin", "dexalinp", "imidazoline", "dermaline", "bicaridine"), + list("tricordrazine", "anti_toxin", "ryetalyn", "dermaline", "bicaridine", "imidazoline", "alkysine", "arithrazine")) /obj/machinery/sleeper/New() ..() component_parts = list() component_parts += new /obj/item/weapon/circuitboard/sleeper(null) - component_parts += new /obj/item/weapon/stock_parts/matter_bin(null) + + // Customizable bin rating, used by the labor camp to stop people filling themselves with chemicals and escaping. + var/obj/item/weapon/stock_parts/matter_bin/B = new(null) + B.rating = initial_bin_rating + component_parts += B + component_parts += new /obj/item/weapon/stock_parts/manipulator(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) @@ -55,12 +61,12 @@ for(var/atom/movable/A in src) A.loc = loc A.blob_act() - del(src) + qdel(src) /obj/machinery/sleeper/attack_animal(var/mob/living/simple_animal/M)//Stop putting hostile mobs in things guise if(M.environment_smash) visible_message("[M.name] smashes [src] apart!") - del(src) + qdel(src) return /obj/machinery/sleeper/attackby(obj/item/I, mob/user) @@ -82,21 +88,21 @@ for(var/atom/movable/A in src) A.loc = loc ex_act(severity) - del(src) + qdel(src) return if(2.0) if(prob(50)) for(var/atom/movable/A in src) A.loc = loc ex_act(severity) - del(src) + qdel(src) return if(3.0) if(prob(25)) for(var/atom/movable/A in src) A.loc = loc ex_act(severity) - del(src) + qdel(src) /obj/machinery/sleeper/emp_act(severity) @@ -125,7 +131,7 @@ ..() open_machine() -/obj/machinery/sleeper/Del() +/obj/machinery/sleeper/Destroy() var/turf/T = loc T.contents += contents ..() @@ -227,10 +233,11 @@ /obj/machinery/sleeper/proc/inject_chem(mob/user, chem) if(occupant && occupant.reagents) - if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency) - occupant.reagents.add_reagent(chem, 10) - var/units = round(occupant.reagents.get_reagent_amount(chem)) - user << "Occupant now has [units] unit\s of [chem] in their bloodstream." + if(chem in injection_chems + "inaprovaline") + if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency) + occupant.reagents.add_reagent(chem, 10) + var/units = round(occupant.reagents.get_reagent_amount(chem)) + user << "Occupant now has [units] unit\s of [chem] in their bloodstream." /obj/machinery/sleeper/update_icon() if(state_open) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 66f7f8c480e..206d7cc15be 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -816,7 +816,7 @@ table tr:first-child th:first-child { border: none;} spawn(20) cable.amount -= 5 if(!cable.amount) - del(cable) + qdel(cable) user << "You wire the air alarm!" wires.wires_status = 0 @@ -829,14 +829,14 @@ table tr:first-child th:first-child { border: none;} buildstage = 1 update_icon() user.drop_item() - del(W) + qdel(W) return if(istype(W, /obj/item/weapon/wrench)) user << "You detach \the [src] from the wall!" playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) new /obj/item/alarm_frame( user.loc ) - del(src) + qdel(src) return return ..() @@ -878,7 +878,7 @@ Code shamelessly copied from apc_frame /obj/item/alarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) - del(src) + qdel(src) return ..() @@ -905,7 +905,7 @@ Code shamelessly copied from apc_frame new /obj/machinery/alarm(loc, ndir, 1) - del(src) + qdel(src) /* @@ -1006,7 +1006,7 @@ FIRE ALARM coil.amount -= 5 if(!coil.amount) - del(coil) + qdel(coil) buildstage = 2 user << "You wire \the [src]!" @@ -1023,7 +1023,7 @@ FIRE ALARM if(0) if(istype(W, /obj/item/weapon/firealarm_electronics)) user << "You insert the circuit!" - del(W) + qdel(W) buildstage = 1 update_icon() @@ -1032,7 +1032,7 @@ FIRE ALARM var/obj/item/firealarm_frame/frame = new /obj/item/firealarm_frame() frame.loc = user.loc playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - del(src) + qdel(src) return src.alarm() @@ -1213,7 +1213,7 @@ Code shamelessly copied from apc_frame /obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) - del(src) + qdel(src) return ..() @@ -1240,7 +1240,7 @@ Code shamelessly copied from apc_frame new /obj/machinery/firealarm(loc, ndir, 1) - del(src) + qdel(src) /* * Party button diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 07c9715c9f8..f711fe8bb83 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -74,6 +74,10 @@ obj/machinery/air_sensor if(radio_controller) set_frequency(frequency) + Destroy() + radio_controller.remove_object(src, frequency) + ..() + obj/machinery/computer/general_air_control icon = 'icons/obj/computer.dmi' icon_state = "tank" @@ -162,6 +166,10 @@ obj/machinery/computer/general_air_control initialize() set_frequency(frequency) + Destroy() + radio_controller.remove_object(src, frequency) + ..() + large_tank_control icon = 'icons/obj/computer.dmi' icon_state = "tank" @@ -178,7 +186,7 @@ obj/machinery/computer/general_air_control return_text() var/output = ..() //if(signal.data) - // input_info = signal.data // Attempting to fix intake control -- TLE + // input_info = signal.data // Attempting to fix intake control output += "
Tank Control System
" if(input_info) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index c2ca35aba10..4c2c0bfbde1 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -213,14 +213,14 @@ update_flag switch(severity) if(1.0) if(destroyed || prob(30)) - del(src) + qdel(src) else src.health = 0 healthcheck() return if(2.0) if(destroyed) - del(src) + qdel(src) else src.health -= rand(40, 100) healthcheck() diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 23f96f27f0c..896e042696b 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -96,7 +96,7 @@ "\blue You have unfastened \the [src].", \ "You hear ratchet.") new /obj/item/pipe_meter(src.loc) - del(src) + qdel(src) return ..() diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 76021357ae4..7dc6ea0347c 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -26,7 +26,7 @@ else update_icon() - Del() + Destroy() del(air_contents) ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index ae2495554e6..a460626269c 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -120,7 +120,7 @@ var/global/list/autolathe_recipes_hidden = list( \ if (stat) return 1 if (busy) - user << "\red The autolathe is busy. Please wait for completion of previous operation." + user << "The autolathe is busy. Please wait for completion of previous operation." return 1 if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", O)) @@ -145,13 +145,13 @@ var/global/list/autolathe_recipes_hidden = list( \ return 1 if (src.m_amount + O.m_amt > max_m_amount) - user << "\red The autolathe is full. Please remove metal from the autolathe in order to insert more." + user << "The autolathe is full. Please remove metal from the autolathe in order to insert more." return 1 if (src.g_amount + O.g_amt > max_g_amount) - user << "\red The autolathe is full. Please remove glass from the autolathe in order to insert more." + user << "The autolathe is full. Please remove glass from the autolathe in order to insert more." return 1 if (O.m_amt == 0 && O.g_amt == 0) - user << "\red This object does not contain significant amounts of metal or glass, or cannot be accepted by the autolathe due to size or hazardous materials." + user << "This object does not contain significant amounts of metal or glass, or cannot be accepted by the autolathe due to size or hazardous materials." return 1 var/amount = 1 @@ -179,7 +179,7 @@ var/global/list/autolathe_recipes_hidden = list( \ src.g_amount += g_amt * amount user << "You insert [amount] sheet[amount>1 ? "s" : ""] to the autolathe." if (O && O.loc == src) - del(O) + qdel(O) busy = 0 src.updateUsrDialog() @@ -227,7 +227,7 @@ var/global/list/autolathe_recipes_hidden = list( \ src.g_amount = 0 busy = 0 else - usr << "\red The autolathe is busy. Please wait for completion of previous operation." + usr << "The autolathe is busy. Please wait for completion of previous operation." src.updateUsrDialog() return @@ -246,27 +246,27 @@ var/global/list/autolathe_recipes_hidden = list( \ var/dat if(!panel_open) var/coeff = 2 ** prod_coeff - dat = "Metal Amount: [src.m_amount] / [max_m_amount] cm3
" - dat += "Glass Amount: [src.g_amount] / [max_g_amount] cm3
" + dat = "
" - dat += "Glass Amount: [src.g_amount] / [max_g_amount] cm3
" + dat = "
Metal amount: [src.m_amount] / [max_m_amount] cm3
" + dat += "Glass amount: [src.g_amount] / [max_g_amount] cm3
" var/list/objs = list() objs += src.L if(src.hacked) objs += src.LL for(var/obj/t in objs) if(disabled || m_amount[t]", "The ", "")
else
- dat += "[t.name]"
+ dat += replacetext("[t]", "The ", "")
if(istype(t, /obj/item/stack))
var/obj/item/stack/S = t
var/max_multiplier = min(S.max_amount, S.m_amt?round(m_amount/S.m_amt):INFINITY, S.g_amt?round(g_amount/S.g_amt):INFINITY)
if (max_multiplier>10 && !disabled)
- dat += " x[10]"
+ dat += " x[10]"
if (max_multiplier>25 && !disabled)
- dat += " x[25]"
+ dat += " x[25]"
if (max_multiplier>1 && !disabled)
- dat += " x[max_multiplier]"
+ dat += " x[max_multiplier]"
dat += " [t.m_amt] m / [t.g_amt] g"
else
dat += " [t.m_amt/coeff] m / [t.g_amt/coeff] g"
diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index b197385018b..f957a2d3a46 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -27,7 +27,7 @@
SetLuminosity(0)
/obj/machinery/bot/proc/explode()
- del(src)
+ qdel(src)
/obj/machinery/bot/proc/healthcheck()
if (src.health <= 0)
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index ce39df4ad50..b67a6b018b8 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -304,7 +304,7 @@ text("[src.oddbutton ? "Yes" : "No"
src.cleaning = 1
spawn(50)
src.cleaning = 0
- del(target)
+ qdel(target)
src.icon_state = "cleanbot[src.on]"
src.anchored = 0
src.target = null
@@ -324,20 +324,20 @@ text("[src.oddbutton ? "Yes" : "No"
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
- del(src)
+ qdel(src)
return
/obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob)
..()
if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
user.drop_item()
- del(W)
+ qdel(W)
var/turf/T = get_turf(src.loc)
var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T)
A.name = src.created_name
user << "You add the robot arm to the bucket and sensor assembly. Beep boop!"
user.unEquip(src, 1)
- del src
+ qdel(src)
else if (istype(W, /obj/item/weapon/pen))
var/t = copytext(stripped_input(user, "Enter new robot name", src.name, src.created_name),1,MAX_NAME_LEN)
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index d748856d1bf..b1792a5a6b3 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -791,7 +791,7 @@ Auto Patrol: []"},
s.start()
new /obj/effect/decal/cleanable/oil(src.loc)
- del(src)
+ qdel(src)
/obj/machinery/bot/ed209/proc/shootAt(var/mob/target)
@@ -897,7 +897,7 @@ Auto Patrol: []"},
if(0,1)
if(istype(W, /obj/item/robot_parts/l_leg) || istype(W, /obj/item/robot_parts/r_leg))
user.drop_item()
- del(W)
+ qdel(W)
build_step++
user << "You add the robot leg to [src]."
name = "legs/frame assembly"
@@ -915,7 +915,7 @@ Auto Patrol: []"},
lasercolor = "b"
if(lasercolor || istype(W, /obj/item/clothing/suit/armor/vest))
user.drop_item()
- del(W)
+ qdel(W)
build_step++
user << "You add the armor to [src]."
name = "vest/legs/frame assembly"
@@ -944,7 +944,7 @@ Auto Patrol: []"},
return
user.drop_item()
- del(W)
+ qdel(W)
build_step++
user << "You add the helmet to [src]."
name = "covered and shielded frame assembly"
@@ -954,7 +954,7 @@ Auto Patrol: []"},
if(5)
if(isprox(W))
user.drop_item()
- del(W)
+ qdel(W)
build_step++
user << "You add the prox sensor to [src]."
name = "covered, shielded and sensored frame assembly"
@@ -994,7 +994,7 @@ Auto Patrol: []"},
src.item_state = "[lasercolor]ed209_taser"
src.icon_state = "[lasercolor]ed209_taser"
user.drop_item()
- del(W)
+ qdel(W)
if(8)
if(istype(W, /obj/item/weapon/screwdriver))
@@ -1014,9 +1014,9 @@ Auto Patrol: []"},
var/turf/T = get_turf(src)
new /obj/machinery/bot/ed209(T,created_name,lasercolor)
user.drop_item()
- del(W)
+ qdel(W)
user.unEquip(src, 1)
- del(src)
+ qdel(src)
/obj/machinery/bot/ed209/bullet_act(var/obj/item/projectile/Proj)
@@ -1043,9 +1043,9 @@ Auto Patrol: []"},
/obj/machinery/bot/ed209/bluetag/New()//If desired, you spawn red and bluetag bots easily
new /obj/machinery/bot/ed209(get_turf(src),null,"b")
- del(src)
+ qdel(src)
/obj/machinery/bot/ed209/redtag/New()
new /obj/machinery/bot/ed209(get_turf(src),null,"r")
- del(src)
+ qdel(src)
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index 6eeb40f8276..963f2785dfb 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -194,7 +194,7 @@
if(targetdirection != null)
/*
for (var/turf/space/D in view(7,src))
- if(!(D in floorbottargets) && D != src.oldtarget) // Added for bridging mode -- TLE
+ if(!(D in floorbottargets) && D != src.oldtarget) // Added for bridging mode
if(get_dir(src, D) == targetdirection)
src.oldtarget = D
src.target = D
@@ -331,7 +331,7 @@
T.amount -= i
else
src.amount += T.amount
- del(T)
+ qdel(T)
src.updateicon()
src.target = null
src.repairing = 0
@@ -351,7 +351,7 @@
var/obj/item/stack/tile/plasteel/T = new /obj/item/stack/tile/plasteel
T.amount = 4
T.loc = M.loc
- del(M)
+ qdel(M)
src.target = null
src.repairing = 0
@@ -387,7 +387,7 @@
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
- del(src)
+ qdel(src)
return
@@ -400,23 +400,23 @@
return
if(user.s_active)
user.s_active.close(user)
- del(T)
+ qdel(T)
var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles
user.put_in_hands(B)
user << "You add the tiles into the empty toolbox. They protrude from the top."
user.unEquip(src, 1)
- del(src)
+ qdel(src)
/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob)
..()
if(isprox(W))
- del(W)
+ qdel(W)
var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor()
B.created_name = src.created_name
user.put_in_hands(B)
user << "You add the sensor to the toolbox and tiles!"
user.unEquip(src, 1)
- del(src)
+ qdel(src)
else if (istype(W, /obj/item/weapon/pen))
var/t = copytext(stripped_input(user, "Enter new robot name", src.name, src.created_name),1,MAX_NAME_LEN)
@@ -430,13 +430,13 @@
/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob)
..()
if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
- del(W)
+ qdel(W)
var/turf/T = get_turf(user.loc)
var/obj/machinery/bot/floorbot/A = new /obj/machinery/bot/floorbot(T)
A.name = src.created_name
user << "You add the robot arm to the odd looking toolbox assembly! Boop beep!"
user.unEquip(src, 1)
- del(src)
+ qdel(src)
else if (istype(W, /obj/item/weapon/pen))
var/t = stripped_input(user, "Enter new robot name", src.name, src.created_name)
diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm
index 97699e949fe..e40e9a21db2 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -476,7 +476,7 @@
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
- del(src)
+ qdel(src)
return
/obj/machinery/bot/medbot/Bump(M as mob|obj) //Leave no door unopened!
@@ -551,11 +551,11 @@
else if(istype(src,/obj/item/weapon/storage/firstaid/o2))
A.skin = "o2"
- del(S)
+ qdel(S)
user.put_in_hands(A)
user << "You add the robot arm to the first aid kit."
user.unEquip(src, 1)
- del(src)
+ qdel(src)
/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -572,7 +572,7 @@
if(0)
if(istype(W, /obj/item/device/healthanalyzer))
user.drop_item()
- del(W)
+ qdel(W)
src.build_step++
user << "You add the health sensor to [src]."
src.name = "First aid/robot arm/health analyzer assembly"
@@ -581,7 +581,7 @@
if(1)
if(isprox(W))
user.drop_item()
- del(W)
+ qdel(W)
src.build_step++
user << "You complete the Medibot! Beep boop."
var/turf/T = get_turf(src)
@@ -589,5 +589,5 @@
S.skin = src.skin
S.name = src.created_name
user.unEquip(src, 1)
- del(src)
+ qdel(src)
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
index a8a26761705..47a26e226c5 100644
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -908,4 +908,4 @@ var/global/mulebot_count = 0
new /obj/effect/decal/cleanable/oil(src.loc)
unload(0)
- del(src)
+ qdel(src)
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index 42eff9005a2..7c2c15fed4d 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -682,7 +682,7 @@ Auto Patrol: []"},
s.start()
new /obj/effect/decal/cleanable/oil(src.loc)
- del(src)
+ qdel(src)
/obj/machinery/bot/secbot/attack_alien(var/mob/living/carbon/alien/user as mob)
..()
@@ -702,12 +702,12 @@ Auto Patrol: []"},
return
if(S.secured)
- del(S)
+ qdel(S)
var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly
user.put_in_hands(A)
user << "You add the signaler to the helmet."
user.unEquip(src, 1)
- del(src)
+ qdel(src)
else
return
@@ -733,7 +733,7 @@ Auto Patrol: []"},
user << "You add the prox sensor to [src]!"
overlays += "hs_eye"
name = "helmet/signaler/prox sensor assembly"
- del(I)
+ qdel(I)
else if(((istype(I, /obj/item/robot_parts/l_arm)) || (istype(I, /obj/item/robot_parts/r_arm))) && (build_step == 2))
user.drop_item()
@@ -741,7 +741,7 @@ Auto Patrol: []"},
user << "You add the robot arm to [src]!"
name = "helmet/signaler/prox sensor/robot arm assembly"
overlays += "hs_arm"
- del(I)
+ qdel(I)
else if((istype(I, /obj/item/weapon/melee/baton)) && (build_step >= 3))
user.drop_item()
@@ -750,8 +750,8 @@ Auto Patrol: []"},
var/obj/machinery/bot/secbot/S = new /obj/machinery/bot/secbot
S.loc = get_turf(src)
S.name = created_name
- del(I)
- del(src)
+ qdel(I)
+ qdel(src)
else if(istype(I, /obj/item/weapon/pen))
var/t = copytext(stripped_input(user, "Enter new robot name", name, created_name),1,MAX_NAME_LEN)
@@ -766,7 +766,7 @@ Auto Patrol: []"},
new /obj/item/device/assembly/signaler(get_turf(src))
new /obj/item/clothing/head/helmet(get_turf(src))
user << "You disconnect the signaler from the helmet."
- del(src)
+ qdel(src)
else if(build_step == 2)
overlays -= "hs_eye"
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 7577a2ddbe7..b9386833cb3 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -48,7 +48,7 @@
if(z == 1 && prob(3))
deactivate()
-/obj/machinery/camera/Del()
+/obj/machinery/camera/Destroy()
if(istype(bug))
bug.bugged_cameras -= src.c_tag
..()
@@ -90,7 +90,7 @@
return
/obj/machinery/camera/blob_act()
- del(src)
+ qdel(src)
return
/obj/machinery/camera/proc/setViewRange(var/num = 7)
@@ -131,7 +131,7 @@
if(assembly)
assembly.loc = src.loc
assembly.state = 1
- del(src)
+ qdel(src)
// OTHER
@@ -180,7 +180,7 @@
playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
playsound(loc, "sparks", 50, 1)
visible_message("\blue The camera has been sliced apart by [] with an energy blade!")
- del(src)
+ qdel(src)
else if(istype(W, /obj/item/device/laser_pointer))
var/obj/item/device/laser_pointer/L = W
L.laser_act(src, user)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 09a548833d4..631d2eb9700 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -353,7 +353,7 @@
src.icon_state = "pod_g"
src.occupant.ghostize()
spawn(5)
- del(src.occupant)
+ qdel(src.occupant)
return
/obj/machinery/clonepod/relaymove(mob/user as mob)
@@ -372,21 +372,21 @@
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
ex_act(severity)
- del(src)
+ qdel(src)
return
if(2.0)
if (prob(50))
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
ex_act(severity)
- del(src)
+ qdel(src)
return
if(3.0)
if (prob(25))
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
ex_act(severity)
- del(src)
+ qdel(src)
return
return
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 79252be3b86..e4c6e621fee 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -136,7 +136,7 @@
// loadProgram(target)
//This could all be done better, but it works for now.
-/obj/machinery/computer/HolodeckControl/Del()
+/obj/machinery/computer/HolodeckControl/Destroy()
emergencyShutdown()
..()
@@ -205,7 +205,7 @@
if(!silent)
var/obj/oldobj = obj
visible_message("The [oldobj.name] fades away!")
- del(obj)
+ qdel(obj)
/obj/machinery/computer/HolodeckControl/proc/checkInteg(var/area/A)
for(var/turf/T in A)
@@ -236,10 +236,10 @@
derez(item)
for(var/obj/effect/decal/cleanable/blood/B in linkedholodeck)
- del(B)
+ qdel(B)
for(var/mob/living/simple_animal/hostile/carp/C in linkedholodeck)
- del(C)
+ qdel(C)
holographic_items = A.copy_contents_to(linkedholodeck , 1)
@@ -334,7 +334,7 @@
G.affecting.loc = src.loc
G.affecting.Weaken(5)
visible_message("\red [G.assailant] puts [G.affecting] on the table.")
- del(W)
+ qdel(W)
return
if (istype(W, /obj/item/weapon/wrench))
@@ -356,9 +356,6 @@
flags = ON_BORDER
-/obj/structure/holowindow/Del()
- ..()
-
/obj/item/weapon/holo
damtype = STAMINA
@@ -452,7 +449,7 @@
G.affecting.loc = src.loc
G.affecting.Weaken(5)
visible_message("\red [G.assailant] dunks [G.affecting] into the [src]!", 3)
- del(W)
+ qdel(W)
return
else if (istype(W, /obj/item) && get_dist(src,user)<2)
user.drop_item(src)
@@ -511,7 +508,7 @@
currentarea = get_area(src.loc)
if(!currentarea)
- del(src)
+ qdel(src)
if(eventstarted)
usr << "The event has already begun!"
@@ -542,7 +539,7 @@
eventstarted = 1
for(var/obj/structure/holowindow/W in currentarea)
- del(W)
+ qdel(W)
for(var/mob/M in currentarea)
M << "FIGHT!"
\ No newline at end of file
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 1fac9a1592a..5f0e35b08ec 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -29,7 +29,7 @@
if(!src || !WT.remove_fuel(0, user)) return
user << "You deconstruct the frame."
new /obj/item/stack/sheet/plasteel( loc, 4)
- del(src)
+ qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -67,7 +67,7 @@
playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20))
P:amount -= 5
- if(!P:amount) del(P)
+ if(!P:amount) qdel(P)
user << "You add cables to the frame."
state = 3
icon_state = "3"
@@ -89,7 +89,7 @@
if(do_after(user, 20))
if (P)
P:amount -= 2
- if(!P:amount) del(P)
+ if(!P:amount) qdel(P)
user << "You put in the glass panel."
state = 4
icon_state = "4"
@@ -171,7 +171,7 @@
if(A) //if there's no brain, the mob is deleted and a structure/AIcore is created
A.rename_self("ai", 1)
feedback_inc("cyborg_ais_created",1)
- del(src)
+ qdel(src)
/obj/structure/AIcore/deactivated
name = "inactive AI"
@@ -272,7 +272,7 @@ That prevents a few funky behaviors.
A.cancel_camera()
A << "You have been uploaded to a stationary terminal. Remote device connection restored."
U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
- del(T)
+ qdel(T)
if("NINJASUIT")
var/obj/item/clothing/suit/space/space_ninja/C = src
var/mob/living/silicon/ai/A = C.AI
@@ -283,7 +283,7 @@ That prevents a few funky behaviors.
A.cancel_camera()
A << "You have been uploaded to a stationary terminal. Remote device connection restored."
U << "\blue Transfer successful: \black [A.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed."
- del(T)
+ qdel(T)
if("AIFIXER")//AI Fixer terminal.
var/obj/machinery/computer/aifixer/T = target
switch(interaction)
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 92ea6494e8d..449bc3b3074 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -31,7 +31,7 @@
..()
var/choice = pick(typesof(/obj/machinery/computer/arcade) - /obj/machinery/computer/arcade)
new choice(loc)
- del(src)
+ qdel(src)
/obj/machinery/computer/arcade/proc/prizevend()
if(!contents.len)
diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
index 614933c0635..428d8384235 100644
--- a/code/game/machinery/computer/atmos_alert.dm
+++ b/code/game/machinery/computer/atmos_alert.dm
@@ -16,6 +16,10 @@
..()
set_frequency(receive_frequency)
+/obj/machinery/computer/atmos_alert/Destroy()
+ radio_controller.remove_object(src, receive_frequency)
+ ..()
+
/obj/machinery/computer/atmos_alert/receive_signal(datum/signal/signal)
if(!signal || signal.encryption) return
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 3cc81b68c26..49ef88bdbd5 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -244,7 +244,7 @@
/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob)
if(istype(I,/obj/item/weapon/screwdriver))
- if(src.build_path == "/obj/machinery/computer/rdconsole/core")
+ if(build_path == /obj/machinery/computer/rdconsole/core)
name = "circuit board (RD Console - Robotics)"
build_path = /obj/machinery/computer/rdconsole/robotics
user << "Access protocols successfully updated."
@@ -282,7 +282,7 @@
user << "You deconstruct the frame."
var/obj/item/stack/sheet/metal/M = new (loc, 5)
M.add_fingerprint(user)
- del(src)
+ qdel(src)
if(1)
if(istype(P, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -328,7 +328,7 @@
if(do_after(user, 20))
if(C && C.amount >= 5)
C.amount -= 5
- if(C.amount <= 0) del(C)
+ if(C.amount <= 0) qdel(C)
user << "You add cables to the frame."
src.state = 3
src.icon_state = "3"
@@ -376,4 +376,4 @@
var/obj/item/weapon/circuitboard/shuttle/C = circuit
S.id = C.id
transfer_fingerprints_to(B)
- del(src)
+ qdel(src)
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index ca522c4d35a..abcd6c8edd6 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -507,7 +507,7 @@
user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated."
return
*/
- if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE
+ if(world.time < 6000)
user << "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minutes before trying again."
return
@@ -573,7 +573,7 @@
frequency.post_signal(src, status_signal)
-/obj/machinery/computer/communications/Del()
+/obj/machinery/computer/communications/Destroy()
shuttle_caller_list -= src
emergency_shuttle.autoshuttlecall()
..()
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index e8a020fcf29..bdf58f727dc 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -38,11 +38,11 @@
/obj/machinery/computer/ex_act(severity)
switch(severity)
if(1.0)
- del(src)
+ qdel(src)
return
if(2.0)
if (prob(25))
- del(src)
+ qdel(src)
return
if (prob(50))
verbs.Cut()
@@ -111,7 +111,7 @@
user << "\blue You disconnect the monitor."
A.state = 4
A.icon_state = "4"
- del(src)
+ qdel(src)
return
/obj/machinery/computer/attack_hand(user)
@@ -140,4 +140,4 @@
return
user.visible_message("[user.name] smashes against the [src.name] with its claws.",\
"You smash against the [src.name] with your claws.",\
- "You hear a clicking sound.")
\ No newline at end of file
+ "You hear a clicking sound.")
diff --git a/code/game/machinery/computer/syndicate_shuttle.dm b/code/game/machinery/computer/syndicate_shuttle.dm
index fb6aa607ab9..2d264251da9 100644
--- a/code/game/machinery/computer/syndicate_shuttle.dm
+++ b/code/game/machinery/computer/syndicate_shuttle.dm
@@ -28,6 +28,8 @@
var/area/transit_location = locate(/area/syndicate_station/transit)
curr_location.move_contents_to(transit_location)
curr_location = transit_location
+ curr_location.has_gravity = 0
+ transit_location.has_gravity = 1
sleep(SYNDICATE_SHUTTLE_MOVE_TIME)
curr_location.move_contents_to(dest_location)
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index f321d06f2e2..c06bb4e015e 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -61,7 +61,7 @@
if(do_after(user, 20))
if(C)
C.amount -= 5
- if(!C.amount) del(C)
+ if(!C.amount) qdel(C)
user << "You add cables to the frame."
state = 2
icon_state = "box_1"
@@ -69,7 +69,7 @@
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user << "You dismantle the frame."
new /obj/item/stack/sheet/metal(src.loc, 5)
- del(src)
+ qdel(src)
if(2)
if(istype(P, /obj/item/weapon/circuitboard))
var/obj/item/weapon/circuitboard/B = P
@@ -122,14 +122,14 @@
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
var/obj/machinery/new_machine = new src.circuit.build_path(src.loc)
for(var/obj/O in new_machine.component_parts)
- del(O)
+ qdel(O)
new_machine.component_parts = list()
for(var/obj/O in src)
O.loc = null
new_machine.component_parts += O
circuit.loc = null
new_machine.RefreshParts()
- del(src)
+ qdel(src)
if(istype(P, /obj/item))
var/success
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 646c4e1c616..51e9f040f10 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -35,10 +35,9 @@
current_heat_capacity = 50 * C
efficiency = C
-/obj/machinery/atmospherics/unary/cryo_cell/Del()
+/obj/machinery/atmospherics/unary/cryo_cell/Destroy()
var/turf/T = loc
T.contents += contents
- ..()
var/obj/item/weapon/reagent_containers/glass/B = beaker
if(beaker)
B.loc = get_step(loc, SOUTH) //Beaker is carefully ejected from the wreckage of the cryotube
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 6d812b5cc66..d8955ceceaa 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -87,14 +87,14 @@ for reference:
new /obj/item/stack/sheet/wood(get_turf(src))
new /obj/item/stack/sheet/wood(get_turf(src))
new /obj/item/stack/sheet/wood(get_turf(src))
- del(src)
+ qdel(src)
..()
ex_act(severity)
switch(severity)
if(1.0)
visible_message("\red The barricade is blown apart!")
- del(src)
+ qdel(src)
return
if(2.0)
src.health -= 25
@@ -103,7 +103,7 @@ for reference:
new /obj/item/stack/sheet/wood(get_turf(src))
new /obj/item/stack/sheet/wood(get_turf(src))
new /obj/item/stack/sheet/wood(get_turf(src))
- del(src)
+ qdel(src)
return
meteorhit()
@@ -111,14 +111,14 @@ for reference:
new /obj/item/stack/sheet/wood(get_turf(src))
new /obj/item/stack/sheet/wood(get_turf(src))
new /obj/item/stack/sheet/wood(get_turf(src))
- del(src)
+ qdel(src)
return
blob_act()
src.health -= 25
if (src.health <= 0)
visible_message("\red The blob eats through the barricade!")
- del(src)
+ qdel(src)
return
CanPass(atom/movable/mover, turf/target, height=0, air_group=0)//So bullets will fly over and stuff.
@@ -267,4 +267,4 @@ for reference:
explosion(src.loc,-1,-1,0)
if(src)
- del(src)
\ No newline at end of file
+ qdel(src)
\ No newline at end of file
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index f21392a7028..dafe8600e96 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -237,7 +237,7 @@
/obj/machinery/door/airlock/plasma/proc/PlasmaBurn(temperature)
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 500)
new/obj/structure/door_assembly/door_assembly_0( src.loc )
- del (src)
+ qdel(src)
/obj/machinery/door/airlock/plasma/BlockSuperconductivity() //we don't stop the heat~
return 0
@@ -403,12 +403,14 @@ About the new airlock wires panel:
icon_state = "door_locked"
else
icon_state = "door_closed"
- if(p_open || welded)
+ if(p_open || welded || emergency)
overlays = list()
if(p_open)
overlays += image(icon, "panel_open")
if(welded)
overlays += image(icon, "welded")
+ if(emergency && !locked)
+ overlays += image(icon, "elights")
else
icon_state = "door_open"
@@ -472,6 +474,11 @@ About the new airlock wires panel:
else
t1 += text("IdScan enabled. Disable?
\n", src) + if(src.emergency) + t1 += text("Emergency Access Override is enabled. Disable?
\n", src) + else + t1 += text("Emergency Access Override is disabled. Enable?
\n", src) + if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER1)) t1 += text("Main Power Input wire is cut.
\n") if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER2)) @@ -542,8 +549,8 @@ About the new airlock wires panel: user << browse(t1, "window=airlock") onclose(user, "airlock") -//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door -//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door +//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 11 lift access override +//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 11 enable access override /obj/machinery/door/airlock/proc/hack(mob/user as mob) @@ -647,8 +654,8 @@ About the new airlock wires panel: if(istype(usr, /mob/living/silicon) && src.canAIControl()) //AI - //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed - //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed + //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed, 11 emergency access + //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed, 11 emergency access if(href_list["aiDisable"]) var/code = text2num(href_list["aiDisable"]) switch (code) @@ -728,6 +735,12 @@ About the new airlock wires panel: else usr << text("Door bolt lights are already disabled!") + if(11) + // Emergency access + if (src.emergency) + emergency = 0 + else + usr << text("Emergency access is already disabled!") else if(href_list["aiEnable"]) @@ -827,6 +840,13 @@ About the new airlock wires panel: else usr << text("Door bolt lights are already enabled!") + if(11) + // Emergency access + if (!src.emergency) + emergency = 1 + else + usr << text("Emergency access is already enabled!") + add_fingerprint(usr) update_icon() if(!nowindow) @@ -856,6 +876,7 @@ About the new airlock wires panel: return else if(istype(C, /obj/item/weapon/screwdriver)) src.p_open = !( src.p_open ) + user << "You [p_open ? "open":"close"] the maintenance panel of the airlock." src.update_icon() else if(istype(C, /obj/item/weapon/wirecutters)) return src.attack_hand(user) @@ -863,7 +884,7 @@ About the new airlock wires panel: return src.attack_hand(user) else if(istype(C, /obj/item/device/assembly/signaler)) return src.attack_hand(user) - else if(istype(C, /obj/item/weapon/pai_cable)) // -- TLE + else if(istype(C, /obj/item/weapon/pai_cable)) var/obj/item/weapon/pai_cable/cable = C cable.plugin(src, user) else if(istype(C, /obj/item/weapon/crowbar) || istype(C, /obj/item/weapon/twohanded/fireaxe) ) @@ -922,7 +943,7 @@ About the new airlock wires panel: electronics = null ae.loc = src.loc - del(src) + qdel(src) return else if(arePowerSystemsOn() && !(stat & NOPOWER)) user << "\blue The airlock's motors resist your efforts to force it." diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index e4d26278b14..b50e9dc769a 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -15,6 +15,7 @@ var/glass = 0 var/normalspeed = 1 var/heat_proof = 0 // For glass airlocks/opacity firedoors + var/emergency = 0 // Emergency access override /obj/machinery/door/New() ..() @@ -29,7 +30,7 @@ return -/obj/machinery/door/Del() +/obj/machinery/door/Destroy() density = 0 air_update_turf(1) update_freelook_sight() @@ -51,7 +52,7 @@ if(istype(AM, /obj/machinery/bot)) var/obj/machinery/bot/bot = AM - if(src.check_access(bot.botcard)) + if(src.check_access(bot.botcard) || emergency == 1) if(density) open() return @@ -59,7 +60,7 @@ if(istype(AM, /obj/mecha)) var/obj/mecha/mecha = AM if(density) - if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access))) + if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access) || emergency == 1)) open() else flick("door_deny", src) @@ -87,7 +88,7 @@ user = null if(density) - if(allowed(user)) open() + if(allowed(user) || src.emergency == 1) open() else flick("door_deny", src) return @@ -128,7 +129,7 @@ open() operating = -1 return 1 - if(src.allowed(user)) + if(src.allowed(user) || src.emergency == 1) if(src.density) open() else @@ -141,7 +142,7 @@ /obj/machinery/door/blob_act() if(prob(40)) - del(src) + qdel(src) return @@ -159,10 +160,10 @@ /obj/machinery/door/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if(prob(25)) - del(src) + qdel(src) if(3.0) if(prob(80)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index c3a724ad244..3695c80ef45 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -312,9 +312,9 @@ f1.sd_SetOpacity(opacity) f2.sd_SetOpacity(opacity) - Del() - del f1 - del f2 + Destroy() + qdel(f1) + qdel(f2) ..() /obj/machinery/door/poddoor/two_tile_ver @@ -331,9 +331,9 @@ f1.sd_SetOpacity(opacity) f2.sd_SetOpacity(opacity) - Del() - del f1 - del f2 + Destroy() + qdel(f1) + qdel(f2) ..() /obj/machinery/door/poddoor/four_tile_hor @@ -358,11 +358,11 @@ f4.sd_SetOpacity(opacity) f3.sd_SetOpacity(opacity) - Del() - del f1 - del f2 - del f3 - del f4 + Destroy() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) ..() /obj/machinery/door/poddoor/four_tile_ver @@ -387,11 +387,11 @@ f4.sd_SetOpacity(opacity) f3.sd_SetOpacity(opacity) - Del() - del f1 - del f2 - del f3 - del f4 + Destroy() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) ..() /obj/machinery/door/poddoor/filler_object diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 09b9452cebc..8a9b225e5a8 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -20,7 +20,7 @@ src.base_state = src.icon_state return -/obj/machinery/door/window/Del() +/obj/machinery/door/window/Destroy() density = 0 playsound(src, "shatter", 70, 1) ..() @@ -125,7 +125,7 @@ var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) return /obj/machinery/door/window/bullet_act(var/obj/item/projectile/Proj) @@ -165,7 +165,7 @@ var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) else return src.attack_hand(user) @@ -206,7 +206,7 @@ var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) return diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 202de927d85..6a1518e311b 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -13,7 +13,7 @@ var/list/doppler_arrays = list() ..() doppler_arrays += src -/obj/machinery/doppler_array/Del() +/obj/machinery/doppler_array/Destroy() doppler_arrays -= src ..() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 5442248986a..0b440c21f66 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -105,7 +105,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/holopad/proc/clear_holo() // hologram.SetLuminosity(0)//Clear lighting. //handled by the lighting controller when its ower is deleted - del(hologram)//Get rid of hologram. + qdel(hologram)//Get rid of hologram. if(master.current == src) master.current = null master = null//Null the master, since no-one is using it now. @@ -160,26 +160,26 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if (prob(50)) - del(src) + qdel(src) if(3.0) if (prob(5)) - del(src) + qdel(src) return /obj/machinery/hologram/blob_act() - del(src) + qdel(src) return /obj/machinery/hologram/meteorhit() - del(src) + qdel(src) return -/obj/machinery/hologram/Del() +/obj/machinery/hologram/holopad/Destroy() if(hologram) - src:clear_holo() + clear_holo() ..() /* diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index a033eb44002..48af8644879 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -25,7 +25,7 @@ if(input_obj) if(isturf(input_obj.loc)) input_plate = input_obj.loc - del(input_obj) + qdel(input_obj) break if(!input_plate) @@ -101,7 +101,7 @@ M.client.eye = src M.loc = src src.occupant = M - del(G) + qdel(G) update_icon() @@ -159,7 +159,7 @@ add_logs(user, occupant, "gibbed") src.occupant.death(1) src.occupant.ghostize() - del(src.occupant) + qdel(src.occupant) spawn(src.gibtime) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) operating = 0 diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index c2b3fbbc0dc..f93bfc68340 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -158,7 +158,7 @@ for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents) var/r_id = get_juice_id(O) beaker.reagents.add_reagent(r_id,get_juice_amount(O)) - del(O) + qdel(O) if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) break diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 8e12010cbfd..540bfeeec26 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -1,4 +1,3 @@ - /obj/machinery/microwave name = "microwave" icon = 'icons/obj/kitchen.dmi' @@ -46,8 +45,7 @@ component_parts += new /obj/item/weapon/circuitboard/microwave(null) component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) - component_parts += new /obj/item/stack/cable_coil(null) - component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) RefreshParts() /obj/machinery/microwave/RefreshParts() @@ -393,7 +391,7 @@ var/id = O.reagents.get_master_reagent_id() if (id) amount+=O.reagents.get_reagent_amount(id) - del(O) + qdel(O) src.reagents.clear_reagents() ffuu.reagents.add_reagent("carbon", amount) ffuu.reagents.add_reagent("toxin", amount/10) diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm index 364c956edaf..31c2aa37d98 100644 --- a/code/game/machinery/kitchen/monkeyrecycler.dm +++ b/code/game/machinery/kitchen/monkeyrecycler.dm @@ -27,7 +27,7 @@ user << "\red The monkey is struggling far too much to put it in the recycler." else user.drop_item() - del(target) + qdel(target) user << "\blue You stuff the monkey in the machine." playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) use_power(500) diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 4fa866635b2..05b5afe5a3f 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -23,7 +23,7 @@ if (src.output && loc) new src.output(loc) if (what) - del(what) + qdel(what) // Note to self: Make this safer /* objs */ meat diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index b3672caa522..a2b378ba426 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -267,7 +267,7 @@ obj/machinery/smartfridge/drying_rack/load() //For updating the filled overlay else var/dried = S.dried_type new dried(src.loc) - del S + qdel(S) return 1 return 0 diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 2d2ea1cfcbb..db84ff75a83 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -46,7 +46,7 @@ Class Variables: Class Procs: New() 'game/machinery/machine.dm' - Del() 'game/machinery/machine.dm' + Destroy() 'game/machinery/machine.dm' auto_use_power() 'game/machinery/machine.dm' This proc determines how power mode power is deducted by the machine. @@ -108,12 +108,14 @@ Class Procs: var/state_open = 0 var/mob/living/occupant = null var/unsecuring_tool = /obj/item/weapon/wrench + var/interact_offline = 0 // Can the machine be interacted with while de-powered. /obj/machinery/New() ..() machines += src -/obj/machinery/Del() +/obj/machinery/Destroy() + machines.Remove(src) ..() /obj/machinery/process()//If you dont use process or power why are you here @@ -170,22 +172,22 @@ Class Procs: /obj/machinery/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(50)) - del(src) + qdel(src) return if(3.0) if (prob(25)) - del(src) + qdel(src) return else return /obj/machinery/blob_act() if(prob(50)) - del(src) + qdel(src) /obj/machinery/proc/auto_use_power() if(!powered(power_channel)) @@ -198,7 +200,7 @@ Class Procs: /obj/machinery/Topic(href, href_list) ..() - if(stat & (NOPOWER|BROKEN)) + if(!interact_offline && stat & (NOPOWER|BROKEN)) return 1 if(usr.restrained() || usr.lying || usr.stat) return 1 @@ -237,7 +239,7 @@ Class Procs: return src.attack_hand(user) /obj/machinery/attack_hand(mob/user as mob) - if(stat & (NOPOWER|BROKEN|MAINT)) + if(!interact_offline && stat & (NOPOWER|BROKEN|MAINT)) return 1 if(user.lying || user.stat) return 1 @@ -285,7 +287,7 @@ Class Procs: if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc - del(src) + qdel(src) /obj/machinery/proc/default_deconstruction_screwdriver(var/mob/user, var/icon_state_open, var/icon_state_closed, var/obj/item/weapon/screwdriver/S) if(istype(S)) @@ -345,4 +347,4 @@ Class Procs: for(var/var/obj/item/C in component_parts) user << " [C.name]" return 1 - return 0 + return 0 diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 8a30aab9651..174c80104e1 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -164,7 +164,7 @@ if(prob(electricity_level)) explosion(loc, 0, 1, 2, 3) // ooo dat shit EXPLODES son spawn(2) - del(src) + qdel(src) */ updateicon() diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 85109d816de..b3ce20d7a9d 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -75,7 +75,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/obj/machinery/newscaster/N = new(loc) N.pixel_y -= (loc.y - on_wall.y) * 32 N.pixel_x -= (loc.x - on_wall.x) * 32 - del(src) + qdel(src) @@ -139,7 +139,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.update_icon() //for any custom ones on the map... ..() //I just realised the newscasters weren't in the global machines list. The superconstructor call will tend to that -/obj/machinery/newscaster/Del() +/obj/machinery/newscaster/Destroy() allCasters -= src ..() @@ -183,12 +183,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) src.isbroken=1 if(prob(50)) - del(src) + qdel(src) else src.update_icon() //can't place it above the return and outside the if-else. or we might get runtimes of null.update_icon() if(prob(50)) goes in. return @@ -750,7 +750,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(do_after(user, 60)) new /obj/item/newscaster_frame(loc) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - del(src) + qdel(src) return if (src.isbroken) diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 35954c0c8b6..e8e0fd7d30d 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -353,7 +353,7 @@ proc/getb(col) /mob/proc/clearmap() src.client.screen -= src.mapobjs for(var/obj/screen/O in mapobjs) - del(O) + qdel(O) mapobjs = null src.unset_machine() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 4cec3d742c7..69b80866b86 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -543,7 +543,7 @@ Buildable meters "[user] fastens the [src].", \ "\blue You have fastened the [src].", \ "You hear ratchet.") - del(src) // remove the pipe item + qdel(src) // remove the pipe item return //TODO: DEFERRED @@ -571,7 +571,7 @@ Buildable meters new/obj/machinery/meter( src.loc ) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You have fastened the meter to the pipe" - del(src) + qdel(src) #undef PIPE_SIMPLE_STRAIGHT #undef PIPE_SIMPLE_BENT diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 03a6b917f10..68497181eae 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -75,7 +75,7 @@ if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter)) usr << "You put [W] back into [src]." user.drop_item() - del(W) + qdel(W) return else if (istype(W, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) @@ -116,7 +116,7 @@ //Allow you to push disposal pipes into it (for those with density 1) /obj/machinery/pipedispenser/disposal/Crossed(var/obj/structure/disposalconstruct/pipe as obj) if(istype(pipe) && !pipe.anchored) - del(pipe) + qdel(pipe) Nah */ @@ -132,7 +132,7 @@ Nah if (pipe.anchored) return - del(pipe) + qdel(pipe) /obj/machinery/pipedispenser/disposal/attack_hand(user as mob) if(..()) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index dd352c00bd7..3671edddeaa 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -133,9 +133,9 @@ egun = 1 -/obj/machinery/porta_turret/Del() +/obj/machinery/porta_turret/Destroy() //deletes its own cover with it - del(cover) + qdel(cover) ..() @@ -261,7 +261,7 @@ new /obj/item/device/assembly/prox_sensor(loc) else user << "You remove the turret but did not manage to salvage anything." - del(src) + qdel(src) if(istype(I, /obj/item/weapon/card/emag) && !emagged) //Emagging the turret makes it go bonkers and stun everyone. It also makes @@ -288,7 +288,7 @@ user << "You unsecure the exterior bolts on the turret." icon_state = "turretCover" invisibility = 0 - del(cover) //deletes the cover, and the turret instance itself becomes its own cover. + qdel(cover) //deletes the cover, and the turret instance itself becomes its own cover. else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda)) //Behavior lock/unlock mangement @@ -333,13 +333,13 @@ if(lasercolor == "b" && disabled == 0) if(istype(Proj, /obj/item/projectile/lasertag/redtag)) disabled = 1 - del (Proj) + qdel(Proj) sleep(100) disabled = 0 if(lasercolor == "r" && disabled == 0) if(istype(Proj, /obj/item/projectile/lasertag/bluetag)) disabled = 1 - del (Proj) + qdel(Proj) sleep(100) disabled = 0 @@ -364,7 +364,7 @@ /obj/machinery/porta_turret/ex_act(severity) if(severity >= 3) //turret dies if an explosion touches it! - del(src) + qdel(src) else die() @@ -376,7 +376,7 @@ invisibility = 0 spark_system.start() //creates some sparks because they look cool density = 1 - del(cover) //deletes the cover - no need on keeping it there! + qdel(cover) //deletes the cover - no need on keeping it there! @@ -387,7 +387,7 @@ if(cover == null && anchored) //if it has no cover and is anchored if(stat & BROKEN) //if the turret is borked - del(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug + qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug else cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover @@ -646,7 +646,7 @@ playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) user << "You dismantle the turret construction." new /obj/item/stack/sheet/metal( loc, 5) - del(src) + qdel(src) return if(1) @@ -659,7 +659,7 @@ icon_state = "turret_frame2" if(M.amount <= 0) user.unEquip(M, 1) //We're deleting it anyway, so no point in having NODROP fuck shit up. - del(M) + qdel(M) else user << "You need two sheets of metal for that." return @@ -709,7 +709,7 @@ gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge user << "You add [I] to the turret." build_step = 4 - del(I) //delete the gun :( + qdel(I) //delete the gun :( return else if(istype(I, /obj/item/weapon/wrench)) @@ -725,7 +725,7 @@ user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" return user << "You add the prox sensor to the turret." - del(I) + qdel(I) return //attack_hand() removes the gun @@ -748,7 +748,7 @@ M.amount -= 2 if(M.amount <= 0) user.unEquip(M, 1) //If we don't force-unequip, bugs happen because the item was deleted without updating the neccesary stuffs. - del(M) + qdel(M) else user << "You need two sheets of metal for that." return @@ -783,7 +783,7 @@ // Turret.cover=new/obj/machinery/porta_turret_cover(loc) // Turret.cover.Parent_Turret=Turret // Turret.cover.name = finish_name - del(src) + qdel(src) else if(istype(I, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) @@ -981,7 +981,7 @@ Status: []
"}, user << "You unsecure the exterior bolts on the turret." Parent_Turret.icon_state = "turretCover" Parent_Turret.invisibility = 0 - del(src) + qdel(src) else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda)) if(Parent_Turret.allowed(user)) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index a4972ab05f1..9ac66a450e6 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -189,7 +189,7 @@ if(istype(O, /obj/item/device/lightreplacer)) var/obj/item/device/lightreplacer/LR = O var/i = 1 - for(1, i < coeff, i++) + for(1, i <= coeff, i++) LR.Charge(occupier) if(occupier) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index d92af0da8c0..5c73bad1431 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -91,7 +91,7 @@ var/const/SAFETY_COOLDOWN = 100 /obj/machinery/recycler/proc/recycle(var/obj/item/I, var/sound = 1) I.loc = src.loc if(!istype(I, /obj/item/weapon/disk/nuclear)) - del(I) + qdel(I) if(prob(15)) new /obj/item/stack/sheet/metal(loc) if(prob(10)) diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 95d0d708d68..0505105dc51 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -26,7 +26,7 @@ count++ if (O:amount < 1) - del(O) + qdel(O) user << "You insert [count] metal sheet\s into \the [src]." src.overlays -= "fab-load-metal" diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index f1cd5d5ebae..855ca45dc7b 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -15,7 +15,7 @@ ..() air_update_turf(1) -/obj/machinery/shield/Del() +/obj/machinery/shield/Destroy() opacity = 0 density = 0 air_update_turf(1) @@ -47,7 +47,7 @@ if (src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return opacity = 1 @@ -60,7 +60,7 @@ if(src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return opacity = 1 @@ -72,7 +72,7 @@ ..() if(health <=0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return opacity = 1 spawn(20) if(src) opacity = 0 @@ -81,25 +81,25 @@ switch(severity) if(1.0) if (prob(75)) - del(src) + qdel(src) if(2.0) if (prob(50)) - del(src) + qdel(src) if(3.0) if (prob(25)) - del(src) + qdel(src) return /obj/machinery/shield/emp_act(severity) switch(severity) if(1) - del(src) + qdel(src) if(2) if(prob(50)) - del(src) + qdel(src) /obj/machinery/shield/blob_act() - del(src) + qdel(src) /obj/machinery/shield/hitby(AM as mob|obj) @@ -121,7 +121,7 @@ //Handle the destruction of the shield if (src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return //The shield becomes dense to absorb the blow.. purely asthetic. @@ -152,9 +152,9 @@ var/locked = 0 var/shield_range = 4 -/obj/machinery/shieldgen/Del() +/obj/machinery/shieldgen/Destroy() for(var/obj/machinery/shield/shield_tile in deployed_shields) - del(shield_tile) + qdel(shield_tile) ..() @@ -176,13 +176,13 @@ update_icon() for(var/obj/machinery/shield/shield_tile in deployed_shields) - del(shield_tile) + qdel(shield_tile) deployed_shields.Cut() /obj/machinery/shieldgen/process() if(malfunction && active) if(deployed_shields.len && prob(5)) - del(pick(deployed_shields)) + qdel(pick(deployed_shields)) return @@ -190,7 +190,7 @@ if(health <= 30) src.malfunction = 1 if(health <= 0) - del(src) + qdel(src) update_icon() return @@ -516,14 +516,14 @@ T2 = T if(locate(/obj/machinery/shieldwall) in T) F = (locate(/obj/machinery/shieldwall) in T) - del(F) + qdel(F) if(locate(/obj/machinery/shieldwallgen) in T) G = (locate(/obj/machinery/shieldwallgen) in T) if(!G.active) break -/obj/machinery/shieldwallgen/Del() +/obj/machinery/shieldwallgen/Destroy() src.cleanup(1) src.cleanup(2) src.cleanup(4) @@ -569,11 +569,11 @@ /obj/machinery/shieldwall/process() if(needs_power) if(isnull(gen_primary)||isnull(gen_secondary)) - del(src) + qdel(src) return if(!(gen_primary.active)||!(gen_secondary.active)) - del(src) + qdel(src) return // if(prob(50)) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index a74260c1dcd..2c8c6e91c6e 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -167,9 +167,9 @@ var/heat_capacity = removed.heat_capacity() //world << "heating ([heat_capacity])" - if(heat_capacity == 0 || heat_capacity == null) // Added check to avoid divide by zero (oshi-) runtime errors -- TLE + if(heat_capacity == 0 || heat_capacity == null) // Added check to avoid divide by zero (oshi-) runtime errors heat_capacity = 1 - removed.temperature = min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE + removed.temperature = min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios cell.use(heating_power/20000) //world << "now at [removed.temperature]" diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index e096329c07e..d61307589bf 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -88,12 +88,12 @@ if(1.0) if(prob(50)) src.dump_everything() //So suits dont survive all the time - del(src) + qdel(src) return if(2.0) if(prob(50)) src.dump_everything() - del(src) + qdel(src) return else return @@ -482,7 +482,7 @@ src.update_icon() // for(var/obj/O in src) -// del(O) +// qdel(O) src.add_fingerprint(usr) src.updateUsrDialog() @@ -528,7 +528,7 @@ //for(var/obj/O in src) // O.loc = src.loc src.add_fingerprint(user) - del(G) + qdel(G) src.updateUsrDialog() src.update_icon() return diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index ddedae35197..d452688974f 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -118,7 +118,7 @@ user << "\blue Locked In" new droptype( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) - del(src) + qdel(src) return /obj/item/device/sbeacondrop/bomb @@ -203,7 +203,7 @@ return - Del() + Destroy() if(active) Deactivate() ..() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index b97f7c5b030..a3098d0580e 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -187,7 +187,7 @@ message_admins(adminlog) log_game(adminlog) explosion(get_turf(src),2,5,11, flame_range = 11) - del(src) + qdel(src) /obj/item/weapon/bombcore/proc/defuse() //Note: Because of how var/defused is used you shouldn't override this UNLESS you intend to set the var to 0 or @@ -219,7 +219,7 @@ holder.loc.visible_message("\red \icon[holder] Alert: Bomb has detonated. Your score is now [defusals] for [attempts]. Resetting wires...") reset() else - del(src) + qdel(src) /obj/item/weapon/bombcore/training/defuse() var/obj/machinery/syndicatebomb/holder = src.loc @@ -236,8 +236,8 @@ /obj/item/weapon/bombcore/badmin/defuse() //because we wouldn't want them being harvested by players var/obj/machinery/syndicatebomb/B = src.loc - del(B) - del(src) + qdel(B) + qdel(src) /obj/item/weapon/bombcore/badmin/summon/ var/summon_path = /obj/item/weapon/reagent_containers/food/snacks/cookie @@ -251,8 +251,8 @@ if(prob(50)) for(var/j = 1, j <= rand(1, 3), j++) step(X, pick(NORTH,SOUTH,EAST,WEST)) - del(B) - del(src) + qdel(B) + qdel(src) /obj/item/weapon/bombcore/badmin/summon/clown summon_path = /mob/living/simple_animal/hostile/retaliate/clown diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index e1ae4223a80..8bb964a7302 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -96,7 +96,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Do a snazzy animation! --- */ flick("broadcaster_send", src) -/obj/machinery/telecomms/broadcaster/Del() +/obj/machinery/telecomms/broadcaster/Destroy() // In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore. if(message_delay) message_delay = 0 @@ -365,7 +365,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/part_b_extra = "" if(data == 3) // intercepted radio message part_b_extra = " (Intercepted)" - var/part_b = " \[[freq_text]\][part_b_extra] \[[freq_text]\][part_b_extra] " if (display_freq==SYND_FREQ) @@ -397,7 +397,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- This following recording is intended for research and feedback in the use of department radio channels --- - var/part_blackbox_b = " \[[freq_text]\] \[[freq_text]\] \icon[radio]\[[freq_text]\][part_b_extra] \icon[radio]\[[freq_text]\][part_b_extra] " if (display_freq==SYND_FREQ) @@ -688,7 +688,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- This following recording is intended for research and feedback in the use of department radio channels --- - var/part_blackbox_b = " \[[freq_text]\] \[[freq_text]\] ") - del(src) + qdel(src) /obj/effect/spider/spiderling/healthcheck() if(health <= 0) @@ -183,7 +183,7 @@ if(!grow_as) grow_as = pick(typesof(/mob/living/simple_animal/hostile/giant_spider)) new grow_as(src.loc) - del(src) + qdel(src) /obj/effect/spider/cocoon name = "cocoon" @@ -204,11 +204,11 @@ if(do_after(user,(breakout_time*60*10))) if(!user || user.stat != CONSCIOUS || user.loc != src) return - Del() + qdel(src) -/obj/effect/spider/cocoon/Del() +/obj/effect/spider/cocoon/Destroy() src.visible_message("\red \The [src] splits open.") for(var/atom/movable/A in contents) A.loc = src.loc diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 9f440d4b4fa..7c61a05111e 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -86,9 +86,9 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa var/lighting_controller_was_processing = lighting_controller.processing //Pause the lighting updates for a bit lighting_controller.processing = 0 - var/powernet_rebuild_was_deferred_already = defer_powernet_rebuild - if(defer_powernet_rebuild != 2) - defer_powernet_rebuild = 1 +// var/powernet_rebuild_was_deferred_already = defer_powernet_rebuild +// if(defer_powernet_rebuild != 2) +// defer_powernet_rebuild = 1 if(heavy_impact_range > 1) var/datum/effect/system/explosion/E = new/datum/effect/system/explosion() @@ -118,13 +118,11 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(T) if(flame_dist && prob(40) && !istype(T, /turf/space)) - spawn() - new/obj/effect/hotspot(T) //Mostly for ambience! + new/obj/effect/hotspot(T) //Mostly for ambience! hotspot_exists = 1 if(dist) - spawn() - if(T) - T.ex_act(dist) + if(T) + T.ex_act(dist) //------- THINGS IN TURFS FIRES ------- @@ -134,14 +132,12 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(AM) //Something is inside T (We have already checked T exists above) - RR if(flame_dist) //if it has flame distance, run this - RR if(isliving(AM) && !hotspot_exists && !istype(T, /turf/space)) - spawn() - if(AM && AM.loc!=null) - new /obj/effect/hotspot(AM.loc) + if(AM && AM.loc!=null) + new /obj/effect/hotspot(AM.loc) //Just in case we missed a mob while they were in flame_range, but a hotspot didn't spawn on them, otherwise it looks weird when you just burst into flame out of nowhere if(dist) //if no flame_dist, run this - RR - spawn() - if(AM) - AM.ex_act(dist) + if(AM) + AM.ex_act(dist) @@ -158,9 +154,9 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa sleep(8) if(!lighting_controller.processing) lighting_controller.processing = lighting_controller_was_processing - if(!powernet_rebuild_was_deferred_already) - if(defer_powernet_rebuild != 2) - defer_powernet_rebuild = 0 +// if(!powernet_rebuild_was_deferred_already) +// if(defer_powernet_rebuild != 2) +// defer_powernet_rebuild = 0 return 1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8305f4c0a96..96a4a7a1ef2 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -35,24 +35,30 @@ /obj/item/device icon = 'icons/obj/device.dmi' +/obj/item/Destroy() + if(ismob(loc)) + var/mob/m = loc + m.unEquip(src, 1) + return ..() + /obj/item/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(50)) - del(src) + qdel(src) return if(3.0) if (prob(5)) - del(src) + qdel(src) return else return /obj/item/blob_act() - del(src) + qdel(src) //user: The mob that is suiciding //damagetype: The type of damage the item will inflict on the user diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index a11b326e455..208a2111da1 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -11,7 +11,7 @@ ..() if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) - del(src) + qdel(src) /obj/item/apc_frame/proc/try_build(turf/on_wall) if (get_dist(on_wall,usr)>1) @@ -38,6 +38,6 @@ var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc) C.amount = 10 usr << "You cut the cables and disassemble the unused power terminal." - del(T) + qdel(T) new /obj/machinery/power/apc(loc, ndir, 1) - del(src) + qdel(src) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index f21832f87a0..35709d906ff 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -10,7 +10,7 @@ /obj/item/bodybag/attack_self(mob/user) var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) R.add_fingerprint(user) - del(src) + qdel(src) /obj/item/weapon/storage/box/bodybags @@ -79,7 +79,7 @@ visible_message("[usr] folds up [src].") var/obj/item/bodybag/B = new /obj/item/bodybag(get_turf(src)) usr.put_in_hands(B) - del(src) + qdel(src) /obj/structure/closet/bodybag/update_icon() diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 7047a708465..3584b97b282 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -66,7 +66,7 @@ if(istype(src.loc, /mob)) var/mob/M = src.loc M.unEquip(src, 1) //src is being deleted anyway - del(src) + qdel(src) update_icon() if(istype(loc, /turf)) //start a fire if possible var/turf/T = loc diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 6456e670447..bed61da06e7 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -81,7 +81,7 @@ uses-- if(!uses) user << "\red You used up your crayon!" - del(src) + qdel(src) return /obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob) @@ -92,6 +92,6 @@ uses -= 5 if(uses <= 0) user << "\red You ate your crayon!" - del(src) + qdel(src) else ..() \ No newline at end of file diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 1083e4c1952..3d18e1a5f17 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -948,10 +948,10 @@ var/global/list/obj/item/device/pda/PDAs = list() explosion(T, -1, -1, 2, 3) - del(src) + qdel(src) return -/obj/item/device/pda/Del() +/obj/item/device/pda/Destroy() PDAs -= src if (src.id) src.id.loc = get_turf(src.loc) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 7e657c718ca..cb18cc0c7a4 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -292,7 +292,7 @@ Code: menu += " Lockdown |" menu += " Biohazard \]
" - if (43) //Muskets' and Rockdtben's power monitor :D + if (43) menu = "
" powmonitor = null powermonitors = list() @@ -318,7 +318,7 @@ Code: menu += "" - if (433) //Muskets' and Rockdtben's power monitor :D + if (433) menu = "
" if(!powmonitor) menu += "\red No connection
" diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 1d30c43ffb0..24c0d8f5af2 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -41,7 +41,7 @@ if(active_dummy) eject_all() playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) - del(active_dummy) + qdel(active_dummy) active_dummy = null usr << "\blue You deactivate the [src]." var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) @@ -54,7 +54,7 @@ if(!O) return var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, src) - del(O) + qdel(O) usr << "\blue You activate the [src]." var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' @@ -69,7 +69,7 @@ spark_system.start() eject_all() if(delete_dummy) - del(active_dummy) + qdel(active_dummy) active_dummy = null can_use = 0 spawn(50) can_use = 1 @@ -140,6 +140,6 @@ step(src, direction) return -/obj/effect/dummy/chameleon/Del() +/obj/effect/dummy/chameleon/Destroy() master.disrupt(0) ..() \ No newline at end of file diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index a0d807b634c..56a57d8a849 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -111,7 +111,7 @@ animation.master = user flick("blspell", animation) sleep(5) - del(animation) + qdel(animation) if(!flashfail) flick(flashanim, src) @@ -158,7 +158,7 @@ animation.master = user flick("blspell", animation) sleep(5) - del(animation) + qdel(animation) for(var/mob/living/carbon/M in oviewers(3, null)) var/safety = M:eyecheck() diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 810b467142f..8993adf9cf3 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -229,7 +229,7 @@ ..() processing_objects.Add(src) -/obj/item/device/flashlight/emp/Del() +/obj/item/device/flashlight/emp/Destroy() processing_objects.Remove(src) ..() diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 9cb72a9b928..9c6dbbdb37c 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -86,7 +86,7 @@ G.amount = remaining if(!G.amount) user.drop_item() - del(G) + qdel(G) AddUses(increment) user << "You insert a piece of glass into the [src.name]. You have [uses] lights remaining." return @@ -98,7 +98,7 @@ AddUses(1) user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining." user.drop_item() - del(L) + qdel(L) return else user << "You need a working light." @@ -164,7 +164,7 @@ target.brightness = L2.brightness target.on = target.has_power() target.update() - del(L2) + qdel(L2) if(target.on && target.rigged) target.explode() diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index a0436fa067d..88bec2edc50 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -17,6 +17,7 @@ g_amt = 20 origin_tech = "magnets=1;engineering=1" var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage + hitsound = 'sound/weapons/tap.ogg' // Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby. @@ -30,7 +31,7 @@ processing_objects += src -/obj/item/device/multitool/ai_detect/Del() +/obj/item/device/multitool/ai_detect/Destroy() processing_objects -= src ..() diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index c38169c621b..3fa8f1593f8 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -14,7 +14,7 @@ ..() overlays += "pai-off" -/obj/item/device/paicard/Del() +/obj/item/device/paicard/Destroy() //Will stop people throwing friend pAIs into the singularity so they can respawn if(!isnull(pai)) pai.death(0) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 1798038265e..868bd0133c1 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -139,4 +139,4 @@ if(power_drained >= max_power) processing_objects.Remove(src) explosion(src.loc, 3,6,9,12) - del(src) + qdel(src) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 853890021fa..28f9936054a 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -30,4 +30,4 @@ /obj/item/device/radio/beacon/bacon //Probably a better way of doing this, I'm lazy. proc/digest_delay() spawn(600) - del(src)*/ //Bacon beacons are no more rip in peace \ No newline at end of file + qdel(src)*/ //Bacon beacons are no more rip in peace \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index ddf8238de04..463f17caf6d 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -36,7 +36,7 @@ origin_tech = "syndicate=3" /obj/item/device/radio/headset/syndicate/New() ..() - del(keyslot1) + qdel(keyslot1) keyslot1 = new /obj/item/device/encryptionkey/syndicate syndie = 1 recalculateChannels() @@ -45,7 +45,7 @@ origin_tech = "syndicate=3" /obj/item/device/radio/headset/binary/New() ..() - del(keyslot1) + qdel(keyslot1) keyslot1 = new /obj/item/device/encryptionkey/binary recalculateChannels() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 8e03f22f48f..3e49179e76f 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -15,7 +15,7 @@ ..() processing_objects += src -/obj/item/device/radio/intercom/Del() +/obj/item/device/radio/intercom/Destroy() processing_objects -= src ..() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 04e26786580..edac441eae1 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -448,7 +448,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use var/list/receive = list() //for (var/obj/item/device/radio/R in radio_connection.devices) - for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) // Modified for security headset code -- TLE + for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) //if(R.accept_rad(src, message)) receive |= R.send_hear(display_freq, 0) @@ -498,7 +498,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use if(!freq_text) freq_text = format_frequency(display_freq) - var/part_b = " \[[freq_text]\] \[[freq_text]\] " if (display_freq==SYND_FREQ) @@ -524,7 +524,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use //This following recording is intended for research and feedback in the use of department radio channels. - var/part_blackbox_b = " \[[freq_text]\] \[[freq_text]\]
" + dat += "Glass amount: [src.g_amount] / [max_g_amount] cm3
" var/list/objs = list() objs += src.L if(src.hacked) objs += src.LL for(var/obj/t in objs) if(disabled || m_amount
\n", src) + if(src.emergency) + t1 += text("Emergency Access Override is enabled. Disable?
\n", src) + else + t1 += text("Emergency Access Override is disabled. Enable?
\n", src) + if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER1)) t1 += text("Main Power Input wire is cut.
\n") if(src.isWireCut(AIRLOCK_WIRE_MAIN_POWER2)) @@ -542,8 +549,8 @@ About the new airlock wires panel: user << browse(t1, "window=airlock") onclose(user, "airlock") -//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door -//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door +//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 11 lift access override +//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 11 enable access override /obj/machinery/door/airlock/proc/hack(mob/user as mob) @@ -647,8 +654,8 @@ About the new airlock wires panel: if(istype(usr, /mob/living/silicon) && src.canAIControl()) //AI - //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed - //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed + //aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed, 11 emergency access + //aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed, 11 emergency access if(href_list["aiDisable"]) var/code = text2num(href_list["aiDisable"]) switch (code) @@ -728,6 +735,12 @@ About the new airlock wires panel: else usr << text("Door bolt lights are already disabled!") + if(11) + // Emergency access + if (src.emergency) + emergency = 0 + else + usr << text("Emergency access is already disabled!") else if(href_list["aiEnable"]) @@ -827,6 +840,13 @@ About the new airlock wires panel: else usr << text("Door bolt lights are already enabled!") + if(11) + // Emergency access + if (!src.emergency) + emergency = 1 + else + usr << text("Emergency access is already enabled!") + add_fingerprint(usr) update_icon() if(!nowindow) @@ -856,6 +876,7 @@ About the new airlock wires panel: return else if(istype(C, /obj/item/weapon/screwdriver)) src.p_open = !( src.p_open ) + user << "You [p_open ? "open":"close"] the maintenance panel of the airlock." src.update_icon() else if(istype(C, /obj/item/weapon/wirecutters)) return src.attack_hand(user) @@ -863,7 +884,7 @@ About the new airlock wires panel: return src.attack_hand(user) else if(istype(C, /obj/item/device/assembly/signaler)) return src.attack_hand(user) - else if(istype(C, /obj/item/weapon/pai_cable)) // -- TLE + else if(istype(C, /obj/item/weapon/pai_cable)) var/obj/item/weapon/pai_cable/cable = C cable.plugin(src, user) else if(istype(C, /obj/item/weapon/crowbar) || istype(C, /obj/item/weapon/twohanded/fireaxe) ) @@ -922,7 +943,7 @@ About the new airlock wires panel: electronics = null ae.loc = src.loc - del(src) + qdel(src) return else if(arePowerSystemsOn() && !(stat & NOPOWER)) user << "\blue The airlock's motors resist your efforts to force it." diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index e4d26278b14..b50e9dc769a 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -15,6 +15,7 @@ var/glass = 0 var/normalspeed = 1 var/heat_proof = 0 // For glass airlocks/opacity firedoors + var/emergency = 0 // Emergency access override /obj/machinery/door/New() ..() @@ -29,7 +30,7 @@ return -/obj/machinery/door/Del() +/obj/machinery/door/Destroy() density = 0 air_update_turf(1) update_freelook_sight() @@ -51,7 +52,7 @@ if(istype(AM, /obj/machinery/bot)) var/obj/machinery/bot/bot = AM - if(src.check_access(bot.botcard)) + if(src.check_access(bot.botcard) || emergency == 1) if(density) open() return @@ -59,7 +60,7 @@ if(istype(AM, /obj/mecha)) var/obj/mecha/mecha = AM if(density) - if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access))) + if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access) || emergency == 1)) open() else flick("door_deny", src) @@ -87,7 +88,7 @@ user = null if(density) - if(allowed(user)) open() + if(allowed(user) || src.emergency == 1) open() else flick("door_deny", src) return @@ -128,7 +129,7 @@ open() operating = -1 return 1 - if(src.allowed(user)) + if(src.allowed(user) || src.emergency == 1) if(src.density) open() else @@ -141,7 +142,7 @@ /obj/machinery/door/blob_act() if(prob(40)) - del(src) + qdel(src) return @@ -159,10 +160,10 @@ /obj/machinery/door/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if(prob(25)) - del(src) + qdel(src) if(3.0) if(prob(80)) var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index c3a724ad244..3695c80ef45 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -312,9 +312,9 @@ f1.sd_SetOpacity(opacity) f2.sd_SetOpacity(opacity) - Del() - del f1 - del f2 + Destroy() + qdel(f1) + qdel(f2) ..() /obj/machinery/door/poddoor/two_tile_ver @@ -331,9 +331,9 @@ f1.sd_SetOpacity(opacity) f2.sd_SetOpacity(opacity) - Del() - del f1 - del f2 + Destroy() + qdel(f1) + qdel(f2) ..() /obj/machinery/door/poddoor/four_tile_hor @@ -358,11 +358,11 @@ f4.sd_SetOpacity(opacity) f3.sd_SetOpacity(opacity) - Del() - del f1 - del f2 - del f3 - del f4 + Destroy() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) ..() /obj/machinery/door/poddoor/four_tile_ver @@ -387,11 +387,11 @@ f4.sd_SetOpacity(opacity) f3.sd_SetOpacity(opacity) - Del() - del f1 - del f2 - del f3 - del f4 + Destroy() + qdel(f1) + qdel(f2) + qdel(f3) + qdel(f4) ..() /obj/machinery/door/poddoor/filler_object diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 09b9452cebc..8a9b225e5a8 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -20,7 +20,7 @@ src.base_state = src.icon_state return -/obj/machinery/door/window/Del() +/obj/machinery/door/window/Destroy() density = 0 playsound(src, "shatter", 70, 1) ..() @@ -125,7 +125,7 @@ var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) return /obj/machinery/door/window/bullet_act(var/obj/item/projectile/Proj) @@ -165,7 +165,7 @@ var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) else return src.attack_hand(user) @@ -206,7 +206,7 @@ var/obj/item/stack/cable_coil/CC = new /obj/item/stack/cable_coil(src.loc) CC.amount = 2 src.density = 0 - del(src) + qdel(src) return diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 202de927d85..6a1518e311b 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -13,7 +13,7 @@ var/list/doppler_arrays = list() ..() doppler_arrays += src -/obj/machinery/doppler_array/Del() +/obj/machinery/doppler_array/Destroy() doppler_arrays -= src ..() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 5442248986a..0b440c21f66 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -105,7 +105,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/holopad/proc/clear_holo() // hologram.SetLuminosity(0)//Clear lighting. //handled by the lighting controller when its ower is deleted - del(hologram)//Get rid of hologram. + qdel(hologram)//Get rid of hologram. if(master.current == src) master.current = null master = null//Null the master, since no-one is using it now. @@ -160,26 +160,26 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ /obj/machinery/hologram/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) if(2.0) if (prob(50)) - del(src) + qdel(src) if(3.0) if (prob(5)) - del(src) + qdel(src) return /obj/machinery/hologram/blob_act() - del(src) + qdel(src) return /obj/machinery/hologram/meteorhit() - del(src) + qdel(src) return -/obj/machinery/hologram/Del() +/obj/machinery/hologram/holopad/Destroy() if(hologram) - src:clear_holo() + clear_holo() ..() /* diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index a033eb44002..48af8644879 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -25,7 +25,7 @@ if(input_obj) if(isturf(input_obj.loc)) input_plate = input_obj.loc - del(input_obj) + qdel(input_obj) break if(!input_plate) @@ -101,7 +101,7 @@ M.client.eye = src M.loc = src src.occupant = M - del(G) + qdel(G) update_icon() @@ -159,7 +159,7 @@ add_logs(user, occupant, "gibbed") src.occupant.death(1) src.occupant.ghostize() - del(src.occupant) + qdel(src.occupant) spawn(src.gibtime) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) operating = 0 diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index c2b3fbbc0dc..f93bfc68340 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -158,7 +158,7 @@ for (var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents) var/r_id = get_juice_id(O) beaker.reagents.add_reagent(r_id,get_juice_amount(O)) - del(O) + qdel(O) if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume) break diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index 8e12010cbfd..540bfeeec26 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -1,4 +1,3 @@ - /obj/machinery/microwave name = "microwave" icon = 'icons/obj/kitchen.dmi' @@ -46,8 +45,7 @@ component_parts += new /obj/item/weapon/circuitboard/microwave(null) component_parts += new /obj/item/weapon/stock_parts/micro_laser(null) component_parts += new /obj/item/weapon/stock_parts/console_screen(null) - component_parts += new /obj/item/stack/cable_coil(null) - component_parts += new /obj/item/stack/cable_coil(null) + component_parts += new /obj/item/stack/cable_coil(null, 2) RefreshParts() /obj/machinery/microwave/RefreshParts() @@ -393,7 +391,7 @@ var/id = O.reagents.get_master_reagent_id() if (id) amount+=O.reagents.get_reagent_amount(id) - del(O) + qdel(O) src.reagents.clear_reagents() ffuu.reagents.add_reagent("carbon", amount) ffuu.reagents.add_reagent("toxin", amount/10) diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm index 364c956edaf..31c2aa37d98 100644 --- a/code/game/machinery/kitchen/monkeyrecycler.dm +++ b/code/game/machinery/kitchen/monkeyrecycler.dm @@ -27,7 +27,7 @@ user << "\red The monkey is struggling far too much to put it in the recycler." else user.drop_item() - del(target) + qdel(target) user << "\blue You stuff the monkey in the machine." playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) use_power(500) diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 4fa866635b2..05b5afe5a3f 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -23,7 +23,7 @@ if (src.output && loc) new src.output(loc) if (what) - del(what) + qdel(what) // Note to self: Make this safer /* objs */ meat diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index b3672caa522..a2b378ba426 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -267,7 +267,7 @@ obj/machinery/smartfridge/drying_rack/load() //For updating the filled overlay else var/dried = S.dried_type new dried(src.loc) - del S + qdel(S) return 1 return 0 diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 2d2ea1cfcbb..db84ff75a83 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -46,7 +46,7 @@ Class Variables: Class Procs: New() 'game/machinery/machine.dm' - Del() 'game/machinery/machine.dm' + Destroy() 'game/machinery/machine.dm' auto_use_power() 'game/machinery/machine.dm' This proc determines how power mode power is deducted by the machine. @@ -108,12 +108,14 @@ Class Procs: var/state_open = 0 var/mob/living/occupant = null var/unsecuring_tool = /obj/item/weapon/wrench + var/interact_offline = 0 // Can the machine be interacted with while de-powered. /obj/machinery/New() ..() machines += src -/obj/machinery/Del() +/obj/machinery/Destroy() + machines.Remove(src) ..() /obj/machinery/process()//If you dont use process or power why are you here @@ -170,22 +172,22 @@ Class Procs: /obj/machinery/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(50)) - del(src) + qdel(src) return if(3.0) if (prob(25)) - del(src) + qdel(src) return else return /obj/machinery/blob_act() if(prob(50)) - del(src) + qdel(src) /obj/machinery/proc/auto_use_power() if(!powered(power_channel)) @@ -198,7 +200,7 @@ Class Procs: /obj/machinery/Topic(href, href_list) ..() - if(stat & (NOPOWER|BROKEN)) + if(!interact_offline && stat & (NOPOWER|BROKEN)) return 1 if(usr.restrained() || usr.lying || usr.stat) return 1 @@ -237,7 +239,7 @@ Class Procs: return src.attack_hand(user) /obj/machinery/attack_hand(mob/user as mob) - if(stat & (NOPOWER|BROKEN|MAINT)) + if(!interact_offline && stat & (NOPOWER|BROKEN|MAINT)) return 1 if(user.lying || user.stat) return 1 @@ -285,7 +287,7 @@ Class Procs: if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc - del(src) + qdel(src) /obj/machinery/proc/default_deconstruction_screwdriver(var/mob/user, var/icon_state_open, var/icon_state_closed, var/obj/item/weapon/screwdriver/S) if(istype(S)) @@ -345,4 +347,4 @@ Class Procs: for(var/var/obj/item/C in component_parts) user << " [C.name]" return 1 - return 0 + return 0 diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 8a30aab9651..174c80104e1 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -164,7 +164,7 @@ if(prob(electricity_level)) explosion(loc, 0, 1, 2, 3) // ooo dat shit EXPLODES son spawn(2) - del(src) + qdel(src) */ updateicon() diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 85109d816de..b3ce20d7a9d 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -75,7 +75,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co var/obj/machinery/newscaster/N = new(loc) N.pixel_y -= (loc.y - on_wall.y) * 32 N.pixel_x -= (loc.x - on_wall.x) * 32 - del(src) + qdel(src) @@ -139,7 +139,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.update_icon() //for any custom ones on the map... ..() //I just realised the newscasters weren't in the global machines list. The superconstructor call will tend to that -/obj/machinery/newscaster/Del() +/obj/machinery/newscaster/Destroy() allCasters -= src ..() @@ -183,12 +183,12 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) src.isbroken=1 if(prob(50)) - del(src) + qdel(src) else src.update_icon() //can't place it above the return and outside the if-else. or we might get runtimes of null.update_icon() if(prob(50)) goes in. return @@ -750,7 +750,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(do_after(user, 60)) new /obj/item/newscaster_frame(loc) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - del(src) + qdel(src) return if (src.isbroken) diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 35954c0c8b6..e8e0fd7d30d 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -353,7 +353,7 @@ proc/getb(col) /mob/proc/clearmap() src.client.screen -= src.mapobjs for(var/obj/screen/O in mapobjs) - del(O) + qdel(O) mapobjs = null src.unset_machine() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 4cec3d742c7..69b80866b86 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -543,7 +543,7 @@ Buildable meters "[user] fastens the [src].", \ "\blue You have fastened the [src].", \ "You hear ratchet.") - del(src) // remove the pipe item + qdel(src) // remove the pipe item return //TODO: DEFERRED @@ -571,7 +571,7 @@ Buildable meters new/obj/machinery/meter( src.loc ) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "\blue You have fastened the meter to the pipe" - del(src) + qdel(src) #undef PIPE_SIMPLE_STRAIGHT #undef PIPE_SIMPLE_BENT diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 03a6b917f10..68497181eae 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -75,7 +75,7 @@ if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter)) usr << "You put [W] back into [src]." user.drop_item() - del(W) + qdel(W) return else if (istype(W, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) @@ -116,7 +116,7 @@ //Allow you to push disposal pipes into it (for those with density 1) /obj/machinery/pipedispenser/disposal/Crossed(var/obj/structure/disposalconstruct/pipe as obj) if(istype(pipe) && !pipe.anchored) - del(pipe) + qdel(pipe) Nah */ @@ -132,7 +132,7 @@ Nah if (pipe.anchored) return - del(pipe) + qdel(pipe) /obj/machinery/pipedispenser/disposal/attack_hand(user as mob) if(..()) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index dd352c00bd7..3671edddeaa 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -133,9 +133,9 @@ egun = 1 -/obj/machinery/porta_turret/Del() +/obj/machinery/porta_turret/Destroy() //deletes its own cover with it - del(cover) + qdel(cover) ..() @@ -261,7 +261,7 @@ new /obj/item/device/assembly/prox_sensor(loc) else user << "You remove the turret but did not manage to salvage anything." - del(src) + qdel(src) if(istype(I, /obj/item/weapon/card/emag) && !emagged) //Emagging the turret makes it go bonkers and stun everyone. It also makes @@ -288,7 +288,7 @@ user << "You unsecure the exterior bolts on the turret." icon_state = "turretCover" invisibility = 0 - del(cover) //deletes the cover, and the turret instance itself becomes its own cover. + qdel(cover) //deletes the cover, and the turret instance itself becomes its own cover. else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda)) //Behavior lock/unlock mangement @@ -333,13 +333,13 @@ if(lasercolor == "b" && disabled == 0) if(istype(Proj, /obj/item/projectile/lasertag/redtag)) disabled = 1 - del (Proj) + qdel(Proj) sleep(100) disabled = 0 if(lasercolor == "r" && disabled == 0) if(istype(Proj, /obj/item/projectile/lasertag/bluetag)) disabled = 1 - del (Proj) + qdel(Proj) sleep(100) disabled = 0 @@ -364,7 +364,7 @@ /obj/machinery/porta_turret/ex_act(severity) if(severity >= 3) //turret dies if an explosion touches it! - del(src) + qdel(src) else die() @@ -376,7 +376,7 @@ invisibility = 0 spark_system.start() //creates some sparks because they look cool density = 1 - del(cover) //deletes the cover - no need on keeping it there! + qdel(cover) //deletes the cover - no need on keeping it there! @@ -387,7 +387,7 @@ if(cover == null && anchored) //if it has no cover and is anchored if(stat & BROKEN) //if the turret is borked - del(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug + qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug else cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover @@ -646,7 +646,7 @@ playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) user << "You dismantle the turret construction." new /obj/item/stack/sheet/metal( loc, 5) - del(src) + qdel(src) return if(1) @@ -659,7 +659,7 @@ icon_state = "turret_frame2" if(M.amount <= 0) user.unEquip(M, 1) //We're deleting it anyway, so no point in having NODROP fuck shit up. - del(M) + qdel(M) else user << "You need two sheets of metal for that." return @@ -709,7 +709,7 @@ gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge user << "You add [I] to the turret." build_step = 4 - del(I) //delete the gun :( + qdel(I) //delete the gun :( return else if(istype(I, /obj/item/weapon/wrench)) @@ -725,7 +725,7 @@ user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" return user << "You add the prox sensor to the turret." - del(I) + qdel(I) return //attack_hand() removes the gun @@ -748,7 +748,7 @@ M.amount -= 2 if(M.amount <= 0) user.unEquip(M, 1) //If we don't force-unequip, bugs happen because the item was deleted without updating the neccesary stuffs. - del(M) + qdel(M) else user << "You need two sheets of metal for that." return @@ -783,7 +783,7 @@ // Turret.cover=new/obj/machinery/porta_turret_cover(loc) // Turret.cover.Parent_Turret=Turret // Turret.cover.name = finish_name - del(src) + qdel(src) else if(istype(I, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) @@ -981,7 +981,7 @@ Status: []
"}, user << "You unsecure the exterior bolts on the turret." Parent_Turret.icon_state = "turretCover" Parent_Turret.invisibility = 0 - del(src) + qdel(src) else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda)) if(Parent_Turret.allowed(user)) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index a4972ab05f1..9ac66a450e6 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -189,7 +189,7 @@ if(istype(O, /obj/item/device/lightreplacer)) var/obj/item/device/lightreplacer/LR = O var/i = 1 - for(1, i < coeff, i++) + for(1, i <= coeff, i++) LR.Charge(occupier) if(occupier) diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index d92af0da8c0..5c73bad1431 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -91,7 +91,7 @@ var/const/SAFETY_COOLDOWN = 100 /obj/machinery/recycler/proc/recycle(var/obj/item/I, var/sound = 1) I.loc = src.loc if(!istype(I, /obj/item/weapon/disk/nuclear)) - del(I) + qdel(I) if(prob(15)) new /obj/item/stack/sheet/metal(loc) if(prob(10)) diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 95d0d708d68..0505105dc51 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -26,7 +26,7 @@ count++ if (O:amount < 1) - del(O) + qdel(O) user << "You insert [count] metal sheet\s into \the [src]." src.overlays -= "fab-load-metal" diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index f1cd5d5ebae..855ca45dc7b 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -15,7 +15,7 @@ ..() air_update_turf(1) -/obj/machinery/shield/Del() +/obj/machinery/shield/Destroy() opacity = 0 density = 0 air_update_turf(1) @@ -47,7 +47,7 @@ if (src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return opacity = 1 @@ -60,7 +60,7 @@ if(src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return opacity = 1 @@ -72,7 +72,7 @@ ..() if(health <=0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return opacity = 1 spawn(20) if(src) opacity = 0 @@ -81,25 +81,25 @@ switch(severity) if(1.0) if (prob(75)) - del(src) + qdel(src) if(2.0) if (prob(50)) - del(src) + qdel(src) if(3.0) if (prob(25)) - del(src) + qdel(src) return /obj/machinery/shield/emp_act(severity) switch(severity) if(1) - del(src) + qdel(src) if(2) if(prob(50)) - del(src) + qdel(src) /obj/machinery/shield/blob_act() - del(src) + qdel(src) /obj/machinery/shield/hitby(AM as mob|obj) @@ -121,7 +121,7 @@ //Handle the destruction of the shield if (src.health <= 0) visible_message("\blue The [src] dissapates") - del(src) + qdel(src) return //The shield becomes dense to absorb the blow.. purely asthetic. @@ -152,9 +152,9 @@ var/locked = 0 var/shield_range = 4 -/obj/machinery/shieldgen/Del() +/obj/machinery/shieldgen/Destroy() for(var/obj/machinery/shield/shield_tile in deployed_shields) - del(shield_tile) + qdel(shield_tile) ..() @@ -176,13 +176,13 @@ update_icon() for(var/obj/machinery/shield/shield_tile in deployed_shields) - del(shield_tile) + qdel(shield_tile) deployed_shields.Cut() /obj/machinery/shieldgen/process() if(malfunction && active) if(deployed_shields.len && prob(5)) - del(pick(deployed_shields)) + qdel(pick(deployed_shields)) return @@ -190,7 +190,7 @@ if(health <= 30) src.malfunction = 1 if(health <= 0) - del(src) + qdel(src) update_icon() return @@ -516,14 +516,14 @@ T2 = T if(locate(/obj/machinery/shieldwall) in T) F = (locate(/obj/machinery/shieldwall) in T) - del(F) + qdel(F) if(locate(/obj/machinery/shieldwallgen) in T) G = (locate(/obj/machinery/shieldwallgen) in T) if(!G.active) break -/obj/machinery/shieldwallgen/Del() +/obj/machinery/shieldwallgen/Destroy() src.cleanup(1) src.cleanup(2) src.cleanup(4) @@ -569,11 +569,11 @@ /obj/machinery/shieldwall/process() if(needs_power) if(isnull(gen_primary)||isnull(gen_secondary)) - del(src) + qdel(src) return if(!(gen_primary.active)||!(gen_secondary.active)) - del(src) + qdel(src) return // if(prob(50)) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index a74260c1dcd..2c8c6e91c6e 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -167,9 +167,9 @@ var/heat_capacity = removed.heat_capacity() //world << "heating ([heat_capacity])" - if(heat_capacity == 0 || heat_capacity == null) // Added check to avoid divide by zero (oshi-) runtime errors -- TLE + if(heat_capacity == 0 || heat_capacity == null) // Added check to avoid divide by zero (oshi-) runtime errors heat_capacity = 1 - removed.temperature = min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE + removed.temperature = min((removed.temperature*heat_capacity + heating_power)/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios cell.use(heating_power/20000) //world << "now at [removed.temperature]" diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index e096329c07e..d61307589bf 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -88,12 +88,12 @@ if(1.0) if(prob(50)) src.dump_everything() //So suits dont survive all the time - del(src) + qdel(src) return if(2.0) if(prob(50)) src.dump_everything() - del(src) + qdel(src) return else return @@ -482,7 +482,7 @@ src.update_icon() // for(var/obj/O in src) -// del(O) +// qdel(O) src.add_fingerprint(usr) src.updateUsrDialog() @@ -528,7 +528,7 @@ //for(var/obj/O in src) // O.loc = src.loc src.add_fingerprint(user) - del(G) + qdel(G) src.updateUsrDialog() src.update_icon() return diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index ddedae35197..d452688974f 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -118,7 +118,7 @@ user << "\blue Locked In" new droptype( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) - del(src) + qdel(src) return /obj/item/device/sbeacondrop/bomb @@ -203,7 +203,7 @@ return - Del() + Destroy() if(active) Deactivate() ..() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index b97f7c5b030..a3098d0580e 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -187,7 +187,7 @@ message_admins(adminlog) log_game(adminlog) explosion(get_turf(src),2,5,11, flame_range = 11) - del(src) + qdel(src) /obj/item/weapon/bombcore/proc/defuse() //Note: Because of how var/defused is used you shouldn't override this UNLESS you intend to set the var to 0 or @@ -219,7 +219,7 @@ holder.loc.visible_message("\red \icon[holder] Alert: Bomb has detonated. Your score is now [defusals] for [attempts]. Resetting wires...") reset() else - del(src) + qdel(src) /obj/item/weapon/bombcore/training/defuse() var/obj/machinery/syndicatebomb/holder = src.loc @@ -236,8 +236,8 @@ /obj/item/weapon/bombcore/badmin/defuse() //because we wouldn't want them being harvested by players var/obj/machinery/syndicatebomb/B = src.loc - del(B) - del(src) + qdel(B) + qdel(src) /obj/item/weapon/bombcore/badmin/summon/ var/summon_path = /obj/item/weapon/reagent_containers/food/snacks/cookie @@ -251,8 +251,8 @@ if(prob(50)) for(var/j = 1, j <= rand(1, 3), j++) step(X, pick(NORTH,SOUTH,EAST,WEST)) - del(B) - del(src) + qdel(B) + qdel(src) /obj/item/weapon/bombcore/badmin/summon/clown summon_path = /mob/living/simple_animal/hostile/retaliate/clown diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm index e1ae4223a80..8bb964a7302 100644 --- a/code/game/machinery/telecomms/broadcaster.dm +++ b/code/game/machinery/telecomms/broadcaster.dm @@ -96,7 +96,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept /* --- Do a snazzy animation! --- */ flick("broadcaster_send", src) -/obj/machinery/telecomms/broadcaster/Del() +/obj/machinery/telecomms/broadcaster/Destroy() // In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore. if(message_delay) message_delay = 0 @@ -365,7 +365,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept var/part_b_extra = "" if(data == 3) // intercepted radio message part_b_extra = " (Intercepted)" - var/part_b = " \[[freq_text]\][part_b_extra] \[[freq_text]\][part_b_extra] " if (display_freq==SYND_FREQ) @@ -397,7 +397,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- This following recording is intended for research and feedback in the use of department radio channels --- - var/part_blackbox_b = " \[[freq_text]\] \[[freq_text]\] \icon[radio]\[[freq_text]\][part_b_extra] \icon[radio]\[[freq_text]\][part_b_extra] " if (display_freq==SYND_FREQ) @@ -688,7 +688,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept // --- This following recording is intended for research and feedback in the use of department radio channels --- - var/part_blackbox_b = " \[[freq_text]\] \[[freq_text]\] ") - del(src) + qdel(src) /obj/effect/spider/spiderling/healthcheck() if(health <= 0) @@ -183,7 +183,7 @@ if(!grow_as) grow_as = pick(typesof(/mob/living/simple_animal/hostile/giant_spider)) new grow_as(src.loc) - del(src) + qdel(src) /obj/effect/spider/cocoon name = "cocoon" @@ -204,11 +204,11 @@ if(do_after(user,(breakout_time*60*10))) if(!user || user.stat != CONSCIOUS || user.loc != src) return - Del() + qdel(src) -/obj/effect/spider/cocoon/Del() +/obj/effect/spider/cocoon/Destroy() src.visible_message("\red \The [src] splits open.") for(var/atom/movable/A in contents) A.loc = src.loc diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 9f440d4b4fa..7c61a05111e 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -86,9 +86,9 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa var/lighting_controller_was_processing = lighting_controller.processing //Pause the lighting updates for a bit lighting_controller.processing = 0 - var/powernet_rebuild_was_deferred_already = defer_powernet_rebuild - if(defer_powernet_rebuild != 2) - defer_powernet_rebuild = 1 +// var/powernet_rebuild_was_deferred_already = defer_powernet_rebuild +// if(defer_powernet_rebuild != 2) +// defer_powernet_rebuild = 1 if(heavy_impact_range > 1) var/datum/effect/system/explosion/E = new/datum/effect/system/explosion() @@ -118,13 +118,11 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(T) if(flame_dist && prob(40) && !istype(T, /turf/space)) - spawn() - new/obj/effect/hotspot(T) //Mostly for ambience! + new/obj/effect/hotspot(T) //Mostly for ambience! hotspot_exists = 1 if(dist) - spawn() - if(T) - T.ex_act(dist) + if(T) + T.ex_act(dist) //------- THINGS IN TURFS FIRES ------- @@ -134,14 +132,12 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(AM) //Something is inside T (We have already checked T exists above) - RR if(flame_dist) //if it has flame distance, run this - RR if(isliving(AM) && !hotspot_exists && !istype(T, /turf/space)) - spawn() - if(AM && AM.loc!=null) - new /obj/effect/hotspot(AM.loc) + if(AM && AM.loc!=null) + new /obj/effect/hotspot(AM.loc) //Just in case we missed a mob while they were in flame_range, but a hotspot didn't spawn on them, otherwise it looks weird when you just burst into flame out of nowhere if(dist) //if no flame_dist, run this - RR - spawn() - if(AM) - AM.ex_act(dist) + if(AM) + AM.ex_act(dist) @@ -158,9 +154,9 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa sleep(8) if(!lighting_controller.processing) lighting_controller.processing = lighting_controller_was_processing - if(!powernet_rebuild_was_deferred_already) - if(defer_powernet_rebuild != 2) - defer_powernet_rebuild = 0 +// if(!powernet_rebuild_was_deferred_already) +// if(defer_powernet_rebuild != 2) +// defer_powernet_rebuild = 0 return 1 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 8305f4c0a96..96a4a7a1ef2 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -35,24 +35,30 @@ /obj/item/device icon = 'icons/obj/device.dmi' +/obj/item/Destroy() + if(ismob(loc)) + var/mob/m = loc + m.unEquip(src, 1) + return ..() + /obj/item/ex_act(severity) switch(severity) if(1.0) - del(src) + qdel(src) return if(2.0) if (prob(50)) - del(src) + qdel(src) return if(3.0) if (prob(5)) - del(src) + qdel(src) return else return /obj/item/blob_act() - del(src) + qdel(src) //user: The mob that is suiciding //damagetype: The type of damage the item will inflict on the user diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index a11b326e455..208a2111da1 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -11,7 +11,7 @@ ..() if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) - del(src) + qdel(src) /obj/item/apc_frame/proc/try_build(turf/on_wall) if (get_dist(on_wall,usr)>1) @@ -38,6 +38,6 @@ var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(loc) C.amount = 10 usr << "You cut the cables and disassemble the unused power terminal." - del(T) + qdel(T) new /obj/machinery/power/apc(loc, ndir, 1) - del(src) + qdel(src) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index f21832f87a0..35709d906ff 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -10,7 +10,7 @@ /obj/item/bodybag/attack_self(mob/user) var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc) R.add_fingerprint(user) - del(src) + qdel(src) /obj/item/weapon/storage/box/bodybags @@ -79,7 +79,7 @@ visible_message("[usr] folds up [src].") var/obj/item/bodybag/B = new /obj/item/bodybag(get_turf(src)) usr.put_in_hands(B) - del(src) + qdel(src) /obj/structure/closet/bodybag/update_icon() diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 7047a708465..3584b97b282 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -66,7 +66,7 @@ if(istype(src.loc, /mob)) var/mob/M = src.loc M.unEquip(src, 1) //src is being deleted anyway - del(src) + qdel(src) update_icon() if(istype(loc, /turf)) //start a fire if possible var/turf/T = loc diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 6456e670447..bed61da06e7 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -81,7 +81,7 @@ uses-- if(!uses) user << "\red You used up your crayon!" - del(src) + qdel(src) return /obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob) @@ -92,6 +92,6 @@ uses -= 5 if(uses <= 0) user << "\red You ate your crayon!" - del(src) + qdel(src) else ..() \ No newline at end of file diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 1083e4c1952..3d18e1a5f17 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -948,10 +948,10 @@ var/global/list/obj/item/device/pda/PDAs = list() explosion(T, -1, -1, 2, 3) - del(src) + qdel(src) return -/obj/item/device/pda/Del() +/obj/item/device/pda/Destroy() PDAs -= src if (src.id) src.id.loc = get_turf(src.loc) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 7e657c718ca..cb18cc0c7a4 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -292,7 +292,7 @@ Code: menu += " Lockdown |" menu += " Biohazard \]
" - if (43) //Muskets' and Rockdtben's power monitor :D + if (43) menu = "
Power Monitors - Please select one
" powmonitor = null powermonitors = list() @@ -318,7 +318,7 @@ Code: menu += "" - if (433) //Muskets' and Rockdtben's power monitor :D + if (433) menu = "
Power Monitor
" if(!powmonitor) menu += "\red No connection
" diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 1d30c43ffb0..24c0d8f5af2 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -41,7 +41,7 @@ if(active_dummy) eject_all() playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) - del(active_dummy) + qdel(active_dummy) active_dummy = null usr << "\blue You deactivate the [src]." var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) @@ -54,7 +54,7 @@ if(!O) return var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, src) - del(O) + qdel(O) usr << "\blue You activate the [src]." var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' @@ -69,7 +69,7 @@ spark_system.start() eject_all() if(delete_dummy) - del(active_dummy) + qdel(active_dummy) active_dummy = null can_use = 0 spawn(50) can_use = 1 @@ -140,6 +140,6 @@ step(src, direction) return -/obj/effect/dummy/chameleon/Del() +/obj/effect/dummy/chameleon/Destroy() master.disrupt(0) ..() \ No newline at end of file diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index a0d807b634c..56a57d8a849 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -111,7 +111,7 @@ animation.master = user flick("blspell", animation) sleep(5) - del(animation) + qdel(animation) if(!flashfail) flick(flashanim, src) @@ -158,7 +158,7 @@ animation.master = user flick("blspell", animation) sleep(5) - del(animation) + qdel(animation) for(var/mob/living/carbon/M in oviewers(3, null)) var/safety = M:eyecheck() diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 810b467142f..8993adf9cf3 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -229,7 +229,7 @@ ..() processing_objects.Add(src) -/obj/item/device/flashlight/emp/Del() +/obj/item/device/flashlight/emp/Destroy() processing_objects.Remove(src) ..() diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 9cb72a9b928..9c6dbbdb37c 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -86,7 +86,7 @@ G.amount = remaining if(!G.amount) user.drop_item() - del(G) + qdel(G) AddUses(increment) user << "You insert a piece of glass into the [src.name]. You have [uses] lights remaining." return @@ -98,7 +98,7 @@ AddUses(1) user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining." user.drop_item() - del(L) + qdel(L) return else user << "You need a working light." @@ -164,7 +164,7 @@ target.brightness = L2.brightness target.on = target.has_power() target.update() - del(L2) + qdel(L2) if(target.on && target.rigged) target.explode() diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index a0436fa067d..88bec2edc50 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -17,6 +17,7 @@ g_amt = 20 origin_tech = "magnets=1;engineering=1" var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage + hitsound = 'sound/weapons/tap.ogg' // Syndicate device disguised as a multitool; it will turn red when an AI camera is nearby. @@ -30,7 +31,7 @@ processing_objects += src -/obj/item/device/multitool/ai_detect/Del() +/obj/item/device/multitool/ai_detect/Destroy() processing_objects -= src ..() diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index c38169c621b..3fa8f1593f8 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -14,7 +14,7 @@ ..() overlays += "pai-off" -/obj/item/device/paicard/Del() +/obj/item/device/paicard/Destroy() //Will stop people throwing friend pAIs into the singularity so they can respawn if(!isnull(pai)) pai.death(0) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 1798038265e..868bd0133c1 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -139,4 +139,4 @@ if(power_drained >= max_power) processing_objects.Remove(src) explosion(src.loc, 3,6,9,12) - del(src) + qdel(src) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 853890021fa..28f9936054a 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -30,4 +30,4 @@ /obj/item/device/radio/beacon/bacon //Probably a better way of doing this, I'm lazy. proc/digest_delay() spawn(600) - del(src)*/ //Bacon beacons are no more rip in peace \ No newline at end of file + qdel(src)*/ //Bacon beacons are no more rip in peace \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index ddf8238de04..463f17caf6d 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -36,7 +36,7 @@ origin_tech = "syndicate=3" /obj/item/device/radio/headset/syndicate/New() ..() - del(keyslot1) + qdel(keyslot1) keyslot1 = new /obj/item/device/encryptionkey/syndicate syndie = 1 recalculateChannels() @@ -45,7 +45,7 @@ origin_tech = "syndicate=3" /obj/item/device/radio/headset/binary/New() ..() - del(keyslot1) + qdel(keyslot1) keyslot1 = new /obj/item/device/encryptionkey/binary recalculateChannels() diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 8e03f22f48f..3e49179e76f 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -15,7 +15,7 @@ ..() processing_objects += src -/obj/item/device/radio/intercom/Del() +/obj/item/device/radio/intercom/Destroy() processing_objects -= src ..() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 04e26786580..edac441eae1 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -448,7 +448,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use var/list/receive = list() //for (var/obj/item/device/radio/R in radio_connection.devices) - for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) // Modified for security headset code -- TLE + for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) //if(R.accept_rad(src, message)) receive |= R.send_hear(display_freq, 0) @@ -498,7 +498,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use if(!freq_text) freq_text = format_frequency(display_freq) - var/part_b = " \[[freq_text]\] \[[freq_text]\] " if (display_freq==SYND_FREQ) @@ -524,7 +524,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use //This following recording is intended for research and feedback in the use of department radio channels. - var/part_blackbox_b = " \[[freq_text]\] \[[freq_text]\]