From ab616a54de98996d7b34cf747a251ff54b339163 Mon Sep 17 00:00:00 2001 From: SquishyEmmaaaa <235807504+SquishyEmmaaaa@users.noreply.github.com> Date: Thu, 21 May 2026 13:01:06 -0700 Subject: [PATCH 1/8] Bring back the sabre --- .../Weapons/Melee/ccsabre.rsi/icon.png | Bin 0 -> 402 bytes .../Weapons/Melee/ccsabre.rsi/inhand-left.png | Bin 0 -> 372 bytes .../Melee/ccsabre.rsi/inhand-right.png | Bin 0 -> 377 bytes .../Weapons/Melee/ccsabre.rsi/meta.json | 22 ++++++++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/icon.png create mode 100644 Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/inhand-left.png create mode 100644 Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/inhand-right.png create mode 100644 Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/meta.json diff --git a/Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/icon.png b/Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1efbd61670b86b3fef3f79d3bc8e576682346aca GIT binary patch literal 402 zcmV;D0d4+?P)4&@u+b=NKxAF58L(1w+TPvt?OMO&)1OUDqHI+EPD>g7OUt@CdLjV8(07*qoM6N<$g80I-ApigX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/inhand-left.png b/Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..86d333d2caaecadbc961d33835b06974be73ede9 GIT binary patch literal 372 zcmV-)0gL{LP)wD*8BJ8Ta*BtK;IGH*Tc4Y@D zRW2Gl{LtJbtYVZlR|%^KZ}~1^RpBjPC9E>Mo;uZarN8KD!`#LZD$+HGSBC-MMAH49tw+o#~T!pqsTE&;jZ__J*g3kW(2w)ui5YQ z;r?&Cw{n6&Ga;a1sgB6$jTeu^Ue{~1U2I!Dd-}S`sS7Rc$#-n(=vDIzGCkHa*(>O4 zw3Arj9{Vp^3$JS07l)eH?3Jm!&}^g4ef0Y2iK}-#46ZAi9eqgJ*Rl2g`IRi3_7{Eb z*@hgtb*MW|b&cts7dnY=A0E9cG*5NU2JaglAAYnV0@y&Iy+A{f^b>lE Date: Thu, 21 May 2026 14:31:50 -0700 Subject: [PATCH 2/8] ok lets do this right and get from the source --- .../Objects/Weapons/Melee/ccsabre.yml | 25 ++++++++++++++++++ .../Weapons/Melee/ccsabre.rsi/icon.png | Bin .../Weapons/Melee/ccsabre.rsi/inhand-left.png | Bin .../Melee/ccsabre.rsi/inhand-right.png | Bin .../Weapons/Melee/ccsabre.rsi/meta.json | 4 +-- 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml rename Resources/Textures/{_Mono => _Goobstation}/Objects/Weapons/Melee/ccsabre.rsi/icon.png (100%) rename Resources/Textures/{_Mono => _Goobstation}/Objects/Weapons/Melee/ccsabre.rsi/inhand-left.png (100%) rename Resources/Textures/{_Mono => _Goobstation}/Objects/Weapons/Melee/ccsabre.rsi/inhand-right.png (100%) rename Resources/Textures/{_Mono => _Goobstation}/Objects/Weapons/Melee/ccsabre.rsi/meta.json (56%) diff --git a/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml b/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml new file mode 100644 index 00000000000..14fa18b3c51 --- /dev/null +++ b/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml @@ -0,0 +1,25 @@ +- type: entity + name: colonial officer's sabre #HardLight rename + parent: [ BaseSword, BaseCentcommContraband ] + id: NavyOfficerSabre + description: A ceremonial weapon belonging to a high ranking Colonial Command official. #HardLight rename + components: + - type: Sprite + sprite: _Goobstation/Objects/Weapons/Melee/ccsabre.rsi + - type: MeleeWeapon + # heavyStaminaCost: 2.5 # goob edit # HardLight commented out + attackRate: 1.6 + damage: + types: + Slash: 20 # Seem important to keep the message from goob.// #HardLight change from 30 to 20, slightly better than cap saber at 17. + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Reflect + reflectProb: .6 + spread: 90 + - type: Item + sprite: _Goobstation/Objects/Weapons/Melee/ccsabre.rsi + - type: Tag + tags: + - CaptainSabre + - type: DisarmMalus diff --git a/Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/icon.png b/Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/icon.png similarity index 100% rename from Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/icon.png rename to Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/icon.png diff --git a/Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/inhand-left.png b/Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/inhand-left.png rename to Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/inhand-left.png diff --git a/Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/inhand-right.png b/Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/inhand-right.png rename to Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/inhand-right.png diff --git a/Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/meta.json b/Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/meta.json similarity index 56% rename from Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/meta.json rename to Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/meta.json index 55ebceb1987..4852df5e183 100644 --- a/Resources/Textures/_Mono/Objects/Weapons/Melee/ccsabre.rsi/meta.json +++ b/Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Sprited by Rosef for goobstation https://github.com/Goob-Station/Goob-Station/tree/31e7e0ed3747f95c6d561aee9c4e679a3022ae64/Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi", + "copyright": "Sprited by Rosef", "size": { "x": 32, "y": 32 @@ -19,4 +19,4 @@ "directions": 4 } ] -} \ No newline at end of file +} From 218d42ebeb1edca23e24bc89d3b429583d2f9c4f Mon Sep 17 00:00:00 2001 From: SquishyEmmaaaa <235807504+SquishyEmmaaaa@users.noreply.github.com> Date: Thu, 21 May 2026 14:37:10 -0700 Subject: [PATCH 3/8] Fixing a namespace oopsie --- Resources/Prototypes/_HL/tags.yml | 3 +++ Resources/Prototypes/tags.yml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_HL/tags.yml b/Resources/Prototypes/_HL/tags.yml index 7964b15724a..8fa2e32f511 100644 --- a/Resources/Prototypes/_HL/tags.yml +++ b/Resources/Prototypes/_HL/tags.yml @@ -376,3 +376,6 @@ - type: Tag id: Bunnysuit + +- type: Tag + id: Medipen \ No newline at end of file diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 814bc42d8a3..eb0793b8cf0 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -927,9 +927,6 @@ - type: Tag id: Medal -- type: Tag - id: Medipen - - type: Tag id: Medkit From 0d17695fff5b15da1ab7ea58951a4075f0e223b1 Mon Sep 17 00:00:00 2001 From: SquishyEmmaaaa <235807504+SquishyEmmaaaa@users.noreply.github.com> Date: Thu, 21 May 2026 14:41:57 -0700 Subject: [PATCH 4/8] Might as well fix contra tags while I'm here --- Resources/Prototypes/Entities/Clothing/Ears/headsets.yml | 2 +- .../Prototypes/_StarLight/Entities/Clothing/Neck/cloaks.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index cc45c49ca54..0cc95bd7a01 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -96,7 +96,7 @@ # HardLight end - type: entity - parent: [ClothingHeadset, BaseCentcommContraband] + parent: [ClothingHeadset, BaseColcommContraband] # Hardlight Change from centcom to colcomm contra id: ClothingHeadsetCentCom name: ColComm headset # HardLight description: A headset used by the upper echelons of the Trans-Solar Federation. diff --git a/Resources/Prototypes/_StarLight/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_StarLight/Entities/Clothing/Neck/cloaks.yml index 729c1a4fb9b..f526ee5fb23 100644 --- a/Resources/Prototypes/_StarLight/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/_StarLight/Entities/Clothing/Neck/cloaks.yml @@ -1,7 +1,7 @@ - type: entity - parent: [ClothingNeckBase, BaseCentcommContraband] + parent: [ClothingNeckBase, BaseColcommContraband] # HardLight Change to Colcomm from Centcom contra id: ClothingNeckCloakCCponcho - name: Colonial Command poncho + name: Colonial Command poncho # HardLight rename description: a stylish poncho for a CC offical that prefers field-work to pushing papers. components: - type: Sprite From ec626dacfc4a0690f87cf72c3947120b1e43335a Mon Sep 17 00:00:00 2001 From: SquishyEmmaaaa <235807504+SquishyEmmaaaa@users.noreply.github.com> Date: Thu, 21 May 2026 15:08:24 -0700 Subject: [PATCH 5/8] don't let your memes be dreams, buy today! --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 3 ++ .../Objects/Weapons/Melee/ccsabre.yml | 6 ++-- .../_Mono/Catalogs/Fills/Items/belt.yml | 9 ++++++ .../Catalogs/security_uplink_catalog.yml | 29 ++++++++++--------- 4 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 Resources/Prototypes/_Mono/Catalogs/Fills/Items/belt.yml diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index d256244429d..c125a305e2b 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -128,6 +128,9 @@ uplink-security-armingsword-desc = Ancient design meets modern materials. uplink-security-captainsword-name = Captain's Sabre uplink-security-captainsword-desc = A sword normally reserved for captains, admiralty, and other high command. Has a small chance to reflect incoming projectiles. +uplink-security-navyofficersword-name = Navy Officer Sabre +uplink-security-navyofficersword-desc = A sword normally reserved for Colonial Command officials. It has a small chance to reflect projectiles. + uplink-security-pulsepistol-name = Pulse Pistol uplink-security-pulsepistol-desc = A high powered laser pistol normally reserved for elite ERT units. Has an internal battery, but requires using a security charging dock. diff --git a/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml b/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml index 14fa18b3c51..1464a59c3fe 100644 --- a/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml +++ b/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml @@ -1,6 +1,6 @@ - type: entity - name: colonial officer's sabre #HardLight rename - parent: [ BaseSword, BaseCentcommContraband ] + name: colonial officer's sabre # HardLight rename + parent: [ BaseSword, BaseColcommContraband ] # HardLight change centcom to colcom contra id: NavyOfficerSabre description: A ceremonial weapon belonging to a high ranking Colonial Command official. #HardLight rename components: @@ -15,7 +15,7 @@ soundHit: path: /Audio/Weapons/bladeslice.ogg - type: Reflect - reflectProb: .6 + reflectProb: .2 # HardLight change from .6 to .2, if someone wants to fuck with colcomm they should get to suffer the consequences. cap saber is .1 spread: 90 - type: Item sprite: _Goobstation/Objects/Weapons/Melee/ccsabre.rsi diff --git a/Resources/Prototypes/_Mono/Catalogs/Fills/Items/belt.yml b/Resources/Prototypes/_Mono/Catalogs/Fills/Items/belt.yml new file mode 100644 index 00000000000..ed94fb22bb7 --- /dev/null +++ b/Resources/Prototypes/_Mono/Catalogs/Fills/Items/belt.yml @@ -0,0 +1,9 @@ +- type: entity + id: ClothingBeltSheathFilledNavy + parent: ClothingBeltSheath + suffix: Filled, NavySabre + components: + - type: ContainerFill + containers: + item: + - NavyOfficerSabre diff --git a/Resources/Prototypes/_Mono/Catalogs/security_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/security_uplink_catalog.yml index e047ecd7acd..62a176c6ef8 100644 --- a/Resources/Prototypes/_Mono/Catalogs/security_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/security_uplink_catalog.yml @@ -111,21 +111,22 @@ tags: - SecurityUplink -#- type: listing -# id: UplinkSecurityNavyOfficerSword -# name: uplink-security-navyofficersword-name -# description: uplink-security-navyofficersword-desc -# productEntity: ClothingBeltSheathFilledNavy -# icon: { sprite: _Mono/Objects/Weapons/Melee/ccsabre.rsi, state: icon } -# cost: +- type: listing + id: UplinkSecurityNavyOfficerSword + name: uplink-security-navyofficersword-name + description: uplink-security-navyofficersword-desc + productEntity: ClothingBeltSheathFilledNavy + icon: { sprite: _Goobstation/Objects/Weapons/Melee/ccsabre.rsi, state: icon } # HardLight point it to the correct sprite location + cost: # FederationMilitaryCredit: 2 #From 10 to 2 -# categories: -# - UplinkSecurityWeapons -# conditions: -# - !type:StoreWhitelistCondition -# whitelist: -# tags: -# - SecurityUplink + FrontierUplinkCoin: 1000 + categories: + - UplinkSecurityWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink # - type: listing # id: UplinkSecurityAuroraExosuit From 8bac82834482d809fb1dc531d83275adc0f83adf Mon Sep 17 00:00:00 2001 From: SquishyEmmaaaa <235807504+SquishyEmmaaaa@users.noreply.github.com> Date: Thu, 21 May 2026 17:06:22 -0700 Subject: [PATCH 6/8] pretty dark green! --- .../Belt/ornatesheath.rsi/equipped-BELT.png | Bin 0 -> 614 bytes .../Clothing/Belt/ornatesheath.rsi/meta.json | 25 ++++++++++++++++++ .../sheath-sabre-equipped-BELT.png | Bin 0 -> 719 bytes .../Belt/ornatesheath.rsi/sheath-sabre.png | Bin 0 -> 801 bytes .../Clothing/Belt/ornatesheath.rsi/sheath.png | Bin 0 -> 597 bytes 5 files changed, 25 insertions(+) create mode 100644 Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/meta.json create mode 100644 Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/sheath-sabre-equipped-BELT.png create mode 100644 Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/sheath-sabre.png create mode 100644 Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/sheath.png diff --git a/Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/equipped-BELT.png b/Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..55c7e9accb1ab0af9bc7816ce56c9867de97646f GIT binary patch literal 614 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jPK-BC>eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?e42rH}w(JACV3ntf zV@SoVx3@NC9SRU(dr+Lqy729VSpqD=?LMsyetAuc*DLIEj9=Wh&*|km=8o)e$Ae2H zy=2yeL`@c3GSx|Ad2m;5yV)~0p-=V69OgUKpUW^k7h(k31qKJ!MeS8v{&p_^;X7-x zxr7Dh%8Kucoo~e*m>HeZe|PVmlB+uZxxRdUZ7nEx*M3*h`@oRbY}>1RubH-{H?tl8 z%5zj_W74!G>*i11cp}S0{PDk@ymjYaKKiC`?UK;Znxfa9Yo%i{qjh$RhuoU>MPJ{P zd7E+K<25Jcc3+Z8T7CUV?`A(Y;XnBTAx1Z*ZJB3V)@eIGCS6l#KBK+u-B`C%O#he4 zzrNmobwhM_%=WCi3Hz*)m|zZPXyED2_L?&5?0Gg`zsDMJSprR+C0DjO_0KNxeVD+u z-*)-^>osxLMeJ-fFEH0n(0G<3q8-Scxi(R$aWx=zVk(M#apk;#1Q?NcsY5MCmGIq-}S|L(0< pN^UGL{Iq29-TA7L>?RCG4}=Y6Pn{D#dfo!$Mo(8imvv4FO#rGz?Lhzl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/meta.json b/Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/meta.json new file mode 100644 index 00000000000..687ec25f74f --- /dev/null +++ b/Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/555fa0ed9f380509156d94131bd8a3f1c1fee1cf , edited by Skarletto (github), edited by SquishyEmmaaaa (github) based on sheath.rsi to recolor for HL Colcom", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "sheath-sabre-equipped-BELT", + "directions": 4 + }, + { + "name": "sheath-sabre" + }, + { + "name": "sheath" + } + ] +} diff --git a/Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/sheath-sabre-equipped-BELT.png b/Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/sheath-sabre-equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..c4725b3c1af44ad31b81d8b3d5ae32ad45028599 GIT binary patch literal 719 zcmV;=0xz@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007 zbV*G`2kHeC7A`AmJe4;900I+9L_t(|+U?rGY7S%axKP z0Pyhs-OJD3MDNw0U6qSZJ6OF?I_v+zV+MCX_t#n6?6{lh)Eh|Y~I+8x~i&%zUB!;zV$ zc(bDzvRG=}_r@yVy3^x>OjWS_6c}B7qo$*#*uIk~0am>%GP#%AKUqXXL_|bHL_|bH znV9HAYkw>r^kJ+^Y@!pbJptbCHaaac70{hPjh}C!<`#|pMrMO{)!1|Vq`HP4#P%KS zJ;*zutJcX>Q=w-R8KARWJY4eY(0h|BWOG>u!hC zhoIYQY*d!xXs%?jT)QP-NPF{}*sYDDx%wI|)=EMl?ae21I{#7z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007 zbV*G`2kHeC7A`gjI{EGZ00L!6L_t(o!|j*9OB-Pr$3L&p#cHG^86=WOjs^^|v3VMF>=hJ%4mCLlaspN+5)%gMHI0 z6-@4ubm=qQ9mo58_&(qFz3;(4E@i!$2pa-0I#A=)=8@_IK$o@o=s=Cpff}Kpi|6-- zrO`!#(@_adN5wWkb_TiKXOcg4kw0~DaNIaVa5^gQpWI|5?!^v7m-S|&V5*IRshWj& z`pLygq-JXb-B&%_D42?{A!rDOMb(Y~cyJd|tG~T-VVp6E5)tVC+`-Fn12NJkW~=815upThPJ0QL`0=qP}O f*grhsf9d)OdsH~&nC4oD00000NkvXXu0mjfOcGi3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/sheath.png b/Resources/Textures/_HL/Clothing/Belt/ornatesheath.rsi/sheath.png new file mode 100644 index 0000000000000000000000000000000000000000..897e4f0a0dac1c20a66a0edbd6115421cc2fc991 GIT binary patch literal 597 zcmV-b0;>IqP)z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007 zbV*G`2kHeC7B2!Yl{^{%00EgvL_t(o!|m5GO9EjW$MNq|x>yS3Ik+fzBp40hfz57C zErH?S*wW++aERzN^ai4(SK!tz7%n9gm(-v`9)+O0Hifqb+_9Df3^OhP zT8$n6+2eg`Fo6J&&PY!W^z5#X&WNGi=d!#8Ksp;HmP<(Kj0l+#uFnsA^?;aVa_wYW zx|`?Ep2=7Sjf;DvGh!tdWl(qM*IeNf7604X(M1u_Kj{XF^Jt3k&LS_VD zA_=VteAg3SlUPUsza` Date: Thu, 21 May 2026 17:08:13 -0700 Subject: [PATCH 7/8] wheeeeee stuff is labeled weird --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 4 +- .../Objects/Weapons/Melee/ccsabre.yml | 4 +- .../_HL/Entities/Clothing/Belt/belts.yml | 43 +++++++++++++++++++ Resources/Prototypes/_HL/tags.yml | 5 ++- .../_Mono/Catalogs/Fills/Items/belt.yml | 9 ---- .../Catalogs/security_uplink_catalog.yml | 8 ++-- 6 files changed, 55 insertions(+), 18 deletions(-) create mode 100644 Resources/Prototypes/_HL/Entities/Clothing/Belt/belts.yml delete mode 100644 Resources/Prototypes/_Mono/Catalogs/Fills/Items/belt.yml diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index c125a305e2b..cfd968f8d49 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -128,8 +128,8 @@ uplink-security-armingsword-desc = Ancient design meets modern materials. uplink-security-captainsword-name = Captain's Sabre uplink-security-captainsword-desc = A sword normally reserved for captains, admiralty, and other high command. Has a small chance to reflect incoming projectiles. -uplink-security-navyofficersword-name = Navy Officer Sabre -uplink-security-navyofficersword-desc = A sword normally reserved for Colonial Command officials. It has a small chance to reflect projectiles. +uplink-security-ccofficersword-name = Ornate Officer's Sabre +uplink-security-ccofficersword-desc = A sword normally reserved for Colonial Command officials. It has a small chance to reflect projectiles. uplink-security-pulsepistol-name = Pulse Pistol uplink-security-pulsepistol-desc = A high powered laser pistol normally reserved for elite ERT units. Has an internal battery, but requires using a security charging dock. diff --git a/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml b/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml index 1464a59c3fe..b6db5fbe9b8 100644 --- a/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml +++ b/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml @@ -1,7 +1,7 @@ - type: entity name: colonial officer's sabre # HardLight rename parent: [ BaseSword, BaseColcommContraband ] # HardLight change centcom to colcom contra - id: NavyOfficerSabre + id: CCOfficerSabre description: A ceremonial weapon belonging to a high ranking Colonial Command official. #HardLight rename components: - type: Sprite @@ -21,5 +21,5 @@ sprite: _Goobstation/Objects/Weapons/Melee/ccsabre.rsi - type: Tag tags: - - CaptainSabre + - CCSabre # HardLight CaptainSabre to CCSabre - type: DisarmMalus diff --git a/Resources/Prototypes/_HL/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_HL/Entities/Clothing/Belt/belts.yml new file mode 100644 index 00000000000..e6d75e49f71 --- /dev/null +++ b/Resources/Prototypes/_HL/Entities/Clothing/Belt/belts.yml @@ -0,0 +1,43 @@ +- type: entity + parent: [ClothingBeltBase, ClothingSlotBase, BaseColcommContraband] # Frontier: BaseCommandContraband Date: Thu, 21 May 2026 17:12:11 -0700 Subject: [PATCH 8/8] No fun toy proliferation for now --- .../Catalogs/security_uplink_catalog.yml | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/_Mono/Catalogs/security_uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/security_uplink_catalog.yml index 6fc9701be40..64a59fff9de 100644 --- a/Resources/Prototypes/_Mono/Catalogs/security_uplink_catalog.yml +++ b/Resources/Prototypes/_Mono/Catalogs/security_uplink_catalog.yml @@ -111,22 +111,21 @@ tags: - SecurityUplink -- type: listing - id: UplinkSecurityCCOfficerSword - name: uplink-security-ccofficersword-name - description: uplink-security-ccofficersword-desc - productEntity: ClothingBeltOrnateSheathFilled - icon: { sprite: _Goobstation/Objects/Weapons/Melee/ccsabre.rsi, state: icon } # HardLight point it to the correct sprite location - cost: -# FederationMilitaryCredit: 2 #From 10 to 2 - FrontierUplinkCoin: 1000 - categories: - - UplinkSecurityWeapons - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink +#- type: listing +# id: UplinkSecurityCCOfficerSword +# name: uplink-security-ccofficersword-name # Hardlight renamed +# description: uplink-security-ccofficersword-desc # Hardlight renamed +# productEntity: ClothingBeltOrnateSheathFilled # Hardlight New sprite and belt +# icon: { sprite: _Goobstation/Objects/Weapons/Melee/ccsabre.rsi, state: icon } # HardLight point it to the correct sprite location +# cost: +# FrontierUplinkCoin: 1000 # Hardlight Silly number for testing reasons, but definitely feels like should be near to or higher than 500 +# categories: +# - UplinkSecurityWeapons +# conditions: +# - !type:StoreWhitelistCondition +# whitelist: +# tags: +# - SecurityUplink # - type: listing # id: UplinkSecurityAuroraExosuit