diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index d256244429d..cfd968f8d49 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-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/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/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml b/Resources/Prototypes/Goobstation/Entities/Objects/Weapons/Melee/ccsabre.yml new file mode 100644 index 00000000000..b6db5fbe9b8 --- /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, BaseColcommContraband ] # HardLight change centcom to colcom contra + id: CCOfficerSabre + 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: .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 + - type: Tag + tags: + - 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