Replaces CTF hardsuits with new armoured vests (tgstation#61716)

Co-authored-by: Thunder12345 <stewart@critar.demon.co.uk>
EOBGames · Sep 28, 2021 · e330485 · e330485
1 parent 84c7b68
commit e330485
Show file tree

Hide file tree

Showing 13 changed files with 182 additions and 164 deletions.
diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm
@@ -392,3 +392,23 @@
 
 /datum/greyscale_config/janicart_upgrade/installed
 	json_config = 'code/datums/greyscale/json_configs/janicart_upgrade_installed.json'
+
+/datum/greyscale_config/ctf_standard
+	name = "CTF Standard Vest"
+	icon_file = 'icons/obj/clothing/suits/ctf.dmi'
+	json_config = 'code/datums/greyscale/json_configs/ctf_standard.json'
+
+/datum/greyscale_config/ctf_standard_worn
+	name = "Worn CTF Standard Vest"
+	icon_file = 'icons/mob/clothing/suits/ctf.dmi'
+	json_config = 'code/datums/greyscale/json_configs/ctf_standard_worn.json'
+
+/datum/greyscale_config/ctf_light
+	name = "CTF Light Vest"
+	icon_file = 'icons/obj/clothing/suits/ctf.dmi'
+	json_config = 'code/datums/greyscale/json_configs/ctf_light.json'
+
+/datum/greyscale_config/ctf_light_worn
+	name = "Worn CTF Light Vest"
+	icon_file = 'icons/mob/clothing/suits/ctf.dmi'
+	json_config = 'code/datums/greyscale/json_configs/ctf_light_worn.json'
diff --git a/code/datums/greyscale/json_configs/ctf_light.json b/code/datums/greyscale/json_configs/ctf_light.json
@@ -0,0 +1,15 @@
+{
+	"light": [
+		{
+			"type": "icon_state",
+			"icon_state": "light",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "light_colours",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/code/datums/greyscale/json_configs/ctf_light_worn.json b/code/datums/greyscale/json_configs/ctf_light_worn.json
@@ -0,0 +1,15 @@
+{
+	"light": [
+		{
+			"type": "icon_state",
+			"icon_state": "light",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "light_colours",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/code/datums/greyscale/json_configs/ctf_standard.json b/code/datums/greyscale/json_configs/ctf_standard.json
@@ -0,0 +1,15 @@
+{
+	"standard": [
+		{
+			"type": "icon_state",
+			"icon_state": "standard",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "standard_colours",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/code/datums/greyscale/json_configs/ctf_standard_worn.json b/code/datums/greyscale/json_configs/ctf_standard_worn.json
@@ -0,0 +1,15 @@
+{
+	"standard": [
+		{
+			"type": "icon_state",
+			"icon_state": "standard",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "standard_colours",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
@@ -429,10 +429,8 @@
 	armor = list(MELEE = 50, BULLET = 40, LASER = 50,ENERGY = 50, BOMB = 50, BIO = 30, RAD = 30, FIRE = 50, ACID = 60)
 	hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/cult_shield
 
-/obj/item/clothing/suit/hooded/cultrobes/cult_shield/Initialize(mapload)
-	. = ..()
-	// note that these charges don't regenerate
-	AddComponent(/datum/component/shielded, recharge_start_delay = 0, shield_icon_file = 'icons/effects/cult_effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, .proc/shield_damaged))
+/obj/item/clothing/suit/hooded/cultrobes/cult_shield/setup_shielding()
+	AddComponent(/datum/component/shielded, recharge_start_delay = 0 SECONDS, shield_icon_file = 'icons/effects/cult_effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, .proc/shield_damaged))
 
 /// A proc for callback when the shield breaks, since cult robes are stupid and have different effects
 /obj/item/clothing/suit/hooded/cultrobes/cult_shield/proc/shield_damaged(mob/living/wearer, attack_text, new_current_charges)

diff --git a/code/modules/capture_the_flag/ctf_classes.dm b/code/modules/capture_the_flag/ctf_classes.dm
@@ -4,7 +4,7 @@
 	name = "CTF Rifleman (Solo)"
 	ears = /obj/item/radio/headset
 	uniform = /obj/item/clothing/under/syndicate
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf
+	suit = /obj/item/clothing/suit/armor/vest/ctf
 	toggle_helmet = FALSE // see the whites of their eyes
 	shoes = /obj/item/clothing/shoes/combat
 	gloves = /obj/item/clothing/gloves/combat
@@ -68,7 +68,7 @@
 
 /datum/outfit/ctf/assault
 	name = "CTF Assaulter (Solo)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/light
+	suit = /obj/item/clothing/suit/armor/vest/ctf/light
 	r_hand = /obj/item/gun/ballistic/shotgun/ctf
 	gloves = /obj/item/clothing/gloves/tackler/rocket
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun
@@ -90,7 +90,7 @@
 
 /datum/outfit/ctf/red
 	name = "CTF Rifleman (Red)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/red
+	suit = /obj/item/clothing/suit/armor/vest/ctf/red
 	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/red
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/rifle/red
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/rifle/red
@@ -105,7 +105,7 @@
 
 /datum/outfit/ctf/assault/red
 	name = "CTF Assaulter (Red)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/light/red
+	suit = /obj/item/clothing/suit/armor/vest/ctf/light/red
 	r_hand = /obj/item/gun/ballistic/shotgun/ctf/red
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/red
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/red
@@ -114,7 +114,7 @@
 
 /datum/outfit/ctf/marksman/red
 	name = "CTF Marksman (Red)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/red
+	suit = /obj/item/clothing/suit/armor/vest/ctf/red
 	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/marksman/red
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/marksman/red
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/marksman/red
@@ -125,7 +125,7 @@
 
 /datum/outfit/ctf/blue
 	name = "CTF Rifleman (Blue)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/blue
+	suit = /obj/item/clothing/suit/armor/vest/ctf/blue
 	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/blue
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/rifle/blue
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/rifle/blue
@@ -140,7 +140,7 @@
 
 /datum/outfit/ctf/assault/blue
 	name = "CTF Assaulter (Blue)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/light/blue
+	suit = /obj/item/clothing/suit/armor/vest/ctf/light/blue
 	r_hand = /obj/item/gun/ballistic/shotgun/ctf/blue
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/blue
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/blue
@@ -149,7 +149,7 @@
 
 /datum/outfit/ctf/marksman/blue
 	name = "CTF Marksman (Blue)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/blue
+	suit = /obj/item/clothing/suit/armor/vest/ctf/blue
 	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/marksman/blue
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/marksman/blue
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/marksman/blue
@@ -160,7 +160,7 @@
 
 /datum/outfit/ctf/green
 	name = "CTF Rifleman (Green)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/green
+	suit = /obj/item/clothing/suit/armor/vest/ctf/green
 	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/green
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/rifle/green
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/rifle/green
@@ -175,16 +175,16 @@
 
 /datum/outfit/ctf/assault/green
 	name = "CTF Assaulter (Green)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/light/green
+	suit = /obj/item/clothing/suit/armor/vest/ctf/light/green
 	r_hand = /obj/item/gun/ballistic/shotgun/ctf/green
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/green
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/green
 	id = /obj/item/card/id/green
 	team_radio_freq = FREQ_CTF_GREEN
 
 /datum/outfit/ctf/marksman/green
-	name = "CTF Marksman (Blue)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/green
+	name = "CTF Marksman (Green)"
+	suit = /obj/item/clothing/suit/armor/vest/ctf/green
 	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/marksman/green
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/marksman/green
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/marksman/green
@@ -195,7 +195,7 @@
 
 /datum/outfit/ctf/yellow
 	name = "CTF Rifleman (Yellow)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/yellow
+	suit = /obj/item/clothing/suit/armor/vest/ctf/yellow
 	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/yellow
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/rifle/yellow
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/rifle/yellow
@@ -210,16 +210,16 @@
 
 /datum/outfit/ctf/assault/yellow
 	name = "CTF Assaulter (Yellow)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/light/yellow
+	suit = /obj/item/clothing/suit/armor/vest/ctf/light/yellow
 	r_hand = /obj/item/gun/ballistic/shotgun/ctf/yellow
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/yellow
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/yellow
 	id = /obj/item/card/id/yellow
 	team_radio_freq = FREQ_CTF_YELLOW
 
 /datum/outfit/ctf/marksman/yellow
-	name = "CTF Marksman (Blue)"
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf/yellow
+	name = "CTF Marksman (Yellow)"
+	suit = /obj/item/clothing/suit/armor/vest/ctf/yellow
 	r_hand = /obj/item/gun/ballistic/automatic/laser/ctf/marksman/yellow
 	l_pocket = /obj/item/ammo_box/magazine/recharge/ctf/marksman/yellow
 	r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/marksman/yellow