- yellow, blue, orange and red hardhats added

- the 'box' item no longer contains internals by default. A survival kit does tho.
- backpacks no longer contain a box, the backpacks which spawn as part of your kit at round start/late join contain a survival kit (box), which contains internals.
- engineers spawn with a different survival kit, which has an engineering em. oxy tank
- emergency oxy tanks now fit in boxes again
- engineering emergency oxygen tank (yellow) added (engineers spawn with it in their internals box), double emergency oxy tank added (not ingame yet), red and yellow oxygen tanks added (red spawns in firefighting closets, yellow is not ingame) (sprites by Aru)
- red hardhats spawn in fire closets
- CE spawns with white hardhat, one is also in his locker
- CE spawns with industrial backpack
- Pod people manual added to HOP's desk (he's the boss) and hydroponics
- Ore pile removed from code (was not used for anything and I don't want it to be)
- The mechanical and electrical toolbox in tool storage replaced with two tool closets. (We'll see if this works out)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1775 316c924e-a436-60f5-8080-3fe189b3f50e

code/WorkInProgress/mining.dm

@@ -1063,13 +1063,6 @@ proc/move_mining_shuttle()
 	pixel_x = rand(0,16)-8
 	pixel_y = rand(0,8)-8
 
-/**********************Ore pile (not used)**************************/
-
-/obj/item/weapon/ore_pile
-	name = "Pile of ores"
-	icon = 'Mining.dmi'
-	icon_state = "orepile"
-
 /**********************Satchel**************************/
 
 /obj/item/weapon/satchel

code/defines/obj/clothing/head.dm

@@ -290,13 +290,34 @@
 /obj/item/clothing/head/helmet/hardhat
 	name = "hard hat"
 	desc = "A hat which appears to be very hard."
-	icon_state = "hardhat0"
+	icon_state = "hardhat0_yellow"
 	flags = FPRINT | TABLEPASS | SUITSPACE
-	item_state = "hardhat0"
+	item_state = "hardhat0_yellow"
 	var/brightness_on = 4 //luminosity when on
 	var/on = 0
+	color = "yellow" //Determines used sprites: hardhat[on]_[color] and hardhat[on]_[color]2 (lying down sprite)
 	armor = list(melee = 30, bullet = 30, laser = 20, taser = 10, bomb = 20, bio = 10, rad = 20)
 
+/obj/item/clothing/head/helmet/hardhat/orange
+	icon_state = "hardhat0_orange"
+	item_state = "hardhat0_orange"
+	color = "orange"
+
+/obj/item/clothing/head/helmet/hardhat/red
+	icon_state = "hardhat0_red"
+	item_state = "hardhat0_red"
+	color = "red"
+
+/obj/item/clothing/head/helmet/hardhat/white
+	icon_state = "hardhat0_white"
+	item_state = "hardhat0_white"
+	color = "white"
+
+/obj/item/clothing/head/helmet/hardhat/dblue
+	icon_state = "hardhat0_dblue"
+	item_state = "hardhat0_dblue"
+	color = "dblue"
+
 
 /obj/item/clothing/head/helmet/welding
 	name = "welding helmet"

code/defines/obj/storage.dm

@@ -77,11 +77,20 @@
 	can_hold = list("/obj/item/weapon/dice")
 
 /obj/item/weapon/storage/box
-	name = "box"
+	name = "Box"
 	desc = "A nice looking box."
 	icon_state = "box"
 	item_state = "syringe_kit"
 
+/obj/item/weapon/storage/survival_kit
+	name = "Centcom Survival Kit"
+	desc = "How nice of CentCom to provide us with some stuff to make our lives easier."
+	icon_state = "box"
+	item_state = "syringe_kit"
+
+/obj/item/weapon/storage/survival_kit/engineer
+	name = "Centcom Engineer Kit"
+
 /obj/item/weapon/storage/pillbottlebox
 	name = "pill bottles"
 	desc = "A box of pill bottles."

code/defines/obj/weapon.dm

@@ -1435,25 +1435,45 @@ Total SMES charging rate should not exceed total power generation rate, or an ov
 	icon_state = "oxygen"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
 
+/obj/item/weapon/tank/oxygen/yellow
+	name = "Gas Tank (Oxygen)"
+	desc = "A tank of oxygen meant for firefighters."
+	icon_state = "oxygen_f"
+
+/obj/item/weapon/tank/oxygen/red
+	name = "Gas Tank (Oxygen)"
+	desc = "A tank of oxygen meant for firefighters."
+	icon_state = "oxygen_fr"
+
 /obj/item/weapon/tank/air
 	name = "Gas Tank (Air Mix)"
 	desc = "Mixed anyone?"
 	icon_state = "oxygen"
 
 /obj/item/weapon/tank/plasma
 	name = "Gas Tank (BIOHAZARD)"
-	desc = "Contains dangerous plasma. When inhaled."
+	desc = "Contains dangerous plasma. Do not inhale."
 	icon_state = "plasma"
 
 /obj/item/weapon/tank/emergency_oxygen
-	name = "emergency oxygentank"
-	desc = "Used for emergencies."
+	name = "Emergency Oxygen Tank"
+	desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actualy need it."
 	icon_state = "emergency"
 	flags = FPRINT | TABLEPASS | ONBELT | CONDUCT
-	w_class = 2.5
+	w_class = 2.0
 	force = 4.0
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
-	volume = 10 //yeah, SO tiny
+	volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
+
+/obj/item/weapon/tank/emergency_oxygen/engi
+	icon_state = "emergency_engi"
+	name = "Engineering Emergency Oxygen Tank"
+	volume = 6 //Engineers are always superior. -errorage (dangercon 2011)
+
+/obj/item/weapon/tank/emergency_oxygen/double
+	icon_state = "emergency_double"
+	name = "Double Emergency Oxygen Tank"
+	volume = 10 //These have the same emoung of gas in them as air tanks, but can be worn on your belt -errorage (dangercon 2011)
 
 /obj/item/weapon/teleportation_scroll
 	name = "Teleportation Scroll"

code/game/algorithm.dm

@@ -171,7 +171,7 @@ proc/countJob(rank)
 		if(slot_in_backpack)
 			if (src.back && istype(src.back, /obj/item/weapon/storage/backpack))
 				var/obj/item/weapon/storage/backpack/B = src.back
-				if(B.contents.len < 7 && W.w_class <= 3)
+				if(B.contents.len < B.storage_slots && W.w_class <= B.max_w_class)
 					W.loc = B
 					equipped = 1
 		if(slot_h_store)

code/game/gamemodes/wizard/wizard.dm

@@ -198,6 +198,7 @@
 	wizard_mob.equip_if_possible(new /obj/item/clothing/suit/wizrobe(wizard_mob), wizard_mob.slot_wear_suit)
 	wizard_mob.equip_if_possible(new /obj/item/clothing/head/wizard(wizard_mob), wizard_mob.slot_head)
 	wizard_mob.equip_if_possible(new /obj/item/weapon/storage/backpack(wizard_mob), wizard_mob.slot_back)
+	wizard_mob.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), wizard_mob.slot_in_backpack)
 //	wizard_mob.equip_if_possible(new /obj/item/weapon/scrying_gem(wizard_mob), wizard_mob.slot_l_store) For scrying gem.
 	wizard_mob.equip_if_possible(new /obj/item/weapon/teleportation_scroll(wizard_mob), wizard_mob.slot_r_store)
 	if(config.feature_object_spell_system) //if it's turned on (in config.txt), spawns an object spell spellbook
