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.

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

Neptune outfit submitions #583

Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
5a9c99c
All But Yml's and Parka made
Neptune-Zvezda Dec 20, 2023
225a29e
Sock Update .2
Neptune-Zvezda Dec 21, 2023
35392ab
Sock bupdate .3
Neptune-Zvezda Dec 21, 2023
76a9a17
Sock update .4
Neptune-Zvezda Dec 21, 2023
f090c46
Outfit Update .5
Neptune-Zvezda Dec 21, 2023
88c1187
Outfit update .6 The Broke Server Bupdate
Neptune-Zvezda Dec 22, 2023
9e4be62
Outfit update .7
Neptune-Zvezda Dec 22, 2023
381c6a8
outfit update .72
Neptune-Zvezda Dec 22, 2023
058b416
Outfit Update .7.3
Neptune-Zvezda Dec 22, 2023
8fa1c65
Merge branch 'master' into Neptune-Outfit-Submitions
Neptune-Zvezda Dec 22, 2023
434d759
outfit update .7.4
Neptune-Zvezda Dec 22, 2023
e487d15
Merge branch 'Neptune-Outfit-Submitions' of https://github.com/Neptun…
Neptune-Zvezda Dec 22, 2023
1bc98f5
Apply suggestions from code review
Neptune-Zvezda Dec 22, 2023
446c661
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Dec 22, 2023
2e9951b
update test 7.4.1.1.1.1.1.1.1.1.1
Neptune-Zvezda Dec 22, 2023
77deacc
Merge branch 'Neptune-Outfit-Submitions' of https://github.com/Neptun…
Neptune-Zvezda Dec 22, 2023
7325f3c
outfit update 7.4.2.2.2.2.2.2.2.2.2
Neptune-Zvezda Dec 22, 2023
f97cbd5
Update StripedSocks.yml
Colin-Tel Dec 22, 2023
fa000c5
I have killed socks
Neptune-Zvezda Dec 22, 2023
8150c5e
i have unkillted socks
Neptune-Zvezda Dec 22, 2023
218358d
suffering
Neptune-Zvezda Dec 22, 2023
5ac4b03
LOOOOO
Neptune-Zvezda Dec 22, 2023
6030a9b
update .7.5
Neptune-Zvezda Dec 22, 2023
ba5a4b4
Update cargo_vending.yml
Colin-Tel Dec 22, 2023
17f432c
Updated N parka
Neptune-Zvezda Dec 22, 2023
e2c9092
Outfit Update .8
Neptune-Zvezda Dec 23, 2023
ebdef1d
Merge branch 'master' into Neptune-Outfit-Submitions
Neptune-Zvezda Dec 23, 2023
f67130e
Outfit update .8.1
Neptune-Zvezda Dec 23, 2023
41589ea
Merge branch 'master' into Neptune-Outfit-Submitions
Neptune-Zvezda Dec 23, 2023
520dbe9
Outfit Update .8.2
Neptune-Zvezda Dec 27, 2023
8e2a4a6
Outfit Update .8.3
Neptune-Zvezda Dec 27, 2023
fbf0b9e
outfit update .8.4
Neptune-Zvezda Dec 28, 2023
9777e8b
Outfit Update .8.5
Neptune-Zvezda Dec 28, 2023
9303174
Outfit update .9.0
Neptune-Zvezda Dec 28, 2023
38d183c
outfit update .9.1
Neptune-Zvezda Dec 29, 2023
df1b610
Outfit update .9.2
Neptune-Zvezda Dec 31, 2023
d03805f
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
ec4e71c
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
60511fd
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
1db82a7
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
d7d16f0
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
09a97df
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
8b07d6b
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
c4d051b
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
4577583
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
5391d61
Update Resources/Prototypes/DeltaV/Entities/Clothing/Under/StripedSoc…
Neptune-Zvezda Jan 16, 2024
c559ced
Update heads.yml
Neptune-Zvezda Jan 28, 2024
dc6d416
Merge branch 'Neptune-Outfit-Submitions' of https://github.com/Neptun…
Neptune-Zvezda Jan 28, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,25 @@
ClothingHeadHatXmasCrown: 2
BedsheetRainbow: 2
ClothingUniformColorRainbow: 2
ClothingUnderSocksCoder: 1
ClothingUnderSocksCoder: 2
Socks_Striped White_and_Light_Blue: 2
Socks_Striped_Captain_Blue_and_Gold: 1
Socks_Striped_Captain_Blue_and_White: 1
Socks_Striped_Captain_Gold_and_Blue: 1
Socks_Striped_Cargo: 5
Socks_Striped_Cargo_LO-Qm: 1
Socks_Striped_Engieering_Atmos: 5
Socks_Striped_Engineering: 5
Socks_Striped_Science: 5
Socks_Striped_Security: 5
Socks_Striped_Security_Jackboots: 5
Socks_Striped_White_and_Green: 2
Socks_Striped_White_and_Light_Blue_BunnySlipper: 2
Socks_Striped_White_and_Orange: 2
Socks_Striped_White_and_Purple: 2
Socks_Striped_White_and_Red: 2
Socks_Striped_White_and_Yellow: 2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is mentioned twice, which is causing an error in the build.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i am a little confused on what part of this is mentioned twice or do you mean just in the error log and have no clue why ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

went to fix the LoQm issue and noticed i failed to save over the pride vendor inventory to remove the Department socks so clearly i need to double check more of my work

