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
+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