Update Clothing Assignments of Suit/Skirt #146

Tirochora · 2024-08-24T03:54:57Z

Description

Changes some of the parent clothing for various outfits in the game, such as the colored jumpskirts, the monastic robes, the operative jumpskirt, and miscellaneous clothing pieces that have open bottoms such as the gladiator's outfit and the kimono.

Changelog

🆑

fix: basic colored jumpskirts, kimonos, monastic robes, and the operative jumpskirt all now have the jumpskirt parent (operative jumpskirt is still unsensored), meaning they should be able to be worn by harpies.

github-actions · 2024-08-24T03:55:34Z

RSI Diff Bot; head commit 93fd4ce merging into d07b00e
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after 93fd4ce

FoxxoTrystan

This is going to be a nightmare with conflict merges.

Please add comments on changes
and move all new jumpskirts to the floof directory wil commenting the old ones instead of deleting them.

…xplain changes

Tirochora · 2024-09-01T13:06:51Z

This is going to be a nightmare with conflict merges.

Please add comments on changes and move all new jumpskirts to the floof directory wil commenting the old ones instead of deleting them.

I'm not quite sure what you mean with 'moving all new jumpskirts to the floof directory, as there are no 'new' jumpskirts. Should I make and move the ones I modified to a separate 'jumpskirts.yml' in the floof directory?

FoxxoTrystan · 2024-09-02T19:19:12Z

Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

+# Moved gladiator uniform here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory.
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpsuitGladiator
+  name: gladiator uniform
+  description: Made for true gladiators (or Ash Walkers).
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/gladiator.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/gladiator.rsi
+
+# Moved purple bartender's uniform here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory.
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpsuitBartenderPurple
+  name: purple bartender's uniform
+  description: A special purple outfit to serve drinks.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/bartender_purple.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/bartender_purple.rsi
+
+# Moved dark monstic robe here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory.
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpsuitMonasticRobeDark
+  name: dark monastic robe
+  description: It's a dark robe, often worn by religious folk.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_dark.rsi
+
+# Moved light monastic here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory.
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpsuitMonasticRobeLight
+  name: light monastic robe
+  description: It's a light robe, often worn by religious folk.
+  components:
+    - type: Sprite
+      sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi
+    - type: Clothing
+      sprite: Clothing/Uniforms/Jumpskirt/monastic_robe_light.rsi
+
+# Moved kimono here instead of jumpsuits.yml, changed its parent to ClothingUniformSkirtBase, and moved the sprite location to the jumpskirts directory.
+- type: entity
+  parent: ClothingUniformSkirtBase
+  id: ClothingUniformJumpsuitKimono
+  name: kimono
+  description: traditional chinese clothing
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Jumpskirt/kimono.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Jumpskirt/kimono.rsi


This need to be moved to a floof directory instead please.

FoxxoTrystan · 2024-09-02T19:20:16Z

Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml

 # White Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase


Suggested change

parent: ClothingUniformSkirtBase

parent: ClothingUniformSkirtBase # FloofStation

FoxxoTrystan · 2024-09-02T19:20:33Z

Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml

@@ -27,7 +28,7 @@

 # Grey Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase


Suggested change

parent: ClothingUniformSkirtBase

parent: ClothingUniformSkirtBase # FloofStation

FoxxoTrystan · 2024-09-02T19:20:39Z

Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml

@@ -58,7 +59,7 @@

 # Black Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase


Suggested change

parent: ClothingUniformSkirtBase

parent: ClothingUniformSkirtBase # FloofStation

FoxxoTrystan · 2024-09-02T19:20:46Z

Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml

@@ -89,7 +90,7 @@

 # Blue Jumpskirt
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase


Suggested change

parent: ClothingUniformSkirtBase

parent: ClothingUniformSkirtBase # FloofStation

FoxxoTrystan · 2024-09-02T19:23:20Z

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

-      sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi
-    - type: Clothing
-      sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi
+# Moved this to jumpskirts.yml, further modifications made there.


Suggested change

# Moved this to jumpskirts.yml, further modifications made there.

# Moved this to jumpskirts.yml, further modifications made there. // FloofStation

FoxxoTrystan · 2024-09-02T19:23:26Z

Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml

-    sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi
-  - type: Clothing
-    sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi
+# Moved this to jumpskirts.yml, further modifications made there.


Suggested change

# Moved this to jumpskirts.yml, further modifications made there.

# Moved this to jumpskirts.yml, further modifications made there. // FloofStation

FoxxoTrystan · 2024-09-02T19:23:38Z

Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml

