Merge branch 'The-Arcadis-Team:master' into master

Hobbitmax · Jan 5, 2025 · b1f7361 · b1f7361
2 parents 66dab14 + 6167380
commit b1f7361
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/Resources/Prototypes/Entities/Arcadis_station/Ghostroles/humanoid.yml b/Resources/Prototypes/Entities/Arcadis_station/Ghostroles/humanoid.yml
@@ -14,7 +14,6 @@
         - NamesLastMilitary
     - type: RandomHumanoidSpawner
       settings: NTPDop
-    - type: InitialInfectedExempt
 
 - type: randomHumanoidSettings
   id: NTPDop
@@ -29,7 +28,6 @@
       nameSegments:
         - NamesFirstMilitaryLeader
         - NamesLastMilitary
-    - type: InitialInfectedExempt
 
 # NTPD Gear
 
@@ -64,7 +62,6 @@
       state: icon
     - type: RandomHumanoidSpawner
       settings: NTPDagent
-    - type: InitialInfectedExempt
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -79,7 +76,6 @@
     - type: MindShield
     - type: Loadout
       prototypes: [ NTPDGearAgent ]
-    - type: InitialInfectedExempt
     - type: RandomMetadata
       nameSegments:
       - names_first
@@ -116,7 +112,6 @@
         - NamesLastmerc
     - type: RandomHumanoidSpawner
       settings: MERCSettings
-    - type: InitialInfectedExempt
 
 - type: randomHumanoidSettings
   id: MERCSettings
@@ -131,7 +126,6 @@
       nameSegments:
         - NamesFirstmerc
         - NamesLastmerc
-    - type: InitialInfectedExempt
 
 # Merc Gear
 

diff --git a/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Battery/battery_guns.yml b/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Battery/battery_guns.yml
@@ -1,20 +1,20 @@
 
 - type: entity
-  name: Overclocked Railgun
+  name: overclocked railgun
   parent: [BaseWeaponBattery, BaseGunWieldable]
   id: WeaponRailgun
   description: A railgun that fires projectiles at such high speeds that they become lasers!
   components:
   - type: Sprite
-    sprite: /_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi
+    sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi
     layers:
     - state: base
       map: ["enum.GunVisualLayers.Base"]
     - state: mag-unshaded-4
       map: ["enum.GunVisualLayers.MagUnshaded"]
       shader: unshaded
   - type: Clothing
-    sprite: /_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi
+    sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/railgun_fbi.rsi
   - type: Gun
     selectedMode: SemiAuto
     fireRate: 3
@@ -46,15 +46,15 @@
         - Taser
         - Sidearm
     - type: Sprite
-      sprite: /_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi
+      sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi
       layers:
         - state: base
           map: ["enum.GunVisualLayers.Base"]
         - state: mag-unshaded-0
           map: ["enum.GunVisualLayers.MagUnshaded"]
           shader: unshaded
     - type: Clothing
-      sprite: /_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi
+      sprite: /Textures/_Arc/Objects/Weapons/Guns/Battery/disabler_magnum_fbi.rsi
       quickEquip: false
       slots:
         - suitStorage

diff --git a/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Rifles/rifles.yml b/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Rifles/rifles.yml
@@ -6,7 +6,7 @@
   description: An reliable assault rifle. That uses .30 rifle ammo.
   components:
   - type: Sprite
-    sprite: /_Arc/Objects/Weapons/Guns/Rifles/viperfang.rsi
+    sprite: /Textures/_Arc/Objects/Weapons/Guns/Rifles/viperfang.rsi
     layers:
       - state: base
         map: ["enum.GunVisualLayers.Base"]
@@ -48,7 +48,7 @@
     zeroVisible: true
   - type: Appearance
   - type: Clothing
-    sprite: /_Arc/Objects/Weapons/Guns/Rifles/viperfang.rsi
+    sprite: /Textures/_Arc/Objects/Weapons/Guns/Rifles/viperfang.rsi
     quickEquip: false
     slots:
     - Back

diff --git a/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Snipers/snipers.yml b/Resources/Prototypes/_Arc/Entities/Objects/Weapons/Snipers/snipers.yml
@@ -5,7 +5,7 @@
   description: A ceremonial rifle given to the best of the best paperpushers. Uses .30 rifle ammo.
   components:
   - type: Sprite
-    sprite: /_Arc/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi
+    sprite: /Textures/_Arc/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi
   - type: Gun
     fireRate: 1
     selectedMode: SemiAuto
@@ -20,4 +20,4 @@
       tags:
       - CartridgeLightRifle
   - type: Clothing
-    sprite: /_Arc/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi
+    sprite: /Textures/_Arc/Objects/Weapons/Guns/Snipers/bolt_gun_hd_fbi.rsi