mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
qdel
This commit is contained in:
@@ -294,5 +294,5 @@
|
|||||||
if(stored_material[mat] > S.perunit)
|
if(stored_material[mat] > S.perunit)
|
||||||
S.amount = round(stored_material[mat] / S.perunit)
|
S.amount = round(stored_material[mat] / S.perunit)
|
||||||
else
|
else
|
||||||
del(S)
|
qdel(S)
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
/obj/item/frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
/obj/item/frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||||
if (istype(W, /obj/item/weapon/wrench))
|
if (istype(W, /obj/item/weapon/wrench))
|
||||||
new refund_type( get_turf(src.loc), refund_amt)
|
new refund_type( get_turf(src.loc), refund_amt)
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
|
|
||||||
@@ -43,7 +43,7 @@
|
|||||||
M.fingerprints = src.fingerprints
|
M.fingerprints = src.fingerprints
|
||||||
M.fingerprintshidden = src.fingerprintshidden
|
M.fingerprintshidden = src.fingerprintshidden
|
||||||
M.fingerprintslast = src.fingerprintslast
|
M.fingerprintslast = src.fingerprintslast
|
||||||
del(src)
|
qdel(src)
|
||||||
|
|
||||||
/obj/item/frame/fire_alarm
|
/obj/item/frame/fire_alarm
|
||||||
name = "fire alarm frame"
|
name = "fire alarm frame"
|
||||||
|
|||||||
@@ -140,7 +140,7 @@
|
|||||||
if(wall_fake)
|
if(wall_fake)
|
||||||
T.can_open = 1
|
T.can_open = 1
|
||||||
T.add_hiddenprint(usr)
|
T.add_hiddenprint(usr)
|
||||||
del(src)
|
qdel(src)
|
||||||
return
|
return
|
||||||
|
|
||||||
else if(istype(W, /obj/item/pipe))
|
else if(istype(W, /obj/item/pipe))
|
||||||
@@ -236,7 +236,7 @@
|
|||||||
|
|
||||||
/obj/structure/girder/cult/dismantle()
|
/obj/structure/girder/cult/dismantle()
|
||||||
new /obj/effect/decal/remains/human(get_turf(src))
|
new /obj/effect/decal/remains/human(get_turf(src))
|
||||||
del(src)
|
qdel(src)
|
||||||
|
|
||||||
/obj/structure/girder/cult/attackby(obj/item/W as obj, mob/user as mob)
|
/obj/structure/girder/cult/attackby(obj/item/W as obj, mob/user as mob)
|
||||||
if(istype(W, /obj/item/weapon/wrench))
|
if(istype(W, /obj/item/weapon/wrench))
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
if(istype(M))
|
if(istype(M))
|
||||||
for(var/i = (devastated? 1 : 3), i <= oreAmount, i++)
|
for(var/i = (devastated? 1 : 3), i <= oreAmount, i++)
|
||||||
new M.stack_type(get_turf(src))
|
new M.stack_type(get_turf(src))
|
||||||
del(src)
|
qdel(src)
|
||||||
|
|
||||||
ex_act(severity = 1)
|
ex_act(severity = 1)
|
||||||
switch(severity)
|
switch(severity)
|
||||||
|
|||||||
@@ -104,7 +104,7 @@
|
|||||||
user << "<span class='notice'>You burn away the fungi with \the [WT].</span>"
|
user << "<span class='notice'>You burn away the fungi with \the [WT].</span>"
|
||||||
playsound(src, 'sound/items/Welder.ogg', 10, 1)
|
playsound(src, 'sound/items/Welder.ogg', 10, 1)
|
||||||
for(var/obj/effect/overlay/wallrot/WR in src)
|
for(var/obj/effect/overlay/wallrot/WR in src)
|
||||||
del(WR)
|
qdel(WR)
|
||||||
return
|
return
|
||||||
else if(!is_sharp(W) && W.force >= 10 || W.force >= 20)
|
else if(!is_sharp(W) && W.force >= 10 || W.force >= 20)
|
||||||
user << "<span class='notice'>\The [src] crumbles away under the force of your [W.name].</span>"
|
user << "<span class='notice'>\The [src] crumbles away under the force of your [W.name].</span>"
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ var/list/global/wall_cache = list()
|
|||||||
|
|
||||||
/turf/simulated/wall/proc/clear_plants()
|
/turf/simulated/wall/proc/clear_plants()
|
||||||
for(var/obj/effect/overlay/wallrot/WR in src)
|
for(var/obj/effect/overlay/wallrot/WR in src)
|
||||||
del(WR)
|
qdel(WR)
|
||||||
for(var/obj/effect/plant/plant in range(src, 1))
|
for(var/obj/effect/plant/plant in range(src, 1))
|
||||||
if(!plant.floor) //shrooms drop to the floor
|
if(!plant.floor) //shrooms drop to the floor
|
||||||
plant.floor = 1
|
plant.floor = 1
|
||||||
@@ -215,7 +215,8 @@ var/list/global/wall_cache = list()
|
|||||||
user << "<span class='warning'>The thermite starts melting through the wall.</span>"
|
user << "<span class='warning'>The thermite starts melting through the wall.</span>"
|
||||||
|
|
||||||
spawn(100)
|
spawn(100)
|
||||||
if(O) del(O)
|
if(O)
|
||||||
|
qdel(O)
|
||||||
// F.sd_LumReset() //TODO: ~Carn
|
// F.sd_LumReset() //TODO: ~Carn
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -270,60 +270,3 @@
|
|||||||
desc = "A set of implantable lenses designed to augment your vision"
|
desc = "A set of implantable lenses designed to augment your vision"
|
||||||
icon_state = "thermalimplants"
|
icon_state = "thermalimplants"
|
||||||
item_state = "syringe_kit"
|
item_state = "syringe_kit"
|
||||||
|
|
||||||
/* These do not currently work, commenting out pending fixes.
|
|
||||||
/obj/item/clothing/glasses/minerals
|
|
||||||
name = "resonance scanners"
|
|
||||||
desc = "A set of goggles geared towards detecting different concentrations of minerals."
|
|
||||||
icon_state = "material"
|
|
||||||
item_state = "glasses"
|
|
||||||
icon_action_button = "action_material"
|
|
||||||
toggleable = 1
|
|
||||||
active = 0
|
|
||||||
|
|
||||||
var/mob/living/carbon/human/wearer
|
|
||||||
var/list/ore_nodes = list()
|
|
||||||
|
|
||||||
/obj/item/clothing/glasses/minerals/New()
|
|
||||||
..()
|
|
||||||
if(!active)
|
|
||||||
icon_state = off_state
|
|
||||||
processing_objects |= src
|
|
||||||
|
|
||||||
/obj/item/clothing/glasses/minerals/Del()
|
|
||||||
processing_objects -= src
|
|
||||||
..()
|
|
||||||
|
|
||||||
/obj/item/clothing/glasses/minerals/equipped(var/mob/living/carbon/human/M)
|
|
||||||
..()
|
|
||||||
remove_ore_images()
|
|
||||||
wearer = null
|
|
||||||
if(istype(M) && M.glasses == src)
|
|
||||||
wearer = M
|
|
||||||
|
|
||||||
/obj/item/clothing/glasses/minerals/dropped()
|
|
||||||
..()
|
|
||||||
remove_ore_images()
|
|
||||||
wearer = null
|
|
||||||
|
|
||||||
/obj/item/clothing/glasses/minerals/process()
|
|
||||||
remove_ore_images()
|
|
||||||
if(active)
|
|
||||||
if(!wearer || wearer.glasses != src)
|
|
||||||
return
|
|
||||||
for(var/obj/effect/mineral/M in range(wearer,6))
|
|
||||||
// Maybe make a cache for this so multiple miners aren't spawning copies.
|
|
||||||
ore_nodes |= M.get_scan_overlay()
|
|
||||||
if(wearer.client)
|
|
||||||
wearer.client.images |= ore_nodes
|
|
||||||
|
|
||||||
/obj/item/clothing/glasses/minerals/proc/remove_ore_images()
|
|
||||||
if(!ore_nodes)
|
|
||||||
ore_nodes = list()
|
|
||||||
if(ore_nodes.len)
|
|
||||||
if(wearer && wearer.client)
|
|
||||||
for(var/image/I in ore_nodes)
|
|
||||||
wearer.client.images -= I
|
|
||||||
del(I)
|
|
||||||
ore_nodes.Cut()
|
|
||||||
*/
|
|
||||||
@@ -154,7 +154,7 @@
|
|||||||
if(!isnull(ores_stored[O.material]))
|
if(!isnull(ores_stored[O.material]))
|
||||||
ores_stored[O.material]++
|
ores_stored[O.material]++
|
||||||
|
|
||||||
del(O)
|
qdel(O)
|
||||||
|
|
||||||
if(!active)
|
if(!active)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -236,7 +236,7 @@
|
|||||||
|
|
||||||
/turf/simulated/mineral/proc/clear_ore_effects()
|
/turf/simulated/mineral/proc/clear_ore_effects()
|
||||||
for(var/obj/effect/mineral/M in contents)
|
for(var/obj/effect/mineral/M in contents)
|
||||||
del(M)
|
qdel(M)
|
||||||
|
|
||||||
/turf/simulated/mineral/proc/DropMineral()
|
/turf/simulated/mineral/proc/DropMineral()
|
||||||
if(!mineral)
|
if(!mineral)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
/mob/living/carbon/process_resist()
|
/mob/living/carbon/process_resist()
|
||||||
|
|
||||||
//drop && roll
|
//drop && roll
|
||||||
if(on_fire)
|
if(on_fire)
|
||||||
fire_stacks -= 2 //reduced
|
fire_stacks -= 2 //reduced
|
||||||
@@ -18,34 +18,34 @@
|
|||||||
)
|
)
|
||||||
ExtinguishMob()
|
ExtinguishMob()
|
||||||
return
|
return
|
||||||
|
|
||||||
if(handcuffed)
|
if(handcuffed)
|
||||||
spawn() escape_handcuffs()
|
spawn() escape_handcuffs()
|
||||||
else if(legcuffed)
|
else if(legcuffed)
|
||||||
spawn() escape_legcuffs()
|
spawn() escape_legcuffs()
|
||||||
|
|
||||||
..()
|
..()
|
||||||
|
|
||||||
/mob/living/carbon/proc/escape_handcuffs()
|
/mob/living/carbon/proc/escape_handcuffs()
|
||||||
if(!(last_special <= world.time)) return
|
if(!(last_special <= world.time)) return
|
||||||
|
|
||||||
next_move = world.time + 100
|
next_move = world.time + 100
|
||||||
last_special = world.time + 100
|
last_special = world.time + 100
|
||||||
|
|
||||||
if(can_break_cuffs()) //Don't want to do a lot of logic gating here.
|
if(can_break_cuffs()) //Don't want to do a lot of logic gating here.
|
||||||
break_handcuffs()
|
break_handcuffs()
|
||||||
return
|
return
|
||||||
|
|
||||||
var/obj/item/weapon/handcuffs/HC = handcuffed
|
var/obj/item/weapon/handcuffs/HC = handcuffed
|
||||||
|
|
||||||
//A default in case you are somehow handcuffed with something that isn't an obj/item/weapon/handcuffs type
|
//A default in case you are somehow handcuffed with something that isn't an obj/item/weapon/handcuffs type
|
||||||
var/breakouttime = 1200
|
var/breakouttime = 1200
|
||||||
var/displaytime = 2 //Minutes to display in the "this will take X minutes."
|
var/displaytime = 2 //Minutes to display in the "this will take X minutes."
|
||||||
//If you are handcuffed with actual handcuffs... Well what do I know, maybe someone will want to handcuff you with toilet paper in the future...
|
//If you are handcuffed with actual handcuffs... Well what do I know, maybe someone will want to handcuff you with toilet paper in the future...
|
||||||
if(istype(HC))
|
if(istype(HC))
|
||||||
breakouttime = HC.breakouttime
|
breakouttime = HC.breakouttime
|
||||||
displaytime = breakouttime / 600 //Minutes
|
displaytime = breakouttime / 600 //Minutes
|
||||||
|
|
||||||
visible_message(
|
visible_message(
|
||||||
"<span class='danger'>[src] attempts to remove \the [HC]!</span>",
|
"<span class='danger'>[src] attempts to remove \the [HC]!</span>",
|
||||||
"<span class='warning'>You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)</span>"
|
"<span class='warning'>You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)</span>"
|
||||||
@@ -62,7 +62,7 @@
|
|||||||
|
|
||||||
/mob/living/carbon/proc/escape_legcuffs()
|
/mob/living/carbon/proc/escape_legcuffs()
|
||||||
if(!(last_special <= world.time)) return
|
if(!(last_special <= world.time)) return
|
||||||
|
|
||||||
next_move = world.time + 100
|
next_move = world.time + 100
|
||||||
last_special = world.time + 100
|
last_special = world.time + 100
|
||||||
|
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
var/obj/item/weapon/legcuffs/HC = legcuffed
|
var/obj/item/weapon/legcuffs/HC = legcuffed
|
||||||
|
|
||||||
//A default in case you are somehow legcuffed with something that isn't an obj/item/weapon/legcuffs type
|
//A default in case you are somehow legcuffed with something that isn't an obj/item/weapon/legcuffs type
|
||||||
var/breakouttime = 1200
|
var/breakouttime = 1200
|
||||||
var/displaytime = 2 //Minutes to display in the "this will take X minutes."
|
var/displaytime = 2 //Minutes to display in the "this will take X minutes."
|
||||||
@@ -79,20 +79,20 @@
|
|||||||
if(istype(HC))
|
if(istype(HC))
|
||||||
breakouttime = HC.breakouttime
|
breakouttime = HC.breakouttime
|
||||||
displaytime = breakouttime / 600 //Minutes
|
displaytime = breakouttime / 600 //Minutes
|
||||||
|
|
||||||
visible_message(
|
visible_message(
|
||||||
"<span class='danger'>[usr] attempts to remove \the [HC]!</span>",
|
"<span class='danger'>[usr] attempts to remove \the [HC]!</span>",
|
||||||
"<span class='warning'>You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)</span>"
|
"<span class='warning'>You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)</span>"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(do_after(src, breakouttime))
|
if(do_after(src, breakouttime))
|
||||||
if(!legcuffed || buckled)
|
if(!legcuffed || buckled)
|
||||||
return
|
return
|
||||||
visible_message(
|
visible_message(
|
||||||
"<span class='danger'>[src] manages to remove \the [legcuffed]!</span>",
|
"<span class='danger'>[src] manages to remove \the [legcuffed]!</span>",
|
||||||
"<span class='notice'>You successfully remove \the [legcuffed].</span>"
|
"<span class='notice'>You successfully remove \the [legcuffed].</span>"
|
||||||
)
|
)
|
||||||
|
|
||||||
drop_from_inventory(legcuffed)
|
drop_from_inventory(legcuffed)
|
||||||
legcuffed = null
|
legcuffed = null
|
||||||
update_inv_legcuffed()
|
update_inv_legcuffed()
|
||||||
@@ -106,18 +106,18 @@
|
|||||||
"<span class='danger'>[src] is trying to break \the [handcuffed]!</span>",
|
"<span class='danger'>[src] is trying to break \the [handcuffed]!</span>",
|
||||||
"<span class='warning'>You attempt to break your [handcuffed.name]. (This will take around 5 seconds and you need to stand still)</span>"
|
"<span class='warning'>You attempt to break your [handcuffed.name]. (This will take around 5 seconds and you need to stand still)</span>"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(do_after(src, 50))
|
if(do_after(src, 50))
|
||||||
if(!handcuffed || buckled)
|
if(!handcuffed || buckled)
|
||||||
return
|
return
|
||||||
|
|
||||||
visible_message(
|
visible_message(
|
||||||
"<span class='danger'>[src] manages to break \the [handcuffed]!</span>",
|
"<span class='danger'>[src] manages to break \the [handcuffed]!</span>",
|
||||||
"<span class='warning'>You successfully break your [handcuffed.name].</span>"
|
"<span class='warning'>You successfully break your [handcuffed.name].</span>"
|
||||||
)
|
)
|
||||||
|
|
||||||
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
|
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
|
||||||
|
|
||||||
del(handcuffed)
|
del(handcuffed)
|
||||||
handcuffed = null
|
handcuffed = null
|
||||||
if(buckled && buckled.buckle_require_restraints)
|
if(buckled && buckled.buckle_require_restraints)
|
||||||
@@ -131,14 +131,14 @@
|
|||||||
if(do_after(src, 50))
|
if(do_after(src, 50))
|
||||||
if(!legcuffed || buckled)
|
if(!legcuffed || buckled)
|
||||||
return
|
return
|
||||||
|
|
||||||
visible_message(
|
visible_message(
|
||||||
"<span class='danger'>[src] manages to break the legcuffs!</span>",
|
"<span class='danger'>[src] manages to break the legcuffs!</span>",
|
||||||
"<span class='warning'>You successfully break your legcuffs.</span>"
|
"<span class='warning'>You successfully break your legcuffs.</span>"
|
||||||
)
|
)
|
||||||
|
|
||||||
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
|
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
|
||||||
|
|
||||||
del(legcuffed)
|
del(legcuffed)
|
||||||
legcuffed = null
|
legcuffed = null
|
||||||
update_inv_legcuffed()
|
update_inv_legcuffed()
|
||||||
|
|||||||
Reference in New Issue
Block a user