mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
Merge pull request #13885 from gbasood/del-cleanup-round-2
QDEL CLEANUP 2 THE RECKONING
This commit is contained in:
@@ -47,7 +47,7 @@
|
|||||||
pixel_x = rand(-6,6)
|
pixel_x = rand(-6,6)
|
||||||
pixel_y = rand(-6,6)
|
pixel_y = rand(-6,6)
|
||||||
else
|
else
|
||||||
del(src)
|
qdel(src)
|
||||||
else
|
else
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
/obj/item/mounted/frame/rust_fuel_assembly_port/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
/obj/item/mounted/frame/rust_fuel_assembly_port/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||||
if (iswrench(W))
|
if (iswrench(W))
|
||||||
new /obj/item/stack/sheet/plasteel( get_turf(src.loc), 12 )
|
new /obj/item/stack/sheet/plasteel( get_turf(src.loc), 12 )
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
|
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
if(do_after(user, src, 10))
|
if(do_after(user, src, 10))
|
||||||
has_electronics &= 1
|
has_electronics &= 1
|
||||||
to_chat(user, "You place the port control board inside the frame.")
|
to_chat(user, "You place the port control board inside the frame.")
|
||||||
del(W)
|
qdel(W)
|
||||||
return
|
return
|
||||||
|
|
||||||
else if (istype(W, /obj/item/weapon/weldingtool) && opened && !has_electronics)
|
else if (istype(W, /obj/item/weapon/weldingtool) && opened && !has_electronics)
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
"<span class='warning'>[src] has been cut away from the wall by [user.name].</span>",\
|
"<span class='warning'>[src] has been cut away from the wall by [user.name].</span>",\
|
||||||
"You detached the port frame.",\
|
"You detached the port frame.",\
|
||||||
"<span class='warning'>You hear welding.</span>")
|
"<span class='warning'>You hear welding.</span>")
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
|
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ var/const/max_assembly_amount = 300
|
|||||||
/obj/machinery/rust_fuel_compressor/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
/obj/machinery/rust_fuel_compressor/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||||
if (istype(W, /obj/item/weapon/rcd_ammo))
|
if (istype(W, /obj/item/weapon/rcd_ammo))
|
||||||
compressed_matter += 10
|
compressed_matter += 10
|
||||||
del(W)
|
qdel(W)
|
||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
|
|
||||||
@@ -98,7 +98,7 @@ var/const/max_assembly_amount = 300
|
|||||||
break
|
break
|
||||||
// to_chat(world, "<span class='notice'>[reagent]: new_assembly_quantities[reagent]<br></span>")
|
// to_chat(world, "<span class='notice'>[reagent]: new_assembly_quantities[reagent]<br></span>")
|
||||||
if(fail)
|
if(fail)
|
||||||
del(F)
|
qdel(F)
|
||||||
compressed_matter = old_matter
|
compressed_matter = old_matter
|
||||||
to_chat(usr, "<span class='warning'>[bicon(src)] [src] flashes red: \'Out of matter.\'</span>")
|
to_chat(usr, "<span class='warning'>[bicon(src)] [src] flashes red: \'Out of matter.\'</span>")
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
/obj/item/mounted/frame/rust_fuel_compressor/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
/obj/item/mounted/frame/rust_fuel_compressor/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||||
if (iswrench(W))
|
if (iswrench(W))
|
||||||
new /obj/item/stack/sheet/plasteel( get_turf(src.loc), 12 )
|
new /obj/item/stack/sheet/plasteel( get_turf(src.loc), 12 )
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
else
|
else
|
||||||
time_alive -= 0.1
|
time_alive -= 0.1
|
||||||
if(time_alive < 0)
|
if(time_alive < 0)
|
||||||
del(src)
|
qdel(src)
|
||||||
|
|
||||||
//radiate mobs nearby here
|
//radiate mobs nearby here
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -98,7 +98,7 @@
|
|||||||
|
|
||||||
/obj/beam/e_beam/Bump(atom/Obstacle)
|
/obj/beam/e_beam/Bump(atom/Obstacle)
|
||||||
Obstacle.laser_act(src)
|
Obstacle.laser_act(src)
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
@@ -122,11 +122,11 @@
|
|||||||
|
|
||||||
/obj/beam/e_beam/Destroy()
|
/obj/beam/e_beam/Destroy()
|
||||||
if(next)
|
if(next)
|
||||||
del(next)
|
qdel(next)
|
||||||
..()
|
..()
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/beam/e_beam/proc/hit()
|
/obj/beam/e_beam/proc/hit()
|
||||||
del src
|
del src
|
||||||
return
|
return
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -45,7 +45,7 @@
|
|||||||
for (var/datum/medical_effect/M in side_effects)
|
for (var/datum/medical_effect/M in side_effects)
|
||||||
if (M.cure(src) || M.strength > 60)
|
if (M.cure(src) || M.strength > 60)
|
||||||
side_effects -= M
|
side_effects -= M
|
||||||
del(M)
|
qdel(M)
|
||||||
else
|
else
|
||||||
if(life_tick % 45 == 0)
|
if(life_tick % 45 == 0)
|
||||||
M.on_life(src, strength_percent*M.strength)
|
M.on_life(src, strength_percent*M.strength)
|
||||||
@@ -147,4 +147,4 @@
|
|||||||
if(H.reagents.has_reagent(INAPROVALINE))
|
if(H.reagents.has_reagent(INAPROVALINE))
|
||||||
to_chat(H, "<span class='warning'>The itching stops..</span>")
|
to_chat(H, "<span class='warning'>The itching stops..</span>")
|
||||||
return 1
|
return 1
|
||||||
return 0
|
return 0
|
||||||
|
|||||||
@@ -104,7 +104,7 @@
|
|||||||
else
|
else
|
||||||
icon_state = "centcom_old"
|
icon_state = "centcom_old"
|
||||||
bans = "9" //if get_region_accesses ever uses 9 we're fucked
|
bans = "9" //if get_region_accesses ever uses 9 we're fucked
|
||||||
del(DE)
|
qdel(DE)
|
||||||
else
|
else
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
@@ -143,6 +143,6 @@
|
|||||||
to_chat(user, "<span class='notice'>You require at least one stamp.</span>")
|
to_chat(user, "<span class='notice'>You require at least one stamp.</span>")
|
||||||
return
|
return
|
||||||
icon_state = "centcom_old"
|
icon_state = "centcom_old"
|
||||||
del(D)
|
qdel(D)
|
||||||
else
|
else
|
||||||
return ..()
|
return ..()
|
||||||
|
|||||||
@@ -198,8 +198,8 @@
|
|||||||
for (var/obj/item/tape/P in cur)
|
for (var/obj/item/tape/P in cur)
|
||||||
if(P.icon_state == icon_dir)
|
if(P.icon_state == icon_dir)
|
||||||
N = 0
|
N = 0
|
||||||
del(P)
|
qdel(P)
|
||||||
cur = get_step(cur,dir[i])
|
cur = get_step(cur,dir[i])
|
||||||
|
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -423,7 +423,7 @@ obj/effect/bmode/buildholder/New()
|
|||||||
log_admin("[key_name(usr)] downgraded an rwall at [formatJumpTo(T)]")
|
log_admin("[key_name(usr)] downgraded an rwall at [formatJumpTo(T)]")
|
||||||
return
|
return
|
||||||
else if(istype(object,/obj))
|
else if(istype(object,/obj))
|
||||||
del(object)
|
qdel(object)
|
||||||
return
|
return
|
||||||
else if(istype(object,/turf) && pa.Find("alt") && pa.Find("left"))
|
else if(istype(object,/turf) && pa.Find("alt") && pa.Find("left"))
|
||||||
new/obj/machinery/door/airlock(get_turf(object))
|
new/obj/machinery/door/airlock(get_turf(object))
|
||||||
@@ -612,7 +612,7 @@ obj/effect/bmode/buildholder/New()
|
|||||||
else if(pa.Find("right"))
|
else if(pa.Find("right"))
|
||||||
log_admin("[key_name(usr)] deleted a [object] at [formatJumpTo(RT)]")
|
log_admin("[key_name(usr)] deleted a [object] at [formatJumpTo(RT)]")
|
||||||
if(isobj(object))
|
if(isobj(object))
|
||||||
del(object)
|
qdel(object)
|
||||||
else if(pa.Find("middle"))
|
else if(pa.Find("middle"))
|
||||||
if(istype(object,/mob) && !check_rights(R_DEBUG,0))
|
if(istype(object,/mob) && !check_rights(R_DEBUG,0))
|
||||||
to_chat(usr, "<span class='notice'>You don't have sufficient rights to clone [object.type]</span>")
|
to_chat(usr, "<span class='notice'>You don't have sufficient rights to clone [object.type]</span>")
|
||||||
@@ -685,4 +685,4 @@ obj/effect/bmode/buildholder/New()
|
|||||||
#undef MASS_FILL
|
#undef MASS_FILL
|
||||||
#undef MASS_DELETE
|
#undef MASS_DELETE
|
||||||
#undef SELECTIVE_DELETE
|
#undef SELECTIVE_DELETE
|
||||||
#undef SELECTIVE_FILL
|
#undef SELECTIVE_FILL
|
||||||
|
|||||||
@@ -113,8 +113,9 @@
|
|||||||
H.forceMove(get_turf(src))
|
H.forceMove(get_turf(src))
|
||||||
H.ex_act(severity + 1)
|
H.ex_act(severity + 1)
|
||||||
to_chat(H, "<span class='warning'>You are forcefully thrown from \the [src]!</span>")
|
to_chat(H, "<span class='warning'>You are forcefully thrown from \the [src]!</span>")
|
||||||
del(ion_trail)
|
qdel(ion_trail)
|
||||||
del(src)
|
ion_trail = null // Should be nulled by qdel src in next line but OH WELL
|
||||||
|
qdel(src)
|
||||||
if(2)
|
if(2)
|
||||||
deal_damage(100)
|
deal_damage(100)
|
||||||
if(3)
|
if(3)
|
||||||
@@ -421,7 +422,7 @@
|
|||||||
if(t_air)
|
if(t_air)
|
||||||
t_air.merge(removed)
|
t_air.merge(removed)
|
||||||
else //just delete the cabin gas, we're in space or some shit
|
else //just delete the cabin gas, we're in space or some shit
|
||||||
del(removed)
|
qdel(removed)
|
||||||
else
|
else
|
||||||
return stop()
|
return stop()
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -517,10 +517,6 @@
|
|||||||
src.OCCUPANT = usr
|
src.OCCUPANT = usr
|
||||||
src.isopen = 0 //Close the thing after the guy gets inside
|
src.isopen = 0 //Close the thing after the guy gets inside
|
||||||
src.update_icon()
|
src.update_icon()
|
||||||
|
|
||||||
// for(var/obj/O in src)
|
|
||||||
// del(O)
|
|
||||||
|
|
||||||
src.add_fingerprint(usr)
|
src.add_fingerprint(usr)
|
||||||
src.updateUsrDialog()
|
src.updateUsrDialog()
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -60,7 +60,7 @@
|
|||||||
if(active_dummy)
|
if(active_dummy)
|
||||||
eject_all()
|
eject_all()
|
||||||
//playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
|
//playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
|
||||||
del(active_dummy)
|
qdel(active_dummy)
|
||||||
active_dummy = null
|
active_dummy = null
|
||||||
to_chat(usr, "<span class='notice'>You deactivate [src].</span>")
|
to_chat(usr, "<span class='notice'>You deactivate [src].</span>")
|
||||||
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
|
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
|
||||||
|
|||||||
@@ -198,31 +198,6 @@
|
|||||||
|
|
||||||
/obj/item/device/radio/proc/isWireCut(var/index)
|
/obj/item/device/radio/proc/isWireCut(var/index)
|
||||||
return wires.IsIndexCut(index)
|
return wires.IsIndexCut(index)
|
||||||
/*
|
|
||||||
/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel) //BS12 EDIT
|
|
||||||
var/datum/radio_frequency/connection = null
|
|
||||||
if(channel && channels && channels.len > 0)
|
|
||||||
if (channel == "department")
|
|
||||||
// to_chat(world, "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\"")
|
|
||||||
channel = channels[1]
|
|
||||||
connection = secure_radio_connections[channel]
|
|
||||||
else
|
|
||||||
connection = radio_connection
|
|
||||||
channel = null
|
|
||||||
if (!istype(connection))
|
|
||||||
return
|
|
||||||
if (!connection)
|
|
||||||
return
|
|
||||||
|
|
||||||
var/mob/living/silicon/ai/A = new /mob/living/silicon/ai(src, null, null, 1)
|
|
||||||
Broadcast_Message(connection, all_languages[LANGUAGE_HUMAN], A,
|
|
||||||
0, "*garbled automated announcement*", src,
|
|
||||||
message, from, "Automated Announcement", from, "synthesized voice",
|
|
||||||
4, 0, list(1), 1459)
|
|
||||||
del(A)
|
|
||||||
return
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
/obj/item/device/radio/talk_into(var/datum/speech/speech_orig, var/channel=null)
|
/obj/item/device/radio/talk_into(var/datum/speech/speech_orig, var/channel=null)
|
||||||
say_testing(loc, "\[Radio\] - Got radio/talk_into([html_encode(speech_orig.message)], [channel!=null ? channel : "null"]).")
|
say_testing(loc, "\[Radio\] - Got radio/talk_into([html_encode(speech_orig.message)], [channel!=null ? channel : "null"]).")
|
||||||
|
|||||||
@@ -288,20 +288,6 @@
|
|||||||
|
|
||||||
return "Unknown"
|
return "Unknown"
|
||||||
|
|
||||||
// vgedit: We have different wallets.
|
|
||||||
/*
|
|
||||||
/obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
|
||||||
..()
|
|
||||||
if(istype(W,/obj/item/weapon/id_wallet))
|
|
||||||
to_chat(user, "You slip [src] into [W].")
|
|
||||||
src.name = "[src.registered_name]'s [W.name] ([src.assignment])"
|
|
||||||
src.desc = W.desc
|
|
||||||
src.icon = W.icon
|
|
||||||
src.icon_state = W.icon_state
|
|
||||||
del(W)
|
|
||||||
return
|
|
||||||
*/
|
|
||||||
|
|
||||||
/obj/item/weapon/card/id/silver
|
/obj/item/weapon/card/id/silver
|
||||||
name = "identification card"
|
name = "identification card"
|
||||||
desc = "A silver card which shows honour and dedication."
|
desc = "A silver card which shows honour and dedication."
|
||||||
|
|||||||
@@ -609,47 +609,3 @@
|
|||||||
else
|
else
|
||||||
playsound(src, 'sound/items/trayhit2.ogg', 35, 1)
|
playsound(src, 'sound/items/trayhit2.ogg', 35, 1)
|
||||||
send_items_flying()
|
send_items_flying()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//Enough with the violent stuff, here's what happens if you try putting food on it
|
|
||||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*/obj/item/weapon/tray/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
|
||||||
if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
|
|
||||||
if (W.icon_state == "forkloaded")
|
|
||||||
to_chat(user, "<span class='warning'>You already have omelette on your fork.</span>")
|
|
||||||
return
|
|
||||||
W.icon = 'icons/obj/kitchen.dmi'
|
|
||||||
W.icon_state = "forkloaded"
|
|
||||||
to_chat(viewers(3,user), "[user] takes a piece of omelette with his fork!")
|
|
||||||
reagents.remove_reagent(NUTRIMENT, 1)
|
|
||||||
if (reagents.total_volume <= 0)
|
|
||||||
del(src)*/
|
|
||||||
|
|
||||||
|
|
||||||
/* if (prob(33))
|
|
||||||
var/turf/location = H.loc
|
|
||||||
if (istype(location, /turf/simulated))
|
|
||||||
location.add_blood(H)
|
|
||||||
if (H.wear_mask)
|
|
||||||
H.wear_mask.add_blood(H)
|
|
||||||
if (H.head)
|
|
||||||
H.head.add_blood(H)
|
|
||||||
if (H.glasses && prob(33))
|
|
||||||
H.glasses.add_blood(H)
|
|
||||||
if (istype(user, /mob/living/carbon/human))
|
|
||||||
var/mob/living/carbon/human/user2 = user
|
|
||||||
if (user2.gloves)
|
|
||||||
user2.gloves.add_blood(H)
|
|
||||||
else
|
|
||||||
user2.add_blood(H)
|
|
||||||
if (prob(15))
|
|
||||||
if (user2.wear_suit)
|
|
||||||
user2.wear_suit.add_blood(H)
|
|
||||||
else if (user2.w_uniform)
|
|
||||||
user2.w_uniform.add_blood(H)*/
|
|
||||||
|
|||||||
@@ -50,10 +50,6 @@
|
|||||||
if ("delete")
|
if ("delete")
|
||||||
qdel(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
/*if ("fire")
|
|
||||||
new /obj/structure/closet/firecloset(src.loc)
|
|
||||||
del(src)
|
|
||||||
return*/
|
|
||||||
|
|
||||||
/obj/structure/closet/emcloset/legacy/New()
|
/obj/structure/closet/emcloset/legacy/New()
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -233,40 +233,6 @@ proc/trigger_armed_response_team(var/force = 0, var/reason)
|
|||||||
var/new_fstyle = input(usr, "Select a facial hair style", "Grooming") as null|anything in facial_hair_styles_list
|
var/new_fstyle = input(usr, "Select a facial hair style", "Grooming") as null|anything in facial_hair_styles_list
|
||||||
if(new_fstyle)
|
if(new_fstyle)
|
||||||
M.f_style = new_fstyle
|
M.f_style = new_fstyle
|
||||||
|
|
||||||
// if new style selected (not cancel)
|
|
||||||
/* if (new_style)
|
|
||||||
M.h_style = new_style
|
|
||||||
|
|
||||||
for(var/x in all_hairs) // loop through all_hairs again. Might be slightly CPU expensive, but not significantly.
|
|
||||||
var/datum/sprite_accessory/hair/H = new x // create new hair datum
|
|
||||||
if(H.name == new_style)
|
|
||||||
M.h_style = H // assign the hair_style variable a new hair datum
|
|
||||||
break
|
|
||||||
else
|
|
||||||
del(H) // if hair H not used, delete. BYOND can garbage collect, but better safe than sorry
|
|
||||||
|
|
||||||
// facial hair
|
|
||||||
var/list/all_fhairs = typesof(/datum/sprite_accessory/facial_hair) - /datum/sprite_accessory/facial_hair
|
|
||||||
var/list/fhairs = list()
|
|
||||||
|
|
||||||
for(var/x in all_fhairs)
|
|
||||||
var/datum/sprite_accessory/facial_hair/H = new x
|
|
||||||
fhairs.Add(H.name)
|
|
||||||
del(H)
|
|
||||||
|
|
||||||
new_style = input("Please select facial style", "Character Generation") as null|anything in fhairs
|
|
||||||
|
|
||||||
if(new_style)
|
|
||||||
M.f_style = new_style
|
|
||||||
for(var/x in all_fhairs)
|
|
||||||
var/datum/sprite_accessory/facial_hair/H = new x
|
|
||||||
if(H.name == new_style)
|
|
||||||
M.f_style = H
|
|
||||||
break
|
|
||||||
else
|
|
||||||
del(H)
|
|
||||||
*/
|
|
||||||
var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female")
|
var/new_gender = alert(usr, "Please select gender.", "Character Generation", "Male", "Female")
|
||||||
if (new_gender)
|
if (new_gender)
|
||||||
if(new_gender == "Male")
|
if(new_gender == "Male")
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ var/global/sent_strike_team = 0
|
|||||||
for (var/obj/effect/landmark/L in landmarks_list)
|
for (var/obj/effect/landmark/L in landmarks_list)
|
||||||
if (L.name == "Commando-Bomb")
|
if (L.name == "Commando-Bomb")
|
||||||
new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
|
new /obj/effect/spawner/newbomb/timer/syndicate(L.loc)
|
||||||
del(L)
|
qdel(L)
|
||||||
|
|
||||||
message_admins("<span class='notice'>[key_name_admin(usr)] has spawned a CentCom strike squad.</span>", 1)
|
message_admins("<span class='notice'>[key_name_admin(usr)] has spawned a CentCom strike squad.</span>", 1)
|
||||||
log_admin("[key_name(usr)] used Spawn Death Squad.")
|
log_admin("[key_name(usr)] used Spawn Death Squad.")
|
||||||
@@ -183,4 +183,4 @@ var/global/sent_strike_team = 0
|
|||||||
W.registered_name = real_name
|
W.registered_name = real_name
|
||||||
equip_to_slot_or_del(W, slot_wear_id)
|
equip_to_slot_or_del(W, slot_wear_id)
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
@@ -190,4 +190,4 @@ var/global/sent_syndicate_strike_team = 0
|
|||||||
E.part = affected
|
E.part = affected
|
||||||
src.update_icons()
|
src.update_icons()
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
@@ -2164,7 +2164,7 @@
|
|||||||
S.victim = M
|
S.victim = M
|
||||||
S.forceMove(M.loc)
|
S.forceMove(M.loc)
|
||||||
spawn(20)
|
spawn(20)
|
||||||
del(S)
|
qdel(S)
|
||||||
|
|
||||||
var/turf/simulated/floor/T = get_turf(M)
|
var/turf/simulated/floor/T = get_turf(M)
|
||||||
if(istype(T))
|
if(istype(T))
|
||||||
@@ -2541,7 +2541,7 @@
|
|||||||
feedback_inc("admin_secrets_fun_used",1)
|
feedback_inc("admin_secrets_fun_used",1)
|
||||||
feedback_add_details("admin_secrets_fun_used","SAC")
|
feedback_add_details("admin_secrets_fun_used","SAC")
|
||||||
for(var/obj/item/clothing/O in world)
|
for(var/obj/item/clothing/O in world)
|
||||||
del(O)
|
qdel(O)
|
||||||
if("monkey")
|
if("monkey")
|
||||||
feedback_inc("admin_secrets_fun_used",1)
|
feedback_inc("admin_secrets_fun_used",1)
|
||||||
feedback_add_details("admin_secrets_fun_used","M")
|
feedback_add_details("admin_secrets_fun_used","M")
|
||||||
@@ -2810,7 +2810,7 @@
|
|||||||
var/turf/T = pick(blobstart)
|
var/turf/T = pick(blobstart)
|
||||||
var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
|
var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
|
||||||
spawn(rand(100, 600))
|
spawn(rand(100, 600))
|
||||||
del(bh)
|
qdel(bh)
|
||||||
|
|
||||||
if("timeanomalies") //dear god this code was awful :P Still needs further optimisation
|
if("timeanomalies") //dear god this code was awful :P Still needs further optimisation
|
||||||
feedback_inc("admin_secrets_fun_used",1)
|
feedback_inc("admin_secrets_fun_used",1)
|
||||||
@@ -3397,7 +3397,7 @@
|
|||||||
var/num=0
|
var/num=0
|
||||||
for(var/obj/item/device/transfer_valve/TV in world)
|
for(var/obj/item/device/transfer_valve/TV in world)
|
||||||
if(TV.tank_one||TV.tank_two)
|
if(TV.tank_one||TV.tank_two)
|
||||||
del(TV)
|
qdel(TV)
|
||||||
TV++
|
TV++
|
||||||
message_admins("[key_name_admin(usr)] has removed [num] bombs", 1)
|
message_admins("[key_name_admin(usr)] has removed [num] bombs", 1)
|
||||||
if("detonate_bombs")
|
if("detonate_bombs")
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
// if(!istates.Find(O.item_state))
|
// if(!istates.Find(O.item_state))
|
||||||
// text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.item_state]\" IN \"[O.icon]\"\n"
|
// text += "[O.type] MISSING NORMAL ICON CALLED\n\"[O.item_state]\" IN \"[O.icon]\"\n"
|
||||||
//text+="\n"
|
//text+="\n"
|
||||||
del(O)
|
qdel(O)
|
||||||
if(text)
|
if(text)
|
||||||
var/F = file("broken_hand_icons.txt")
|
var/F = file("broken_hand_icons.txt")
|
||||||
fdel(F)
|
fdel(F)
|
||||||
|
|||||||
@@ -387,8 +387,10 @@ client/proc/antag_madness(var/mob/M in mob_list)
|
|||||||
M.equip_to_slot_or_del(pack, slot_in_backpack)
|
M.equip_to_slot_or_del(pack, slot_in_backpack)
|
||||||
to_chat(M, "Your previous belongings have been stored in your backpack.")
|
to_chat(M, "Your previous belongings have been stored in your backpack.")
|
||||||
|
|
||||||
del(M.wear_suit)
|
qdel(M.wear_suit)
|
||||||
del(M.head)
|
qdel(M.head)
|
||||||
|
M.wear_suit = null
|
||||||
|
M.head = null
|
||||||
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(M), slot_wear_mask)
|
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(M), slot_wear_mask)
|
||||||
M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/syndi(M), slot_wear_suit)
|
M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/syndi(M), slot_wear_suit)
|
||||||
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/syndi(M), slot_head)
|
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/syndi(M), slot_head)
|
||||||
|
|||||||
@@ -463,7 +463,7 @@ Pressure: [env.return_pressure()]"}
|
|||||||
if(hsbitem)
|
if(hsbitem)
|
||||||
for(var/atom/O in world)
|
for(var/atom/O in world)
|
||||||
if(istype(O, hsbitem))
|
if(istype(O, hsbitem))
|
||||||
del(O)
|
qdel(O)
|
||||||
log_admin("[key_name(src)] has deleted all instances of [hsbitem].")
|
log_admin("[key_name(src)] has deleted all instances of [hsbitem].")
|
||||||
message_admins("[key_name_admin(src)] has deleted all instances of [hsbitem].", 0)
|
message_admins("[key_name_admin(src)] has deleted all instances of [hsbitem].", 0)
|
||||||
feedback_add_details("admin_verb","DELA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
feedback_add_details("admin_verb","DELA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
@@ -534,7 +534,7 @@ Pressure: [env.return_pressure()]"}
|
|||||||
var/mob/adminmob = src.mob
|
var/mob/adminmob = src.mob
|
||||||
M.ckey = src.ckey
|
M.ckey = src.ckey
|
||||||
if( isobserver(adminmob) )
|
if( isobserver(adminmob) )
|
||||||
del(adminmob)
|
qdel(adminmob)
|
||||||
feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
|
||||||
|
|
||||||
/client/proc/cmd_admin_areatest()
|
/client/proc/cmd_admin_areatest()
|
||||||
@@ -683,7 +683,7 @@ Pressure: [env.return_pressure()]"}
|
|||||||
for (var/obj/item/I in M)
|
for (var/obj/item/I in M)
|
||||||
if (istype(I, /obj/item/weapon/implant))
|
if (istype(I, /obj/item/weapon/implant))
|
||||||
continue
|
continue
|
||||||
del(I)
|
qdel(I)
|
||||||
switch(dresscode)
|
switch(dresscode)
|
||||||
if ("strip")
|
if ("strip")
|
||||||
//do nothing
|
//do nothing
|
||||||
@@ -770,7 +770,7 @@ Pressure: [env.return_pressure()]"}
|
|||||||
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/shoes/black(M), slot_shoes)
|
||||||
var/obj/item/weapon/storage/backpack/backpack = new(M)
|
var/obj/item/weapon/storage/backpack/backpack = new(M)
|
||||||
for(var/obj/item/I in backpack)
|
for(var/obj/item/I in backpack)
|
||||||
del(I)
|
qdel(I)
|
||||||
M.equip_to_slot_or_del(backpack, slot_back)
|
M.equip_to_slot_or_del(backpack, slot_back)
|
||||||
|
|
||||||
M.put_in_hands(new /obj/item/weapon/mop(M))
|
M.put_in_hands(new /obj/item/weapon/mop(M))
|
||||||
@@ -862,7 +862,7 @@ Pressure: [env.return_pressure()]"}
|
|||||||
|
|
||||||
var/obj/item/weapon/storage/secure/briefcase/sec_briefcase = new(M)
|
var/obj/item/weapon/storage/secure/briefcase/sec_briefcase = new(M)
|
||||||
for(var/obj/item/briefcase_item in sec_briefcase)
|
for(var/obj/item/briefcase_item in sec_briefcase)
|
||||||
del(briefcase_item)
|
qdel(briefcase_item)
|
||||||
for(var/i=3, i>0, i--)
|
for(var/i=3, i>0, i--)
|
||||||
sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000
|
sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000
|
||||||
sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow
|
sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow
|
||||||
@@ -1148,7 +1148,7 @@ Pressure: [env.return_pressure()]"}
|
|||||||
if(G.anchored)
|
if(G.anchored)
|
||||||
var/obj/machinery/singularity/S = new /obj/machinery/singularity(get_turf(G), 50)
|
var/obj/machinery/singularity/S = new /obj/machinery/singularity(get_turf(G), 50)
|
||||||
spawn(0)
|
spawn(0)
|
||||||
del(G)
|
qdel(G)
|
||||||
S.energy = 1250 //No energy dissipates
|
S.energy = 1250 //No energy dissipates
|
||||||
S.current_size = 7
|
S.current_size = 7
|
||||||
S.icon = 'icons/effects/224x224.dmi'
|
S.icon = 'icons/effects/224x224.dmi'
|
||||||
@@ -1180,7 +1180,7 @@ Pressure: [env.return_pressure()]"}
|
|||||||
|
|
||||||
for(var/obj/machinery/power/battery/smes/SMES in power_machines)
|
for(var/obj/machinery/power/battery/smes/SMES in power_machines)
|
||||||
var/turf/T=SMES.loc
|
var/turf/T=SMES.loc
|
||||||
del(SMES)
|
qdel(SMES)
|
||||||
var/obj/machinery/power/battery/smes/infinite/magic = new(T)
|
var/obj/machinery/power/battery/smes/infinite/magic = new(T)
|
||||||
// Manually set up our powernets since stupid seems to reign in the powernet code.
|
// Manually set up our powernets since stupid seems to reign in the powernet code.
|
||||||
magic.connect_to_network()
|
magic.connect_to_network()
|
||||||
|
|||||||
@@ -333,7 +333,7 @@ client/proc/one_click_antag()
|
|||||||
candidates.Remove(theghost)
|
candidates.Remove(theghost)
|
||||||
|
|
||||||
if(!theghost)
|
if(!theghost)
|
||||||
del(new_syndicate_commando)
|
qdel(new_syndicate_commando)
|
||||||
break
|
break
|
||||||
|
|
||||||
new_syndicate_commando.key = theghost.key
|
new_syndicate_commando.key = theghost.key
|
||||||
@@ -436,7 +436,7 @@ client/proc/one_click_antag()
|
|||||||
candidates.Remove(theghost)
|
candidates.Remove(theghost)
|
||||||
|
|
||||||
if(!theghost)
|
if(!theghost)
|
||||||
del(new_vox)
|
qdel(new_vox)
|
||||||
break
|
break
|
||||||
|
|
||||||
new_vox.key = theghost.key
|
new_vox.key = theghost.key
|
||||||
|
|||||||
@@ -830,7 +830,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
|||||||
message_admins("<span class='warning'>[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.</span>")
|
message_admins("<span class='warning'>[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.</span>")
|
||||||
world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=[mins]&server=[replacetext(config.server_name, "#", "")]")
|
world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=[mins]&server=[replacetext(config.server_name, "#", "")]")
|
||||||
del(M.client)
|
del(M.client)
|
||||||
del(M)
|
qdel(M)
|
||||||
else
|
else
|
||||||
|
|
||||||
if("No")
|
if("No")
|
||||||
@@ -846,7 +846,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
|
|||||||
message_admins("<span class='warning'>[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.</span>")
|
message_admins("<span class='warning'>[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.</span>")
|
||||||
world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=perma&server=[replacetext(config.server_name, "#", "")]")
|
world.Export("http://216.38.134.132/adminlog.php?type=ban&key=[usr.client.key]&key2=[M.key]&msg=[html_decode(reason)]&time=perma&server=[replacetext(config.server_name, "#", "")]")
|
||||||
del(M.client)
|
del(M.client)
|
||||||
del(M)
|
qdel(M)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/client/proc/update_world()
|
/client/proc/update_world()
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
bombtank.master = null
|
bombtank.master = null
|
||||||
bombtank = null
|
bombtank = null
|
||||||
|
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
|
if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
|
||||||
if(!status)
|
if(!status)
|
||||||
@@ -155,12 +155,12 @@
|
|||||||
ground_zero.hotspot_expose(1000, 125,surfaces=1)
|
ground_zero.hotspot_expose(1000, 125,surfaces=1)
|
||||||
|
|
||||||
if(master)
|
if(master)
|
||||||
del(master)
|
qdel(master)
|
||||||
del(src)
|
qdel(src)
|
||||||
|
|
||||||
/obj/item/weapon/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out.
|
/obj/item/weapon/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out.
|
||||||
var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
|
var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
|
||||||
var/turf/simulated/T = get_turf(src)
|
var/turf/simulated/T = get_turf(src)
|
||||||
if(!T)
|
if(!T)
|
||||||
return
|
return
|
||||||
T.assume_air(removed)
|
T.assume_air(removed)
|
||||||
|
|||||||
@@ -231,7 +231,7 @@
|
|||||||
a_right.forceMove(T)
|
a_right.forceMove(T)
|
||||||
a_right.disconnected(a_left)
|
a_right.disconnected(a_left)
|
||||||
spawn(0)
|
spawn(0)
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,8 @@
|
|||||||
"On" = "on;number"
|
"On" = "on;number"
|
||||||
)
|
)
|
||||||
|
|
||||||
New() del(src)
|
New()
|
||||||
|
qdel(src) // Why is this even
|
||||||
|
|
||||||
|
|
||||||
///obj/item/device/assembly/infra/describe()
|
///obj/item/device/assembly/infra/describe()
|
||||||
|
|||||||
@@ -178,7 +178,8 @@ swapmap
|
|||||||
for(var/obj/O in A) del(O)
|
for(var/obj/O in A) del(O)
|
||||||
for(var/mob/M in A)
|
for(var/mob/M in A)
|
||||||
if(!M.key)
|
if(!M.key)
|
||||||
del(M)
|
qdel(M)
|
||||||
|
continue
|
||||||
else
|
else
|
||||||
M.forceMove(null)
|
M.forceMove(null)
|
||||||
areas[A.loc]=null
|
areas[A.loc]=null
|
||||||
@@ -295,10 +296,12 @@ swapmap
|
|||||||
else
|
else
|
||||||
defarea.contents+=T
|
defarea.contents+=T
|
||||||
// clear the turf
|
// clear the turf
|
||||||
for(var/obj/O in T) del(O)
|
for(var/obj/O in T)
|
||||||
|
qdel(O)
|
||||||
for(var/mob/M in T)
|
for(var/mob/M in T)
|
||||||
if(!M.key)
|
if(!M.key)
|
||||||
del(M)
|
qdel(M)
|
||||||
|
continue
|
||||||
else
|
else
|
||||||
M.forceMove(null)
|
M.forceMove(null)
|
||||||
// finish the read
|
// finish the read
|
||||||
|
|||||||
@@ -148,7 +148,7 @@
|
|||||||
if(M.ckey == "nerezza" && M.real_name == "Asher Spock" && M.mind.role_alt_title && M.mind.role_alt_title != "Emergency Physician")
|
if(M.ckey == "nerezza" && M.real_name == "Asher Spock" && M.mind.role_alt_title && M.mind.role_alt_title != "Emergency Physician")
|
||||||
//only spawn ID if asher is joining as an emergency physician
|
//only spawn ID if asher is joining as an emergency physician
|
||||||
ok = 1
|
ok = 1
|
||||||
del(Item)
|
qdel(Item)
|
||||||
goto skip
|
goto skip
|
||||||
var/obj/item/weapon/card/id/I = Item
|
var/obj/item/weapon/card/id/I = Item
|
||||||
for(var/obj/item/weapon/card/id/C in M)
|
for(var/obj/item/weapon/card/id/C in M)
|
||||||
@@ -172,7 +172,7 @@
|
|||||||
I.name = "[M.real_name]'s Technician ID ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
|
I.name = "[M.real_name]'s Technician ID ([M.mind.role_alt_title ? M.mind.role_alt_title : M.mind.assigned_role])"
|
||||||
|
|
||||||
//replace old ID
|
//replace old ID
|
||||||
del(C)
|
qdel(C)
|
||||||
ok = M.equip_if_possible(I, slot_wear_id, 0) //if 1, last argument deletes on fail
|
ok = M.equip_if_possible(I, slot_wear_id, 0) //if 1, last argument deletes on fail
|
||||||
break
|
break
|
||||||
else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back
|
else if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back
|
||||||
|
|||||||
@@ -56,7 +56,8 @@
|
|||||||
if ( !M.blood_DNA || !M.blood_DNA.len )
|
if ( !M.blood_DNA || !M.blood_DNA.len )
|
||||||
to_chat(user, "<span class='notice'>No blood found on [M]</span>")
|
to_chat(user, "<span class='notice'>No blood found on [M]</span>")
|
||||||
if(M.blood_DNA)
|
if(M.blood_DNA)
|
||||||
del(M.blood_DNA)
|
qdel(M.blood_DNA)
|
||||||
|
M.blood_DNA = null
|
||||||
else
|
else
|
||||||
to_chat(user, "<span class='notice'>Blood found on [M]. Analysing...</span>")
|
to_chat(user, "<span class='notice'>Blood found on [M]. Analysing...</span>")
|
||||||
spawn(15)
|
spawn(15)
|
||||||
@@ -68,7 +69,8 @@
|
|||||||
var/list/extracted_prints=list()
|
var/list/extracted_prints=list()
|
||||||
if(!A.fingerprints || !A.fingerprints.len)
|
if(!A.fingerprints || !A.fingerprints.len)
|
||||||
if(A.fingerprints)
|
if(A.fingerprints)
|
||||||
del(A.fingerprints)
|
qdel(A.fingerprints)
|
||||||
|
A.fingerprints = null
|
||||||
else
|
else
|
||||||
for(var/i in A.fingerprints)
|
for(var/i in A.fingerprints)
|
||||||
extracted_prints[i]=A.fingerprints[i]
|
extracted_prints[i]=A.fingerprints[i]
|
||||||
@@ -316,7 +318,8 @@
|
|||||||
//PRINTS
|
//PRINTS
|
||||||
if(!A.fingerprints || !A.fingerprints.len)
|
if(!A.fingerprints || !A.fingerprints.len)
|
||||||
if(A.fingerprints)
|
if(A.fingerprints)
|
||||||
del(A.fingerprints)
|
qdel(A.fingerprints)
|
||||||
|
A.fingerprints = null
|
||||||
if(custom_finger.len)
|
if(custom_finger.len)
|
||||||
to_chat(user, "<span class='notice'>Isolated [custom_finger.len] fingerprints: Data Stored: Scan with Hi-Res Forensic Scanner to retrieve.</span>")
|
to_chat(user, "<span class='notice'>Isolated [custom_finger.len] fingerprints: Data Stored: Scan with Hi-Res Forensic Scanner to retrieve.</span>")
|
||||||
to_chat(user, "<span class='notice'> Found [custom_finger.len] intact prints</span>")
|
to_chat(user, "<span class='notice'> Found [custom_finger.len] intact prints</span>")
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ var/const/MAX_ACTIVE_TIME = 400
|
|||||||
// if(stat != DEAD)
|
// if(stat != DEAD)
|
||||||
// carr << "You pick up a facehugger"
|
// carr << "You pick up a facehugger"
|
||||||
// carr.facehuggers += 1
|
// carr.facehuggers += 1
|
||||||
// del(src)
|
// qdel(src)
|
||||||
//
|
//
|
||||||
// else
|
// else
|
||||||
// user << "This facehugger is dead."
|
// user << "This facehugger is dead."
|
||||||
|
|||||||
@@ -847,9 +847,6 @@
|
|||||||
C.r_arm = new/obj/item/robot_parts/r_arm(C)
|
C.r_arm = new/obj/item/robot_parts/r_arm(C)
|
||||||
C.updateicon()
|
C.updateicon()
|
||||||
new/obj/item/robot_parts/chest(loc)
|
new/obj/item/robot_parts/chest(loc)
|
||||||
// This doesn't work. Don't use it.
|
|
||||||
//src.Destroy()
|
|
||||||
// del() because it's infrequent and mobs act weird in qdel.
|
|
||||||
qdel(src)
|
qdel(src)
|
||||||
else
|
else
|
||||||
// Okay we're not removing the cell or an MMI, but maybe something else?
|
// Okay we're not removing the cell or an MMI, but maybe something else?
|
||||||
|
|||||||
@@ -149,7 +149,7 @@
|
|||||||
/obj/effect/spider/spiderling/proc/die()
|
/obj/effect/spider/spiderling/proc/die()
|
||||||
visible_message("<span class='alert'>[src] dies!</span>")
|
visible_message("<span class='alert'>[src] dies!</span>")
|
||||||
new /obj/effect/decal/cleanable/spiderling_remains(src.loc)
|
new /obj/effect/decal/cleanable/spiderling_remains(src.loc)
|
||||||
del(src)
|
qdel(src)
|
||||||
|
|
||||||
/obj/effect/spider/spiderling/healthcheck()
|
/obj/effect/spider/spiderling/healthcheck()
|
||||||
if(health <= 0)
|
if(health <= 0)
|
||||||
|
|||||||
@@ -416,7 +416,8 @@
|
|||||||
|
|
||||||
for(var/obj/item/weapon/grab/G in mob.grabbed_by)
|
for(var/obj/item/weapon/grab/G in mob.grabbed_by)
|
||||||
if((G.state == GRAB_PASSIVE)&&(!grabbing.Find(G.assailant)))
|
if((G.state == GRAB_PASSIVE)&&(!grabbing.Find(G.assailant)))
|
||||||
del(G)
|
qdel(G)
|
||||||
|
mob.grabbed_by.Remove(G)
|
||||||
if(G.state == GRAB_AGGRESSIVE)
|
if(G.state == GRAB_AGGRESSIVE)
|
||||||
mob.delayNextMove(10)
|
mob.delayNextMove(10)
|
||||||
if(!prob(25))
|
if(!prob(25))
|
||||||
|
|||||||
@@ -348,23 +348,6 @@
|
|||||||
/obj/machinery/singularity/proc/consume(const/atom/A)
|
/obj/machinery/singularity/proc/consume(const/atom/A)
|
||||||
var/gain = A.singularity_act(current_size,src)
|
var/gain = A.singularity_act(current_size,src)
|
||||||
src.energy += gain
|
src.energy += gain
|
||||||
/*if(istype(A, /obj/))
|
|
||||||
if(isbot(A))
|
|
||||||
var/obj/machinery/bot/B = A
|
|
||||||
if(B.flags & INVULNERABLE)
|
|
||||||
return
|
|
||||||
else
|
|
||||||
src.energy += 20000//Instantly sends it to max size
|
|
||||||
SetUniversalState(/datum/universal_state/supermatter_cascade) //AND NOW YOU'RE FUCKED
|
|
||||||
expand(11, 1)
|
|
||||||
var/prints=""
|
|
||||||
if(A.fingerprintshidden)
|
|
||||||
prints=", all touchers: "+A.fingerprintshidden
|
|
||||||
|
|
||||||
log_admin("New super singularity made by eating a SM crystal [prints]. Last touched by [A.fingerprintslast].")
|
|
||||||
message_admins("New super singularity made by eating a SM crystal [prints]. Last touched by [A.fingerprintslast].")
|
|
||||||
del(A)
|
|
||||||
return*/
|
|
||||||
return
|
return
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -630,4 +613,4 @@
|
|||||||
/obj/machinery/singularity/Move(newLoc, movedir)
|
/obj/machinery/singularity/Move(newLoc, movedir)
|
||||||
if(timestopped)
|
if(timestopped)
|
||||||
return 0
|
return 0
|
||||||
return forceMove(get_step(src,movedir))
|
return forceMove(get_step(src,movedir))
|
||||||
|
|||||||
@@ -256,11 +256,11 @@
|
|||||||
/datum/construction/flatpack_unpack/spawn_result(mob/user as mob)
|
/datum/construction/flatpack_unpack/spawn_result(mob/user as mob)
|
||||||
var/obj/structure/closet/crate/flatpack/FP = holder
|
var/obj/structure/closet/crate/flatpack/FP = holder
|
||||||
if(!istype(FP))
|
if(!istype(FP))
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
FP.Finalize()
|
FP.Finalize()
|
||||||
del(src)
|
qdel(src)
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
#undef Fl_ACTION
|
#undef Fl_ACTION
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
B.item_state = "melted"
|
B.item_state = "melted"
|
||||||
new /obj/item/weapon/paper/sc_safehint_paper_bible(B)
|
new /obj/item/weapon/paper/sc_safehint_paper_bible(B)
|
||||||
new /obj/item/weapon/pen(B)
|
new /obj/item/weapon/pen(B)
|
||||||
del(src)
|
qdel(src)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
|
* Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
|
||||||
|
|||||||
Reference in New Issue
Block a user