From: Huaqas Date: Sat, 13 Sep 2025 17:36:28 +0000 (+0800) Subject: Add Undergarments to Vulpkanin (#40321) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f1ae8ecdfefaef0086bc1d8bae1d917cdcc1f95a;p=space-station-14.git Add Undergarments to Vulpkanin (#40321) Putting underwear on dogs. --- diff --git a/Resources/Locale/en-US/markings/undergarment.ftl b/Resources/Locale/en-US/markings/undergarment.ftl index 3740d0573d..4eebee641a 100644 --- a/Resources/Locale/en-US/markings/undergarment.ftl +++ b/Resources/Locale/en-US/markings/undergarment.ftl @@ -1,21 +1,54 @@ marking-UndergarmentTopTanktop = Tanktop +marking-UndergarmentTopTanktop-tanktop = Tanktop marking-UndergarmentTopBinder = Binder +marking-UndergarmentTopBinder-binder = Binder marking-UndergarmentTopBra = Classic Bra +marking-UndergarmentTopBra-classic = Classic Bra marking-UndergarmentTopSportsbra = Sports Bra +marking-UndergarmentTopSportsbra-sports = Sports Bra marking-UndergarmentBottomBoxers = Boxers +marking-UndergarmentBottomBoxers-boxers = Boxers marking-UndergarmentBottomBriefs = Briefs +marking-UndergarmentBottomBriefs-briefs = Briefs marking-UndergarmentBottomSatin = Satin +marking-UndergarmentBottomSatin-satin = Satin marking-UndergarmentTopTanktopVox = Tanktop +marking-UndergarmentTopTanktopVox-tanktop_vox = Tanktop marking-UndergarmentTopBinderVox = Binder +marking-UndergarmentTopBinderVox-binder_vox = Binder marking-UndergarmentTopBraVox = Classic Bra +marking-UndergarmentTopBraVox-classic_vox = Classic Bra marking-UndergarmentTopSportsbraVox = Sports Bra +marking-UndergarmentTopSportsbraVox-sports_vox = Sports Bra marking-UndergarmentBottomBoxersVox = Boxers +marking-UndergarmentBottomBoxersVox_boxers_vox = Boxers marking-UndergarmentBottomBriefsVox = Briefs +marking-UndergarmentBottomBriefsVox-briefs_vox = Briefs marking-UndergarmentBottomSatinVox = Satin +marking-UndergarmentBottomSatinVox-satin_vox = Satin marking-UndergarmentBottomBoxersReptilian = Boxers +marking-UndergarmentBottomBoxersReptilian-boxers_reptilian = Boxers marking-UndergarmentBottomBriefsReptilian = Briefs +marking-UndergarmentBottomBriefsReptilian-briefs_reptilian = Briefs marking-UndergarmentBottomSatinReptilian = Satin +marking-UndergarmentBottomSatinReptilian-satin_reptilian = Satin + +marking-UndergarmentTopTanktopVulpkanin = Tanktop +marking-UndergarmentTopTanktopVulpkanin-tanktop_vulpkanin = Tanktop +marking-UndergarmentTopBinderVulpkanin = Binder +marking-UndergarmentTopBinderVulpkanin-binder_vulpkanin = Binder +marking-UndergarmentTopBraVulpkanin = Classic Bra +marking-UndergarmentTopBraVulpkanin-classic_vulpkanin = Classic Bra +marking-UndergarmentTopSportsbraVulpkanin = Sports Bra +marking-UndergarmentTopSportsbraVulpkanin-sports_vulpkanin = Sports Bra + +marking-UndergarmentBottomBoxersVulpkanin = Boxers +marking-UndergarmentBottomBoxersVulpkanin-boxers_vulpkanin = Boxers +marking-UndergarmentBottomBriefsVulpkanin = Briefs +marking-UndergarmentBottomBriefsVulpkanin-briefs_vulpkanin = Briefs +marking-UndergarmentBottomSatinVulpkanin = Satin +marking-UndergarmentBottomSatinVulpkanin-satin_vulpkanin = Satin \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml index b7f62290e1..f711264bcf 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/undergarments.yml @@ -221,3 +221,95 @@ sprites: - sprite: Mobs/Customization/undergarments.rsi state: satin_reptilian + +- type: marking + id: UndergarmentBottomBoxersVulpkanin + bodyPart: UndergarmentBottom + markingCategory: UndergarmentBottom + speciesRestriction: [Vulpkanin] + coloring: + default: + type: null + fallbackColor: '#FFFFFF' + sprites: + - sprite: Mobs/Customization/undergarments.rsi + state: boxers_vulpkanin + +- type: marking + id: UndergarmentBottomBriefsVulpkanin + bodyPart: UndergarmentBottom + markingCategory: UndergarmentBottom + speciesRestriction: [Vulpkanin] + coloring: + default: + type: null + fallbackColor: '#FFFFFF' + sprites: + - sprite: Mobs/Customization/undergarments.rsi + state: briefs_vulpkanin + +- type: marking + id: UndergarmentBottomSatinVulpkanin + bodyPart: UndergarmentBottom + markingCategory: UndergarmentBottom + speciesRestriction: [Vulpkanin] + coloring: + default: + type: null + fallbackColor: '#FFFFFF' + sprites: + - sprite: Mobs/Customization/undergarments.rsi + state: satin_vulpkanin + +- type: marking + id: UndergarmentTopBraVulpkanin + bodyPart: UndergarmentTop + markingCategory: UndergarmentTop + speciesRestriction: [Vulpkanin] + coloring: + default: + type: null + fallbackColor: '#FFFFFF' + sprites: + - sprite: Mobs/Customization/undergarments.rsi + state: classic_vulpkanin + +- type: marking + id: UndergarmentTopSportsbraVulpkanin + bodyPart: UndergarmentTop + markingCategory: UndergarmentTop + speciesRestriction: [Vulpkanin] + coloring: + default: + type: null + fallbackColor: '#FFFFFF' + sprites: + - sprite: Mobs/Customization/undergarments.rsi + state: sports_vulpkanin + +- type: marking + id: UndergarmentTopBinderVulpkanin + bodyPart: UndergarmentTop + markingCategory: UndergarmentTop + speciesRestriction: [Vulpkanin] + coloring: + default: + type: null + fallbackColor: '#FFFFFF' + sprites: + - sprite: Mobs/Customization/undergarments.rsi + state: binder_vulpkanin + +- type: marking + id: UndergarmentTopTanktopVulpkanin + bodyPart: UndergarmentTop + markingCategory: UndergarmentTop + speciesRestriction: [Vulpkanin] + coloring: + default: + type: null + fallbackColor: '#FFFFFF' + sprites: + - sprite: Mobs/Customization/undergarments.rsi + state: tanktop_vulpkanin + \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/undergarments.rsi/binder_vulpkanin.png b/Resources/Textures/Mobs/Customization/undergarments.rsi/binder_vulpkanin.png new file mode 100644 index 0000000000..5462b644df Binary files /dev/null and b/Resources/Textures/Mobs/Customization/undergarments.rsi/binder_vulpkanin.png differ diff --git a/Resources/Textures/Mobs/Customization/undergarments.rsi/boxers_vulpkanin.png b/Resources/Textures/Mobs/Customization/undergarments.rsi/boxers_vulpkanin.png new file mode 100644 index 0000000000..39960b57c7 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/undergarments.rsi/boxers_vulpkanin.png differ diff --git a/Resources/Textures/Mobs/Customization/undergarments.rsi/briefs_vulpkanin.png b/Resources/Textures/Mobs/Customization/undergarments.rsi/briefs_vulpkanin.png new file mode 100644 index 0000000000..868518a9f4 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/undergarments.rsi/briefs_vulpkanin.png differ diff --git a/Resources/Textures/Mobs/Customization/undergarments.rsi/classic_vulpkanin.png b/Resources/Textures/Mobs/Customization/undergarments.rsi/classic_vulpkanin.png new file mode 100644 index 0000000000..957e50c145 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/undergarments.rsi/classic_vulpkanin.png differ diff --git a/Resources/Textures/Mobs/Customization/undergarments.rsi/meta.json b/Resources/Textures/Mobs/Customization/undergarments.rsi/meta.json index 345c141ccd..d41a500803 100644 --- a/Resources/Textures/Mobs/Customization/undergarments.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/undergarments.rsi/meta.json @@ -74,6 +74,34 @@ { "name": "boxers_reptilian", "directions": 4 + }, + { + "name": "boxers_vulpkanin", + "directions": 4 + }, + { + "name": "briefs_vulpkanin", + "directions": 4 + }, + { + "name": "satin_vulpkanin", + "directions": 4 + }, + { + "name": "classic_vulpkanin", + "directions": 4 + }, + { + "name": "sports_vulpkanin", + "directions": 4 + }, + { + "name": "tanktop_vulpkanin", + "directions": 4 + }, + { + "name": "binder_vulpkanin", + "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/Mobs/Customization/undergarments.rsi/satin_vulpkanin.png b/Resources/Textures/Mobs/Customization/undergarments.rsi/satin_vulpkanin.png new file mode 100644 index 0000000000..6ee18f4e9e Binary files /dev/null and b/Resources/Textures/Mobs/Customization/undergarments.rsi/satin_vulpkanin.png differ diff --git a/Resources/Textures/Mobs/Customization/undergarments.rsi/sports_vulpkanin.png b/Resources/Textures/Mobs/Customization/undergarments.rsi/sports_vulpkanin.png new file mode 100644 index 0000000000..cb18450f72 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/undergarments.rsi/sports_vulpkanin.png differ diff --git a/Resources/Textures/Mobs/Customization/undergarments.rsi/tanktop_vulpkanin.png b/Resources/Textures/Mobs/Customization/undergarments.rsi/tanktop_vulpkanin.png new file mode 100644 index 0000000000..c7014130d1 Binary files /dev/null and b/Resources/Textures/Mobs/Customization/undergarments.rsi/tanktop_vulpkanin.png differ