diff --git a/code/citadel/cit_clothing.dm b/code/citadel/cit_clothing.dm
new file mode 100644
index 0000000000..31b36b7723
--- /dev/null
+++ b/code/citadel/cit_clothing.dm
@@ -0,0 +1,6 @@
+/obj/item/clothing/head/hunter
+ name = "hunter hat"
+ desc = "It's a flimsy looking hat."
+ item_state = "hunter"
+ icon_state = "hunter-worn"
+ icon = 'icons/obj/clothing/cit_hats.dmi'
\ No newline at end of file
diff --git a/code/modules/clothing/head/cit_hats.dm b/code/modules/clothing/head/cit_hats.dm
index 31b36b7723..a5b9d1a1b6 100644
--- a/code/modules/clothing/head/cit_hats.dm
+++ b/code/modules/clothing/head/cit_hats.dm
@@ -2,5 +2,5 @@
name = "hunter hat"
desc = "It's a flimsy looking hat."
item_state = "hunter"
- icon_state = "hunter-worn"
+ icon_state = "hunter"
icon = 'icons/obj/clothing/cit_hats.dmi'
\ No newline at end of file
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 28e8709984..ac4873a09b 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -30,7 +30,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector/process()
if(loaded_tank)
if(!loaded_tank.air_contents.gases["plasma"])
- investigate_log("out of fuel.", INVESTIGATE_SINGULO)
+ investigate_log("out of fuel.", INVESTIGATE_SINGULO)
eject()
else
loaded_tank.air_contents.gases["plasma"][MOLES] -= 0.001*drainratio
@@ -46,9 +46,11 @@ GLOBAL_LIST_EMPTY(rad_collectors)
toggle_power()
user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
"You turn the [src.name] [active? "on":"off"].")
- var/fuel = loaded_tank.air_contents.gases["plasma"]
+ var/fuel
+ if(loaded_tank)
+ fuel = loaded_tank.air_contents.gases["plasma"]
fuel = fuel ? fuel[MOLES] : 0
- investigate_log("turned [active?"on":"off"] by [user.key]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_SINGULO)
+ investigate_log("turned [active?"on":"off"] by [user.key]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_SINGULO)
return
else
to_chat(user, "The controls are locked!")
@@ -73,34 +75,34 @@ GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/multitool))
to_chat(user, "The [W.name] detects that [last_power]W were recently produced.")
- return TRUE
+ return TRUE
else if(istype(W, /obj/item/device/analyzer) && loaded_tank)
atmosanalyzer_scan(loaded_tank.air_contents, user)
else if(istype(W, /obj/item/weapon/tank/internals/plasma))
if(!anchored)
to_chat(user, "The [src] needs to be secured to the floor first!")
- return TRUE
+ return TRUE
if(loaded_tank)
to_chat(user, "There's already a plasma tank loaded!")
- return TRUE
+ return TRUE
if(!user.drop_item())
- return TRUE
+ return TRUE
loaded_tank = W
W.forceMove(src)
update_icons()
else if(istype(W, /obj/item/weapon/crowbar))
- if(loaded_tank)
- if(locked)
- to_chat(user, "The controls are locked!")
- return TRUE
+ if(loaded_tank)
+ if(locked)
+ to_chat(user, "The controls are locked!")
+ return TRUE
eject()
- return TRUE
- else
- to_chat(user, "There isn't a tank loaded!")
- return TRUE
+ return TRUE
+ else
+ to_chat(user, "There isn't a tank loaded!")
+ return TRUE
else if(istype(W, /obj/item/weapon/wrench))
default_unfasten_wrench(user, W, 0)
- return TRUE
+ return TRUE
else if(W.GetID())
if(allowed(user))
if(active)
@@ -110,7 +112,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
to_chat(user, "The controls can only be locked when \the [src] is active!")
else
to_chat(user, "Access denied.")
- return TRUE
+ return TRUE
else
return ..()
@@ -147,11 +149,11 @@ GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector/proc/update_icons()
cut_overlays()
if(loaded_tank)
- add_overlay("ptank")
+ add_overlay("ptank")
if(stat & (NOPOWER|BROKEN))
return
if(active)
- add_overlay("on")
+ add_overlay("on")
/obj/machinery/power/rad_collector/proc/toggle_power()
diff --git a/code/modules/power/singularity/collector.dm.rej b/code/modules/power/singularity/collector.dm.rej
deleted file mode 100644
index 68aa14d5d7..0000000000
--- a/code/modules/power/singularity/collector.dm.rej
+++ /dev/null
@@ -1,12 +0,0 @@
-diff a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm (rejected hunks)
-@@ -46,7 +46,9 @@ GLOBAL_LIST_EMPTY(rad_collectors)
- toggle_power()
- user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
- "You turn the [src.name] [active? "on":"off"].")
-- var/fuel = loaded_tank.air_contents.gases["plasma"]
-+ var/fuel
-+ if(loaded_tank)
-+ fuel = loaded_tank.air_contents.gases["plasma"]
- fuel = fuel ? fuel[MOLES] : 0
- investigate_log("turned [active?"on":"off"] by [user.key]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].","singulo")
- return
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index f98009ca3a..d27cfca0f9 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/obj/clothing/cit_hats.dmi b/icons/obj/clothing/cit_hats.dmi
index 25a03dc97e..2f2b877eff 100644
Binary files a/icons/obj/clothing/cit_hats.dmi and b/icons/obj/clothing/cit_hats.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index f61256862c..7e42602839 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -161,6 +161,7 @@
#include "code\citadel\_cit_helpers.dm"
#include "code\citadel\cit_areas.dm"
#include "code\citadel\cit_arousal.dm"
+#include "code\citadel\cit_clothing.dm"
#include "code\citadel\cit_genemods.dm"
#include "code\citadel\cit_guns.dm"
#include "code\citadel\cit_kegs.dm"
@@ -1194,7 +1195,6 @@
#include "code\modules\clothing\gloves\miscellaneous.dm"
#include "code\modules\clothing\gloves\vg_gloves.dm"
#include "code\modules\clothing\head\beanie.dm"
-#include "code\modules\clothing\head\cit_hats.dm"
#include "code\modules\clothing\head\collectable.dm"
#include "code\modules\clothing\head\hardhat.dm"
#include "code\modules\clothing\head\helmet.dm"