Neptune-Zvezda marked this conversation as resolved.
Show resolved Hide resolved
Socks_Striped_White_and_Purple: 2
Socks_Striped_Yellow_and_Purple: 2
Neptune-Zvezda marked this conversation as resolved.
Show resolved Hide resolved
N_Parka 2

35 changes: 35 additions & 0 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/N_Parka.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: N_Parka
name: N Parka
description: A white parka with a purple N smells of pudding.
components:
- type: Sprite
sprite: Clothing\OuterClothing\WinterCoats\N_Parka.rsi
- type: Clothing
sprite: Clothing\OuterClothing\WinterCoats\N_Parka.rsi
- type: TemperatureProtection
coefficient: 0.1
- type: Item
size: 10
- type: Armor
modifiers:
coefficients:
Slash: 0.95
Heat: 0.90
- type: Food
requiresSpecialDigestion: true
- type: SolutionContainerManager
solutions:
food:
maxVol: 30
reagents:
- ReagentId: Fiber
Quantity: 30
- type: Tag
tags:
- ClothMade
- WhitelistChameleon
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Stripped White_and_Light_Blue
name: Striped white and light blue socks
description: Wearing these makes you feel just a little bit lazier
components:
- type: Sprite
sprite: Clothing\Under\Socks\/Socks/Socks_Striped White_and_Light_Blue.rsi
- type: Clothing
sprite: Clothing\Under\Socks\/Socks/Socks_Striped White_and_Light_Blue.rsi

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Striped_Captain_Blue_and_Gold
name: Striped blue and gold Socks
description: Striped Socks that make you feel special enough to boss the heads
components:
- type: Sprite
sprite: Clothing/Under/Socks/Socks_Striped_Captain_Blue_and_Gold.rsi
- type: Clothing
sprite: Clothing/Under/Socks/Socks_Striped_Captain_Blue_and_Gold.rsi

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Striped_Captain_Blue_and_White
name: Striped blue and white socks
description: Striped Socks that make you feel special enough to boss the heads
components:
- type: Sprite
sprite: Clothing/Under/Socks/Socks_Striped_Captain_Blue_and_White.rsi
- type: Clothing
sprite: Clothing/Under/Socks/Socks_Striped_Captain_Blue_and_White.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Striped_Captain_Gold_and_Blue.rsi
name: Striped gold and blue socks
description: Striped Socks that make you feel special enough to boss the heads
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_Captain_Gold_and_Blue.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_Captain_Gold_and_Blue.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Stripped_Cargo.rsi
name: Cargo striped socks
description: These Striped Socks make you feel a little bit stronger
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_Cargo.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_Cargo.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Striped_Cargo_LO-Qm
name: Logistics striped socks
description: Striped Socks that make you feel like becoming an independant Station State
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_Cargo_LO-Qm.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_Cargo_LO-Qm.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Striped_Engieering_Atmos.rsi
name: Atmos Tech striped socks
description: Striped socks to make you stand out in an emergency
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_Engieering_Atmos.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_Engieering_Atmos.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Striped_Engineering.rsi
name: Engineer striped socks
description: Striped socks to make you stand out in an emergency
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_Engieering.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_Engieering.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Clothing\Under\Socks\Socks_Striped_Science.rsi
name: Science striped socks
description: These Striped socks make you want to do some Science
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_Science.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_Science.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Striped_Security.rsi
name: Security striped socks
description: These striped socks make you feel like beating a mime
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_Security.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_Security.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Socks_Striped_Security.rsi
name: JackBoots with striped socks
description: The striped socks make you feel a little more "Secure"
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_Security.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_Security.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: ClothingUnderSocksSocks_Striped_White_and_Green.rsi
name: Striped green and white socks
description: Minty! Now in Green.
components:
- type: Sprite
sprite: ClothingUnderSocksSocks_Striped_White_and_Green.rsi
- type: Clothing
sprite: ClothingUnderSocksSocks_Striped_White_and_Green.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Clothing\Under\Socks\Socks_Striped_White_and_Light_Blue_BunnySlipper.rsi
name: Striped Socks with Bunny Slippers
description: a Pair of Bunny Slipers with striped socks for all your hospital needs.
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Light_Blue_BunnySlipper.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Light_Blue_BunnySlipper.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Clothing\Under\Socks\Socks_Striped_White_and_Orange.rsi
name: Striped white and orange socks
description: Striped Socks that match the traffic style
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Orange.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Orange.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Clothing\Under\Socks\Socks_Striped_White_and_Purple.rsi
name: Striped white and purple socks
description: Striped Socks that smell like Grape Soda
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Purple.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Purple.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Clothing\Under\Socks\Socks_Striped_White_and_Red.rsi
name: Striped white and red socks
description: Minty! Now in red
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Red.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Red.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Clothing\Under\Socks\Socks_Striped_White_and_Yellow.rsi
name: Striped white and yellow socks
description: Please don't order pilk at the bar
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Yellow.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_White_and_Yellow.rsi


Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Created From Coder Socks as Base for texturing
# Made By NeptuneZvezda on Discord

- type: entity
parent: ClothingShoesBase
id: Clothing\Under\Socks\Socks_Striped_Yellow_and_Purple.rsi
name: Striped yellow and purple socks
description: Striped Socks styled after banana and grape jelly sandwiches
components:
- type: Sprite
sprite: Clothing\Under\Socks\Socks_Striped_Yellow_and_Purple.rsi
- type: Clothing
sprite: Clothing\Under\Socks\Socks_Striped_Yellow_and_Purple.rsi


Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Clothing/Under/Socks/coder.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/77cff42b6c514e73881a885036be4b4dd2949f62 Edited by NeptuneZvezda",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading