diff --git a/code/ATMOSPHERICS/pipes.dm b/code/ATMOSPHERICS/pipes.dm
index c2cfa133de1..f035e75c5da 100644
--- a/code/ATMOSPHERICS/pipes.dm
+++ b/code/ATMOSPHERICS/pipes.dm
@@ -1232,32 +1232,9 @@
if(istype(W, /obj/item/device/pipe_painter))
return
- if(istype(W, /obj/item/device/analyzer) && in_range(user, src))
- for (var/mob/O in viewers(user, null))
- O << "\red [user] has used the analyzer on \icon[icon]"
-
- var/pressure = parent.air.return_pressure()
- var/total_moles = parent.air.total_moles()
-
- user << "\blue Results of analysis of \icon[icon]"
- if (total_moles>0)
- var/o2_concentration = parent.air.oxygen/total_moles
- var/n2_concentration = parent.air.nitrogen/total_moles
- var/co2_concentration = parent.air.carbon_dioxide/total_moles
- var/toxins_concentration = parent.air.toxins/total_moles
-
- var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+toxins_concentration)
-
- user << "\blue Pressure: [round(pressure,0.1)] kPa"
- user << "\blue Nitrogen: [round(n2_concentration*100)]%"
- user << "\blue Oxygen: [round(o2_concentration*100)]%"
- user << "\blue CO2: [round(co2_concentration*100)]%"
- user << "\blue Toxins: [round(toxins_concentration*100)]%"
- if(unknown_concentration>0.01)
- user << "\red Unknown: [round(unknown_concentration*100)]%"
- user << "\blue Temperature: [round(parent.air.temperature-T0C)]°C"
- else
- user << "\blue Tank is empty!"
+ if(istype(W, /obj/item/device/analyzer))
+ atmosanalyzer_scan(parent.air, user)
+ return
/obj/machinery/atmospherics/pipe/tank/air
name = "Pressure Tank (Air)"
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
index 9e2b19b17a5..17a35c9ba7d 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -331,7 +331,32 @@ Turf and target are seperate in case you want to teleport some distance from a t
/proc/format_frequency(var/f)
return "[round(f / 10)].[f % 10]"
+/obj/proc/atmosanalyzer_scan(var/datum/gas_mixture/air_contents, mob/user, var/obj/target = src)
+ var/obj/icon = target
+ user.visible_message("[user] has used the analyzer on \icon[icon] [target].", "You use the analyzer on \icon[icon] [target].")
+ var/pressure = air_contents.return_pressure()
+ var/total_moles = air_contents.total_moles()
+ user << "Results of analysis of \icon[icon] [target]."
+ if(total_moles>0)
+ var/o2_concentration = air_contents.oxygen/total_moles
+ var/n2_concentration = air_contents.nitrogen/total_moles
+ var/co2_concentration = air_contents.carbon_dioxide/total_moles
+ var/plasma_concentration = air_contents.toxins/total_moles
+
+ var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
+
+ user << "Pressure: [round(pressure,0.1)] kPa"
+ user << "Nitrogen: [round(n2_concentration*100)] %"
+ user << "Oxygen: [round(o2_concentration*100)] %"
+ user << "CO2: [round(co2_concentration*100)] %"
+ user << "Plasma: [round(plasma_concentration*100)] %"
+ if(unknown_concentration>0.01)
+ user << "Unknown: [round(unknown_concentration*100)] %"
+ user << "Temperature: [round(air_contents.temperature-T0C)] °C"
+ else
+ user << "[target] is empty!"
+ return
//This will update a mob's name, real_name, mind.name, data_core records, pda and id
//Calling this proc without an oldname will only update the mob and skip updating the pda, id and records ~Carn
diff --git a/code/datums/martial.dm b/code/datums/martial.dm
index cfcca8d0a69..7c6bac1a89a 100644
--- a/code/datums/martial.dm
+++ b/code/datums/martial.dm
@@ -344,7 +344,7 @@
D.emote("scream")
D.drop_item()
D.apply_damage(5, BRUTE, pick("l_arm", "r_arm"))
- D.Stun(2)
+ D.Stun(1)
return 1
return basic_hit(A,D)
@@ -361,10 +361,10 @@
/datum/martial_art/the_sleeping_carp/proc/kneeStomach(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
if(!D.stat && !D.weakened)
D.visible_message("[A] knees [D] in the stomach!", \
- "[A] winds you with a knee in the stomach!")
+ "[A] winds you with a knee in the stomach!")
D.audible_message("[D] gags!")
D.losebreath += 3
- D.Stun(1)
+ D.Stun(2)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
return 1
return basic_hit(A,D)
diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm
index 1be7ef4b3c3..1e6ce7e1253 100644
--- a/code/game/machinery/atmoalter/portable_atmospherics.dm
+++ b/code/game/machinery/atmoalter/portable_atmospherics.dm
@@ -91,7 +91,6 @@
return 1
/obj/machinery/portable_atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
- var/obj/icon = src
if ((istype(W, /obj/item/weapon/tank) && !( src.destroyed )))
if (src.holding)
return
@@ -123,32 +122,6 @@
return
else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
- visible_message("\red [user] has used [W] on \icon[icon]")
- if(air_contents)
- var/pressure = air_contents.return_pressure()
- var/total_moles = air_contents.total_moles()
-
- user << "\blue Results of analysis of \icon[icon]"
- if (total_moles>0)
- var/o2_concentration = air_contents.oxygen/total_moles
- var/n2_concentration = air_contents.nitrogen/total_moles
- var/co2_concentration = air_contents.carbon_dioxide/total_moles
- var/plasma_concentration = air_contents.toxins/total_moles
-
- var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-
- user << "\blue Pressure: [round(pressure,0.1)] kPa"
- user << "\blue Nitrogen: [round(n2_concentration*100)]%"
- user << "\blue Oxygen: [round(o2_concentration*100)]%"
- user << "\blue CO2: [round(co2_concentration*100)]%"
- user << "\blue Plasma: [round(plasma_concentration*100)]%"
- if(unknown_concentration>0.01)
- user << "\red Unknown: [round(unknown_concentration*100)]%"
- user << "\blue Temperature: [round(air_contents.temperature-T0C)]°C"
- else
- user << "\blue Tank is empty!"
- else
- user << "\blue Tank is empty!"
- return
+ atmosanalyzer_scan(air_contents, user)
return
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index bc161a5d70e..c0a5bce63b2 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -1178,62 +1178,21 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(5)
JFLOG("[user] used the air analysis scanner on [A]")
- if((istype(A, /obj/item/weapon/tank)) || (istype(A, /obj/machinery/portable_atmospherics)))
- var/obj/icon = A
- for (var/mob/O in viewers(user, null))
- O << "\red [user] has used [src] on \icon[icon] [A]"
- var/pressure = A:air_contents.return_pressure()
-
- var/total_moles = A:air_contents.total_moles()
-
- user << "\blue Results of analysis of \icon[icon]"
- if (total_moles>0)
- var/o2_concentration = A:air_contents.oxygen/total_moles
- var/n2_concentration = A:air_contents.nitrogen/total_moles
- var/co2_concentration = A:air_contents.carbon_dioxide/total_moles
- var/plasma_concentration = A:air_contents.toxins/total_moles
-
- var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-
- user << "\blue Pressure: [round(pressure,0.1)] kPa"
- user << "\blue Nitrogen: [round(n2_concentration*100)]%"
- user << "\blue Oxygen: [round(o2_concentration*100)]%"
- user << "\blue CO2: [round(co2_concentration*100)]%"
- user << "\blue Plasma: [round(plasma_concentration*100)]%"
- if(unknown_concentration>0.01)
- user << "\red Unknown: [round(unknown_concentration*100)]%"
- user << "\blue Temperature: [round(A:air_contents.temperature-T0C)]°C"
- else
- user << "\blue Tank is empty!"
-
- if (istype(A, /obj/machinery/atmospherics/pipe/tank))
- var/obj/icon = A
- var/obj/machinery/atmospherics/pipe/tank/T = A
- for (var/mob/O in viewers(user, null))
- O << "\red [user] has used [src] on \icon[icon] [T]"
-
- var/pressure = T.parent.air.return_pressure()
- var/total_moles = T.parent.air.total_moles()
-
- user << "\blue Results of analysis of \icon[icon]"
- if (total_moles>0)
- var/o2_concentration = T.parent.air.oxygen/total_moles
- var/n2_concentration = T.parent.air.nitrogen/total_moles
- var/co2_concentration = T.parent.air.carbon_dioxide/total_moles
- var/plasma_concentration = T.parent.air.toxins/total_moles
-
- var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-
- user << "\blue Pressure: [round(pressure,0.1)] kPa"
- user << "\blue Nitrogen: [round(n2_concentration*100)]%"
- user << "\blue Oxygen: [round(o2_concentration*100)]%"
- user << "\blue CO2: [round(co2_concentration*100)]%"
- user << "\blue Plasma: [round(plasma_concentration*100)]%"
- if(unknown_concentration>0.01)
- user << "\red Unknown: [round(unknown_concentration*100)]%"
- user << "\blue Temperature: [round(T.parent.air.temperature-T0C)]°C"
- else
- user << "\blue Tank is empty!"
+ if (istype(A, /obj/item/weapon/tank))
+ var/obj/item/weapon/tank/T = A
+ atmosanalyzer_scan(T.air_contents, user, T)
+ else if (istype(A, /obj/machinery/portable_atmospherics))
+ var/obj/machinery/portable_atmospherics/T = A
+ atmosanalyzer_scan(T.air_contents, user, T)
+ else if (istype(A, /obj/machinery/atmospherics/pipe))
+ var/obj/machinery/atmospherics/pipe/T = A
+ atmosanalyzer_scan(T.parent.air, user, T)
+ else if (istype(A, /obj/machinery/power/rad_collector))
+ var/obj/machinery/power/rad_collector/T = A
+ if(T.P) atmosanalyzer_scan(T.P.air_contents, user, T)
+ else if (istype(A, /obj/item/weapon/flamethrower))
+ var/obj/item/weapon/flamethrower/T = A
+ if(T.ptank) atmosanalyzer_scan(T.ptank.air_contents, user, T)
if (!scanmode && istype(A, /obj/item/weapon/paper) && owner)
JFLOG("[user] used the document scanner on [A]")
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 388467ac607..2f23f8d47ba 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -296,9 +296,9 @@ REAGENT SCANNER
w_class = 2.0
flags = CONDUCT
slot_flags = SLOT_BELT
- throwforce = 5
- throw_speed = 4
- throw_range = 20
+ throwforce = 0
+ throw_speed = 3
+ throw_range = 7
m_amt = 30
g_amt = 20
origin_tech = "magnets=1;engineering=1"
@@ -307,9 +307,6 @@ REAGENT SCANNER
if (user.stat)
return
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
- usr << "\red You don't have the dexterity to do this!"
- return
var/turf/location = user.loc
if (!( istype(location, /turf) ))
@@ -320,11 +317,11 @@ REAGENT SCANNER
var/pressure = environment.return_pressure()
var/total_moles = environment.total_moles()
- user.show_message("\blue Results:", 1)
+ user.show_message("Results:", 1)
if(abs(pressure - ONE_ATMOSPHERE) < 10)
- user.show_message("\blue Pressure: [round(pressure,0.1)] kPa", 1)
+ user.show_message("Pressure: [round(pressure,0.1)] kPa", 1)
else
- user.show_message("\red Pressure: [round(pressure,0.1)] kPa", 1)
+ user.show_message("Pressure: [round(pressure,0.1)] kPa", 1)
if(total_moles)
var/o2_concentration = environment.oxygen/total_moles
var/n2_concentration = environment.nitrogen/total_moles
@@ -333,27 +330,27 @@ REAGENT SCANNER
var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
if(abs(n2_concentration - N2STANDARD) < 20)
- user.show_message("\blue Nitrogen: [round(n2_concentration*100)]%", 1)
+ user.show_message("Nitrogen: [round(n2_concentration*100)] %", 1)
else
- user.show_message("\red Nitrogen: [round(n2_concentration*100)]%", 1)
+ user.show_message("Nitrogen: [round(n2_concentration*100)] %", 1)
if(abs(o2_concentration - O2STANDARD) < 2)
- user.show_message("\blue Oxygen: [round(o2_concentration*100)]%", 1)
+ user.show_message("Oxygen: [round(o2_concentration*100)] %", 1)
else
- user.show_message("\red Oxygen: [round(o2_concentration*100)]%", 1)
+ user.show_message("Oxygen: [round(o2_concentration*100)] %", 1)
if(co2_concentration > 0.01)
- user.show_message("\red CO2: [round(co2_concentration*100)]%", 1)
+ user.show_message("CO2: [round(co2_concentration*100)] %", 1)
else
- user.show_message("\blue CO2: [round(co2_concentration*100)]%", 1)
+ user.show_message("CO2: [round(co2_concentration*100)] %", 1)
if(plasma_concentration > 0.01)
- user.show_message("\red Plasma: [round(plasma_concentration*100)]%", 1)
+ user.show_message("Plasma: [round(plasma_concentration*100)] %", 1)
if(unknown_concentration > 0.01)
- user.show_message("\red Unknown: [round(unknown_concentration*100)]%", 1)
+ user.show_message("Unknown: [round(unknown_concentration*100)] %", 1)
- user.show_message("\blue Temperature: [round(environment.temperature-T0C)]°C", 1)
+ user.show_message("Temperature: [round(environment.temperature-T0C)] °C", 1)
src.add_fingerprint(user)
return
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 1df86de4c29..9e81b02d31c 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -112,31 +112,7 @@
return
if(istype(W, /obj/item/device/analyzer) && ptank)
- var/obj/item/weapon/icon = src
- user.visible_message("[user] has used the analyzer on \icon[icon]")
- var/pressure = ptank.air_contents.return_pressure()
- var/total_moles = ptank.air_contents.total_moles()
-
- user << "\blue Results of analysis of \icon[icon]"
- if(total_moles>0)
- var/o2_concentration = ptank.air_contents.oxygen/total_moles
- var/n2_concentration = ptank.air_contents.nitrogen/total_moles
- var/co2_concentration = ptank.air_contents.carbon_dioxide/total_moles
- var/plasma_concentration = ptank.air_contents.toxins/total_moles
-
- var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-
- user << "\blue Pressure: [round(pressure,0.1)] kPa"
- user << "\blue Nitrogen: [round(n2_concentration*100)]%"
- user << "\blue Oxygen: [round(o2_concentration*100)]%"
- user << "\blue CO2: [round(co2_concentration*100)]%"
- user << "\blue Plasma: [round(plasma_concentration*100)]%"
- if(unknown_concentration>0.01)
- user << "\red Unknown: [round(unknown_concentration*100)]%"
- user << "\blue Temperature: [round(ptank.air_contents.temperature-T0C)]°C"
- else
- user << "\blue Tank is empty!"
- return
+ atmosanalyzer_scan(ptank.air_contents, user)
..()
return
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 6a977006fb8..624c1c345c0 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -80,43 +80,17 @@
/obj/item/weapon/tank/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
- var/obj/icon = src
+ src.add_fingerprint(user)
if (istype(src.loc, /obj/item/assembly))
icon = src.loc
if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
- for (var/mob/O in viewers(user, null))
- O << "\red [user] has used [W] on \icon[icon] [src]"
+ atmosanalyzer_scan(air_contents, user)
- var/pressure = air_contents.return_pressure()
-
- var/total_moles = air_contents.total_moles()
-
- user << "\blue Results of analysis of \icon[icon]"
- if (total_moles>0)
- var/o2_concentration = air_contents.oxygen/total_moles
- var/n2_concentration = air_contents.nitrogen/total_moles
- var/co2_concentration = air_contents.carbon_dioxide/total_moles
- var/plasma_concentration = air_contents.toxins/total_moles
-
- var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration)
-
- user << "\blue Pressure: [round(pressure,0.1)] kPa"
- user << "\blue Nitrogen: [round(n2_concentration*100)]%"
- user << "\blue Oxygen: [round(o2_concentration*100)]%"
- user << "\blue CO2: [round(co2_concentration*100)]%"
- user << "\blue Plasma: [round(plasma_concentration*100)]%"
- if(unknown_concentration>0.01)
- user << "\red Unknown: [round(unknown_concentration*100)]%"
- user << "\blue Temperature: [round(air_contents.temperature-T0C)]°C"
- else
- user << "\blue Tank is empty!"
- src.add_fingerprint(user)
else if (istype(W,/obj/item/latexballon))
var/obj/item/latexballon/LB = W
LB.blow(src)
- src.add_fingerprint(user)
if(istype(W, /obj/item/device/assembly_holder))
bomb_assemble(W,user)
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 62dd0c0690e..8085fefd999 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -39,7 +39,7 @@
bombtank.master = null
bombtank = null
- del(src)
+ qdel(src)
return
if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
if(!status)
diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index 420b110080d..a6c8ee86e5b 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -1,25 +1,26 @@
-
-var/list/dreams = list(
- "an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the captain",
- "voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
- "light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun",
- "a hat","the Luna","a ruined station","a planet","plasma","air","the medical bay","the bridge","blinking lights",
- "a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect",
- "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money",
- "the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer",
- "the detective","the warden","a member of the internal affairs","a station engineer","the janitor","atmospheric technician",
- "the quartermaster","a cargo technician","the botanist","a shaft miner","the psychologist","the chemist","the geneticist",
- "the virologist","the roboticist","the chef","the bartender","the chaplain","the librarian","a mouse","an ert member",
- "a beach","the holodeck","a smokey room","a voice","the cold","a mouse","an operating table","the bar","the rain","a skrell",
- "a unathi","a tajaran","the ai core","the mining station","the research station","a beaker of strange liquid",
- )
-
mob/living/carbon/proc/dream()
dreaming = 1
-
+ var/list/dreams = list(
+ "an ID card","a bottle","a familiar face","a crewmember","a toolbox","a security officer","the captain",
+ "voices from all around","deep space","a doctor","the engine","a traitor","an ally","darkness",
+ "light","a scientist","a monkey","a catastrophe","a loved one","a gun","warmth","freezing","the sun",
+ "a hat","the Cyberiad","a ruined station","a planet","plasma","air","the medical bay","the bridge","blinking lights",
+ "a blue light","an abandoned laboratory","Nanotrasen","The Syndicate","blood","healing","power","respect",
+ "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money",
+ "the head of personnel","the head of security","a chief engineer","a research director","a chief medical officer",
+ "the detective","the warden","a member of the internal affairs","a station engineer","the janitor","atmospheric technician",
+ "the quartermaster","a cargo technician","the botanist","a shaft miner","the psychologist","the chemist","the geneticist",
+ "the virologist","the roboticist","the chef","the bartender","the chaplain","the librarian", "the brig physician", "the pod pilot",
+ "the barber", "the mechanic", "the magistrate", "the nanotrasen representative", "the blueshield", "a mouse","an ert member",
+ "a beach","the holodeck","a smokey room","a voice","the cold","a mouse","an operating table","the bar","the rain","a skrell",
+ "a unathi","a tajaran", "a vulpkanin", "a slime", "an ipc", "a vox", "a plasmaman", "a grey", "a kidan", "a diona", "the ai core",
+ "the mining station","the research station", "a beaker of strange liquid"
+ )
spawn(0)
for(var/i = rand(1,4),i > 0, i--)
- src << "\blue ... [pick(dreams)] ..."
+ var/dream_image = pick(dreams)
+ dreams -= dream_image
+ src << "... [dream_image] ..."
sleep(rand(40,70))
if(paralysis <= 0)
dreaming = 0
@@ -27,8 +28,8 @@ mob/living/carbon/proc/dream()
dreaming = 0
return 1
-mob/living/carbon/proc/handle_dreams()
+/mob/living/carbon/proc/handle_dreams()
if(client && !dreaming && prob(5))
dream()
-mob/living/carbon/var/dreaming = 0
+/mob/living/carbon/var/dreaming = 0
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 25df3769d72..c7e96dd4737 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -51,9 +51,11 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/device/analyzer))
- user << "\blue The [W.name] detects that [last_power]W were recently produced."
+ if(istype(W, /obj/item/device/multitool))
+ user << "The [W.name] detects that [last_power]W were recently produced."
return 1
+ else if(istype(W, /obj/item/device/analyzer) && P)
+ atmosanalyzer_scan(P.air_contents, user)
else if(istype(W, /obj/item/weapon/tank/plasma))
if(!src.anchored)
user << "\red The [src] needs to be secured to the floor first."
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 87cf5df27df..71e8d206a85 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -285,7 +285,7 @@
else
user << "Ow..."
user.apply_effect(110,AGONY,0)
- del(in_chamber)
+ qdel(in_chamber)
mouthshoot = 0
return
else
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index c9d41e26531..78e04d8c44b 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -97,7 +97,7 @@
in_chamber.pass_flags = pass_flags //And the pass flags to that of the real projectile...
in_chamber.firer = user
var/output = in_chamber.process() //Test it!
- del(in_chamber) //No need for it anymore
+ qdel(in_chamber) //No need for it anymore
return output //Send it back to the gun!
Bump(atom/A as mob|obj|turf|area)
@@ -168,7 +168,7 @@
if(!istype(src, /obj/item/projectile/beam/lightning))
density = 0
invisibility = 101
- del(src)
+ qdel(src)
return 1
diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm
index 4dbb2c9ee82..089a7088f66 100644
--- a/code/modules/reagents/newchem/pyro.dm
+++ b/code/modules/reagents/newchem/pyro.dm
@@ -197,6 +197,7 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
blackpowder_detonate(holder, created_volume)
return
+/*
/datum/reagent/blackpowder/on_ex_act()
var/location = get_turf(holder.my_atom)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
@@ -205,7 +206,7 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
sleep(rand(10,15))
blackpowder_detonate(holder, volume)
holder.remove_reagent("blackpowder", volume)
- return
+ return */
/proc/blackpowder_detonate(var/datum/reagents/holder, var/created_volume)
var/turf/simulated/T = get_turf(holder.my_atom)
diff --git a/icons/misc/fullscreen.dmi b/icons/misc/fullscreen.dmi
index 6f9e7d29635..1573d1f6379 100644
Binary files a/icons/misc/fullscreen.dmi and b/icons/misc/fullscreen.dmi differ
diff --git a/icons/misc/fullscreen_old_480.dmi b/icons/misc/fullscreen_old_480.dmi
deleted file mode 100644
index 0850c49f62b..00000000000
Binary files a/icons/misc/fullscreen_old_480.dmi and /dev/null differ