Merge pull request #3159 from Citadel-Station-13/upstream-merge-30525

[MIRROR] Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()

code/modules/clothing/head/helmet.dm

@@ -17,13 +17,25 @@
 
 	dog_fashion = /datum/dog_fashion/head/helmet
 
-
-/obj/item/clothing/head/helmet/Initialize()
-	. = ..()
-
 /obj/item/clothing/head/helmet/sec
 	can_flashlight = 1
 
+/obj/item/clothing/head/helmet/sec/attackby(obj/item/I, mob/user, params)
+	if(issignaler(I))
+		var/obj/item/device/assembly/signaler/S = I
+		if(F) //Has a flashlight. Player must remove it, else it will be lost forever.
+			to_chat(user, "<span class='warning'>The mounted flashlight is in the way, remove it first!</span>")
+			return
+
+		if(S.secured)
+			qdel(S)
+			var/obj/item/secbot_assembly/A = new /obj/item/secbot_assembly
+			user.put_in_hands(A)
+			to_chat(user, "<span class='notice'>You add the signaler to the helmet.</span>")
+			qdel(src)
+			return
+	return ..()
+
 /obj/item/clothing/head/helmet/alt
 	name = "bulletproof helmet"
 	desc = "A bulletproof combat helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
@@ -281,7 +293,7 @@
 				qdel(THL)
 			return
 
-	..()
+	return ..()
 
 /obj/item/clothing/head/helmet/proc/toggle_helmlight()
 	set name = "Toggle Helmetlight"

code/modules/mining/equipment/explorer_gear.dm

@@ -46,3 +46,64 @@
 /obj/item/clothing/mask/gas/explorer/folded/New()
 	..()
 	adjustmask()
+
+/obj/item/clothing/suit/space/hostile_environment
+	name = "H.E.C.K. suit"
+	desc = "Hostile Environiment Cross-Kinetic Suit: A suit designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner."
+	icon_state = "hostile_env"
+	item_state = "hostile_env"
+	flags_1 = THICKMATERIAL_1 //not spaceproof
+	max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+	resistance_flags = FIRE_PROOF | LAVA_PROOF
+	slowdown = 0
+	armor = list("melee" = 70, "bullet" = 40, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/device/mining_scanner, /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
+
+/obj/item/clothing/suit/space/hostile_environment/Initialize()
+	. = ..()
+	AddComponent(/datum/component/spraycan_paintable)
+	START_PROCESSING(SSobj, src)
+
+/obj/item/clothing/suit/space/hostile_environment/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	return ..()
+
+/obj/item/clothing/suit/space/hostile_environment/process()
+	var/mob/living/carbon/C = loc
+	if(istype(C) && prob(2)) //cursed by bubblegum
+		if(prob(15))
+			new /datum/hallucination/oh_yeah(C)
+			to_chat(C, "<span class='colossus'><b>[pick("I AM IMMORTAL.","I SHALL TAKE BACK WHAT'S MINE.","I SEE YOU.","YOU CANNOT ESCAPE ME FOREVER.","DEATH CANNOT HOLD ME.")]</b></span>")
+		else
+			to_chat(C, "<span class='warning'>[pick("You hear faint whispers.","You smell ash.","You feel hot.","You hear a roar in the distance.")]</span>")
+
+/obj/item/clothing/head/helmet/space/hostile_environment
+	name = "H.E.C.K. helmet"
+	desc = "Hostile Environiment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner."
+	icon_state = "hostile_env"
+	item_state = "hostile_env"
+	w_class = WEIGHT_CLASS_NORMAL
+	max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
+	flags_1 = THICKMATERIAL_1 // no space protection
+	armor = list("melee" = 70, "bullet" = 40, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+	resistance_flags = FIRE_PROOF | LAVA_PROOF
+
+/obj/item/clothing/head/helmet/space/hostile_environment/Initialize()
+	. = ..()
+	AddComponent(/datum/component/spraycan_paintable)
+	update_icon()
+
+/obj/item/clothing/head/helmet/space/hostile_environment/update_icon()
+	..()
+	cut_overlays()
+	var/mutable_appearance/glass_overlay = mutable_appearance(icon, "hostile_env_glass")
+	glass_overlay.appearance_flags = RESET_COLOR
+	add_overlay(glass_overlay)
+
+/obj/item/clothing/head/helmet/space/hostile_environment/worn_overlays(isinhands)
+	. = ..()
+	if(!isinhands)
+		var/mutable_appearance/M = mutable_appearance('icons/mob/head.dmi', "hostile_env_glass")
+		M.appearance_flags = RESET_COLOR
+		. += M
+

code/modules/mining/lavaland/necropolis_chests.dm

@@ -932,6 +932,8 @@
 	name = "bubblegum chest"
 
 /obj/structure/closet/crate/necropolis/bubblegum/PopulateContents()
+	new /obj/item/clothing/suit/space/hostile_environment(src)
+	new /obj/item/clothing/head/helmet/space/hostile_environment(src)
 	var/loot = rand(1,3)
 	switch(loot)
 		if(1)

code/modules/mob/living/simple_animal/bot/construction.dm

@@ -357,28 +357,6 @@
 	var/build_step = 0
 	var/created_name = "Securitron" //To preserve the name if it's a unique securitron I guess
 
-/obj/item/clothing/head/helmet/attackby(obj/item/device/assembly/signaler/S, mob/user, params)
-	..()
-	if(!issignaler(S))
-		..()
-		return
-
-	if(type != /obj/item/clothing/head/helmet/sec) //Eh, but we don't want people making secbots out of space helmets.
-		return
-
-	if(F) //Has a flashlight. Player must remove it, else it will be lost forever.
-		to_chat(user, "<span class='warning'>The mounted flashlight is in the way, remove it first!</span>")
-		return
-
-	if(S.secured)
-		qdel(S)
-		var/obj/item/secbot_assembly/A = new /obj/item/secbot_assembly
-		user.put_in_hands(A)
-		to_chat(user, "<span class='notice'>You add the signaler to the helmet.</span>")
-		qdel(src)
-	else
-		return
-
 /obj/item/secbot_assembly/attackby(obj/item/I, mob/user, params)
 	..()
 	if(istype(I, /obj/item/weldingtool))