Assorted fixes (maybe) (#1581)

I hate reaping what I've sown (Hopefully) makes crate code from refinery more readable Completely removes old K-corp Armor Adds K-corp helmets to K-corp gacha Adds L3 hat to its armor Fixes Aida hats (Properly hides stuff) Fixes Index/Thumb armor inv sprites Index Proxy Armor can be switched between closed and open (and resolves any issues with remaking the item)
vlggms · Oct 29, 2023 · d31bbeb · d31bbeb
1 parent 8438086
commit d31bbeb
Show file tree

Hide file tree

Showing 11 changed files with 99 additions and 91 deletions.
diff --git a/ModularTegustation/tegu_items/refinery/crates/association.dm b/ModularTegustation/tegu_items/refinery/crates/association.dm
@@ -55,7 +55,7 @@
 		/obj/item/clothing/suit/armor/ego_gear/city/hanacombat,
 		/obj/item/clothing/suit/armor/ego_gear/city/hanacombat/paperwork,
 		/obj/item/clothing/suit/armor/ego_gear/city/hanadirector,
-	)
+		)
 
 //Zwei - Zwei Association
 /obj/structure/lootcrate/zwei
@@ -69,12 +69,14 @@
 		/obj/item/ego_weapon/city/zweihander/knife,
 		/obj/item/clothing/suit/armor/ego_gear/city/zwei,
 		/obj/item/clothing/suit/armor/ego_gear/city/zweiriot,
-		/obj/item/ego_weapon/city/zweibaton,)
+		/obj/item/ego_weapon/city/zweibaton,
+		)
 
 	rareloot =	list(
 		/obj/item/ego_weapon/city/zweihander/vet,
 		/obj/item/clothing/suit/armor/ego_gear/city/zweivet,
-		/obj/item/clothing/suit/armor/ego_gear/city/zweileader)
+		/obj/item/clothing/suit/armor/ego_gear/city/zweileader,
+		)
 
 //Tres - Tres Association (Not really accessible)
 /obj/structure/lootcrate/tres
@@ -83,57 +85,57 @@
 	icon_state = "crate_tres"
 	rarechance = 40
 	veryrarechance = 10
