Merge pull request new-frontiers-14#26 from cherubdev/Credits

last minute changes before test

Resources/Locale/en-US/job/department.ftl

@@ -1,8 +1,8 @@
-department-Cargo = Cargo
+department-Cargo = Shinohara Logistics
 department-Civilian = Civilian
-department-Command = Command
-department-Engineering = Engineering
-department-Medical = Medical
-department-Security = New Frontier Sheriff's Department
-department-Science = Science
+department-Command = New Crescent Worker's League
+department-Engineering = Shinohara Spaceworks
+department-Medical = Biodyne Pharmaceuticals
+department-Security = Colonial Minutemen
+department-Science = Biodyne Techworks
 department-Specific = Station specific

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -693,3 +693,29 @@
     sprite: Clothing/Head/Hardsuits/clown.rsi
     equipSound: /Audio/Mecha/mechmove03.ogg
     unequipSound: /Audio/Effects/Emotes/parp1.ogg
+
+- type: entity
+  parent: ClothingHeadHardsuitWithLightBase
+  id: ClothingHeadHelmetJuggernautLeague
+  noSpawn: true
+  name: HERMES Mk I juggernaut helmet
+  description: A little space-worthy protection for your fragile skull. Developed by the NCWL and outfitted with state-of-the-art visor electronics.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hardsuits/commienaut.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hardsuits/commienaut.rsi
+  - type: PointLight
+    color: "#ff4433"
+  - type: PressureProtection
+    highPressureMultiplier: 0.1
+    lowPressureMultiplier: 1000
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.80
+        Slash: 0.80
+        Piercing: 0.80
+        Heat: 0.80
+        Radiation: 0.80
+        Caustic: 0.95

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -866,3 +866,33 @@
     node: clownHardsuit
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitClown
+
+- type: entity
+  parent: ClothingOuterHardsuitBase
+  id: ClothingOuterHardsuitCommienautJuggernaut
+  name: HERMES Mk I juggernaut hardsuit
+  description: A bulky marvel of NCWL engineering. Cumbersome plastitanium plates and heavy durathread combine together to make up this nearly invulnerable hardsuit module. Outfitted with a slot for an external air tank and life support systems to boot, you feel like a fucking tank in this thing.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Hardsuits/commienaut.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Hardsuits/commienaut.rsi
+  - type: PressureProtection
+    highPressureMultiplier: 0.2
+    lowPressureMultiplier: 1000
+  - type: ExplosionResistance
+    damageCoefficient: 0.3
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.2
+        Slash: 0.2
+        Piercing: 0.2
+        Heat: 0.2
+        Radiation: 0.2
+        Caustic: 0.2
+  - type: ClothingSpeedModifier
+    walkModifier: 0.9
+    sprintModifier: 0.65
+  - type: ToggleableClothing
+    clothingPrototype: ClothingHeadHelmetJuggernautLeague

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -53,10 +53,10 @@
     price: 210
 
 - type: entity
-  name: Hristov
+  name: SHI 14.5mm Hristov
   parent: BaseWeaponSniper
   id: WeaponSniperHristov
-  description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo.
+  description: A bulky anti-materiel rifle developed as part of Shinohara's 'portable anti-vessel solution' line. This thing is capable of great destruction.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/heavy_sniper.rsi

Resources/Prototypes/Maps/frontier.yml

@@ -1,6 +1,6 @@
 - type: gameMap
   id: Frontier
-  mapName: 'Frontier Outpost'
+  mapName: 'New Crescent'
   mapPath: /Maps/frontier.yml
   minPlayers: 0
   maxPlayers: 100
@@ -9,7 +9,7 @@
       stationProto: StandardFrontierStation
       components:
         - type: StationNameSetup
-          mapNameTemplate: 'Frontier Outpost'
+          mapNameTemplate: 'New Crescent'
 #          nameGenerator:
 #            !type:NanotrasenNameGenerator
 #            prefixCreator: '14'

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -47,7 +47,6 @@
   - ChiefEngineer
   - ChiefMedicalOfficer
   - HeadOfPersonnel
-  - HeadOfSecurity
   - ResearchDirector
   - Quartermaster
 
@@ -78,15 +77,14 @@
 - type: department
   id: Security
   description: department-Security-description
-  color: "#DE3A3A"
+  color: "#579CB3"
   roles:
   - HeadOfSecurity
   - SecurityCadet
   - SecurityOfficer
   - SeniorOfficer
   - Detective
   - Warden
-  - PrisonGuard ##nyano
   - Prisoner ##nyano
   - Brigmedic
 

Resources/Textures/Clothing/Head/Hardsuits/commienaut.rsi/meta.json

@@ -0,0 +1,41 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-flash"
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "off-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "on-inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Clothing/OuterClothing/Hardsuits/commienaut.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by emisse for ss14",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-OUTERCLOTHING",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}