Merc fixes

The-Arcadis-Team · Aug 20, 2024 · a1deeab · a1deeab
1 parent 7463f5e
commit a1deeab
Show file tree

Hide file tree

Showing 8 changed files with 5,691 additions and 6 deletions.
diff --git a/Resources/Locale/en-US/advertisements/vending/erpdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/erpdrobe.ftl
@@ -1 +1,2 @@
-advertisement-erpdrobe-1 = You turn me TRUE, use defines!
+advertisement-erpdrobe-1 = You turn me TRUE, use defines!
+advertisement-erpdrobe- = I hope you like my chaRIZZma!
diff --git a/Resources/Maps/Nonstations/Outpost_Alpha_MAP.yml b/Resources/Maps/Nonstations/Outpost_Alpha_MAP.yml
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/erpdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/erpdrobe.yml
@@ -10,4 +10,5 @@
     ClothingHandsTacticalMaidGloves: 2
     ClothingShoesBootsLaceup: 2
     ClothingUnderSocksCoder: 2
-    ClothingUnderSocksBee: 2
+    ClothingUnderSocksBee: 2
+    ClothingHeadHatCatEars: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -272,4 +272,4 @@
   id: ERPDrobeAds
   values:
     prefix: advertisement-erpdrobe-
-    count: 1
+    count: 2
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -1118,4 +1118,20 @@
     tags:
     - ClothMade
     - WhitelistChameleon
-    - HamsterWearable
+    - HamsterWearable
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadHatNTPDBeret
+  name: NTPD beret
+  description: A beret.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/NTPDberet.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Hats/NTPDberet.rsi
+  - type: Tag
+    tags:
+    - ClothMade
+    - HamsterWearable
+    - WhitelistChameleon
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml
@@ -167,3 +167,24 @@
     - state: green
     - sprite: Objects/Weapons/Melee/energykatana.rsi
       state: icon
+
+- type: entity
+  id: SpawnPointmerc2
+  name: ghost role spawn point
+  suffix: Merc
+  parent: MarkerBase
+  components:
+  - type: GhostRole
+    name: ghost-role-information-merc-name
+    description: ghost-role-information-merc-description
+    rules: You are a [color=red][bold]mercenary[/bold][/color] You can kill anyone in your way but NOT your target, make sure the target is taken and shipped.
+    raffle:
+      settings: short
+  - type: GhostRoleMobSpawner
+    prototype: RandomHumanoidSpawnerMerc
+  - type: Sprite
+    sprite: Markers/jobs.rsi
+    layers:
+      - state: green
+      - sprite: Mobs/Species/Human/parts.rsi
+        state: merc
diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -872,7 +872,7 @@
 
 - type: entity
   id: RandomHumanoidSpawnerNTPD
-  name: NTPD Opritive
+  name: NTPD Operative
   suffix: NTPD
   components:
     - type: Sprite
@@ -902,7 +902,7 @@
 - type: entity
   id: RandomHumanoidSpawnerMerc
   name: Mercop
-  suffix: ERTRole, Death Squad
+  suffix: Merc
   components:
     - type: Sprite
       sprite: Mobs/Species/Human/parts.rsi

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -1252,3 +1252,12 @@
   - type: ContainerFill
     containers:
       board: [ DoorElectronicsmerc ]
+
+- type: entity
+  parent: AirlockGlassShuttle
+  id: AirlockExternalGlassShuttlemercLocked
+  suffix: External, Glass, Docking, Locked, merc
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsmerc ]