Merge pull request #9693 from Ghommie/Ghommie-cit310

Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing.
2019-11-28 23:03:07 -07:00
parent a105f55e38 a5298dac7e
commit 7495ce602a
13 changed files with 25 additions and 35 deletions
@@ -0,0 +1,44 @@
+/obj/item/clothing/glasses/phantomthief
+	name = "suspicious paper mask"
+	desc = "A cheap, Syndicate-branded paper face mask. They'll never see it coming."
+	alternate_worn_icon = 'icons/mob/mask.dmi'
+	icon = 'icons/obj/clothing/masks.dmi'
+	icon_state = "s-ninja"
+	item_state = "s-ninja"
+
+/obj/item/clothing/glasses/phantomthief/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/wearertargeting/phantomthief)
+
+/obj/item/clothing/glasses/phantomthief/syndicate
+	name = "suspicious plastic mask"
+	desc = "A cheap, bulky, Syndicate-branded plastic face mask. You have to break in to break out."
+	var/nextadrenalinepop
+
+/obj/item/clothing/glasses/phantomthief/syndicate/examine(mob/user)
+	. = ..()
+	if(user.get_item_by_slot(SLOT_GLASSES) == src)
+		if(world.time >= nextadrenalinepop)
+			. += "<span class='notice'>The built-in adrenaline injector is ready for use.</span>"
+		else
+			. += "<span class='notice'>[DisplayTimeText(nextadrenalinepop - world.time)] left before the adrenaline injector can be used again."
+
+/obj/item/clothing/glasses/phantomthief/syndicate/proc/injectadrenaline(mob/user, combatmodestate)
+	if(istype(user) && combatmodestate && world.time >= nextadrenalinepop)
+		nextadrenalinepop = world.time + 5 MINUTES
+		user.reagents.add_reagent("syndicateadrenals", 5)
+		user.playsound_local(user, 'sound/misc/adrenalinject.ogg', 100, 0, pressure_affected = FALSE)
+
+/obj/item/clothing/glasses/phantomthief/syndicate/equipped(mob/user, slot)
+	. = ..()
+	if(!istype(user))
+		return
+	if(slot != SLOT_GLASSES)
+		return
+	RegisterSignal(user, COMSIG_COMBAT_TOGGLED, .proc/injectadrenaline)
+
+/obj/item/clothing/glasses/phantomthief/syndicate/dropped(mob/user)
+	. = ..()
+	if(!istype(user))
+		return
+	UnregisterSignal(user, COMSIG_COMBAT_TOGGLED)
@@ -301,3 +301,16 @@
 	. = ..()
 	if(!warped)
 		warp_up()
+
+/obj/item/clothing/head/flakhelm	//Actually the M1 Helmet
+	name = "flak helmet"
+	icon_state = "m1helm"
+	item_state = "helmet"
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0.1, "bio" = 0, "rad" = 0, "fire" = -10, "acid" = -15)
+	desc = "A dilapidated helmet used in ancient wars. This one is brittle and essentially useless. An ace of spades is tucked into the band around the outer shell."
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/tiny/spacenam	//So you can stuff other things in the elastic band instead of it simply being a fluff thing.
+
+//The "pocket" for the M1 helmet so you can tuck things into the elastic band
+
+/datum/component/storage/concrete/pockets/tiny/spacenam
+	attack_hand_interact = TRUE		//So you can actually see what you stuff in there
@@ -763,6 +763,17 @@
 	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS|HEAD
 	alternate_worn_layer = UNDER_HEAD_LAYER

+/obj/item/clothing/suit/flakjack
+	name = "flak jacket"
+	desc = "A dilapidated jacket made of a supposedly bullet-proof material (Hint: It isn't.). Smells faintly of napalm."
+	icon_state = "flakjack"
+	item_state = "redtag"
+	blood_overlay_type = "armor"
+	body_parts_covered = CHEST
+	resistance_flags = NONE
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = -5, "acid" = -15) //nylon sucks against acid
+
 /obj/item/clothing/suit/assu_suit
 	name = "DAB suit"
 	desc = "A cheap replica of old SWAT armor. On its back, it is written: \"<i>Desperate Assistance Battleforce</i>\"."