Update Clothing Assignments of Suit/Skirt #146
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,6 +1,7 @@ | ||||||
| # Every jumpskirt in this file has been changed from having ClothingUniformBase to having ClothingUniformSkirtBase as a parent. | ||||||
| # White Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorWhite | ||||||
| name: white jumpskirt | ||||||
| description: A generic white jumpskirt with no rank markings. | ||||||
|
|
@@ -27,7 +28,7 @@ | |||||
|
|
||||||
| # Grey Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorGrey | ||||||
| name: grey jumpskirt | ||||||
| description: A tasteful grey jumpskirt that reminds you of the good old days. | ||||||
|
|
@@ -58,7 +59,7 @@ | |||||
|
|
||||||
| # Black Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorBlack | ||||||
| name: black jumpskirt | ||||||
| description: A generic black jumpskirt with no rank markings. | ||||||
|
|
@@ -89,7 +90,7 @@ | |||||
|
|
||||||
| # Blue Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorBlue | ||||||
| name: blue jumpskirt | ||||||
| description: A generic blue jumpskirt with no rank markings. | ||||||
|
|
@@ -120,7 +121,7 @@ | |||||
|
|
||||||
| # Dark Blue Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorDarkBlue | ||||||
| name: dark blue jumpskirt | ||||||
| description: A generic dark blue jumpskirt with no rank markings. | ||||||
|
|
@@ -151,7 +152,7 @@ | |||||
|
|
||||||
| # Teal Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorTeal | ||||||
| name: teal jumpskirt | ||||||
| description: A generic teal jumpskirt with no rank markings. | ||||||
|
|
@@ -182,7 +183,7 @@ | |||||
|
|
||||||
| # Green Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorGreen | ||||||
| name: green jumpskirt | ||||||
| description: A generic green jumpskirt with no rank markings. | ||||||
|
|
@@ -213,7 +214,7 @@ | |||||
|
|
||||||
| # Dark Green Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorDarkGreen | ||||||
| name: dark green jumpskirt | ||||||
| description: A generic dark green jumpskirt with no rank markings. | ||||||
|
|
@@ -244,7 +245,7 @@ | |||||
|
|
||||||
| # Orange Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorOrange | ||||||
| name: orange jumpskirt | ||||||
| description: Don't wear this near paranoid security officers. | ||||||
|
|
@@ -275,7 +276,7 @@ | |||||
|
|
||||||
| # Pink Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorPink | ||||||
| name: pink jumpskirt | ||||||
| description: Just looking at this makes you feel <i>fabulous</i>. | ||||||
|
|
@@ -306,7 +307,7 @@ | |||||
|
|
||||||
| # Red Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorRed | ||||||
| name: red jumpskirt | ||||||
| description: A generic red jumpskirt with no rank markings. | ||||||
|
|
@@ -337,7 +338,7 @@ | |||||
|
|
||||||
| # Yellow Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorYellow | ||||||
| name: yellow jumpskirt | ||||||
| description: A generic yellow jumpskirt with no rank markings. | ||||||
|
|
@@ -368,7 +369,7 @@ | |||||
|
|
||||||
| # Purple Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorPurple | ||||||
| name: purple jumpskirt | ||||||
| description: A generic light purple jumpskirt with no rank markings. | ||||||
|
|
@@ -399,7 +400,7 @@ | |||||
|
|
||||||
| # Light Brown Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorLightBrown | ||||||
| name: light brown jumpskirt | ||||||
| description: A generic light brown jumpskirt with no rank markings. | ||||||
|
|
@@ -430,7 +431,7 @@ | |||||
|
|
||||||
| # Brown Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorBrown | ||||||
| name: brown jumpskirt | ||||||
| description: A generic brown jumpskirt with no rank markings. | ||||||
|
|
@@ -461,7 +462,7 @@ | |||||
|
|
||||||
| # Maroon Jumpskirt | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpskirtColorMaroon | ||||||
| name: maroon jumpskirt | ||||||
| description: A generic maroon jumpskirt with no rank markings. | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,66 @@ | |
| - type: Clothing | ||
| sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi | ||
|
|
||
| # 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 | ||
|
Comment on lines
+12
to
+70
There was a problem hiding this comment. This need to be moved to a floof directory instead please. |
||
|
|
||
| - type: entity | ||
| parent: ClothingUniformSkirtBase | ||
| id: ClothingUniformJumpskirtCaptain | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -46,16 +46,17 @@ | |||||
| randomMode: false | ||||||
| mode: SensorCords | ||||||
|
|
||||||
| # Moved this to jumpskirts.yml, further modifications made there. | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| # - type: entity | ||||||
| # parent: ClothingUniformBase | ||||||
| # id: ClothingUniformJumpsuitBartenderPurple | ||||||
| # name: purple bartender's uniform | ||||||
| # description: A special purple outfit to serve drinks. | ||||||
| # components: | ||||||
| # - type: Sprite | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi | ||||||
| # - type: Clothing | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi | ||||||
|
|
||||||
| - type: entity | ||||||
| parent: ClothingUniformBase | ||||||
|
|
@@ -396,16 +397,17 @@ | |||||
| - type: Clothing | ||||||
| sprite: Clothing/Uniforms/Jumpsuit/janitor.rsi | ||||||
|
|
||||||
| # Moved this to jumpskirts.yml, further modifications made there. | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| # - type: entity | ||||||
| # parent: ClothingUniformBase | ||||||
| # id: ClothingUniformJumpsuitKimono | ||||||
| # name: kimono | ||||||
| # description: traditional chinese clothing | ||||||
| # components: | ||||||
| # - type: Sprite | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi | ||||||
| # - type: Clothing | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi | ||||||
|
|
||||||
| - type: entity | ||||||
| parent: ClothingUniformBase | ||||||
|
|
@@ -892,27 +894,29 @@ | |||||
| - type: Clothing | ||||||
| sprite: Clothing/Uniforms/Jumpsuit/journalist.rsi | ||||||
|
|
||||||
| # Moved this to jumpskirts.yml, further modifications made there. | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| # - type: entity | ||||||
| # parent: ClothingUniformBase | ||||||
| # id: ClothingUniformJumpsuitMonasticRobeDark | ||||||
| # name: dark monastic robe | ||||||
| # description: It's a dark robe, often worn by religious folk. | ||||||
| # components: | ||||||
| # - type: Sprite | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi | ||||||
| # - type: Clothing | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_dark.rsi | ||||||
|
|
||||||
| # Moved this to jumpskirts.yml, further modifications made there. | ||||||
| # - type: entity | ||||||
| # parent: ClothingUniformBase | ||||||
| # id: ClothingUniformJumpsuitMonasticRobeLight | ||||||
| # name: light monastic robe | ||||||
| # description: It's a light robe, often worn by religious folk. | ||||||
| # components: | ||||||
| # - type: Sprite | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi | ||||||
| # - type: Clothing | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/monastic_robe_light.rsi | ||||||
|
|
||||||
| - type: entity | ||||||
| parent: ClothingUniformBase | ||||||
|
|
@@ -1191,16 +1195,17 @@ | |||||
| - type: Clothing | ||||||
| sprite: Clothing/Uniforms/Jumpsuit/loungewear.rsi | ||||||
|
|
||||||
| # Moved this to jumpskirts.yml, further modifications made there. | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| # - type: entity | ||||||
| # parent: ClothingUniformBase | ||||||
| # id: ClothingUniformJumpsuitGladiator | ||||||
| # name: gladiator uniform | ||||||
| # description: Made for true gladiators (or Ash Walkers). | ||||||
| # components: | ||||||
| # - type: Sprite | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi | ||||||
| # - type: Clothing | ||||||
| # sprite: Clothing/Uniforms/Jumpsuit/gladiator.rsi | ||||||
|
|
||||||
| - type: entity | ||||||
| parent: ClothingUniformBase | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,5 +1,5 @@ | ||||||
| - type: entity | ||||||
| parent: ClothingUniformSkirtBase | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| id: ClothingUniformJumpsuitChameleon | ||||||
| name: black jumpsuit | ||||||
| description: A generic black jumpsuit with no rank markings. | ||||||
|
|
||||||
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.