From 55fa8bb5bd9a0c3e77063cfc3cb221105983e7fb Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Sat, 22 Sep 2018 15:53:37 +0100 Subject: [PATCH] tidying up --- code/game/objects/items/devices/scanners.dm | 9 +++------ code/game/objects/items/weapons/storage/belt.dm | 1 + code/modules/clothing/spacesuits/ert.dm | 3 --- code/modules/projectiles/guns/energy/laser.dm | 1 - code/modules/surgery/organs/augments_arms.dm | 1 - 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index de465284f9d..e558d24594f 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -647,7 +647,6 @@ REAGENT SCANNER origin_tech = "magnets=6;biotech=6" var/obj/item/stock_parts/cell/power_supply var/cell_type = /obj/item/stock_parts/cell/upgraded - var/printing = FALSE // Printing the paper. var/ready = TRUE // Ready to scan var/time_to_use = 0 // How much time remaining before next scan is available. var/usecharge = 750 @@ -666,7 +665,7 @@ REAGENT SCANNER playsound(src, 'sound/machines/defib_saftyOn.ogg', 50, 0) update_icon() -/obj/item/bodyanalyzer/update_icon() +/obj/item/bodyanalyzer/update_icon(printing = FALSE) overlays.Cut() var/percent = power_supply.percent() if(ready) @@ -703,15 +702,13 @@ REAGENT SCANNER if(do_after(user, 100, target = M)) var/obj/item/paper/printout = new printout.info = report - printout.name = "Scan report" + printout.name = "Scan report - [M.name]" playsound(user.loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1) user.put_in_hands(printout) time_to_use = world.time + 600 power_supply.use(usecharge) - printing = TRUE ready = FALSE - update_icon() - printing = FALSE + update_icon(TRUE) addtimer(CALLBACK(src, /obj/item/bodyanalyzer/.proc/setReady), 600) addtimer(CALLBACK(src, /obj/item/bodyanalyzer/.proc/update_icon), 20) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 09cc7e20cdb..c20046beea9 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -252,6 +252,7 @@ new /obj/item/flash(src) new /obj/item/grenade/flashbang(src) new /obj/item/grenade/flashbang(src) + update_icon() /obj/item/storage/belt/soulstone name = "soul stone belt" diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index caf85c91ee1..a123ae8a2af 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -58,7 +58,6 @@ /obj/item/clothing/head/helmet/space/hardsuit/ert/commander/gamma max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT - /obj/item/clothing/suit/space/hardsuit/ert/commander name = "emergency response team commander suit" @@ -110,7 +109,6 @@ /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT - //Medical /obj/item/clothing/head/helmet/space/hardsuit/ert/medical name = "emergency response team medical helmet" @@ -121,7 +119,6 @@ /obj/item/clothing/head/helmet/space/hardsuit/ert/medical/gamma max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT - /obj/item/clothing/suit/space/hardsuit/ert/medical name = "emergency response team medical suit" desc = "A suit worn by medical members of a Nanotrasen Emergency Response Team. Has white highlights. Armoured and space ready." diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index b7970caf9fd..f4cd13419b4 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -131,7 +131,6 @@ icon_state = "multilensimmolator" ammo_type = list(/obj/item/ammo_casing/energy/immolator/strong, /obj/item/ammo_casing/energy/immolator/scatter) origin_tech = "combat=5;magnets=5;powerstorage=4" - shaded_charge = TRUE /obj/item/gun/energy/immolator/multi/update_icon() ..() diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 32f584a2aa0..622531921b9 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -320,7 +320,6 @@ break H.visible_message("[H] unplugs from \the [A].", "You unplug from \the [A].") - /obj/item/organ/internal/cyberimp/arm/telebaton name = "telebaton implant" desc = "Telescopic baton implant. Does what it says on the tin" // A better description