@@ -233,7 +234,7 @@
 	return 1
 
 /datum/game_mode/proc/auto_declare_completion_wizard()
-	for(var/datum/mind/wizard in wizards)	
+	for(var/datum/mind/wizard in wizards)
 		var/wizard_name
 		if(wizard.current)
 			if(wizard.current == wizard.original)

code/game/jobs/jobprocs.dm

@@ -301,6 +301,7 @@
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/geneticist(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
@@ -320,6 +321,7 @@
 
 		if ("Clown")
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/clown (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/pda/clown(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/clown(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/clown_shoes(src), slot_shoes)
@@ -333,6 +335,7 @@
 
 		if ("Mime")
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/mime(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
@@ -349,6 +352,7 @@
 
 		if ("Station Engineer")
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit/engineer(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_eng (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/device/pda/engineering(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/engineer(src), slot_w_uniform)
@@ -360,6 +364,7 @@
 
 		if ("Shaft Miner")
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_mine (src), slot_ears)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/miner(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
@@ -374,6 +379,7 @@
 		if ("Detective")
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/det(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
@@ -393,6 +399,7 @@
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_med (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
@@ -402,6 +409,7 @@
 		if ("Captain")
 			src.equip_if_possible(new /obj/item/device/radio/headset/heads/captain (src), slot_ears)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/pda/captain(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/captain(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/suit/armor/captain(src), slot_wear_suit)
@@ -414,6 +422,7 @@
 		if ("Security Officer")
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/security(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
@@ -426,6 +435,7 @@
 		if ("Warden")
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/pda/security(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/warden(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
@@ -456,6 +466,7 @@
 			src.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(src), slot_head)
 			src.equip_if_possible(new /obj/item/clothing/mask/gas/emergency(src), slot_wear_mask)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/security (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses)
 			src.equip_if_possible(new /obj/item/weapon/handcuffs(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/weapon/gun/energy(src), slot_s_store)
@@ -464,6 +475,7 @@
 		if ("Head of Personnel")
 			src.equip_if_possible(new /obj/item/device/radio/headset/heads/hop (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/pda/heads/hop(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/head_of_personnel(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
@@ -482,6 +494,7 @@
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/ammo_casing/shotgun/beanbag(src), slot_in_backpack)
@@ -499,6 +512,7 @@
 			src.equip_if_possible(new /obj/item/clothing/under/rank/roboticist(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/clothing/suit/labcoat(src), slot_wear_suit)
 			src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves)
 			src.equip_if_possible(new /obj/item/weapon/storage/toolbox/mechanical(src), slot_l_hand)
@@ -521,6 +535,7 @@
 			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/suit/suit(src), slot_wear_suit)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/detective_scanner(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/weapon/storage/briefcase(src), slot_l_hand)
 
@@ -541,11 +556,13 @@
 			src.equip_if_possible(new /obj/item/device/pda/quartermaster(src), slot_belt)
 
 		if ("Chief Engineer")
+			src.equip_if_possible(new /obj/item/weapon/storage/backpack/industrial (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit/engineer(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/device/radio/headset/heads/ce (src), slot_ears)
 			src.equip_if_possible(new /obj/item/device/pda/heads/ce(src), slot_belt)
 			src.equip_if_possible(new /obj/item/clothing/gloves/black(src), slot_gloves) //changed to black as part of dangercon 2011, approved by Urist_McDorf --Errorage
 			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
-			src.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat(src), slot_head)
+			src.equip_if_possible(new /obj/item/clothing/head/helmet/hardhat/white(src), slot_head)
 			src.equip_if_possible(new /obj/item/weapon/storage/utilitybelt/full(src), slot_l_hand) //currently spawns in hand due to traitor assignment requiring a PDA to be on the belt. --Errorage
 			var/obj/item/clothing/mask/cigarette/CIG = new /obj/item/clothing/mask/cigarette(src)
 			CIG.light("")
@@ -567,6 +584,7 @@
 			src.equip_if_possible(new /obj/item/device/radio/headset/heads/cmo (src), slot_ears)
 			src.equip_if_possible(new /obj/item/device/pda/heads/cmo(src), slot_belt)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/chief_medical_officer(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/suit/labcoat_cmo(src), slot_wear_suit)
@@ -577,6 +595,7 @@
 			src.equip_if_possible(new /obj/item/device/radio/headset/headset_medsci (src), slot_ears) // -- TLE
 			src.equip_if_possible(new /obj/item/device/pda/medical(src), slot_belt)
 			src.equip_if_possible(new /obj/item/weapon/storage/backpack/medic (src), slot_back)
+			src.equip_if_possible(new /obj/item/weapon/storage/survival_kit(src), slot_in_backpack)
 			src.equip_if_possible(new /obj/item/clothing/under/rank/medical(src), slot_w_uniform)
 			src.equip_if_possible(new /obj/item/clothing/mask/surgical(src), slot_wear_mask)
 			src.equip_if_possible(new /obj/item/clothing/shoes/white(src), slot_shoes)
@@ -635,7 +654,9 @@
 		src.Robotize()
 	else
 		src.equip_if_possible(new /obj/item/device/radio/headset(src), slot_ears)
-		src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
+		var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack(src)
+		BPK.contents += new /obj/item/weapon/storage/survival_kit(src)
+		src.equip_if_possible(BPK, slot_back)
 
 
 	/*

code/game/magic/library.dm

@@ -142,6 +142,7 @@
 		new /obj/item/weapon/book/manual/engineering_hacking(src)
 		new /obj/item/weapon/book/manual/engineering_guide(src)
 		new /obj/item/weapon/book/manual/engineering_singularity_safety(src)
+		new /obj/item/weapon/book/manual/robotics_cyborgs(src)
 
 /obj/bookcase/manuals/research_and_development
 	name = "R&D Manuals bookcase"

code/game/objects/closets/firecloset.dm

@@ -6,17 +6,18 @@
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/device/flashlight(src)
-	new /obj/item/weapon/tank/emergency_oxygen(src)
+	new /obj/item/weapon/tank/oxygen/red(src)
 	new /obj/item/weapon/extinguisher(src)
-	new /obj/item/clothing/head/helmet/hardhat(src)
+	new /obj/item/clothing/head/helmet/hardhat/red(src)
 
 /obj/closet/firecloset/New()
 	..()
 
+	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/weapon/tank/emergency_oxygen(src)
+	new /obj/item/weapon/tank/oxygen/red(src)
 	new /obj/item/weapon/extinguisher(src)
-	new /obj/item/clothing/suit/fire/firefighter(src)
+	new /obj/item/clothing/head/helmet/hardhat/red(src)
 
 	/*switch (pickweight(list("nothing" = 5, "bare-bones" = 35, "basic" = 40, "pickpocketed" = 10, "untouched" = 10)))
 		if ("nothing")
@@ -31,13 +32,13 @@
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/weapon/tank/oxygen(src)
 			new /obj/item/weapon/extinguisher(src)
-			new /obj/item/clothing/head/helmet/hardhat(src)
+			new /obj/item/clothing/head/helmet/hardhat/red(src)
 		if ("untouched")
 			new /obj/item/clothing/mask/breath(src)
 			new /obj/item/weapon/tank/oxygen(src)
 			new /obj/item/weapon/extinguisher(src)
 			new /obj/item/clothing/suit/fire/firefighter(src)
-			new /obj/item/clothing/head/helmet/hardhat(src)*/
+			new /obj/item/clothing/head/helmet/hardhat/red(src)*/
 
 /obj/closet/toolcloset/New()
 	if(prob(60))

code/game/objects/closets/secure/engineering.dm

@@ -14,7 +14,7 @@
 	new /obj/item/clothing/suit/hazardvest( src )
 	new /obj/item/clothing/mask/gas( src )
 	new /obj/item/clothing/head/helmet/welding( src )
-	new /obj/item/clothing/head/helmet/hardhat( src )
+	new /obj/item/clothing/head/helmet/hardhat/white( src )
 	new /obj/item/device/multitool( src )
 	new /obj/item/device/flash( src )
 	return

code/game/objects/devices/flashlight.dm

@@ -57,17 +57,15 @@
 		src.sd_SetLuminosity(0)
 		user.sd_SetLuminosity(user.luminosity + brightness_on)
 
-
-
 /obj/item/device/flashlight/dropped(mob/user)
 	if(on)
 		user.sd_SetLuminosity(user.luminosity - brightness_on)
 		src.sd_SetLuminosity(brightness_on)
 
 /obj/item/clothing/head/helmet/hardhat/attack_self(mob/user)
 	on = !on
-	icon_state = "hardhat[on]"
-	item_state = "hardhat[on]"
+	icon_state = "hardhat[on]_[color]"
+	item_state = "hardhat[on]_[color]"
 
 	if(on)
 		user.sd_SetLuminosity(user.luminosity + brightness_on)

code/game/objects/items/item.dm

@@ -31,6 +31,7 @@
 //
 
 /obj/item/proc/afterattack()
+
 	return
 
 /obj/item/weapon/dummy/ex_act()