tidying up

This commit is contained in:
Birdtalon
2018-09-22 15:53:37 +01:00
parent eb312f526f
commit 55fa8bb5bd
5 changed files with 4 additions and 11 deletions
+3 -6
View File
@@ -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)
@@ -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"
-3
View File
@@ -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."
@@ -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()
..()
@@ -320,7 +320,6 @@
break
H.visible_message("<span class='notice'>[H] unplugs from \the [A].</span>", "<span class='notice'>You unplug from \the [A].</span>")
/obj/item/organ/internal/cyberimp/arm/telebaton
name = "telebaton implant"
desc = "Telescopic baton implant. Does what it says on the tin" // A better description