-	lootlist =	list(/obj/item/tresmetal)
+	lootlist =	list(
+		/obj/item/tresmetal,
+		)
 
 	rareloot =	list(
-	/obj/item/workshop_mod/regular/red,
-	/obj/item/workshop_mod/regular/white,
-	/obj/item/workshop_mod/regular/black,
-	/obj/item/workshop_mod/fast/red,
-	/obj/item/workshop_mod/fast/white,
-	/obj/item/workshop_mod/fast/black,
-	/obj/item/workshop_mod/slow/red,
-	/obj/item/workshop_mod/slow/white,
-	/obj/item/workshop_mod/slow/black,
-	/obj/item/workshop_mod/throwforce/red,
-	/obj/item/workshop_mod/throwforce/white,
-	/obj/item/workshop_mod/throwforce/black,
-	/obj/item/workshop_mod/aoe/red,
-	/obj/item/workshop_mod/aoe/white,
-	/obj/item/workshop_mod/aoe/black,
+		/obj/item/workshop_mod/regular/red,
+		/obj/item/workshop_mod/regular/white,
+		/obj/item/workshop_mod/regular/black,
+		/obj/item/workshop_mod/fast/red,
+		/obj/item/workshop_mod/fast/white,
+		/obj/item/workshop_mod/fast/black,
+		/obj/item/workshop_mod/slow/red,
+		/obj/item/workshop_mod/slow/white,
+		/obj/item/workshop_mod/slow/black,
+		/obj/item/workshop_mod/throwforce/red,
+		/obj/item/workshop_mod/throwforce/white,
+		/obj/item/workshop_mod/throwforce/black,
+		/obj/item/workshop_mod/aoe/red,
+		/obj/item/workshop_mod/aoe/white,
+		/obj/item/workshop_mod/aoe/black,
 		)
 
 	veryrareloot =	list(
-	/obj/item/workshop_mod/regular/pale,
-	/obj/item/workshop_mod/fast/pale,
-	/obj/item/workshop_mod/slow/pale,
-	/obj/item/workshop_mod/throwforce/pale,
-	/obj/item/workshop_mod/aoe/pale,
-	/obj/item/workshop_mod/healing/red,
-	/obj/item/workshop_mod/healing/white,
-	/obj/item/workshop_mod/healing/black,
-	/obj/item/workshop_mod/healing/pale,
-	/obj/item/workshop_mod/curing/red,
-	/obj/item/workshop_mod/curing/white,
-	/obj/item/workshop_mod/curing/black,
-	/obj/item/workshop_mod/curing/pale,
-	/obj/item/workshop_mod/sapping/red,
-	/obj/item/workshop_mod/sapping/white,
-	/obj/item/workshop_mod/sapping/black,
-	/obj/item/workshop_mod/sapping/pale,
-	/obj/item/workshop_mod/aoe/large/red,
-	/obj/item/workshop_mod/aoe/large/white,
-	/obj/item/workshop_mod/aoe/large/black,
-	/obj/item/workshop_mod/aoe/large/pale,
-	/obj/item/workshop_mod/sharp/red,
-	/obj/item/workshop_mod/sharp/white,
-	/obj/item/workshop_mod/sharp/black,
-	/obj/item/workshop_mod/sharp/pale,
-	/obj/item/workshop_mod/split/redpale,
-	/obj/item/workshop_mod/split/whiteblack,
-
-	)
-
+		/obj/item/workshop_mod/regular/pale,
+		/obj/item/workshop_mod/fast/pale,
+		/obj/item/workshop_mod/slow/pale,
+		/obj/item/workshop_mod/throwforce/pale,
+		/obj/item/workshop_mod/aoe/pale,
+		/obj/item/workshop_mod/healing/red,
+		/obj/item/workshop_mod/healing/white,
+		/obj/item/workshop_mod/healing/black,
+		/obj/item/workshop_mod/healing/pale,
+		/obj/item/workshop_mod/curing/red,
+		/obj/item/workshop_mod/curing/white,
+		/obj/item/workshop_mod/curing/black,
+		/obj/item/workshop_mod/curing/pale,
+		/obj/item/workshop_mod/sapping/red,
+		/obj/item/workshop_mod/sapping/white,
+		/obj/item/workshop_mod/sapping/black,
+		/obj/item/workshop_mod/sapping/pale,
+		/obj/item/workshop_mod/aoe/large/red,
+		/obj/item/workshop_mod/aoe/large/white,
+		/obj/item/workshop_mod/aoe/large/black,
+		/obj/item/workshop_mod/aoe/large/pale,
+		/obj/item/workshop_mod/sharp/red,
+		/obj/item/workshop_mod/sharp/white,
+		/obj/item/workshop_mod/sharp/black,
+		/obj/item/workshop_mod/sharp/pale,
+		/obj/item/workshop_mod/split/redpale,
+		/obj/item/workshop_mod/split/whiteblack,
+		)
 
 //Shi - Shi Association
 /obj/structure/lootcrate/shi
@@ -145,7 +147,6 @@
 		/obj/item/ego_weapon/city/shi_knife,
 		/obj/item/clothing/suit/armor/ego_gear/city/shi,
 		/obj/item/clothing/suit/armor/ego_gear/city/shilimbus,
-
 		)
 
 	rareloot =	list(
@@ -170,7 +171,6 @@
 		/obj/item/ego_weapon/city/shi_knife,
 		/obj/item/clothing/suit/armor/ego_gear/city/shi,
 		/obj/item/clothing/suit/armor/ego_gear/city/shilimbus,
-
 		)
 
 	rareloot =	list(
@@ -210,8 +210,6 @@
 		/obj/item/clothing/suit/armor/ego_gear/city/liuleader/section5,
 		)
 
-
-
 //Seven - Seven and its associates
 /obj/structure/lootcrate/seven
 	name = "Seven Association Crate"
@@ -238,4 +236,5 @@
 		/obj/item/clothing/suit/armor/ego_gear/city/sevendirector,
 		/obj/item/ego_weapon/city/seven/director,
 		/obj/item/ego_weapon/city/seven/cane,
-		/obj/item/ego_weapon/city/seven_fencing/dagger)
+		/obj/item/ego_weapon/city/seven_fencing/dagger,
+		)
diff --git a/ModularTegustation/tegu_items/refinery/crates/corporation.dm b/ModularTegustation/tegu_items/refinery/crates/corporation.dm
@@ -26,7 +26,8 @@
 		/obj/item/powered_gadget/detector_gadget/ordeal,
 		/obj/item/managerbullet,
 		/obj/item/powered_gadget/teleporter,
