cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 23:17:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Great Del() Cull of 2015

Browse Source
This commit is contained in:
Fox-McCloud
2015-07-09 02:48:34 -04:00
parent 656b2c449a
commit 0dbea7621f
342 changed files with 915 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/AI_modules.dm
+1 -1
View File
@@ -369,7 +369,7 @@ AI MODULES
if(!laws.len) //Failsafe if something goes wrong with silicon_laws.txt.
warning("ERROR: empty custom board created, empty custom board deleted. Please check silicon_laws.txt.")
del(src)
qdel(src)
/****************** T.Y.R.A.N.T. *****************/
code/game/objects/items/weapons/RCD.dm
+1 -1
View File
@@ -46,7 +46,7 @@ RCD
return
matter += R.ammoamt
user.drop_item()
del(W)
qdel(W)
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
user << "<span class='notice'>The RCD now holds [matter]/[max_matter] matter-units.</span>"
desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
code/game/objects/items/weapons/RSF.dm
+1 -1
View File
@@ -25,7 +25,7 @@ RSF
if ((matter + 10) > 30)
user << "The RSF cant hold any more matter."
return
del(W)
qdel(W)
matter += 10
playsound(src.loc, 'sound/machines/click.ogg', 10, 1)
user << "The RSF now holds [matter]/30 fabrication-units."
code/game/objects/items/weapons/chrono_eraser.dm
+8 -8
View File
@@ -18,7 +18,7 @@
/obj/item/weapon/chrono_eraser/dropped()
if(PA)
del(PA)
qdel(PA)
/obj/item/weapon/chrono_eraser/Destroy()
dropped()
@@ -28,7 +28,7 @@
var/mob/living/carbon/user = src.loc
if(iscarbon(user) && (user.back == src))
if(PA)
del(PA)
qdel(PA)
else
PA = new(src)
user.put_in_hands(PA)
@@ -58,10 +58,10 @@
TED = T
else //admin must have spawned it
TED = new(src.loc)
del(src)
qdel(src)
/obj/item/weapon/gun/energy/chrono_gun/dropped()
del(src)
qdel(src)
/obj/item/weapon/gun/energy/chrono_gun/update_icon()
return
@@ -193,7 +193,7 @@
if(tickstokill > initial(tickstokill))
for(var/atom/movable/AM in contents)
AM.loc = loc
del(src)
qdel(src)
else if(tickstokill <= 0)
captured << "<span class='boldnotice'>As the last essence of your being is erased from time, you begin to re-experience your most enjoyable memory. You feel happy...</span>"
var/mob/dead/observer/ghost = captured.ghostize(1)
@@ -202,8 +202,8 @@
ghost.mind = null
if(gun)
gun.pass_mind(captured.mind)
del(captured)
del(src)
qdel(captured)
qdel(src)
else
captured.Paralyse(4)
if(captured.reagents)
@@ -222,7 +222,7 @@
else
tickstokill++
else
del(src)
qdel(src)
/obj/effect/chrono_field/bullet_act(var/obj/item/projectile/P)
if(istype(P, /obj/item/projectile/energy/chrono_beam))
code/game/objects/items/weapons/cigs.dm
+4 -4
View File
@@ -102,7 +102,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(ismob(loc))
var/mob/M = loc
M.unEquip(src, 1)
del(src)
qdel(src)
return
if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
var/datum/effect/effect/system/reagents_explosion/e = new()
@@ -111,7 +111,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(ismob(loc))
var/mob/M = loc
M.unEquip(src, 1)
del(src)
qdel(src)
return
flags &= ~NOREACT // allowing reagents to react after being lit
reagents.handle_reactions()
@@ -174,7 +174,7 @@ LIGHTERS ARE IN LIGHTERS.DM
M << "<span class='notice'>Your [name] goes out.</span>"
M.unEquip(src, 1) //Force the un-equip so the overlays update
processing_objects.Remove(src)
del(src)
qdel(src)
/obj/item/clothing/mask/cigarette/joint
@@ -383,7 +383,7 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user)
var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
user.put_in_inactive_hand(P)
user << "You take the last paper out of the pack, and throw the pack away."
del(src)
qdel(src)
/obj/item/weapon/rollingpaperpack/MouseDrop(atom/over_object)
var/mob/M = usr
code/game/objects/items/weapons/clown_items.dm
+2 -2
View File
@@ -63,13 +63,13 @@
user.visible_message("<span class='warning'>[user] begins to scrub \the [target.name] out with [src].</span>")
if(do_after(user, src.cleanspeed) && target)
user << "<span class='notice'>You scrub \the [target.name] out.</span>"
del(target)
qdel(target)
else
user.visible_message("<span class='warning'>[user] begins to clean \the [target.name] with [src].</span>")
if(do_after(user, src.cleanspeed))
user << "<span class='notice'>You clean \the [target.name].</span>"
var/obj/effect/decal/cleanable/C = locate() in target
del(C)
qdel(C)
target.clean_blood()
return
code/game/objects/items/weapons/dna_injector.dm
+1 -1
View File
@@ -91,7 +91,7 @@
spawn(0)//this prevents the collapse of space-time continuum
if (user)
user.unEquip(src)
del(src)
qdel(src)
return uses
/obj/item/weapon/dnainjector/attack(mob/M as mob, mob/user as mob)
code/game/objects/items/weapons/fireworks.dm
+2 -2
View File
@@ -18,7 +18,7 @@ obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user, params)
if(ismob(src.loc) || isobj(src.loc))
S.attach(src.loc)
S.start()
del(src)
qdel(src)
obj/item/weapon/sparkler
name = "sparkler"
@@ -42,7 +42,7 @@ obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user, params)
S.attach(src.loc)
S.start()
sleep(10)
del(src)
qdel(src)
/obj/crate/fireworks
name = "Fireworks!"
/obj/crate/fireworks/New()
code/game/objects/items/weapons/gift_wrappaper.dm
+3 -3
View File
@@ -31,7 +31,7 @@
src.gift.add_fingerprint(user)
else
user << "\blue The gift was empty!"
del(src)
qdel(src)
return
/obj/item/weapon/a_gift/ex_act()
@@ -58,7 +58,7 @@
M.client.eye = M.client.mob
M.client.perspective = MOB_PERSPECTIVE
del(src)
qdel(src)
/obj/item/weapon/a_gift/attack_self(mob/M as mob)
var/gift_type = pick(/obj/item/weapon/sord,
@@ -112,7 +112,7 @@
M.unEquip(src, 1)
M.put_in_hands(I)
I.add_fingerprint(M)
del(src)
qdel(src)
return
/*
code/game/objects/items/weapons/grenades.dm
+2 -2
View File
@@ -409,7 +409,7 @@
new /obj/item/weapon/grenade/clusterbuster/segment(src.loc,payload,name)//Creates a 'segment' that launches more payloads
playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
spawn(0)
del(src)
qdel(src)
return
/obj/item/weapon/grenade/clusterbuster/segment
@@ -440,7 +440,7 @@
new /obj/item/weapon/grenade/clusterbuster/node(src.loc,payload)
spawn(0)
playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
del(src)
qdel(src)
return
/obj/item/weapon/grenade/clusterbuster/node/New(var/turf/newloc,var/T,var/N)
code/game/objects/items/weapons/grenades/bananade.dm
+3 -3
View File
@@ -29,7 +29,7 @@ var/turf/T
del(src)
qdel(src)
return
/obj/item/weapon/grenade/bananade/casing
@@ -44,7 +44,7 @@ var/turf/T
if(fillamt < 9)
usr << "<span class='notice'>You add another banana peel to the assembly.</span>"
fillamt += 1
del(I)
qdel(I)
else
usr << "<span class='notice'>The bananade is full, screwdriver it shut to lock it down.</span>"
if(istype(I, /obj/item/weapon/screwdriver))
@@ -54,7 +54,7 @@ var/turf/T
user.put_in_hands(G)
G.deliveryamt = src.fillamt
user << "<span class='notice'>You lock the assembly shut, readying it for HONK.</span>"
del(src)
qdel(src)
else
usr << "<span class='notice'>You need to add banana peels before you can ready the grenade!.</span>"
else
code/game/objects/items/weapons/grenades/chem_grenade.dm
+2 -2
View File
@@ -285,7 +285,7 @@
spawn(15) //Making sure all reagents can work
del(src) //correctly before deleting the grenade.
qdel(src) //correctly before deleting the grenade.
/obj/item/weapon/grenade/chem_grenade/proc/CreateDefaultTrigger(var/typekey)
if(ispath(typekey,/obj/item/device/assembly))
@@ -364,7 +364,7 @@
invisibility = INVISIBILITY_MAXIMUM //Why am i doing this?
spawn(50) //To make sure all reagents can work
del(src) //correctly before deleting the grenade.
qdel(src) //correctly before deleting the grenade.
//I tried to just put it in the allowed_containers list but
code/game/objects/items/weapons/grenades/clowngrenade.dm
+1 -1
View File
@@ -40,7 +40,7 @@
else
step(peel,direction)
new /obj/item/weapon/bananapeel/traitorpeel(get_turf(src.loc))
del(src)
qdel(src)
return
/*
proc/banana(turf/T as turf)
code/game/objects/items/weapons/grenades/emgrenade.dm
+1 -1
View File
@@ -8,6 +8,6 @@
prime()
..()
if(empulse(src, 4, 10))
del(src)
qdel(src)
return
code/game/objects/items/weapons/grenades/flashbang.dm
+3 -3
View File
@@ -18,7 +18,7 @@
var/damage = round(30/(get_dist(B,get_turf(src))+1))
B.health -= damage
B.update_icon()
del(src)
qdel(src)
/obj/item/weapon/grenade/flashbang/proc/bang(var/turf/T , var/mob/living/M)
M.show_message("<span class='warning'>BANG</span>", 2)
@@ -96,7 +96,7 @@
playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
del(src)
qdel(src)
//////////////////////
@@ -126,7 +126,7 @@
playsound(src.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
del(src)
qdel(src)
////////////////////////////////
//Clusterbang spawned flashbang
code/game/objects/items/weapons/grenades/ghettobomb.dm
+2 -2
View File
@@ -10,8 +10,8 @@
user.put_in_hands(W)
user << "<span class='notice'>You stuff the [I] in the [src], emptying the contents beforehand.</span>"
W.underlays += image(src.icon, icon_state = src.icon_state)
del(I)
del(src)
qdel(I)
qdel(src)
/obj/item/weapon/grenade/iedcasing
code/game/objects/items/weapons/grenades/smokebomb.dm
+1 -1
View File
@@ -31,5 +31,5 @@
B.health -= damage
B.update_icon()
sleep(80)
del(src)
qdel(src)
return
code/game/objects/items/weapons/grenades/spawnergrenade.dm
+1 -1
View File
@@ -30,7 +30,7 @@
// Spawn some hostile syndicate critters
del(src)
qdel(src)
return
/obj/item/weapon/grenade/spawnergrenade/manhacks
code/game/objects/items/weapons/implants/implant.dm
+8 -8
View File
@@ -153,7 +153,7 @@ Implant Specifics:<BR>"}
msg = sanitize_simple(msg, replacechars)
if(findtext(msg,phrase))
activate()
del(src)
qdel(src)
activate()
if (malfunction == MALFUNCTION_PERMANENT)
@@ -177,11 +177,11 @@ Implant Specifics:<BR>"}
istype(part,/obj/item/organ/external/head))
part.createwound(BRUISE, 60) //mangle them instead
explosion(get_turf(imp_in), -1, -1, 2, 3)
del(src)
qdel(src)
else
explosion(get_turf(imp_in), -1, -1, 2, 3)
part.droplimb()
del(src)
qdel(src)
if (elevel == "Destroy Body")
explosion(get_turf(T), -1, 0, 1, 6)
T.gib()
@@ -247,7 +247,7 @@ Implant Specifics:<BR>"}
else
part.droplimb()
explosion(get_turf(imp_in), -1, -1, 2, 3)
del(src)
qdel(src)
/obj/item/weapon/implant/chem
name = "chem"
@@ -294,7 +294,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
if(!src.reagents.total_volume)
R << "You hear a faint click from your chest."
spawn(0)
del(src)
qdel(src)
return
emp_act(severity)
@@ -484,17 +484,17 @@ the implant may become unstable and either pre-maturely inject the subject or si
a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm")
else
a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
del(a)
qdel(a)
processing_objects.Remove(src)
if ("emp")
var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
var/name = prob(50) ? t.name : pick(teleportlocs)
a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
del(a)
qdel(a)
else
var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
del(a)
qdel(a)
processing_objects.Remove(src)
emp_act(severity) //for some reason alarms stop going off in case they are emp'd, even without this
code/game/objects/items/weapons/implants/implantchair.dm
+1 -1
View File
@@ -84,7 +84,7 @@
return
var/mob/M = G:affecting
if(put_mob(M))
del(G)
qdel(G)
src.updateUsrDialog()
return
code/game/objects/items/weapons/mop.dm
+1 -1
View File
@@ -24,7 +24,7 @@
A.clean_blood()
for(var/obj/effect/O in A)
if(istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay) || istype(O,/obj/effect/rune))
del(O)
qdel(O)
reagents.reaction(A, TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly.
reagents.remove_any(1) //reaction() doesn't use up the reagents
code/game/objects/items/weapons/storage/backpack.dm
+3 -3
View File
@@ -40,12 +40,12 @@
if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
investigate_log("has become a singularity. Caused by [user.key]","singulo")
user << "\red The Bluespace interfaces of the two devices catastrophically malfunction!"
del(W)
qdel(W)
var/obj/singularity/singulo = new /obj/singularity (get_turf(src))
singulo.energy = 300 //should make it a bit bigger~
message_admins("[key_name_admin(user)] detonated a bag of holding")
log_game("[key_name(user)] detonated a bag of holding")
del(src)
qdel(src)
return
..()
@@ -57,7 +57,7 @@
else
user << "\red The Bluespace generator malfunctions!"
for (var/obj/O in src.contents) //it broke, delete what was in it
del(O)
qdel(O)
crit_fail = 1
icon_state = "brokenpack"
code/game/objects/items/weapons/storage/belt.dm
+1 -1
View File
@@ -361,7 +361,7 @@
else
user << "\red The Bluespace generator malfunctions!"
for (var/obj/O in src.contents) //it broke, delete what was in it
del(O)
qdel(O)
crit_fail = 1
return 0
code/game/objects/items/weapons/storage/storage.dm
+2 -2
View File
@@ -190,7 +190,7 @@
New(obj/item/sample as obj)
if(!istype(sample))
del(src)
qdel(src)
sample_object = sample
number = 1
@@ -479,7 +479,7 @@
// Now make the cardboard
user << "<span class='notice'>You fold [src] flat.</span>"
new src.foldable(get_turf(src))
del(src)
qdel(src)
//BubbleWrap END
//Returns the storage depth of an atom. This is the number of storage items the atom is contained in before reaching toplevel (the area).
code/game/objects/items/weapons/storage/toolbox.dm
+1 -1
View File
@@ -18,7 +18,7 @@
..()
if (src.type == /obj/item/weapon/storage/toolbox)
world << "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]"
del(src)
qdel(src)
/obj/item/weapon/storage/toolbox/emergency
name = "emergency toolbox"
code/game/objects/items/weapons/swords_axes_etc.dm
+4 -4
View File
@@ -73,8 +73,8 @@
if(src.hacked) // That's right, we'll only check the "original" esword.
newSaber.hacked = 1
newSaber.blade_color = "rainbow"
del(W)
del(src)
qdel(W)
qdel(src)
else if(istype(W, /obj/item/device/multitool))
if(hacked == 0)
@@ -201,11 +201,11 @@
return
/obj/item/weapon/melee/energy/blade/dropped()
del(src)
qdel(src)
return
/obj/item/weapon/melee/energy/blade/proc/toss()
del(src)
qdel(src)
return
/*
code/game/objects/items/weapons/table_rack_parts.dm
+11 -11
View File
@@ -52,20 +52,20 @@
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( user.loc )
//SN src = null
del(src)
qdel(src)
if (istype(W, /obj/item/stack/rods))
if (W:amount >= 4)
new /obj/item/weapon/table_parts/reinforced( user.loc )
user << "\blue You reinforce the [name]."
W:use(4)
del(src)
qdel(src)
else if (W:amount < 4)
user << "\red You need at least four rods to do this."
/obj/item/weapon/table_parts/attack_self(mob/user as mob)
new /obj/structure/table( user.loc )
user.drop_item()
del(src)
qdel(src)
return
@@ -76,12 +76,12 @@
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( user.loc )
new /obj/item/stack/rods( user.loc )
del(src)
qdel(src)
/obj/item/weapon/table_parts/reinforced/attack_self(mob/user as mob)
new /obj/structure/table/reinforced( user.loc )
user.drop_item()
del(src)
qdel(src)
return
/*
@@ -90,12 +90,12 @@
/obj/item/weapon/table_parts/wood/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/wood( user.loc )
del(src)
qdel(src)
/obj/item/weapon/table_parts/wood/attack_self(mob/user as mob)
new /obj/structure/table/woodentable( user.loc )
user.drop_item()
del(src)
qdel(src)
return
/*
@@ -105,12 +105,12 @@
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( user.loc )
new /obj/item/stack/sheet/metal( user.loc )
del(src)
qdel(src)
/obj/item/weapon/table_parts/glass/attack_self(mob/user as mob)
new /obj/structure/glasstable_frame( user.loc )
user.drop_item()
del(src)
qdel(src)
return
/*
@@ -120,7 +120,7 @@
..()
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( user.loc )
del(src)
qdel(src)
return
return
@@ -128,5 +128,5 @@
var/obj/structure/rack/R = new /obj/structure/rack( user.loc )
R.add_fingerprint(user)
user.drop_item()
del(src)
qdel(src)
return
code/game/objects/items/weapons/tanks/jetpack.dm
+1 -1
View File
@@ -65,7 +65,7 @@
if(allgases >= 0.005)
return 1
del(G)
qdel(G)
return
ui_action_click()
code/game/objects/items/weapons/tanks/tanks.dm
+2 -2
View File
@@ -71,12 +71,12 @@
if(prob(50))
var/turf/location = src.loc
if (!( istype(location, /turf) ))
del(src)
qdel(src)
if(src.air_contents)
location.assume_air(air_contents)
del(src)
qdel(src)
/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
code/game/objects/items/weapons/twohanded.dm
+2 -2
View File
@@ -115,10 +115,10 @@
flags = ABSTRACT
/obj/item/weapon/twohanded/offhand/unwield()
del(src)
qdel(src)
/obj/item/weapon/twohanded/offhand/wield()
del(src)
qdel(src)
/obj/item/weapon/twohanded/offhand/IsShield()//if the actual twohanded weapon is a shield, we count as a shield too!
var/mob/user = loc
code/game/objects/items/weapons/weaponry.dm
+4 -4
View File
@@ -175,8 +175,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
user.put_in_hands(S)
user << "<span class='notice'>You fasten the glass shard to the top of the rod with the cable.</span>"
del(I)
del(src)
qdel(I)
qdel(src)
else if(istype(I, /obj/item/weapon/wirecutters))
var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod
@@ -186,8 +186,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
user.put_in_hands(P)
user << "<span class='notice'>You fasten the wirecutters to the top of the rod with the cable, prongs outward.</span>"
del(I)
del(src)
qdel(I)
qdel(src)
/obj/item/weapon/spear/kidan