From 868408f7c5ac5fc88d0180a5b3b084668e0fe935 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Tue, 24 Sep 2019 20:33:43 -0700 Subject: [PATCH 1/4] adds comfortable uniform and puts it in loadout --- code/modules/clothing/under/syndicate.dm | 8 ++++++++ modular_citadel/code/modules/client/loadout/uniform.dm | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 40e3fb2f..f0e2e1c8 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -67,3 +67,11 @@ icon_state = "syndicate_combat" item_color = "syndicate_combat" can_adjust = FALSE + +/obj/item/clothing/under/syndicate/comfortable + name = "Comfortable Uniform" + desc = "A modified combat uniform, it has had much of it's armor stripped out and replaced with padding to make it as comfortable as possible." + icon_state = "syndicate_combat" + item_color = "syndicate_combat" + can_adjust = FALSE + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index abdf8e3a..e6f9ff3e 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -143,6 +143,11 @@ category = SLOT_W_UNIFORM path = /obj/item/clothing/under/pants/track +/datum/gear/comfortable + name = "Comfortable Uniform" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/under/syndicate/comfortable + // Pantsless Sweaters /datum/gear/turtleneck From f6f5430aa0507aa335b43f86eb915adc223d2277 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Sat, 5 Oct 2019 20:50:14 -0700 Subject: [PATCH 2/4] Updates to make it a subtype --- code/modules/clothing/under/syndicate.dm | 6 +++--- modular_citadel/code/modules/client/loadout/uniform.dm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index f0e2e1c8..d595e767 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -68,9 +68,9 @@ item_color = "syndicate_combat" can_adjust = FALSE -/obj/item/clothing/under/syndicate/comfortable - name = "Comfortable Uniform" - desc = "A modified combat uniform, it has had much of it's armor stripped out and replaced with padding to make it as comfortable as possible." +/obj/item/clothing/under/syndicate/combat/comfortable + name = "Padded Uniform" + desc = "A uniform of similar design to the combat uniform, it has had it's armor replaced with extra padding while providing pockets to hold useful gear." icon_state = "syndicate_combat" item_color = "syndicate_combat" can_adjust = FALSE diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index e6f9ff3e..0c2d4eb6 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -144,9 +144,9 @@ path = /obj/item/clothing/under/pants/track /datum/gear/comfortable - name = "Comfortable Uniform" + name = "padded uniform" category = SLOT_WEAR_SUIT - path = /obj/item/clothing/under/syndicate/comfortable + path = /obj/item/clothing/under/syndicate/combat/comfortable // Pantsless Sweaters From b9740ce783ebf45268865493176a99e5005fe518 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Sat, 5 Oct 2019 20:54:41 -0700 Subject: [PATCH 3/4] swaps it to uniforms instead of suits as uniforms are jumpsuits. --- modular_citadel/code/modules/client/loadout/uniform.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 0c2d4eb6..8b11e6be 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -145,7 +145,7 @@ /datum/gear/comfortable name = "padded uniform" - category = SLOT_WEAR_SUIT + category = SLOT_W_UNIFORM path = /obj/item/clothing/under/syndicate/combat/comfortable // Pantsless Sweaters From af3e083f93478353d59e72065204b8839438900f Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Sat, 5 Oct 2019 21:07:34 -0700 Subject: [PATCH 4/4] note to self, don't subtype somethign that is already subtyped until I learn more about how it works. --- code/modules/clothing/under/syndicate.dm | 5 ++++- modular_citadel/code/modules/client/loadout/uniform.dm | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index d595e767..98135478 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -25,6 +25,7 @@ icon_state = "tactifool" item_state = "bl_suit" item_color = "tactifool" + has_sensor = HAS_SENSORS armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) /obj/item/clothing/under/syndicate/tacticool/skirt @@ -33,6 +34,7 @@ icon_state = "tactifool_skirt" item_state = "bl_suit" item_color = "tactifool_skirt" + has_sensor = HAS_SENSORS armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) fitted = FEMALE_UNIFORM_TOP @@ -68,10 +70,11 @@ item_color = "syndicate_combat" can_adjust = FALSE -/obj/item/clothing/under/syndicate/combat/comfortable +/obj/item/clothing/under/syndicate/comfortable name = "Padded Uniform" desc = "A uniform of similar design to the combat uniform, it has had it's armor replaced with extra padding while providing pockets to hold useful gear." icon_state = "syndicate_combat" item_color = "syndicate_combat" can_adjust = FALSE + has_sensor = HAS_SENSORS armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 8b11e6be..9bf050cb 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -144,9 +144,9 @@ path = /obj/item/clothing/under/pants/track /datum/gear/comfortable - name = "padded uniform" + name = "Padded Uniform" category = SLOT_W_UNIFORM - path = /obj/item/clothing/under/syndicate/combat/comfortable + path = /obj/item/clothing/under/syndicate/comfortable // Pantsless Sweaters