From cc84550204820dc43deb1f62b72f6cc96253c2ce Mon Sep 17 00:00:00 2001 From: Shiro69420 <123057216+Shiro69420@users.noreply.github.com> Date: Thu, 18 Jul 2024 02:08:03 -0500 Subject: [PATCH 1/4] Blood Red Coder Socks Added blood red coder socks to the game. Added it to uplink and emag storage in pride-o-mat. --- .../en-US/Floof/store/uplink-catalog.ftl | 3 +++ .../Floof/Catalog/uplink_catalog.yml | 10 ++++++++++ .../Floof/Entities/Clothing/Under/under.yml | 10 ++++++++++ .../Socks/codervalid.rsi/equipped-FEET.png | Bin 0 -> 569 bytes .../Under/Socks/codervalid.rsi/icon.png | Bin 0 -> 284 bytes .../Under/Socks/codervalid.rsi/meta.json | 18 ++++++++++++++++++ 6 files changed, 41 insertions(+) create mode 100644 Resources/Locale/en-US/Floof/store/uplink-catalog.ftl create mode 100644 Resources/Prototypes/Floof/Catalog/uplink_catalog.yml create mode 100644 Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/codervalid.rsi/equipped-FEET.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/codervalid.rsi/icon.png create mode 100644 Resources/Textures/Floof/Clothing/Under/Socks/codervalid.rsi/meta.json diff --git a/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl b/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl new file mode 100644 index 00000000000..52709952c3d --- /dev/null +++ b/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl @@ -0,0 +1,3 @@ +# Pointless +uplink-coder-socks-valid-name = Blood Red Coder Socks +uplink-coder-socks-valid-desc = These socks add onto your robustness by making you look breedable. Make trojans, not war. \ No newline at end of file diff --git a/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml b/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml new file mode 100644 index 00000000000..741be24908f --- /dev/null +++ b/Resources/Prototypes/Floof/Catalog/uplink_catalog.yml @@ -0,0 +1,10 @@ +- type: listing + id: UplinkSocksCoderValid + name: uplink-coder-socks-valid-name + description: uplink-coder-socks-valid-desc + productEntity: ClothingUnderSocksCoderValid + cost: + Telecrystal: 1 + categories: + - UplinkPointless + \ No newline at end of file diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml new file mode 100644 index 00000000000..45550c5932d --- /dev/null +++ b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml @@ -0,0 +1,10 @@ +- type: entity + parent: ClothingShoesBase + id: ClothingUnderSocksCoderValid + name: blood red coder socks + description: "It's time to code malciously while petting a syndicat!!! :3 :3" + components: + - type: Sprite + sprite: Floof/Clothing/Under/Socks/codervalid.rsi + - type: Clothing + sprite: Floof/Clothing/Under/Socks/codervalid.rsi diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/codervalid.rsi/equipped-FEET.png b/Resources/Textures/Floof/Clothing/Under/Socks/codervalid.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..e59c60927243f1b1480296054384440df8a199a8 GIT binary patch literal 569 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GGLLkg|>2BR01_s90 zo-U3d6^w6Z+4>!J5O7l$a+;&S%i20I=0cG~UUQMO-T~c=;D|%4tWKvml|(deMs7;m zt8=QazC~nScZ#j#`R#SH&WIT+#RxPouqZGvayT$BVK5u(of8r(FCYJvC;xl>tglMx z-L=bNo^L5K>weaH^rvT8QFQ3PiPyJ%y>B^Nb=gt#<)XK1)}-ZfYN|2tpR4`(?;)#M z-rl0sbIxvIZZ7s)oqoIS)MmwbyJj&|+`4Waw`e+J=h+?YN#BEi*$GGnoVjd0iE-&3 zr>(Z3%tz*mR9Q_qru$XNnqM;nSt!&AhCvSnGbDwf6t;(fNPG?!%f(gksa&s%JaQ z62R~$lJ6Ufl?+x?3hpv7?6BPBSoo*J_NrW$l=8}oJCpl&o2taO%DJC$XY|A3i$<^>*AoQ!$tpKr>`xTG1l+6q`=oG3MZxDFOuws!Y zPrXFQl&J^zSeL(V%FIbxGQ)Ecvr@x5(du6^Isdd3b_PK-cYNp%Wo#H%5vdI z#xsVTeMdopJQ*AZf~*&s9AG%3*=xRDXePTv$7$AAQm_7>*KmF$C${ItB?ceAxew3( zpKYEm^ps;!5u?UD$#-@s0*@1zZ-0DsT%S#NNlb$`-?IgQRVFNM&Iw>5pq+t1IX!Ie U=EI`pK%X&qy85}Sb4q9e0HQ)+oB#j- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Floof/Clothing/Under/Socks/codervalid.rsi/meta.json b/Resources/Textures/Floof/Clothing/Under/Socks/codervalid.rsi/meta.json new file mode 100644 index 00000000000..e07d455bc0e --- /dev/null +++ b/Resources/Textures/Floof/Clothing/Under/Socks/codervalid.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Based from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, edited by SkullBunny", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} From 6d48853c83bd21af200114b799ae31f0d23d807e Mon Sep 17 00:00:00 2001 From: Shiro69420 <123057216+Shiro69420@users.noreply.github.com> Date: Thu, 18 Jul 2024 02:24:16 -0500 Subject: [PATCH 2/4] Update pride.yml Quick fix because I forgot to fucking add it to the actual vending machine. --- .../DeltaV/Catalog/VendingMachines/Inventories/pride.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml index 9e1de27fa4b..cde94995e7b 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml @@ -26,4 +26,7 @@ BedsheetRainbow: 2 ClothingUniformColorRainbow: 2 ClothingUnderSocksCoder: 1 - ClothingUnderSocksBee: 1 \ No newline at end of file + ClothingUnderSocksBee: 1 + emaggedInventory: + # 3 for more friends! + ClothingUnderSocksCoderValid: 3 \ No newline at end of file From 8367363a0ca67af638e938877a1285e69aa09818 Mon Sep 17 00:00:00 2001 From: Shiro69420 <123057216+Shiro69420@users.noreply.github.com> Date: Thu, 18 Jul 2024 14:17:40 -0500 Subject: [PATCH 3/4] Fixing Spelling and whatnot Fixing spelling, adding - to be consistent. --- Resources/Locale/en-US/Floof/store/uplink-catalog.ftl | 2 +- Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl b/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl index 52709952c3d..c80a39fb314 100644 --- a/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/Floof/store/uplink-catalog.ftl @@ -1,3 +1,3 @@ # Pointless -uplink-coder-socks-valid-name = Blood Red Coder Socks +uplink-coder-socks-valid-name = Blood-red Coder Socks uplink-coder-socks-valid-desc = These socks add onto your robustness by making you look breedable. Make trojans, not war. \ No newline at end of file diff --git a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml index 45550c5932d..9222edade62 100644 --- a/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml +++ b/Resources/Prototypes/Floof/Entities/Clothing/Under/under.yml @@ -1,8 +1,8 @@ - type: entity parent: ClothingShoesBase id: ClothingUnderSocksCoderValid - name: blood red coder socks - description: "It's time to code malciously while petting a syndicat!!! :3 :3" + name: blood-red coder socks + description: "It's time to code maliciously while petting a syndicat!!! :3 :3" components: - type: Sprite sprite: Floof/Clothing/Under/Socks/codervalid.rsi From 03a6df2f0079a5663e828855cbcd6234f98aae3f Mon Sep 17 00:00:00 2001 From: Shiro69420 <123057216+Shiro69420@users.noreply.github.com> Date: Thu, 18 Jul 2024 15:28:06 -0500 Subject: [PATCH 4/4] Added comment to pride.yml clarifying its floofstation specific Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> --- .../DeltaV/Catalog/VendingMachines/Inventories/pride.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml index cde94995e7b..28d2fbc1af2 100644 --- a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml +++ b/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml @@ -29,4 +29,4 @@ ClothingUnderSocksBee: 1 emaggedInventory: # 3 for more friends! - ClothingUnderSocksCoderValid: 3 \ No newline at end of file + ClothingUnderSocksCoderValid: 3 # Floofstation \ No newline at end of file