-		/obj/item/tool_extractor)
+		/obj/item/tool_extractor,
+		)
 
 //K Corporation
 /obj/structure/lootcrate/k_corp
@@ -37,18 +38,21 @@
 	veryrarechance = 5
 	lootlist =	list(
 		/obj/item/managerbullet,
-		/obj/item/ksyringe)
+		/obj/item/ksyringe,
+		)
 
 	rareloot =	list(
 		/obj/item/ego_weapon/city/kcorp,
 		/obj/item/ego_weapon/shield/kcorp,
 		/obj/item/ego_weapon/city/kcorp/axe,
 		/obj/item/gun/ego_gun/pistol/kcorp,
 		/obj/item/clothing/suit/armor/ego_gear/city/kcorp_l1,
+		/obj/item/clothing/head/kcorp,
+		/obj/item/clothing/head/kcorp/visor,
 		)
 
 	veryrareloot =	list(
-		/obj/item/clothing/under/rank/k_corporation/intern,
+		/obj/item/clothing/suit/armor/ego_gear/city/kcorp_sci,
 		/obj/item/ego_weapon/city/kcorp/spear,
 		/obj/item/ego_weapon/city/kcorp/dspear,
 		/obj/item/gun/ego_gun/pistol/kcorp/smg,
@@ -90,7 +94,8 @@
 		/obj/item/ego_weapon/city/ncorp_brassnail/huge,
 		/obj/item/ego_weapon/city/ncorp_brassnail/rose,
 		/obj/item/clothing/suit/armor/ego_gear/city/grosshammmer,
-		/obj/item/clothing/suit/armor/ego_gear/city/ncorpcommander)
+		/obj/item/clothing/suit/armor/ego_gear/city/ncorpcommander,
+		)
 
 //R Corporation
 /obj/structure/lootcrate/r_corp
@@ -107,18 +112,20 @@
 		/obj/item/clothing/suit/space/hardsuit/rabbit/leader,
 		/obj/item/gun/energy/e_gun/rabbitdash,
 		/obj/item/ego_weapon/city/rabbit_rush,
-		/obj/item/clothing/under/suit/lobotomy/rcorp_command
+		/obj/item/clothing/under/suit/lobotomy/rcorp_command,
 		)
 
 	rareloot =	list(
 		/obj/item/ego_weapon/city/rabbit_blade,
 		/obj/item/ego_weapon/city/reindeer,
 		/obj/item/clothing/head/beret/tegu/rcorp,
-		/obj/item/clothing/neck/cloak/rcorp)
+		/obj/item/clothing/neck/cloak/rcorp,
+		)
 
-	veryrareloot =	list(/obj/item/ego_weapon/city/rabbit_blade/command,
+	veryrareloot =	list(
+		/obj/item/ego_weapon/city/rabbit_blade/command,
 		/obj/item/ego_weapon/city/reindeer/captain,
-	)
+		)
 
 //S Corporation
 /obj/structure/lootcrate/s_corp
@@ -138,7 +145,8 @@
 	rareloot =	list(
 		/obj/item/gun/ego_gun/shrimp/minigun,
 		/mob/living/simple_animal/hostile/shrimp,
-		/obj/item/grenade/spawnergrenade/shrimp)
+		/obj/item/grenade/spawnergrenade/shrimp,
+		)
 
 
 //W Corporation
@@ -151,9 +159,11 @@
 		/obj/item/clothing/head/wcorp,
 		/obj/item/clothing/under/suit/lobotomy/wcorp,
 		/obj/item/clothing/suit/armor/ego_gear/wcorp,
-		/obj/item/powered_gadget/teleporter)
+		/obj/item/powered_gadget/teleporter,
+		)
 
-	rareloot =	list(/obj/item/ego_weapon/city/charge/wcorp/fist,
+	rareloot =	list(
+		/obj/item/ego_weapon/city/charge/wcorp/fist,
 		/obj/item/ego_weapon/city/charge/wcorp/axe,
 		/obj/item/ego_weapon/city/charge/wcorp/spear,
 		/obj/item/ego_weapon/city/charge/wcorp/dagger,
@@ -164,4 +174,3 @@
 		/obj/item/ego_weapon/city/charge/wcorp/shield/club,
 		/obj/item/ego_weapon/city/charge/wcorp/shield/axe,
 		)
-
diff --git a/ModularTegustation/tegu_items/refinery/crates/misc.dm b/ModularTegustation/tegu_items/refinery/crates/misc.dm
@@ -23,10 +23,13 @@
 		/obj/item/clothing/under/limbus/shirt,
 		/obj/item/clothing/accessory/limbusvest,
 		/obj/item/clothing/under/limbus/prison,
-		/obj/item/clothing/neck/limbus_tie)
+		/obj/item/clothing/neck/limbus_tie,
+		)
 
-	rareloot =	list(/obj/item/clothing/suit/armor/ego_gear/limbus/durante,
+	rareloot =	list(
+		/obj/item/clothing/suit/armor/ego_gear/limbus/durante,
 		/obj/item/ego_weapon/lance/sangre,
 		/obj/item/clothing/suit/armor/ego_gear/limbus/ego/minos,
 		/obj/item/clothing/suit/armor/ego_gear/limbus/ego/cast,
-		/obj/item/clothing/suit/armor/ego_gear/limbus/ego/branch)
+		/obj/item/clothing/suit/armor/ego_gear/limbus/ego/branch,
+		)
diff --git a/ModularTegustation/tegu_items/refinery/crates/syndicate.dm b/ModularTegustation/tegu_items/refinery/crates/syndicate.dm
@@ -15,7 +15,7 @@
 	rareloot =	list(
 		/obj/item/clothing/suit/armor/ego_gear/city/blade_lineage_cutthroat,
 		/obj/item/clothing/suit/armor/ego_gear/city/thumb_capo,
-		/obj/item/clothing/suit/armor/ego_gear/city/index_proxy,
+		/obj/item/clothing/suit/armor/ego_gear/adjustable/index_proxy,
 		/obj/item/ego_weapon/city/index,
 		/obj/item/ego_weapon/city/awl,
 		/obj/item/ego_weapon/city/kurokumo,

diff --git a/ModularTegustation/tegu_items/refinery/crates/workshop.dm b/ModularTegustation/tegu_items/refinery/crates/workshop.dm
@@ -1,4 +1,3 @@
-
 //First set of city stuff. Cane, Streetlight, Yun office, Leaflet, The Udjat and Mirae Life Insurance, as well as generic Grade 1 fixers.
 /obj/structure/lootcrate/workshopleaf
 	name = "leaflet workshop crate"
@@ -14,7 +13,7 @@
 		/obj/item/ego_weapon/city/streetlight_bat,
 		/obj/item/ego_weapon/city/streetlight_greatsword,
 		/obj/item/ego_weapon/city/leaflet/round,
-		/obj/item/ego_weapon/city/leaflet/wide
+		/obj/item/ego_weapon/city/leaflet/wide,
 		)
 
 	rareloot =	list(
@@ -117,5 +116,5 @@
 		/obj/item/ego_weapon/city/charge/rosespanner/minihammer,
 		/obj/item/clothing/suit/armor/ego_gear/city/rosespannerrep,
 		/obj/item/clothing/suit/armor/ego_gear/city/rosespanner,
-		/obj/item/rosespanner_gear/pale
+		/obj/item/rosespanner_gear/pale,
 		)
diff --git a/_maps/templates/syndicate_office/index.dmm b/_maps/templates/syndicate_office/index.dmm
@@ -196,7 +196,7 @@
 /area/city/backstreets_room)
 "Q" = (
 /obj/structure/closet/crate,
-/obj/item/clothing/suit/armor/ego_gear/city/index_proxy,
+/obj/item/clothing/suit/armor/ego_gear/adjustable/index_proxy,
 /obj/effect/spawner/lootdrop/proxy,
 /turf/open/floor/facility/white,
 /area/city/backstreets_room)

diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/index.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/index.dm
@@ -11,17 +11,20 @@
 							JUSTICE_ATTRIBUTE = 60
 							)
 
-/obj/item/clothing/suit/armor/ego_gear/city/index_proxy
+/obj/item/clothing/suit/armor/ego_gear/adjustable/index_proxy //Choose your Drip babey
 	name = "index proxy armor"
 	desc = "Armor worn by index proxies."
 	icon_state = "index_proxy_open"
