Fix non-icon merge conflicts

This commit is contained in:
DZD
2015-07-10 19:57:59 -04:00
412 changed files with 3631 additions and 3603 deletions
@@ -14,7 +14,7 @@ obj/effect/decal/cleanable/liquid_fuel
if(other != src)
other.amount += src.amount
spawn other.Spread()
del src
qdel(src)
Spread()
. = ..()
@@ -32,7 +32,7 @@ var/global/list/image/splatter_cache=list()
if(B != src)
if (B.blood_DNA)
blood_DNA |= B.blood_DNA.Copy()
del(B)
qdel(B)
spawn(DRYING_TIME * (amount+1))
dry()
@@ -53,7 +53,7 @@
/obj/effect/decal/warning_stripes/New()
. = ..()
loc.overlays += src
del src
qdel(src)
// Credit to Neinhaus for making these into individual decals.
+5 -9
View File
@@ -40,11 +40,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
var/amount = 8.0
/obj/effect/proc/delete()
loc = null
if(reagents)
reagents.my_atom = null
reagents.delete()
return
qdel(src)
/obj/effect/effect/water/New()
@@ -685,7 +681,7 @@ steam.start() -- spawns the effect
/obj/effect/effect/mustard_gas/New()
..()
spawn (100)
del(src)
qdel(src)
return
/obj/effect/effect/mustard_gas/Move()
@@ -752,7 +748,7 @@ steam.start() -- spawns the effect
sleep(10)
step(smoke,direction)
spawn(100)
del(smoke)
qdel(smoke)
src.total_smoke--
@@ -1238,7 +1234,7 @@ steam.start() -- spawns the effect
if (istype(T, /turf))
T.hotspot_expose(3000,100)
spawn (100)
del(src)
qdel(src)
return
/obj/effects/sparkels/Destroy()
@@ -1294,5 +1290,5 @@ steam.start() -- spawns the effect
sleep(5)
step(sparks,direction)
spawn(20)
del(sparks)
qdel(sparks)
src.total_sparks--
+1 -1
View File
@@ -163,4 +163,4 @@
/obj/effect/glowshroom/proc/CheckEndurance()
if(endurance <= 0)
del(src)
qdel(src)
+1 -1
View File
@@ -17,5 +17,5 @@
P.info = dat
P.name = "paper- 'Crew Manifest'"
//SN src = null
del(src)
qdel(src)
return
+7 -7
View File
@@ -33,7 +33,7 @@
randmutb(obj)
domutcheck(obj,null)
spawn(0)
del(src)
qdel(src)
/obj/effect/mine/proc/triggerstun(obj)
if(ismob(obj))
@@ -43,30 +43,30 @@
s.set_up(3, 1, src)
s.start()
spawn(0)
del(src)
qdel(src)
/obj/effect/mine/proc/triggern2o(obj)
atmos_spawn_air(SPAWN_N2O, 360)
spawn(0)
del(src)
qdel(src)
/obj/effect/mine/proc/triggerplasma(obj)
atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 360)
spawn(0)
del(src)
qdel(src)
/obj/effect/mine/proc/triggerkick(obj)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
del(obj:client)
qdel(obj:client)
spawn(0)
del(src)
qdel(src)
/obj/effect/mine/proc/explode(obj)
explosion(loc, 0, 1, 2, 3)
spawn(0)
del(src)
qdel(src)
/obj/effect/mine/dnascramble
name = "Radiation Mine"
+1 -1
View File
@@ -44,7 +44,7 @@
if (icon_state == "portal1")
return
if (!( target ))
del(src)
qdel(src)
return
if (istype(M, /atom/movable))
if(prob(failchance)) //oh dear a problem, put em in deep space
+12 -18
View File
@@ -78,10 +78,6 @@
var/datum/controller/process/lighting = processScheduler.getProcess("lighting")
lighting.disable()
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()
E.set_up(epicenter)
@@ -107,7 +103,7 @@
dist += D.explosion_block
var/flame_dist = 0
var/throw_dist = dist
var/throw_dist = max_range - dist
if(dist < flame_range)
flame_dist = 1
@@ -122,7 +118,7 @@
if(T)
for(var/atom_movable in T.contents) //bypass type checking since only atom/movable can be contained by turfs anyway
var/atom/movable/AM = atom_movable
if(AM) AM.ex_act(dist)
if(AM && AM.simulated) AM.ex_act(dist)
if(flame_dist && prob(40) && !istype(T, /turf/space) && !T.density)
PoolOrNew(/obj/effect/hotspot, T) //Mostly for ambience!
if(dist > 0)
@@ -130,14 +126,16 @@
//--- THROW ITEMS AROUND ---
var/throw_dir = get_dir(epicenter,T)
for(var/obj/item/I in T)
spawn(0) //Simultaneously not one at a time
if(I && !I.anchored)
var/throw_range = rand(throw_dist, max_range)
var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
I.throw_speed = 4 //Temporarily change their throw_speed for embedding purposes (Reset when it finishes throwing, regardless of hitting anything)
I.throw_at(throw_at, throw_range, 2)//Throw it at 2 speed, this is purely visual anyway.
if(throw_dist > 0)
var/throw_dir = get_dir(epicenter,T)
for(var/obj/item/I in T)
spawn(0) //Simultaneously not one at a time
if(I && !I.anchored)
var/throw_mult = 0.5 + (0.5 * rand()) // Between 0.5 and 1.0
var/throw_range = round((throw_dist + 1) * throw_mult) // Roughly 50% to 100% of throw_dist
if(throw_range > 0)
var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range)
I.throw_at(throw_at, throw_range, 2, no_spin = 1)//Throw it at 2 speed, this is purely visual anyway.
var/took = (world.timeofday-start)/10
//You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes to explosion code using this please so we can compare
@@ -153,10 +151,6 @@
lighting.enable()
if(!powernet_rebuild_was_deferred_already)
if(defer_powernet_rebuild != 2)
defer_powernet_rebuild = 0
return 1
+4 -12
View File
@@ -52,17 +52,9 @@
var/list/species_fit = null //This object has a different appearance when worn by these species
/obj/item/Destroy()
if(istype(src.loc, /mob))
var/mob/H = src.loc
H.unEquip(src) // items at the very least get unequipped from their mob before being deleted
if(reagents && istype(reagents))
reagents.my_atom = null
reagents.delete()
if(hasvar(src, "holder"))
src:holder = null
/* BROKEN, FUCK BYOND
if(hasvar(src, "my_atom"))
src:my_atom = null*/
if(ismob(loc))
var/mob/m = loc
m.unEquip(src, 1)
return ..()
/obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)
@@ -91,7 +83,7 @@
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
+1 -1
View File
@@ -31,7 +31,7 @@
processing_objects.Remove(cig)
var/obj/item/butt = new cig.type_butt(src)
cig.transfer_fingerprints_to(butt)
del(cig)
qdel(cig)
else if (cig.lit == 0)
user << "You place [cig] in [src] without even smoking it. Why would you do that?"
+3 -3
View File
@@ -79,7 +79,7 @@
visible_message("[usr] folds up the [src.name]")
new item_path(get_turf(src))
spawn(0)
del(src)
qdel(src)
return
/obj/structure/closet/bodybag/update_icon()
@@ -98,7 +98,7 @@
attack_self(mob/user)
var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc)
R.add_fingerprint(user)
del(src)
qdel(src)
@@ -119,7 +119,7 @@
O.icon = src.icon
O.icon_state = "bodybag_used"
O.desc = "Pretty useless now.."
del(src)
qdel(src)
MouseDrop(over_object, src_location, over_location)
if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
+1 -1
View File
@@ -63,7 +63,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
+1 -1
View File
@@ -1072,7 +1072,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if ( !(C:blood_DNA) )
user << "\blue No blood found on [C]"
if(C:blood_DNA)
del(C:blood_DNA)
qdel(C:blood_DNA)
else
user << "\blue Blood found on [C]. Analysing..."
spawn(15)
+1 -1
View File
@@ -132,7 +132,7 @@
/obj/item/device/aicard/ex_act(severity)
switch(severity)
if(1.0)
del(src)
qdel(src)
if(2.0)
if(prob(50)) qdel(src)
if(3.0)
+1 -1
View File
@@ -68,7 +68,7 @@
else
D.organ_names += ", [O.name]"
del D.organs_scanned[O.name]
qdel(D.organs_scanned[O.name])
D.organs_scanned[O.name] = W.copy()
for(var/V in O.trace_chemicals)
+123 -98
View File
@@ -5,82 +5,85 @@
slot_flags = SLOT_BELT
item_state = "electronic"
throwforce = 5.0
throw_speed = 1
throw_speed = 3
throw_range = 5
w_class = 2.0
origin_tech = "syndicate=4;magnets=4"
var/can_use = 1
var/obj/effect/dummy/chameleon/active_dummy = null
var/saved_item = "/obj/item/weapon/cigbutt"
var/saved_item = /obj/item/weapon/cigbutt
var/saved_icon = 'icons/obj/clothing/masks.dmi'
var/saved_icon_state = "cigbutt"
var/saved_overlays = null
var/saved_underlays = null
dropped()
disrupt()
/obj/item/device/chameleon/dropped()
disrupt()
attack_self()
toggle()
/obj/item/device/chameleon/equipped()
disrupt()
afterattack(atom/target, mob/user, proximity)
if(!proximity) return
if(istype(target,/obj/item/toy/cards/singlecard))
user << "\red Unable to scan [target]."
return
if(istype(target,/obj/item))
playsound(src, 'sound/weapons/flash.ogg', 100, 1, 1)
user << "\blue Scanned [target]."
/obj/item/device/chameleon/attack_self()
toggle()
/obj/item/device/chameleon/afterattack(atom/target, mob/user , proximity)
if(!proximity) return
if(!active_dummy)
if(istype(target,/obj/item) && !istype(target, /obj/item/weapon/disk/nuclear))
playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6)
user << "<span class='notice'>Scanned [target].</span>"
saved_item = target.type
saved_icon = target.icon
saved_icon_state = target.icon_state
saved_overlays = target.overlays
saved_underlays = target.underlays
proc/toggle()
if(!can_use || !saved_item) return
if(active_dummy)
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
for(var/atom/movable/A in active_dummy)
A.loc = active_dummy.loc
if(ismob(A))
if(A:client)
A:client:eye = A
del(active_dummy)
active_dummy = null
usr << "\blue You deactivate the [src]."
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
T.icon = 'icons/effects/effects.dmi'
flick("emppulse",T)
spawn(8) T.delete()
else
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
var/obj/O = new saved_item(src)
if(!O) return
var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc)
C.name = O.name
C.desc = O.desc
C.icon = O.icon
C.icon_state = O.icon_state
C.dir = O.dir
usr.loc = C
C.master = src
src.active_dummy = C
del(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'
flick("emppulse",T)
spawn(8) T.delete()
/obj/item/device/chameleon/proc/toggle()
if(!can_use || !saved_item) return
if(active_dummy)
eject_all()
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
qdel(active_dummy)
active_dummy = null
usr << "<span class='notice'>You deactivate \the [src].</span>"
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
T.icon = 'icons/effects/effects.dmi'
flick("emppulse",T)
spawn(8)
qdel(T)
else
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
var/obj/O = new saved_item(src)
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, saved_underlays, src)
qdel(O)
usr << "<span class='notice'>You activate \the [src].</span>"
var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src))
T.icon = 'icons/effects/effects.dmi'
flick("emppulse",T)
spawn(8)
qdel(T)
proc/disrupt()
if(active_dummy)
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
spark_system.start()
for(var/atom/movable/A in active_dummy)
A.loc = active_dummy.loc
if(ismob(A))
if(A:client)
A:client:eye = A
del(active_dummy)
active_dummy = null
can_use = 0
spawn(100) can_use = 1
/obj/item/device/chameleon/proc/disrupt(var/delete_dummy = 1)
if(active_dummy)
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
spark_system.start()
eject_all()
if(delete_dummy)
qdel(active_dummy)
active_dummy = null
can_use = 0
spawn(50) can_use = 1
/obj/item/device/chameleon/proc/eject_all()
for(var/atom/movable/A in active_dummy)
A.loc = active_dummy.loc
if(ismob(A))
var/mob/M = A
M.reset_view(null)
/obj/effect/dummy/chameleon
name = ""
@@ -89,38 +92,60 @@
anchored = 1
var/can_move = 1
var/obj/item/device/chameleon/master = null
attackby()
for(var/mob/M in src)
M << "\red Your chameleon-projector deactivates."
master.disrupt()
attack_hand()
for(var/mob/M in src)
M << "\red Your chameleon-projector deactivates."
master.disrupt()
ex_act()
for(var/mob/M in src)
M << "\red Your chameleon-projector deactivates."
master.disrupt()
bullet_act()
for(var/mob/M in src)
M << "\red Your chameleon-projector deactivates."
..()
master.disrupt()
relaymove(var/mob/user, direction)
if(istype(loc, /turf/space)) return //No magical space movement!
if(can_move)
can_move = 0
switch(usr.bodytemperature)
if(300 to INFINITY)
spawn(10) can_move = 1
if(295 to 300)
spawn(13) can_move = 1
if(280 to 295)
spawn(16) can_move = 1
if(260 to 280)
spawn(20) can_move = 1
else
spawn(25) can_move = 1
step(src,direction)
return
/obj/effect/dummy/chameleon/proc/activate(var/obj/O, var/mob/M, new_icon, new_iconstate, new_overlays, new_underlays, var/obj/item/device/chameleon/C)
name = O.name
desc = O.desc
icon = new_icon
icon_state = new_iconstate
overlays = new_overlays
underlays = new_underlays
dir = O.dir
M.loc = src
master = C
master.active_dummy = src
/obj/effect/dummy/chameleon/attackby()
for(var/mob/M in src)
M << "<span class='danger'>Your chameleon-projector deactivates.</span>"
master.disrupt()
/obj/effect/dummy/chameleon/attack_hand()
for(var/mob/M in src)
M << "<span class='danger'>Your chameleon-projector deactivates.</span>"
master.disrupt()
/obj/effect/dummy/chameleon/ex_act() //ok now THATS some serious protection against explosions right here
for(var/mob/M in src)
M << "<span class='danger'>Your chameleon-projector deactivates.</span>"
master.disrupt()
/obj/effect/dummy/chameleon/bullet_act()
for(var/mob/M in src)
M << "<span class='danger'>Your chameleon-projector deactivates.</span>"
..()
master.disrupt()
/obj/effect/dummy/chameleon/relaymove(var/mob/user, direction)
if(istype(loc, /turf/space) || !direction)
return //No magical space movement!
if(can_move)
can_move = 0
switch(user.bodytemperature)
if(300 to INFINITY)
spawn(10) can_move = 1
if(295 to 300)
spawn(13) can_move = 1
if(280 to 295)
spawn(16) can_move = 1
if(260 to 280)
spawn(20) can_move = 1
else
spawn(25) can_move = 1
step(src, direction)
return
/obj/effect/dummy/chameleon/Destroy()
master.disrupt(0)
return ..()
@@ -82,7 +82,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
@@ -94,7 +94,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."
@@ -167,7 +167,7 @@
target.brightness_color = L2.brightness_color
target.on = target.has_power()
target.update()
del(L2)
qdel(L2)
if(target.on && target.rigged)
target.explode()
+2 -2
View File
@@ -24,7 +24,7 @@
if(!parts)
user << "<span class='warning'>This kit has no parts for this modification left.</span>"
user.unEquip(src)
del(src)
qdel(src)
return
var/allowed = 0
@@ -60,7 +60,7 @@
if(!parts)
user.unEquip(src)
del(src)
qdel(src)
/obj/item/device/modkit/examine()
..()
@@ -38,7 +38,7 @@
/obj/item/device/radio/beacon/bacon //Probably a better way of doing this, I'm lazy.
proc/digest_delay()
spawn(600)
del(src)
qdel(src)
// SINGULO BEACON SPAWNER
@@ -54,7 +54,7 @@
user << "\blue Locked In"
new /obj/machinery/power/singularity_beacon/syndicate( user.loc )
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
del(src)
qdel(src)
return
/obj/item/device/radio/beacon/syndicate/bomb
@@ -67,7 +67,7 @@
user << "\blue Locked In"
new /obj/machinery/syndicatebomb( user.loc )
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
del(src)
qdel(src)
return
@@ -84,5 +84,5 @@
user << "\blue Locked In"
new /obj/machinery/telepad_cargo(user.loc)
playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
del(src)
qdel(src)
return
@@ -191,7 +191,7 @@
0, "*garbled automated announcement*", src,
message, from, "Automated Announcement", from, "synthesized voice",
4, 0, zlevel, connection.frequency, follow_target=follow_target)
del(A)
qdel(A)
return
// Interprets the message mode when talking into a radio, possibly returning a connection datum
+3 -3
View File
@@ -22,17 +22,17 @@
if(istype(src.loc,/turf))
new /obj/effect/decal/cleanable/ash(src.loc)
new /obj/item/stack/rods(src.loc)
del(src)
qdel(src)
return
if(istype(src.loc,/mob/living/carbon))
var/mob/living/carbon/C = src.loc
var/turf/location = get_turf(C)
new /obj/effect/decal/cleanable/ash(location)
new /obj/item/stack/rods(location)
del(src)
qdel(src)
return
else
del(src)
qdel(src)
return
/obj/item/flag/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+2 -2
View File
@@ -198,10 +198,10 @@ var/list/tape_roll_applications = list()
for (var/obj/item/tape/P in cur)
if(P.icon_state == icon_dir)
N = 0
del(P)
qdel(P)
cur = get_step(cur,dir[i])
del(src)
qdel(src)
return
+6 -6
View File
@@ -9,7 +9,7 @@
var/T = pick(types)
new T(loc)
spawn(1)
del src
qdel(src)
// -------------------------------------
// Random cleanables, clearly this makes sense
@@ -23,7 +23,7 @@
var/T = pick(list)
new T(loc)
spawn(0)
del src
qdel(src)
/obj/item/stack/sheet/animalhide/random
@@ -34,7 +34,7 @@
var/htype = pick(/obj/item/stack/sheet/animalhide/cat,/obj/item/stack/sheet/animalhide/corgi,/obj/item/stack/sheet/animalhide/human,/obj/item/stack/sheet/animalhide/lizard,/obj/item/stack/sheet/animalhide/monkey)
var/obj/item/stack/S = new htype(loc)
S.amount = amount
del src
qdel(src)
// -------------------------------------
// Not yet identified chemical.
@@ -115,7 +115,7 @@
pixel_x = rand(-5,5)
pixel_y = rand(-5,5)
spawn(0)
del src
qdel(src)
/obj/item/weapon/storage/pill_bottle/random_meds
name = "unlabelled pillbottle"
@@ -311,9 +311,9 @@
Cat2.desc = "It's was alive the whole time!"
sleep(2)
if(prob(50))
del Cat1
qdel(Cat1)
else
del Cat2
qdel(Cat2)
..()
// --------------------------------------
+4 -4
View File
@@ -131,7 +131,7 @@
if (user.get_inactive_hand()==src)
user.unEquip(src)
user.put_in_inactive_hand(B)
del(src)
qdel(src)
if(istype(W, /obj/item/robot_parts/l_leg))
if(src.l_leg) return
user.drop_item()
@@ -254,7 +254,7 @@
callHook("borgify", list(O))
O.Namepick()
del(src)
qdel(src)
else
user << "\blue The MMI must go in after everything else!"
@@ -314,8 +314,8 @@
user << "\blue You install some manipulators and modify the head, creating a functional spider-bot!"
new /mob/living/simple_animal/spiderbot(get_turf(loc))
user.drop_item()
del(W)
del(src)
qdel(W)
qdel(src)
return
return
@@ -30,7 +30,7 @@
R.uneq_all()
R.hands.icon_state = "nomod"
R.icon_state = "robot"
del(R.module)
qdel(R.module)
R.module = null
R.camera.network.Remove(list("Engineering","Medical","Mining Outpost"))
R.updatename("Default")
+1 -1
View File
@@ -97,7 +97,7 @@
for(var/mob/O in oviewers())
if ((O.client && !( O.blinded )))
O << "\red [src] breaks into tiny pieces and collapses!"
del(src)
qdel(src)
// Create a temporary object to represent the damage
var/obj/bmark = new
+20 -20
View File
@@ -63,7 +63,7 @@
if(O.reagents.has_reagent("facid", 1))
user << "The acid chews through the balloon!"
O.reagents.reaction(user)
del(src)
qdel(src)
else
src.desc = "A translucent balloon with some form of liquid sloshing around in it."
user << "\blue You fill the balloon with the contents of [O]."
@@ -80,7 +80,7 @@
src.icon_state = "burst"
spawn(5)
if(src)
del(src)
qdel(src)
return
/obj/item/toy/balloon/update_icon()
@@ -223,7 +223,7 @@
if(istype(I, /obj/item/toy/ammo/crossbow))
if(bullets <= 4)
user.drop_item()
del(I)
qdel(I)
bullets++
user << "\blue You load the foam dart into the crossbow."
else
@@ -254,21 +254,21 @@
if(M == user) continue
D.visible_message("<span class='danger'>[M] was hit by the foam dart!</span>")
new /obj/item/toy/ammo/crossbow(M.loc)
del(D)
qdel(D)
return
for(var/atom/A in D.loc)
if(A == user) continue
if(A.density)
new /obj/item/toy/ammo/crossbow(A.loc)
del(D)
qdel(D)
sleep(1)
spawn(10)
if(D)
new /obj/item/toy/ammo/crossbow(D.loc)
del(D)
qdel(D)
return
else if (bullets == 0)
@@ -332,7 +332,7 @@
if(istype(I, /obj/item/toy/ammo/crossbow))
if(bullets <= 19)
user.drop_item()
del(I)
qdel(I)
bullets++
user << "<span class='notice'>You load the foam dart into the tommy gun.</span>"
else
@@ -389,8 +389,8 @@
new /obj/item/weapon/twohanded/dualsaber/toy(user.loc)
user.unEquip(W)
user.unEquip(src)
del(W)
del(src)
qdel(W)
qdel(src)
/*
* Subtype of Double-Bladed Energy Swords
@@ -457,7 +457,7 @@
playsound(src, 'sound/effects/snap.ogg', 50, 1)
del(src)
qdel(src)
@@ -481,7 +481,7 @@
new /obj/effect/decal/cleanable/ash(src.loc)
src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
del(src)
qdel(src)
/obj/item/toy/snappop/Crossed(H as mob|obj)
if((ishuman(H))) //i guess carp and shit shouldn't set them off
@@ -495,7 +495,7 @@
new /obj/effect/decal/cleanable/ash(src.loc)
src.visible_message("\red The [src.name] explodes!","\red You hear a snap!")
playsound(src, 'sound/effects/snap.ogg', 50, 1)
del(src)
qdel(src)
@@ -691,7 +691,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use
return
src.cards += C.cardname
user.visible_message("<span class='notice'>[user] adds a card to the bottom of the deck.</span>","<span class='notice'>You add the card to the bottom of the deck.</span>")
del(C)
qdel(C)
else
user << "<span class='notice'>You can't mix cards from other decks.</span>"
if(cards.len > 26)
@@ -711,7 +711,7 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user,
return
src.cards += C.currenthand
user.visible_message("<span class='notice'>[user] puts their hand of cards in the deck.</span>", "<span class='notice'>You put the hand of cards in the deck.</span>")
del(C)
qdel(C)
else
user << "<span class='notice'>You can't mix cards from other decks.</span>"
if(cards.len > 26)
@@ -803,7 +803,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
cardUser.put_in_any_hand_if_possible(N)
cardUser << "<span class='notice'>You also take [currenthand[1]] and hold it.</span>"
cardUser << browse(null, "window=cardhand")
del(src)
qdel(src)
return
obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
@@ -819,7 +819,7 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living
src.icon_state = "[deckstyle]_hand4"
else if(currenthand.len > 2)
src.icon_state = "[deckstyle]_hand3"
del(C)
qdel(C)
else
user << "<span class='notice'>You can't mix cards from other decks.</span>"
@@ -890,8 +890,8 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
H.pickup(user)
user.put_in_active_hand(H)
user << "<span class='notice'>You combine the [C.cardname] and the [src.cardname] into a hand.</span>"
del(C)
del(src)
qdel(C)
qdel(src)
else
user << "<span class='notice'>You can't mix cards from other decks.</span>"
@@ -908,7 +908,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
H.icon_state = "[deckstyle]_hand4"
else if(H.currenthand.len > 2)
H.icon_state = "[deckstyle]_hand3"
del(src)
qdel(src)
else
user << "<span class='notice'>You can't mix cards from other decks.</span>"
@@ -1068,7 +1068,7 @@ obj/item/toy/cards/deck/syndicate/black
for(var/mob/M in range(10, src))
if(!M.stat && !istype(M, /mob/living/silicon/ai))\
shake_camera(M, 3, 1)
del(src)
qdel(src)
/*
* Carp plushie
@@ -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. *****************/
+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."
+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."
@@ -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))
+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
@@ -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
@@ -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)
+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()
@@ -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
/*
+3 -3
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)
@@ -458,4 +458,4 @@
A:prime()
if(istype(A,/obj/singularity)) // I can't emphasize enough how much you should never use this grenade
A:energy = 200
del src
qdel(src)
@@ -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
@@ -266,7 +266,7 @@
update_mob()
invisibility = INVISIBILITY_MAXIMUM //kaboom
del nadeassembly // do this now to stop infrared beams
qdel(nadeassembly) // do this now to stop infrared beams
var/end_temp = 0
for(var/obj/item/weapon/reagent_containers/glass/G in beakers)
G.reagents.trans_to(src, G.reagents.total_volume)
@@ -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
@@ -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)
@@ -8,6 +8,6 @@
prime()
..()
if(empulse(src, 4, 10))
del(src)
qdel(src)
return
@@ -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
@@ -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
@@ -31,5 +31,5 @@
B.health -= damage
B.update_icon()
sleep(80)
del(src)
qdel(src)
return
@@ -30,7 +30,7 @@
// Spawn some hostile syndicate critters
del(src)
qdel(src)
return
/obj/item/weapon/grenade/spawnergrenade/manhacks
@@ -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
@@ -552,7 +552,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
imp_in.put_in_hands(scanned)
else
scanned.loc = t
del src
qdel(src)
implanted(mob/source as mob)
src.activation_emote = input("Choose activation emote:") in list("blink", "blink_r", "eyebrow", "chuckle", "twitch_s", "frown", "nod", "blush", "giggle", "grin", "groan", "shrug", "smile", "pale", "sniff", "whimper", "wink")
@@ -84,7 +84,7 @@
return
var/mob/M = G:affecting
if(put_mob(M))
del(G)
qdel(G)
src.updateUsrDialog()
return
+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
@@ -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"
@@ -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
@@ -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).
@@ -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"
@@ -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
/*
@@ -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
@@ -65,7 +65,7 @@
if(allgases >= 0.005)
return 1
del(G)
qdel(G)
return
ui_action_click()
@@ -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)
..()
+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
+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
+1 -1
View File
@@ -11,7 +11,7 @@
..()
if (!prob(spawn_nothing_percentage))
spawn_item()
del src
qdel(src)
// this function should return a specific item to spawn
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/structure/blob_act()
if(prob(50))
del(src)
qdel(src)
/obj/structure/ex_act(severity)
switch(severity)
@@ -157,7 +157,7 @@
if(health <= 0)
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
del(src)
qdel(src)
return
/obj/structure/closet/attack_animal(mob/living/simple_animal/user as mob)
@@ -166,14 +166,14 @@
visible_message("\red [user] destroys the [src]. ")
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
del(src)
qdel(src)
// this should probably use dump_contents()
/obj/structure/closet/blob_act()
if(prob(75))
for(var/atom/movable/A as mob|obj in src)
A.loc = src.loc
del(src)
qdel(src)
/obj/structure/closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/rcs) && !src.opened)
@@ -254,7 +254,7 @@
new /obj/item/stack/sheet/metal(src.loc)
for(var/mob/M in viewers(src))
M.show_message("<span class='notice'>\The [src] has been cut apart by [user] with \the [WT].</span>", 3, "You hear welding.", 2)
del(src)
qdel(src)
return
if(isrobot(user))
return
@@ -41,7 +41,7 @@
desc = "If it takes forever, I will wait for you..."
if(health == 0) //meaning if the statue didn't find a valid target
del(src)
qdel(src)
return
processing_objects.Add(src)
@@ -57,7 +57,7 @@
if (timer <= 0)
dump_contents()
processing_objects.Remove(src)
del(src)
qdel(src)
/obj/structure/closet/statue/dump_contents()
@@ -151,7 +151,7 @@
user.dust()
dump_contents()
visible_message("\red [src] shatters!. ")
del(src)
qdel(src)
/obj/structure/statue
@@ -48,7 +48,7 @@
// teehee - Ah, tg coders...
if ("delete")
del(src)
qdel(src)
//If you want to re-add fire, just add "fire" = 15 to the pick list.
/*if ("fire")
@@ -160,7 +160,7 @@
return
user << "<span class='notice'>You rig [src].</span>"
user.drop_item()
del(W)
qdel(W)
rigged = 1
return
else if(istype(W, /obj/item/device/radio/electropack))
@@ -43,7 +43,7 @@
user.visible_message("<span class='notice'>[user] pries \the [src] open.</span>", \
"<span class='notice'>You pry open \the [src].</span>", \
"<span class='notice'>You hear splitting wood.</span>")
del(src)
qdel(src)
else
return attack_hand(user)
+1 -1
View File
@@ -17,7 +17,7 @@
/obj/structure/curtain/bullet_act(obj/item/projectile/P, def_zone)
if(!P.nodamage)
visible_message("<span class='warning'>[P] tears [src] down!</span>")
del(src)
qdel(src)
else
..(P, def_zone)
+5 -5
View File
@@ -19,7 +19,7 @@
if(istype(W, /obj/item/weapon/crowbar))
new /obj/machinery/constructable_frame/machine_frame(T)
new /obj/item/stack/sheet/glass(T)
del(src)
qdel(src)
playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1)
return
@@ -33,7 +33,7 @@
C.req_access = circuit.conf_access
C.req_one_access = null
playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1)
del(src)
qdel(src)
return
if(istype(W, /obj/item/weapon/crowbar))
circuit.loc=T
@@ -123,8 +123,8 @@
if (prob(75))
PoolOrNew(/obj/item/weapon/shard, loc)
if(occupant) dump()
del(src)
qdel(src)
/obj/structure/displaycase/proc/healthcheck()
if (src.health <= 0)
if (!( src.destroyed ))
@@ -194,7 +194,7 @@
C.loc=T
circuit=null
new /obj/machinery/constructable_frame/machine_frame(T)
del(src)
qdel(src)
if(user.a_intent == "harm")
src.health -= W.force
src.healthcheck()
@@ -174,7 +174,7 @@ obj/structure/door_assembly
if(!src || !WT.isOn()) return
user << "\blue You dissasembled the airlock assembly!"
new /obj/item/stack/sheet/metal(src.loc, 4)
del (src)
qdel(src)
else
user << "\blue You need more welding fuel."
return
@@ -290,7 +290,7 @@ obj/structure/door_assembly
else
door.name = "[istext(glass) ? "[glass] airlock" : base_name]"
src.electronics.loc = door
del(src)
qdel(src)
else
..()
update_state()
@@ -29,7 +29,7 @@
part.loc = loc
part.master = null
part = null
del(src)
qdel(src)
return
return
@@ -87,4 +87,3 @@
A.power_light = light
A.updateicon()
return
+15 -15
View File
@@ -15,14 +15,14 @@
if(!src) return
user << "\blue You dissasembled the girder!"
new /obj/item/stack/sheet/metal(get_turf(src))
del(src)
qdel(src)
else if(!anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
user << "\blue Now securing the girder"
if(get_turf(user, 40))
user << "\blue You secured the girder!"
new/obj/structure/girder( src.loc )
del(src)
qdel(src)
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
user << "\blue Now slicing apart the girder"
@@ -30,12 +30,12 @@
if(!src) return
user << "\blue You slice apart the girder!"
new /obj/item/stack/sheet/metal(get_turf(src))
del(src)
qdel(src)
else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill))
user << "\blue You drill through the girder!"
new /obj/item/stack/sheet/metal(get_turf(src))
del(src)
qdel(src)
else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
@@ -52,7 +52,7 @@
if(!src) return
user << "\blue You removed the support struts!"
new/obj/structure/girder( src.loc )
del(src)
qdel(src)
else if(istype(W, /obj/item/weapon/crowbar) && state == 0 && anchored )
playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
@@ -61,7 +61,7 @@
if(!src) return
user << "\blue You dislodged the girder!"
new/obj/structure/girder/displaced( src.loc )
del(src)
qdel(src)
else if(istype(W, /obj/item/stack/sheet))
@@ -74,7 +74,7 @@
S.use(2)
user << "\blue You create a false wall! Push on it to open or close the passage."
new /obj/structure/falsewall (src.loc)
del(src)
qdel(src)
else
if(S.amount < 2) return ..()
user << "\blue Now adding plating..."
@@ -86,7 +86,7 @@
Tsrc.ChangeTurf(/turf/simulated/wall)
for(var/turf/simulated/wall/X in Tsrc.loc)
if(X) X.add_hiddenprint(usr)
del(src)
qdel(src)
return
if(/obj/item/stack/sheet/plasteel)
@@ -95,7 +95,7 @@
S.use(2)
user << "\blue You create a false wall! Push on it to open or close the passage."
new /obj/structure/falsewall/reinforced (src.loc)
del(src)
qdel(src)
else
if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code...
if(S.amount < 1) return ..()
@@ -108,7 +108,7 @@
Tsrc.ChangeTurf(/turf/simulated/wall/r_wall)
for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
if(X) X.add_hiddenprint(usr)
del(src)
qdel(src)
return
else
if(S.amount < 1) return ..()
@@ -118,7 +118,7 @@
S.use(1)
user << "\blue Girders reinforced!"
new/obj/structure/girder/reinforced( src.loc )
del(src)
qdel(src)
return
if(S.sheettype)
@@ -129,7 +129,7 @@
user << "\blue You create a false wall! Push on it to open or close the passage."
var/F = text2path("/obj/structure/falsewall/[M]")
new F (src.loc)
del(src)
qdel(src)
else
if(S.amount < 2) return ..()
user << "\blue Now adding plating..."
@@ -141,7 +141,7 @@
Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]"))
for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
if(X) X.add_hiddenprint(usr)
del(src)
qdel(src)
return
add_hiddenprint(usr)
@@ -157,7 +157,7 @@
/obj/structure/girder/blob_act()
if(prob(40))
del(src)
qdel(src)
/obj/structure/girder/bullet_act(var/obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/beam))
@@ -165,7 +165,7 @@
..()
if(health <= 0)
new /obj/item/stack/sheet/metal(get_turf(src))
del(src)
qdel(src)
if(istype(Proj ,/obj/item/projectile/beam/pulse))
src.ex_act(2)
+7 -7
View File
@@ -11,7 +11,7 @@
var/obj/structure/inflatable/R = new /obj/structure/inflatable(user.loc)
src.transfer_fingerprints_to(R)
R.add_fingerprint(user)
del(src)
qdel(src)
/obj/structure/inflatable
name = "inflatable wall"
@@ -48,7 +48,7 @@
ex_act(severity)
switch(severity)
if(1.0)
del(src)
qdel(src)
return
if(2.0)
deflate(1)
@@ -118,14 +118,14 @@
visible_message("[src] rapidly deflates!")
var/obj/item/inflatable/torn/R = new /obj/item/inflatable/torn(loc)
src.transfer_fingerprints_to(R)
del(src)
qdel(src)
else
//user << "\blue You slowly deflate the inflatable wall."
visible_message("[src] slowly deflates.")
spawn(50)
var/obj/item/inflatable/R = new /obj/item/inflatable(loc)
src.transfer_fingerprints_to(R)
del(src)
qdel(src)
verb/hand_deflate()
set name = "Deflate"
@@ -149,7 +149,7 @@
var/obj/structure/inflatable/door/R = new /obj/structure/inflatable/door(user.loc)
src.transfer_fingerprints_to(R)
R.add_fingerprint(user)
del(src)
qdel(src)
/obj/structure/inflatable/door //Based on mineral door code
name = "inflatable door"
@@ -242,14 +242,14 @@
visible_message("[src] rapidly deflates!")
var/obj/item/inflatable/door/torn/R = new /obj/item/inflatable/door/torn(loc)
src.transfer_fingerprints_to(R)
del(src)
qdel(src)
else
//user << "\blue You slowly deflate the inflatable wall."
visible_message("[src] slowly deflates.")
spawn(50)
var/obj/item/inflatable/door/R = new /obj/item/inflatable/door(loc)
src.transfer_fingerprints_to(R)
del(src)
qdel(src)
/obj/item/inflatable/torn
@@ -20,8 +20,8 @@
else
if(spike(G.affecting))
visible_message("<span class = 'danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>")
del(G.affecting)
del(G)
qdel(G.affecting)
qdel(G)
else
user << "<span class='danger'>They are too big for the spike, try something smaller!</span>"
+1 -1
View File
@@ -60,7 +60,7 @@
if(WT.remove_fuel(0, user))
user << "\blue Slicing lattice joints ..."
new /obj/item/stack/rods(src.loc)
del(src)
qdel(src)
return
@@ -243,7 +243,7 @@
if(!devastated)
for(var/i = 1, i <= oreAmount, i++)
new/obj/item/stack/sheet/wood(get_turf(src))
del(src)
qdel(src)
/obj/structure/mineral_door/resin
mineralType = "resin"
@@ -281,7 +281,7 @@
isSwitchingStates = 0
Dismantle(devastated = 0)
del(src)
qdel(src)
CheckHardness()
playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
+10 -10
View File
@@ -81,7 +81,7 @@
A.loc = src
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
//src.connected = null
del(src.connected)
qdel(src.connected)
else
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
src.connected = new /obj/structure/m_tray( src.loc )
@@ -97,7 +97,7 @@
src.connected.dir = src.dir
else
//src.connected = null
del(src.connected)
qdel(src.connected)
src.add_fingerprint(user)
update()
return
@@ -135,7 +135,7 @@
src.connected.icon_state = "morguet"
else
//src.connected = null
del(src.connected)
qdel(src.connected)
return
@@ -164,7 +164,7 @@
src.connected.update()
add_fingerprint(user)
//SN src = null
del(src)
qdel(src)
return
return
@@ -253,7 +253,7 @@
A.loc = src
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
//src.connected = null
del(src.connected)
qdel(src.connected)
else if (src.locked == 0)
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
src.connected = new /obj/structure/c_tray( src.loc )
@@ -268,7 +268,7 @@
src.connected.icon_state = "cremat"
else
//src.connected = null
del(src.connected)
qdel(src.connected)
src.add_fingerprint(user)
update()
@@ -303,7 +303,7 @@
src.connected.icon_state = "cremat"
else
//src.connected = null
del(src.connected)
qdel(src.connected)
return
/obj/structure/crematorium/proc/cremate(atom/A, mob/user as mob)
@@ -341,10 +341,10 @@
//log_attack("\[[time_stamp()]\] <b>[user]/[user.ckey]</b> cremated <b>[M]/[M.ckey]</b>")
M.death(1)
M.ghostize()
del(M)
qdel(M)
for(var/obj/O in contents) //obj instead of obj/item so that bodybags and ashes get destroyed. We dont want tons and tons of ash piling up
del(O)
qdel(O)
new /obj/effect/decal/cleanable/ash(src)
sleep(30)
@@ -379,7 +379,7 @@
src.connected.update()
add_fingerprint(user)
//SN src = null
del(src)
qdel(src)
return
return
+2 -2
View File
@@ -33,7 +33,7 @@
//var/icon/I = icon('icons/obj/decals.dmi', icon_state)
//S.icon = I.Scale(24, 24)
S.sign_state = icon_state
del(src)
qdel(src)
else ..()
/obj/item/sign
@@ -62,7 +62,7 @@
S.desc = desc
S.icon_state = sign_state
user << "You fasten \the [S] with your [tool]."
del(src)
qdel(src)
else ..()
/obj/structure/sign/double/map
@@ -80,5 +80,5 @@
/obj/structure/stool/bed/nest/proc/healthcheck()
if(health <=0)
density = 0
del(src)
qdel(src)
return
@@ -42,7 +42,7 @@
/obj/structure/stool/bed/attack_animal(var/mob/living/simple_animal/M)//No more buckling hostile mobs to chairs to render them immobile forever
if(M.environment_smash)
new /obj/item/stack/sheet/metal(src.loc)
del(src)
qdel(src)
/obj/structure/stool/bed/MouseDrop_T(mob/M as mob, mob/user as mob)
@@ -133,7 +133,7 @@
visible_message("[user] collapses \the [src.name].")
new/obj/item/roller(get_turf(src))
spawn(0)
del(src)
qdel(src)
return
..()
@@ -147,7 +147,7 @@
/obj/item/roller/attack_self(mob/user)
var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
R.add_fingerprint(user)
del(src)
qdel(src)
/obj/item/roller/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
@@ -181,7 +181,7 @@
user << "\blue You deploy the roller bed."
var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc)
R.add_fingerprint(user)
del(held)
qdel(held)
held = null
@@ -223,5 +223,5 @@
visible_message("[usr] collapses \the [src.name]")
new/obj/item/roller(get_turf(src))
spawn(0)
del(src)
qdel(src)
return
@@ -30,7 +30,7 @@
E.part = SK
SK.loc = E
SK.master = E
del(src)
qdel(src)
/obj/structure/stool/bed/chair/attack_tk(mob/user as mob)
if(buckled_mob)
@@ -89,7 +89,7 @@
if(istype(W, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
new /obj/item/stack/sheet/wood(src.loc)
del(src)
qdel(src)
else
..()
@@ -24,13 +24,13 @@
/obj/structure/stool/blob_act()
if(prob(75))
new /obj/item/stack/sheet/metal(src.loc)
del(src)
qdel(src)
/obj/structure/stool/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/wrench))
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
new /obj/item/stack/sheet/metal(src.loc)
del(src)
qdel(src)
return
/obj/structure/stool/MouseDrop(atom/over_object)
@@ -58,7 +58,7 @@
origin.loc = get_turf(src)
user.unEquip(src)
user.visible_message("\blue [user] puts [src] down.", "\blue You put [src] down.")
del src
qdel(src)
/obj/item/weapon/stool/attack(mob/M as mob, mob/user as mob)
if (prob(5) && istype(M,/mob/living))
@@ -66,7 +66,7 @@
user.unEquip(src)
var/obj/item/stack/sheet/metal/m = new/obj/item/stack/sheet/metal
m.loc = get_turf(src)
del src
qdel(src)
var/mob/living/T = M
T.Weaken(5)
return
+3 -3
View File
@@ -171,7 +171,7 @@
/obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up
overlays.Cut() //once it's been on for a while, in addition to handling the water overlay.
if(mymist)
del(mymist)
qdel(mymist)
if(on)
overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
@@ -190,7 +190,7 @@
mymist = new /obj/effect/mist(loc)
spawn(250)
if(src && !on)
del(mymist)
qdel(mymist)
ismist = 0
/obj/machinery/shower/Crossed(atom/movable/O)
@@ -300,7 +300,7 @@
loc.clean_blood()
for(var/obj/effect/E in tile)
if(istype(E,/obj/effect/rune) || istype(E,/obj/effect/decal/cleanable) || istype(E,/obj/effect/overlay))
del(E)
qdel(E)
/obj/machinery/shower/process()
if(!on || !mobpresent) return
+2 -2
View File
@@ -171,7 +171,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
if(istype(G.affecting,/mob/living))
var/mob/living/M = G.affecting
var/state = G.state
del(W) //gotta delete it here because if window breaks, it won't get deleted
qdel(W) //gotta delete it here because if window breaks, it won't get deleted
switch (state)
if(1)
M.visible_message("<span class='warning'>[user] slams [M] against \the [src]!</span>")
@@ -241,7 +241,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
density = 0
air_update_turf(1)
update_nearby_icons()
del(src)
qdel(src)
else
if(W.damtype == BRUTE || W.damtype == BURN)
user.changeNext_move(CLICK_CD_MELEE)