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

Neptune Sock Submition #815

Closed
wants to merge 51 commits into from
Closed

Neptune Sock Submition #815

Changes from 1 commit
Commits
Show all changes
51 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
b388b99
Merge branch 'master' into Neptune-Outfit-Sock-Submition-1
DangerRevolution Jan 30, 2024
7a1da4b
Merge branch 'DeltaV-Station:master' into Neptune-Outfit-Sock-Submiti…
DangerRevolution Feb 4, 2024
f292ca7
Disabled Socks From Head Lockers
Neptune-Zvezda Feb 11, 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
Prev Previous commit
Next Next commit
Outfit update .7 
Removed " " from Json's around coder socks as could have been causing issues as well as syncing inventory with master due to new winter boot addions
@Neptune-Zvezda
Neptune-Zvezda committed Dec 22, 2023
commit 9e4be620b72f95fd416e218a6b776d8702c7e9a8
5 changes: 5 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
View file
Original file line number Diff line number Diff line change
@@ -99,6 +99,7 @@
- id: ClothingHeadHatBeretCap # Nyanotrasen - Captain's Beret
- id: ClothingShoesLeather # DeltaV - add fancy shoes for HoP and cap
- id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
- id: ClothingShoesBootsWinterCap #Delta V: Add departmental winter boots
- id: SocksStripedCaptainBlueandGold
- id: SocksStripedCaptainBlueandWhite
- id: SocksStripedCaptainGoldandBlue
@@ -141,6 +142,7 @@
- id: ClothingUniformJumpsuitBoatswain # DeltaV - Add turtleneck for HoP.
- id: ClothingShoesBootsLaceup # DeltaV - add fancy shoes for HoP and cap
- id: ClothingShoesMiscWhite # DeltaV - add fancy shoes for HoP and cap
- id: ClothingShoesBootsWinterHeadOfPersonel #Delta V: Add departmental winter boots
- id: SocksStripedCaptainBlueandWhite

- type: entity
@@ -196,6 +198,7 @@
- id: AccessConfigurator
- id: BoxPDAEngineering # Delta-V
- id: CEIDCard # Delta-V
- id: ClothingShoesBootsWinterChiefEngineer #Delta V: Add departmental winter boots
- id: SocksStripedEngineering
- type: entity
id: LockerChiefMedicalOfficerFilledHardsuit
@@ -249,6 +252,7 @@
- id: BoxPDAMedical # Delta-V
- id: ClothingBeltMilitaryWebbingCMO # DeltaV - add webbing for CMO. ON THIS STATION, IT'S DRIP OR [die], CAPTAIN!
- id: CMOIDCard # Delta-V
- id: ClothingShoesBootsWinterChiefMedicalOfficer #Delta V: Add departmental winter boots
- id: SocksStripedWhiteandLightBlueBunnySlipper
- type: entity
id: LockerResearchDirectorFilledHardsuit
@@ -365,6 +369,7 @@
- id: BoxPDASecurity # Delta-V
- id: WeaponEnergyGunMultiphase # DeltaV - HoS Energy Gun
- id: HoSIDCard # Delta-V
- id: ClothingShoesBootsWinterHeadOfSecurity #Delta V: Add departmental winter boots
- id: SocksStripedSecurityJackboots
- type: entity
id: LockerFreezerVaultFilled
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
View file
Original file line number Diff line number Diff line change
@@ -13,4 +13,5 @@
ClothingOuterSuitFire: 2
ClothingOuterWinterAtmos: 2
ClothingNeckScarfStripedLightBlue: 3
ClothingShoesBootsWinterAtmos: 2 #Delta V: Add departmental winter boots
SocksStripedEngieeringAtmos: 3
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
View file
Original file line number Diff line number Diff line change
@@ -13,4 +13,5 @@
ClothingHandsGlovesLatex: 2
ClothingHeadsetMedical: 2
ClothingOuterWinterChem: 2
ClothingShoesBootsWinterChem: 2 #Delta V: Add departmental winter boots
SocksStripedWhiteandOrange: 2
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedCaptainBlueandGold.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedCaptainBlueandWhite.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedCaptainGoldandBlue.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedCargo.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedCargoLO-Qm.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedEngieeringAtmos.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedEngineering.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedScience.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedSecurity.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedSecurityJackboots.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": 'Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedWhiteandGreen.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedWhiteandLightBlue.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion ...tures/DeltaV/Clothing/Under/Socks/SocksStripedWhiteandLightBlueBunnySlipper.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedWhiteandOrange.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedWhiteandPurple.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedWhiteandRed.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedWhiteandYellow.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32
2 changes: 1 addition & 1 deletion Resources/Textures/DeltaV/Clothing/Under/Socks/SocksStripedYellowandPurple.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Neptunezvezda(discord) Modified from "Coder Socks" tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"copyright": "Made by Neptunezvezda(discord) Modified from Coder Socks tgstation https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039",
"size": {
"x": 32,
"y": 32