Merge branch 'master' of https://github.com/Guloveos/arc-station-14

Resources/Locale/en-US/_Arc/Gods_spawns/Carnemori.ftl

@@ -0,0 +1,2 @@
+carnemori-has-risen = Carnemori, the one true god, has risen.
+carnemori-has-risen-sender = Unknown Force

Resources/Locale/en-US/headset/headset-component.ftl

@@ -16,8 +16,8 @@ chat-radio-supply = Logistics
 chat-radio-syndicate = Syndicate
 chat-radio-freelance = Freelance
 chat-radio-NTPD = NTPD
-chat-radio-merc = UrbSol
+chat-radio-Urbsol = UrbSol
 
 # not headset but whatever
 chat-radio-handheld = Handheld
-chat-radio-binary = Binary
+chat-radio-binary = Binary

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -1056,6 +1056,10 @@
       - WeaponMechCombatDisabler
       - WeaponMechCombatFlashbangLauncher
       - WeaponMechCombatMissileRack8
+      - PowercellRiflemagcr # Arcadis - rifle power cell magazine
+      - PowercellRailgunmagcr # Arcadis - railgun power cell magazine
+      - WeaponLaserAssaultLaserRifleCR # Arcadis - CRT-20 Laser Assault Rifle
+      - WeaponRailgunUziRefrenceCR # Arcadis - CRT-21 Laser Railgun
   - type: MaterialStorage
     whitelist:
       tags:

Resources/Prototypes/_Arc/Entities/Clothing/Ears/headsets.yml

@@ -57,8 +57,8 @@
   components:
   - type: EncryptionKey
     channels:
-    - MERCradio
-    defaultChannel: MERCradio
+    -  Urbsolradio
+    defaultChannel: Urbsolradio
   - type: Sprite
     layers:
     - state: crypt_rusted

Resources/Prototypes/_Arc/Entities/Clothing/OuterClothing/armor.yml

@@ -67,3 +67,31 @@
     - WhitelistChameleon
     - HidesHarpyWings
     - FullBodyOuter
+
+- type: entity
+  parent: ClothingOuterArmorBasic
+  id: ClothingArmorMalformedCarapace
+  name: malformed flesh carapace
+  description: Twisted armor made of flesh and bone. It’s hard to tell where the armor ends and the wearer begins.
+  components:
+  - type: Sprite
+    sprite: _Arc/Clothing/OuterClothing/Armor/Carapace_Malformed_Limbs.rsi
+  - type: Clothing
+    sprite: _Arc/Clothing/OuterClothing/Armor/Carapace_Malformed_Limbs.rsi
+  - type: ExplosionResistance
+    damageCoefficient: 0.95
+  - type: Armor
+    modifiers:
+      coefficients:
+        Blunt: 0.95
+        Slash: 0.95
+        Caustic: 0.95
+  - type: ClothingSpeedModifier
+    walkModifier: 1
+    sprintModifier: 1
+  - type: HeldSpeedModifier
+  - type: Tag
+    tags:
+    - Hardsuit
+    - WhitelistChameleon
+    - FullBodyOuter

Resources/Prototypes/_Arc/Entities/Gods/Carnemori.yml

@@ -0,0 +1,149 @@
+- type: entity
+  name: Carnemori
+  parent:
+  - BaseSimpleMob
+  - MobCombat
+  - MobBloodstream
+  id: GodCarnemori
+  abstract: true
+  description: The one and only, god of all that is evil, god of all that is flesh. His horrifying name is Carnemori.
+  components:
+    - type: RotationVisuals
+      defaultRotation: 90
+      horizontalRotation: 90
+    - type: HitscanBatteryAmmoProvider
+      proto: Darklaser
+      fireCost: 62.5
+    - type: Battery
+      maxCharge: 1000
+      startingCharge: 1000
+    - type: BatterySelfRecharger
+      autoRecharge: true
+      autoRechargeRate: 40
+    - type: Reflect
+      reflectProb: 0.7
+      reflects:
+      - Energy
+    - type: Gun
+      fireRate: 0.75
+      useKey: false
+      selectedMode: SemiAuto
+      availableModes:
+        - SemiAuto
+      soundGunshot: /Audio/Weapons/Guns/Gunshots/Soul.ogg
+    - type: NpcFactionMember
+      factions:
+        - SimpleHostile
+    - type: Speech
+      speechVerb: Cluwne
+    - type: CombatMode
+    - type: Tag
+      tags:
+        - CannotSuicide
+        - DoorBumpOpener
+        - FootstepSound
+    - type: FootstepModifier
+      footstepSoundCollection:
+        collection: FootstepThud
+    - type: MobMover
+    - type: InputMover
+    - type: MovementSpeedModifier
+      baseWalkSpeed: 0.8
+      baseSprintSpeed: 2
+      weightlessModifier: 1.5
+    - type: Sprite
+      sprite: _Arc/Gods/Carnemori
+      layers:
+        - sprite: _Arc/Gods/Carnemori
+          state: alive
+      scale: 1.2, 1.2
+    - type: DamageStateVisuals
+      states:
+        Alive:
+          Base: alive
+        Critical:
+          Base: Critical
+    - type: MobState
+    - type: InnateTool
+      tools:
+        - id: Weapondark
+    - type: MobThresholds
+      thresholds:
+        0: Alive
+        2500: Critical
+    - type: Metabolizer
+      solutionOnBody: false
+      updateInterval: 0.25
+      metabolizerTypes: [ Dragon ]
+      groups:
+        - id: Medicine
+        - id: Poison
+    - type: Butcherable
+      spawned:
+        - id: Weapondark
+          amount: 1
+    - type: MeleeWeapon
+      soundHit:
+        path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg
+      damage:
+        types:
+          Piercing: 12
+          Slash: 12
+          Structural: 85
+    - type: Input
+      context: "human"
+    - type: Bloodstream
+      bloodMaxVolume: 300
+    - type: Fixtures
+      fixtures:
+        fix1:
+          shape:
+            !type:PhysShapeCircle
+            radius: 0.7
+          density: 301
+          mask:
+          - MobMask
+          layer:
+          - MobLayer
+    - type: FireVisuals
+      sprite: Mobs/Effects/onfire.rsi
+      normalState: Generic_mob_burning
+    - type: AmbientSound
+      range: 15
+      volume: 5
+      sound:
+        path: /Audio/Psionics/heartbeat_fast.ogg
+
+- type: entity
+  name: Carnemori
+  parent: GodCarnemori
+  id: MobCarnemori
+  suffix: "flesh"
+  components:
+  - type: AnnounceOnSpawn
+    message: carnemori-has-risen
+    sender: carnemori-has-risen-sender
+    sound:
+      path: /Audio/Misc/ratvar_reveal.ogg
+    color: "#bf0000"
+  - type: CargoSellBlacklist
+  - type: IntrinsicRadioReceiver
+  - type: ActiveRadio
+    channels:
+    - Binary
+    - Common
+    - Command
+    - CentCom
+    - Engineering
+    - Medical
+    - Science
+    - Security
+    - Service
+    - Supply
+    - Syndicate
+    - Urbsolradio
+    - NTPDradio
+    globalReceive: true
+  - type: WarpPoint
+    follow: true
+    location: Carnemori

Resources/Prototypes/_Arc/NPCs/Human.yml

@@ -64,9 +64,6 @@
     shoes: ClothingShoesBootsMagNTPD
     id: NTPDPDA
     belt: ClothingBeltMilitaryWebbingMedFilled
-  inhand:
-    - BaseBallBat
-
 
 #Merc
 
@@ -100,5 +97,3 @@
     shoes: ClothingShoesBootsMerc
     id: MERCPDA
     ears: ClothingHeadsetMERC
-  inhand:
-    - CombatKnife

Resources/Prototypes/_Arc/reagents/reagents.yml

@@ -20,7 +20,7 @@
   desc: reagent-desc-notrademark
   group: Medicine
   physicalDesc: reagent-physical-desc-enigmatic
-  flavor: sickly
+  flavor: chalky
   color: "#ffffff"
   metabolisms:
     Medicine:

Resources/Prototypes/radio_channels.yml

@@ -106,8 +106,8 @@
   longRange: true
 
 - type: radioChannel
-  id: MERCradio
-  name: chat-radio-merc
+  id: Urbsolradio
+  name: chat-radio-Urbsol
   keycode: 'o'
   frequency: 8008
   color: "#2a6900"

Resources/Textures/_Arc/Clothing/OuterClothing/Armor/Carapace_Malformed_Limbs.rsi/meta.json

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

Resources/Textures/_Arc/Gods/Carnemori/meta.json

@@ -0,0 +1,48 @@
+{
+  "version": 1,
+  "size": {
+    "x": 64,
+    "y": 64
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by gulo for Arcadis Station",
+  "states": [
+    {
+      "name": "alive",
+      "directions": 4,
+      "delays": [
+        [
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5
+        ],
+        [
+          0.5,
+          0.5,
+          0.5,
+          0.5,
+          0.5
+        ]
+      ]
+    },
+    {
+      "name": "Critical"
+    }
+  ]
+}