+	icon = 'icons/obj/clothing/ego_gear/lc13_armor.dmi'
+	worn_icon = 'icons/mob/clothing/ego_gear/lc13_armor.dmi'
 	armor = list(RED_DAMAGE = 30, WHITE_DAMAGE = 30, BLACK_DAMAGE = 30, PALE_DAMAGE = 40)
 	attribute_requirements = list(
 							FORTITUDE_ATTRIBUTE = 80,
 							PRUDENCE_ATTRIBUTE = 80,
 							TEMPERANCE_ATTRIBUTE = 80,
 							JUSTICE_ATTRIBUTE = 80
 							)
+	alternative_styles = list("index_proxy_open", "index_proxy_closed")
 
 /obj/item/clothing/suit/armor/ego_gear/city/index_mess
 	name = "index messenger armor"

diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/jcorp.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/jcorp.dm
@@ -72,6 +72,7 @@
 	name = "los mariachis sombrero"
 	desc = "A sombrero worn by the Los Mariachis leader. This one has a glowing mask of a skull."
 	icon_state = "aida_boss"
-	flags_inv = HIDEMASK|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR
+	flags_inv = HIDEHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
 	dynamic_hair_suffix = ""
 	dynamic_fhair_suffix = ""
diff --git a/code/modules/clothing/suits/ego_gear/non_abnormality/kcorp.dm b/code/modules/clothing/suits/ego_gear/non_abnormality/kcorp.dm
@@ -1,20 +1,9 @@
-/obj/item/clothing/suit/armor/ego_gear/city/kcorp //bit outdated, left here if someone wants to use it.
-	name = "K corp armor"
-	desc = "Armor worn by Kcorp employees."
-	icon_state = "kcorp"
-	armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 40, BLACK_DAMAGE = 40, PALE_DAMAGE = 20)
-	attribute_requirements = list(
-							FORTITUDE_ATTRIBUTE = 80,
-							PRUDENCE_ATTRIBUTE = 80,
-							TEMPERANCE_ATTRIBUTE = 80,
-							JUSTICE_ATTRIBUTE = 80
-							)
-
-/obj/item/clothing/suit/armor/ego_gear/city/kcorp_l1 //Sprites by Quack. Current Values reflect Assoc Armor Values
+//Sprites by Quack. Red Favored. Drip? Maybe??
+/obj/item/clothing/suit/armor/ego_gear/city/kcorp_l1
 	name = "K corp L1 armor"
 	desc = "Armor worn by Kcorp security."
 	icon_state = "kcorp_l1"
-	armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 20, BLACK_DAMAGE = 20, PALE_DAMAGE = 0) //Red was favored, so Red is K-corps Focus
+	armor = list(RED_DAMAGE = 40, WHITE_DAMAGE = 20, BLACK_DAMAGE = 20, PALE_DAMAGE = 0)
 	attribute_requirements = list(
 							FORTITUDE_ATTRIBUTE = 60,
 							PRUDENCE_ATTRIBUTE = 60,
@@ -27,6 +16,7 @@
 	desc = "Armor worn by Kcorp excision staff."
 	icon_state = "kcorp_l3"
 	armor = list(RED_DAMAGE = 50, WHITE_DAMAGE = 40, BLACK_DAMAGE = 40, PALE_DAMAGE = 20)
+	hat = /obj/item/clothing/head/ego_hat/kcorp_l3
 	attribute_requirements = list(
 							FORTITUDE_ATTRIBUTE = 80,
 							PRUDENCE_ATTRIBUTE = 80,
@@ -56,7 +46,11 @@
 	desc = "A riot helmet worn by k-corp. This one comes with a Visor."
 	icon_state = "kcorp_l1_visor"
 
-/obj/item/clothing/head/kcorp/l3
+/obj/item/clothing/head/ego_hat/kcorp_l3
 	name = "\improper k-corp l3 helmet"
 	desc = "A helmet worn by k-corp."
 	icon_state = "kcorp_l3"
+	flags_inv = HIDEHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
+	dynamic_hair_suffix = ""
+	dynamic_fhair_suffix = ""
diff --git a/icons/mob/clothing/ego_gear/lc13_armor.dmi b/icons/mob/clothing/ego_gear/lc13_armor.dmi
diff --git a/icons/obj/clothing/ego_gear/lc13_armor.dmi b/icons/obj/clothing/ego_gear/lc13_armor.dmi