Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Adds more fake Syndicate clothing to the loadout list, fixes and balances the existing ones #2747

Merged
merged 1 commit into from
Apr 5, 2024
+77 −17
Merged

[MIRROR] Adds more fake Syndicate clothing to the loadout list, fixes and balances the existing ones #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 55 additions & 11 deletions modular_nova/master_files/code/modules/clothing/under/syndicate.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
inhand_icon_state = "b_suit"
can_adjust = TRUE
has_sensor = HAS_SENSORS
armor_type = /datum/armor/clothing_under/none
armor_type = /datum/armor/clothing_under
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
unique_reskin = list(
RESKIN_NT = "tactifool_blue",
Expand All @@ -49,42 +49,86 @@
name = "tacticool skirtleneck"
desc = "A snug skirtleneck, in fabulous Nanotrasen-blue. Just looking at it makes you want to buy a NT-certifed coffee, go into the office, and -work-."
icon_state = "tactifool_blue_skirt"
armor_type = /datum/armor/clothing_under/none
gets_cropped_on_taurs = FALSE
body_parts_covered = CHEST|GROIN|ARMS
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
dying_key = DYE_REGISTRY_JUMPSKIRT
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
unique_reskin = list(
RESKIN_NT = "tactifool_blue_skirt",
RESKIN_CHARCOAL = "tactifool_skirt"
)

/obj/item/clothing/under/syndicate/bloodred/sleepytime/sensors //Halloween-only
has_sensor = HAS_SENSORS
armor_type = /datum/armor/clothing_under/none
armor_type = /datum/armor/clothing_under
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION

/obj/item/clothing/under/syndicate/nova/baseball
name = "syndicate baseball tee"
desc = "Aaand the Syndicate Snakes are up to bat, ready for one of their signature nuclear home-runs! Lets show these corpos a good time." //NT pitches their plasma/bluespace(something)
icon_state = "syndicate_baseball"

/obj/item/clothing/under/syndicate/unarmoured
name = "suspicious tactical turtleneck"
desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants."
icon_state = "syndicate"
inhand_icon_state = "bl_suit"
has_sensor = HAS_SENSORS
armor_type = /datum/armor/clothing_under

/obj/item/clothing/under/syndicate/unarmoured/skirt
name = "suspicious tactical skirtleneck"
desc = "A non-descript and slightly suspicious looking skirtleneck."
icon_state = "syndicate_skirt"
gets_cropped_on_taurs = FALSE
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
dying_key = DYE_REGISTRY_JUMPSKIRT
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/syndicate/unarmoured/examine_more(mob/user)
. = ..()
. += span_notice("The armor has been removed from the fabric.")

/obj/item/clothing/under/syndicate/nova/tactical/unarmoured
name = "suspicious tactical turtleneck"
desc = "A snug syndicate-red turtleneck with charcoal-black cargo pants."
icon_state = "syndicate_red"
inhand_icon_state = "r_suit"
has_sensor = HAS_SENSORS
armor_type = /datum/armor/clothing_under
unique_reskin = null

/obj/item/clothing/under/syndicate/nova/tactical/unarmoured/skirt
name = "suspicious tactical skirtleneck"
desc = "A pair of spiffy overalls with a turtleneck underneath, this one is a skirt instead, breezy."
icon_state = "syndicate_red_skirt"
gets_cropped_on_taurs = FALSE
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
dying_key = DYE_REGISTRY_JUMPSKIRT
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/syndicate/nova/tactical/unarmoured/examine_more(mob/user)
. = ..()
. += span_notice("The armor has been removed from the fabric.")

/obj/item/clothing/under/syndicate/nova/overalls/unarmoured
name = "tacticool utility overalls turtleneck"
name = "suspicious utility overalls turtleneck"
desc = "A pair of spiffy overalls with a turtleneck underneath, useful for both engineering and botanical work."
icon_state = "syndicate_overalls"
armor_type = /datum/armor/clothing_under/none
armor_type = /datum/armor/clothing_under
has_sensor = HAS_SENSORS
can_adjust = TRUE

/obj/item/clothing/under/syndicate/nova/overalls/unarmoured/skirt
name = "tacticool utility overalls skirtleneck"
name = "suspicious utility overalls skirtleneck"
desc = "A pair of spiffy overalls with a turtleneck underneath, this one is a skirt instead, breezy."
icon_state = "syndicate_overallskirt"
gets_cropped_on_taurs = FALSE
female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY
dying_key = DYE_REGISTRY_JUMPSKIRT
supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON

/obj/item/clothing/under/syndicate/nova/overalls/unarmoured/examine_more(mob/user)
. = ..()
. += span_notice("The armor has been removed from the fabric.")

/obj/item/clothing/mask/gas/sechailer/half_mask
name = "tacticool neck gaiter"
desc = "A black techwear mask. Its low-profile design contrasts with the edge. Has a small respirator to be used with internals."
Expand Down Expand Up @@ -149,7 +193,7 @@
desc = "Throughout the stars, rumors of mad scientists and angry drill sergeants run rampant; of creatures in armor black as night, being led by men or women wearing this uniform. They share one thing: a deep, natonalistic zeal of the dream of America."
icon_state = "enclave"
can_adjust = TRUE
armor_type = /datum/armor/clothing_under/none
armor_type = /datum/armor/clothing_under

/obj/item/clothing/under/syndicate/nova/enclave/officer
name = "neo-American officer uniform"
Expand Down
28 changes: 22 additions & 6 deletions modular_nova/modules/loadouts/loadout_items/under/loadout_datum_under.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,19 +523,35 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/

/datum/loadout_item/under/miscellaneous/tacticool_turtleneck
name = "Tacticool Turtleneck"
item_path = /obj/item/clothing/under/syndicate/tacticool //This has been rebalanced in modular_nova\master_files\code\modules\clothing\under\syndicate.dm
item_path = /obj/item/clothing/under/syndicate/tacticool

/datum/loadout_item/under/miscellaneous/tactical_skirt
name = "Tacticool Skirtleneck"
item_path = /obj/item/clothing/under/syndicate/tacticool/skirt //This has been rebalanced in modular_nova\master_files\code\modules\clothing\under\syndicate.dm
item_path = /obj/item/clothing/under/syndicate/tacticool/skirt

/datum/loadout_item/under/miscellaneous/syndicate_unarmoured
name = "Suspicious Tactical Turtleneck (Grey)"
item_path = /obj/item/clothing/under/syndicate/unarmoured

/datum/loadout_item/under/miscellaneous/syndicate_unarmoured_skirt
name = "Suspicious Tactical Skirtleneck (Grey)"
item_path = /obj/item/clothing/under/syndicate/unarmoured/skirt

/datum/loadout_item/under/miscellaneous/syndicate_nova_unarmoured
name = "Suspicious Tactical Turtleneck (Red)"
item_path = /obj/item/clothing/under/syndicate/nova/tactical/unarmoured

/datum/loadout_item/under/miscellaneous/syndicate_nova_unarmoured_skirt
name = "Suspicious Tactical Skirtleneck (Red)"
item_path = /obj/item/clothing/under/syndicate/nova/tactical/unarmoured/skirt

/datum/loadout_item/under/miscellaneous/syndicate_nova_overalls_unarmoured
name = "Tacticool Utility Overalls Turtleneck"
item_path = /obj/item/clothing/under/syndicate/nova/overalls/unarmoured //This has been rebalanced in modular_nova\master_files\code\modules\clothing\under\syndicate.dm :3
name = "Suspicious Utility Overalls Turtleneck"
item_path = /obj/item/clothing/under/syndicate/nova/overalls/unarmoured

/datum/loadout_item/under/miscellaneous/syndicate_nova_overalls_unarmoured_skirt
name = "Tacticool Overalls Skirtleneck"
item_path = /obj/item/clothing/under/syndicate/nova/overalls/unarmoured/skirt //This has been rebalanced in modular_nova\master_files\code\modules\clothing\under\syndicate.dm :3
name = "Suspicious Utility Overalls Skirtleneck"
item_path = /obj/item/clothing/under/syndicate/nova/overalls/unarmoured/skirt

/datum/loadout_item/under/miscellaneous/tactical_pants
name = "Tactical Pants"
Expand Down
Loading