@@ -1,5 +1,5 @@
 - type: entity
-  parent: ClothingUniformBase
+  parent: ClothingUniformSkirtBase


Suggested change

parent: ClothingUniformSkirtBase

parent: ClothingUniformSkirtBase # FloofStation

FoxxoTrystan · 2024-09-02T19:25:28Z

Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml

@@ -36,6 +36,11 @@
  - type: Clothing
    slots: [innerclothing]
    femaleMask: UniformTop
+# Adds the 'skirt' tag to UnsensoredClothingUniformSkirtBase to, well, make it a skirt.


Suggested change

# Adds the 'skirt' tag to UnsensoredClothingUniformSkirtBase to, well, make it a skirt.

# Adds the 'skirt' tag to UnsensoredClothingUniformSkirtBase to, well, make it a skirt. // FloofStation

FoxxoTrystan · 2024-09-02T19:25:57Z

Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml

@@ -66,6 +71,6 @@
    slots: [innerclothing]
    femaleMask: UniformTop
  - type: Tag #DeltaV, needed for species with nonhuman legs/can only wear skirts
+# Removed the subsequent 'skirt' tag from ClothingUniformSkirtBase, as the unsensored parent now has it.


Suggested change

# Removed the subsequent 'skirt' tag from ClothingUniformSkirtBase, as the unsensored parent now has it.

# Removed the subsequent 'skirt' tag from ClothingUniformSkirtBase, as the unsensored parent now has it. // FloofStation

Also doing this kinda make this base now worthless.

Tirochora · 2024-09-13T03:32:14Z

I forgot to close this earlier - I brought this up to EE, as there's no reason not to and it makes things simpler.

update clothing assignments of suit/skirt

ae60520

Tirochora requested review from Memeji and FoxxoTrystan as code owners August 24, 2024 03:54

github-actions bot added Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 24, 2024

Floof-Station-Bot changed the title ~~Update clothing assignments of suit/skirt~~ Update Clothing Assignments of Suit/Skirt Aug 24, 2024

FoxxoTrystan requested changes Aug 24, 2024

View reviewed changes

FoxxoTrystan assigned Tirochora Aug 24, 2024

FoxxoTrystan added Priority: 2-Medium Needs to be resolved at some point Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Aug 24, 2024

Commented out jumpsuits instead of deleting them, added comments to e…

93fd4ce

…xplain changes

FoxxoTrystan requested changes Sep 2, 2024

View reviewed changes

Tirochora closed this Sep 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Clothing Assignments of Suit/Skirt #146

Update Clothing Assignments of Suit/Skirt #146

Tirochora commented Aug 24, 2024

github-actions bot commented Aug 24, 2024 •

edited

Loading

FoxxoTrystan left a comment

Tirochora commented Sep 1, 2024

FoxxoTrystan Sep 2, 2024

FoxxoTrystan Sep 2, 2024

FoxxoTrystan Sep 2, 2024

FoxxoTrystan Sep 2, 2024

FoxxoTrystan Sep 2, 2024

FoxxoTrystan Sep 2, 2024

FoxxoTrystan Sep 2, 2024

FoxxoTrystan Sep 2, 2024

FoxxoTrystan Sep 2, 2024

FoxxoTrystan Sep 2, 2024

Tirochora commented Sep 13, 2024

	parent: ClothingUniformSkirtBase
	parent: ClothingUniformSkirtBase # FloofStation

	# Moved this to jumpskirts.yml, further modifications made there.
	# Moved this to jumpskirts.yml, further modifications made there. // FloofStation

	# Adds the 'skirt' tag to UnsensoredClothingUniformSkirtBase to, well, make it a skirt.
	# Adds the 'skirt' tag to UnsensoredClothingUniformSkirtBase to, well, make it a skirt. // FloofStation

	# Removed the subsequent 'skirt' tag from ClothingUniformSkirtBase, as the unsensored parent now has it.
	# Removed the subsequent 'skirt' tag from ClothingUniformSkirtBase, as the unsensored parent now has it. // FloofStation

Update Clothing Assignments of Suit/Skirt #146

Update Clothing Assignments of Suit/Skirt #146

Conversation

Tirochora commented Aug 24, 2024

Description

Changelog

github-actions bot commented Aug 24, 2024 • edited Loading

FoxxoTrystan left a comment

Choose a reason for hiding this comment

Tirochora commented Sep 1, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Tirochora commented Sep 13, 2024

github-actions bot commented Aug 24, 2024 •

edited

Loading