Colonial Command Sabre!

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.
 

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.

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

Resources/Prototypes/_HL/Entities/Clothing/Belt/belts.yml

@@ -0,0 +1,43 @@
+- type: entity
+  parent: [ClothingBeltBase, ClothingSlotBase, BaseColcommContraband] # Frontier: BaseCommandContraband<BaseC1Contraband
+  id: ClothingBeltOrnateSheath
+  name: ornate sabre sheath
+  description: An especially ornate sheath designed to hold an officer's blade.
+  components:
+  - type: Sprite
+    sprite: _HL/Clothing/Belt/ornatesheath.rsi
+    state: sheath
+  - type: Clothing
+    sprite: _HL/Clothing/Belt/ornatesheath.rsi
+    #- type: Item # Frontier
+    #size: Ginormous # Frontier
+  - type: ItemSlots
+    slots:
+      item:
+        name: Sabre
+        insertVerbText: sheath-insert-verb
+        ejectVerbText: sheath-eject-verb
+        insertSound: /Audio/Items/sheath.ogg
+        ejectSound: /Audio/Items/unsheath.ogg
+        whitelist:
+          tags:
+          - CCSabre
+          - CaptainSabre
+  - type: ItemMapper
+    mapLayers:
+      sheath-sabre:
+        whitelist:
+          tags:
+          - CCSabre
+          - CaptainSabre
+  - type: Appearance
+
+- type: entity
+  id: ClothingBeltOrnateSheathFilled
+  parent: ClothingBeltOrnateSheath
+  suffix: Filled, CCSabre
+  components:
+  - type: ContainerFill
+    containers:
+      item:
+      - CCOfficerSabre

Resources/Prototypes/_HL/tags.yml

@@ -376,3 +376,9 @@
 
 - type: Tag
   id: Bunnysuit
+
+- type: Tag
+  id: Medipen
+
+- type: Tag
+  id: CCSabre

Resources/Prototypes/_Mono/Catalogs/security_uplink_catalog.yml

@@ -112,13 +112,13 @@
       - 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 }
+#  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:
-#    FederationMilitaryCredit: 2 #From 10 to 2
+#    FrontierUplinkCoin: 1000 # Hardlight Silly number for testing reasons, but definitely feels like should be near to or higher than 500
 #  categories:
 #    - UplinkSecurityWeapons
 #  conditions:

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

Resources/Prototypes/tags.yml

@@ -927,9 +927,6 @@
 - type: Tag
   id: Medal
 
-- type: Tag
-  id: Medipen
-
 - type: Tag
   id: Medkit
 

Resources/Textures/_Goobstation/Objects/Weapons/Melee/ccsabre.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Sprited by Rosef",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

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"
+    }
+  ]
+}