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

The-Arcadis-Team · Dec 25, 2024 · 8308af1 · 8308af1
2 parents fe7468e + ba0560c
commit 8308af1
Show file tree

Hide file tree

Showing 25 changed files with 1,931 additions and 172 deletions.
diff --git a/Resources/Prototypes/Entities/Arcadis_station/Admin.yml b/Resources/Prototypes/Entities/Arcadis_station/Admin.yml
diff --git a/Resources/Prototypes/Entities/Arcadis_station/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Arcadis_station/Clothing/Ears/headsets_alt.yml
diff --git a/...totypes/Entities/Mobs/NPCs/flesh_tele.yml → ...ities/Arcadis_station/NPCs/flesh_tele.yml b/...totypes/Entities/Mobs/NPCs/flesh_tele.yml → ...ities/Arcadis_station/NPCs/flesh_tele.yml
diff --git a/...rototypes/Entities/Mobs/NPCs/meathunk.yml → ...ntities/Arcadis_station/NPCs/meathunk.yml b/...rototypes/Entities/Mobs/NPCs/meathunk.yml → ...ntities/Arcadis_station/NPCs/meathunk.yml
@@ -63,7 +63,7 @@
       baseSprintSpeed: 2.5
       weightlessModifier: 1.5
     - type: Sprite
-      sprite: Mobs/Demons/Meathunk.rsi
+      sprite: Arcadis_station/NPC/Meathunk.rsi
       layers:
         - map: [ "enum.DamageStateVisualLayers.Base" ]
           state: alive