Port boxer from Nyano (#9080)

Resources/Audio/Weapons/licenses.txt

@@ -6,4 +6,8 @@ slash.ogg taken from https://github.com/tgstation/tgstation/blob/5d264fbea0124e5
 
 tap.ogg taken from https://github.com/tgstation/tgstation/blob/803ca4537df35cf252b056d8460d510be8a4f353/sound/weapons/tap.ogg under CC BY-SA 3.0
 
-block_metal1.ogg taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/31c5996a5db8cce0cb431cb1dc20d99cac83f268 under CC BY-SA 3.0
+BoxingPunch 1, 2, and 3 taken from Ryan Conway at https://freesound.org/people/ryanconway/sounds/260739/ under CC BY 3.0
+
+boxingbell.ogg taken from Herkules92 at https://freesound.org/people/Herkules92/sounds/520998/ under CC0 1.0
+
+block_metal1.ogg taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/31c5996a5db8cce0cb431cb1dc20d99cac83f268 under CC BY-SA 3.0

Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

@@ -8,13 +8,23 @@
     sprite: Clothing/Hands/Gloves/boxing.rsi
   - type: Clothing
     sprite: Clothing/Hands/Gloves/boxing.rsi
+  - type: BoxingGloves
+  - type: StaminaDamageOnHit
+    damage: 8 #Stam damage values seem a bit higher than regular damage because of the decay, etc
+    knockdownSound: /Audio/Weapons/boxingbell.ogg
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 0.6
+    hitSound:
+      collection: BoxingHit
   - type: Fiber
     fiberMaterial: fibers-leather
     fiberColor: fibers-red
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsBase
+  parent: ClothingHandsGlovesBoxingRed
   id: ClothingHandsGlovesBoxingBlue
   name: blue boxing gloves
   description: Blue gloves for competitive boxing.
@@ -31,7 +41,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsBase
+  parent: ClothingHandsGlovesBoxingRed
   id: ClothingHandsGlovesBoxingGreen
   name: green boxing gloves
   description: Green gloves for competitive boxing.
@@ -48,7 +58,7 @@
   - type: FingerprintMask
 
 - type: entity
-  parent: ClothingHandsBase
+  parent: ClothingHandsGlovesBoxingRed
   id: ClothingHandsGlovesBoxingYellow
   name: yellow boxing gloves
   description: Yellow gloves for competitive boxing.

Resources/Prototypes/Entities/Clothing/Uniforms/misc_roles.yml

@@ -0,0 +1,21 @@
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformShortsRed
+  name: boxing shorts
+  description: These are shorts, not boxers.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Shorts/Color/red.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Shorts/Color/red.rsi
+
+- type: entity
+  parent: ClothingUniformBase
+  id: UniformShortsRedWithTop
+  name: boxing shorts with top
+  description: These are shorts, not boxers.
+  components:
+  - type: Sprite
+    sprite: Clothing/Uniforms/Shorts/Color/red_female.rsi
+  - type: Clothing
+    sprite: Clothing/Uniforms/Shorts/Color/red_female.rsi

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -178,7 +178,7 @@
   - type: PDA
     id: ClownIDCard
     penSlot:
-      startingItem: CrayonOrange # no pink crayon?!? 
+      startingItem: CrayonOrange # no pink crayon?!?
       # ^ Still unacceptable.
       ejectSound: /Audio/Items/bikehorn.ogg
       priority: -1
@@ -662,6 +662,21 @@
   - type: Icon
     state: pda-reporter
 
+- type: entity
+  parent: BasePDA
+  id: BoxerPDA
+  name: boxer PDA
+  description: Float like a butterfly, ringtone like a bee.
+  components:
+  - type: PDA
+    id: BoxerIDCard
+  - type: Appearance
+    visuals:
+      - type: PDAVisualizer
+        state: pda-boxer
+  - type: Icon
+    state: pda-boxer
+
 - type: entity
   parent: BasePDA
   id: DetectivePDA

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml

@@ -511,6 +511,18 @@
   - type: PresetIdCard
     job: Reporter
 
+- type: entity
+  parent: IDCardStandard
+  id: BoxerIDCard
+  name: boxer ID card
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: idboxer
+  - type: PresetIdCard
+    job: Boxer
+
 - type: entity
   parent: IDCardStandard
   id: DetectiveIDCard

Resources/Prototypes/Maps/lighthouse.yml

@@ -17,6 +17,7 @@
         Passenger: [ -1, -1 ]
         Bartender: [ 1, 2 ]
         Botanist: [ 2, 2 ]
+        Boxer: [ 2, 2 ] #Wildcard for this map
         Chef: [ 2, 3 ]
         Clown: [ 1, 1 ]
         Janitor: [ 1, 2 ]

Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml

@@ -0,0 +1,32 @@
+- type: job
+  id: Boxer
+  name: "boxer"
+  startingGear: BoxerGear
+  setPreference: false
+  departments:
+  - Civilian
+  icon: "Boxer"
+  supervisors: "the head of personnel"
+  access:
+  - Service
+  special:
+  - !type:AddComponentSpecial
+    components:
+    - type: Boxer
+      modifiers:
+        coefficients: #Remember these only apply to unarmed
+          Blunt: 1.5
+          Slash: 1.5
+          Piercing: 1.5
+
+- type: startingGear
+  id: BoxerGear
+  equipment:
+    jumpsuit: UniformShortsRed
+    back: ClothingBackpackFilled
+    id: BoxerPDA
+    ears: ClothingHeadsetService
+    gloves: ClothingHandsGlovesBoxingRed
+  innerclothingskirt: UniformShortsRedWithTop
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml

@@ -1,25 +1,25 @@
-- type: job
-  id: Psychologist
-  name: job-name-psychologist
-  startingGear: PsychologistGear
-  departments:
-  - Medical
-  icon: "Psychologist"
-  supervisors: job-supervisors-cmo
-  access:
-  - Medical
-  - Maintenance
-  extendedAccess:
-  - Chemistry
-
-- type: startingGear
-  id: PsychologistGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitPsychologist
-    back: ClothingBackpackMedicalFilled
-    shoes: ClothingShoesLeather
-    id: PsychologistPDA
-    ears: ClothingHeadsetMedical
-  innerclothingskirt: ClothingUniformJumpsuitPsychologist
-  satchel: ClothingBackpackSatchelMedicalFilled
-  duffelbag: ClothingBackpackDuffelMedicalFilled
+- type: job
+  id: Psychologist
+  name: job-name-psychologist
+  startingGear: PsychologistGear
+  departments:
+  - Medical
+  icon: "Psychologist"
+  supervisors: job-supervisors-cmo
+  access:
+  - Medical
+  - Maintenance
+  extendedAccess:
+  - Chemistry
+
+- type: startingGear
+  id: PsychologistGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPsychologist
+    back: ClothingBackpackMedicalFilled
+    shoes: ClothingShoesLeather
+    id: PsychologistPDA
+    ears: ClothingHeadsetMedical
+  innerclothingskirt: ClothingUniformJumpsuitPsychologist
+  satchel: ClothingBackpackSatchelMedicalFilled
+  duffelbag: ClothingBackpackDuffelMedicalFilled

Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml

@@ -1,23 +1,23 @@
-- type: job
-  id: Reporter
-  name: job-name-reporter
-  startingGear: ReporterGear
-  departments:
-  - Civilian
-  icon: "Reporter"
-  supervisors: job-supervisors-hop
-  access:
-  - Service
-  - Maintenance
-
-- type: startingGear
-  id: ReporterGear
-  equipment:
-    jumpsuit: ClothingUniformJumpsuitReporter
-    back: ClothingBackpackFilled
-    shoes: ClothingShoesColorWhite
-    id: ReporterPDA
-    ears: ClothingHeadsetService
-  innerclothingskirt: ClothingUniformJumpsuitJournalist
-  satchel: ClothingBackpackSatchelFilled
-  duffelbag: ClothingBackpackDuffelFilled
+- type: job
+  id: Reporter
+  name: job-name-reporter
+  startingGear: ReporterGear
+  departments:
+  - Civilian
+  icon: "Reporter"
+  supervisors: job-supervisors-hop
+  access:
+  - Service
+  - Maintenance
+
+- type: startingGear
+  id: ReporterGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitReporter
+    back: ClothingBackpackFilled
+    shoes: ClothingShoesColorWhite
+    id: ReporterPDA
+    ears: ClothingHeadsetService
+  innerclothingskirt: ClothingUniformJumpsuitJournalist
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled

Resources/Prototypes/SoundCollections/generic_hit.yml

@@ -4,3 +4,10 @@
     - /Audio/Weapons/genhit1.ogg
     - /Audio/Weapons/genhit2.ogg
     - /Audio/Weapons/genhit3.ogg
+
+- type: soundCollection
+  id: BoxingHit
+  files:
+    - /Audio/Weapons/boxingpunch1.ogg
+    - /Audio/Weapons/boxingpunch2.ogg
+    - /Audio/Weapons/boxingpunch3.ogg

Resources/Textures/Clothing/Uniforms/Shorts/Color/red.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/Uniforms/Shorts/Color/red_female.rsi/meta.json

@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/tgstation/tgstation/commit/beaea876ea426c0e215cee64619862dc19bd9cd8",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-INNERCLOTHING",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Interface/Misc/job_icons.rsi/meta.json

@@ -16,6 +16,9 @@
         {
             "name": "Botanist"
         },
+        {
+            "name": "Boxer"
+        },
         {
             "name": "AtmosphericTechnician"
         },

Resources/Textures/Markers/jobs.rsi/meta.json

@@ -25,6 +25,9 @@
     {
       "name": "botanist"
     },
+    {
+      "name": "boxer"
+    },
     {
       "name": "captain"
     },

Resources/Textures/Objects/Devices/pda.rsi/meta.json

@@ -29,6 +29,9 @@
     {
       "name": "pda-bartender"
     },
+    {
+      "name": "pda-boxer"
+    },
     {
       "name": "pda-captain"
     },

Resources/Textures/Objects/Misc/id_cards.rsi/meta.json

@@ -46,6 +46,9 @@
     {
       "name": "idbotanist"
     },
+    {
+      "name": "idboxer"
+    },
     {
       "name": "idcaptain"
     },