Last-stop fixes, new toweg, gibmonster and the detective,admin fulton…

…, removed survivor role, added (some) new guidebook factions.
The-Arcadis-Team · Sep 9, 2024 · 5655a1d · 5655a1d
1 parent 9d67162
commit 5655a1d
Show file tree

Hide file tree

Showing 86 changed files with 38,169 additions and 116 deletions.
diff --git a/Resources/Credits/Arcadis_station.txt b/Resources/Credits/Arcadis_station.txt
@@ -0,0 +1,8 @@
+Gulo - NTPD, some merc items, Toweg :), the void and a few shuttles. Also vanden
+SethDiedAgain137 - Many shuttles (that are AWESOME)
+Federal Bureau of Investigation - ERPDrobe
+TheDoctor1977 - Works on the lore, keeps me (gulo) working >:(
+Madformoose - worked on some shuttles
+CreatorBot01 - January station, some shuttles
+Jack2 - Works on the lore
+Carmello - Admin (maybe)
diff --git a/Resources/Locale/en-US/chat/emotes.ftl b/Resources/Locale/en-US/chat/emotes.ftl
@@ -29,6 +29,7 @@ chat-emote-name-monkeyscreeches = Monkey Screeches
 chat-emote-name-robotbeep = Robot
 chat-emote-name-yawn = Yawn
 chat-emote-name-snore = Snore
+chat-emote-name-hat-tip = tip hat
 
 # Message
 chat-emote-msg-scream = screams!
@@ -60,3 +61,4 @@ chat-emote-msg-cathisses = hisses!
 chat-emote-msg-monkeyscreeches = screeches!
 chat-emote-msg-yawn = yawns.
 chat-emote-msg-snore = snores.
+chat-emote-msg-hat-tip = tips his hat.
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -137,3 +137,9 @@ guide-entry-rules-ban-durations = Ban Durations
 
 guide-entry-writing = Writing
 guide-entry-glossary = Glossary
+
+guide-entry-factions = Factions
+guide-entry-nano = Nanotereson
+guide-entry-syndi = Syndicate
+guide-entry-urban = Urban Sulutions
+guide-entry-NTPD = NTPD
diff --git a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -100,3 +100,4 @@ petting-success-flesh = You uh... tap {THE($target)} on its skin?
 petting-failure-flesh = You reach out to pet {THE($target)}, but something tells you to not pet it.
 
 hugging-success-toweg = You hug me, thanks :)
+hugging-success-gib = You got close enough to hug the gib monster.
diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl
@@ -106,9 +106,9 @@ JobSecurityCadet = Security Cadet
 JobSecurityOfficer = Security Officer
 JobServiceWorker = Service Worker
 JobStationAi = Station AI
+Jobsurvivor = Survivor
 JobStationEngineer = Station Engineer
 JobTechnicalAssistant = Technical Assistant
 JobVisitor = Visitor
 JobWarden = Warden
 JobZookeeper = Zookeeper
-Jobsurvivor = Survivor
diff --git a/Resources/Locale/en-US/store/store.ftl b/Resources/Locale/en-US/store/store.ftl
@@ -12,4 +12,4 @@ store-not-account-owner = This {$store} is not bound to you!
 store-preset-name-uplink = Uplink
 store-preset-name-spellbook = Spellbook
 
-store-preset-name-laststop = Last-Stop Corp™️
+store-preset-name-laststop = Last-Stop Corp
diff --git a/Resources/Maps/Shuttles/NT-shuttles/NT-Breaker.yml b/Resources/Maps/Shuttles/NT-shuttles/NT-Breaker.yml
diff --git a/Resources/Maps/Survival/sm.yml b/Resources/Maps/Survival/sm.yml
@@ -25116,7 +25116,7 @@ entities:
       pos: 35.5,-13.5
       parent: 2
     - type: Door
-      secondsUntilStateChange: -7115.6587
+      secondsUntilStateChange: -7314.072
       state: Opening
 - proto: SpacemenFigureSpawner
   entities:
@@ -25188,44 +25188,80 @@ entities:
     - type: Transform
       pos: 14.5,9.5
       parent: 2
+- proto: SpawnPointMedicalDoctor
+  entities:
+  - uid: 4785
+    components:
+    - type: Transform
+      pos: -0.5,-0.5
+      parent: 2
+  - uid: 4786
+    components:
+    - type: Transform
+      pos: -0.5,1.5
+      parent: 2
 - proto: SpawnPointObserver
   entities:
-  - uid: 4706
+  - uid: 3818
     components:
     - type: Transform
       pos: 0.5,0.5
       parent: 2
-- proto: SpawnPointsurvivor
-  entities:
-  - uid: 64
+  - uid: 4706
     components:
     - type: Transform
-      pos: 1.5,1.5
+      pos: 0.5,0.5
       parent: 2
+- proto: SpawnPointPassenger
+  entities:
   - uid: 65
     components:
     - type: Transform
-      pos: 0.5,-0.5
+      pos: 0.5,1.5
       parent: 2
   - uid: 1881
     components:
     - type: Transform
-      pos: 1.5,-0.5
+      pos: 0.5,0.5
       parent: 2
   - uid: 1951
     components:
     - type: Transform
-      pos: 0.5,1.5
+      pos: 0.5,-0.5
+      parent: 2
+- proto: SpawnPointSecurityOfficer
+  entities:
+  - uid: 64
+    components:
+    - type: Transform
+      pos: 1.5,1.5
       parent: 2
   - uid: 2711
+    components:
+    - type: Transform
+      pos: 1.5,-0.5
+      parent: 2
+  - uid: 4781
     components:
     - type: Transform
       pos: 1.5,0.5
       parent: 2
-  - uid: 3818
+- proto: SpawnPointStationEngineer
+  entities:
+  - uid: 4782
     components:
     - type: Transform
-      pos: 0.5,0.5
+      pos: 2.5,-0.5
+      parent: 2
+  - uid: 4783
+    components:
+    - type: Transform
+      pos: 2.5,0.5
+      parent: 2
+  - uid: 4784
+    components:
+    - type: Transform
+      pos: 2.5,1.5
       parent: 2
 - proto: StationMapBroken
   entities:

diff --git a/Resources/Prototypes/Catalog/uplink_last-stop_catalog.yml b/Resources/Prototypes/Catalog/uplink_last-stop_catalog.yml
@@ -7,7 +7,7 @@
   icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon }
   productEntity: EnergySword
   cost:
-    Telecrystal: 8
+    Telecrystal: 100
   categories:
   - UplinkWeaponrylaststop
 
@@ -18,7 +18,7 @@
   icon: { sprite: /Textures/Objects/Weapons/Guns/Pistols/mk58.rsi, state: base }
   productEntity: WeaponPistolMk58
   cost:
-    Telecrystal: 4
+    Telecrystal: 25
   categories:
   - UplinkWeaponrylaststop
 
@@ -29,7 +29,7 @@
   icon: { sprite: /Textures/Objects/Weapons/Guns/Pistols/cobra.rsi, state: base }
   productEntity: WeaponPistolCobra
   cost:
-    Telecrystal: 4
+    Telecrystal: 25
   categories:
   - UplinkWeaponrylaststop
 
@@ -41,7 +41,7 @@
   description: uplink-explosive-grenade-desc
   productEntity: ExGrenade
   cost:
-    Telecrystal: 2
+    Telecrystal: 15
   categories:
   - UplinkExplosiveslaststop
 
@@ -51,7 +51,7 @@
   description: uplink-flash-grenade-desc
   productEntity: GrenadeFlashBang
   cost:
-    Telecrystal: 1
+    Telecrystal: 5
   categories:
   - UplinkExplosiveslaststop
 
@@ -61,7 +61,7 @@
   description: uplink-c4-desc
   productEntity: C4
   cost:
-    Telecrystal: 2
+    Telecrystal: 25
   categories:
   - UplinkExplosiveslaststop
 
@@ -71,7 +71,7 @@
   description: uplink-shrapnel-grenade-desc
   productEntity: GrenadeShrapnel
   cost:
-    Telecrystal: 4
+    Telecrystal: 10
   categories:
   - UplinkExplosiveslaststop
 
@@ -83,7 +83,7 @@
   description: .35 ammo for reliable guns.
   productEntity: BoxMagazinePistolHighCapacity
   cost:
-    Telecrystal: 4
+    Telecrystal: 25
   categories:
   - UplinkAmmolaststop
 
@@ -93,7 +93,7 @@
   description: .25 ammo. In a box!
   productEntity: BoxMagazinePistolCaselessRifle
   cost:
-    Telecrystal: 4
+    Telecrystal: 25
   categories:
   - UplinkAmmolaststop
 
@@ -105,7 +105,7 @@
   description: Some basic armor to keep you in the fight.
   productEntity: ClothingOuterArmorBasic
   cost:
-    Telecrystal: 3
+    Telecrystal: 5
   categories:
   - UplinkWearableslaststop
 
@@ -125,7 +125,7 @@
   description: Gotta keep the machines running some way.
   productEntity: ClothingBeltUtilityFilled
   cost:
-    Telecrystal: 3
+    Telecrystal: 10
   categories:
   - UplinkWearableslaststop
 
@@ -135,7 +135,7 @@
   description: Magboots! if power goes out you can keep walking!
   productEntity: ClothingShoesBootsMag
   cost:
-    Telecrystal: 5
+    Telecrystal: 15
   categories:
   - UplinkWearableslaststop
 
@@ -167,7 +167,7 @@
   description: An awesome watermelon.
   productEntity: FoodWatermelon
   cost:
-    Telecrystal: 2
+    Telecrystal: 5
   categories:
   - Uplinkfoodwaterlaststop
 

diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -466,7 +466,6 @@
     mustBeEquippedToUse: true
   - type: Fiber
     fiberMaterial: fibers-leather
-    fiberColor: fibers-blue
   - type: FingerprintMask
   - type: MeleeSpeech
   - type: ActivatableUI
@@ -512,3 +511,35 @@
   - type: Fiber
     fiberMaterial: fibers-insulative
     fiberColor: fibers-purple
+
+- type: entity
+  parent: ClothingHandsGlovesColorBlack
+  id: ClothingHandsroboticarm
+  name: combat robo arm
+  description: A robotic arm.
+  components:
+  - type: Sprite
+    sprite: Clothing/Hands/Gloves/Combat_robo_arm.rsi
+  - type: Clothing
+    sprite: Clothing/Hands/Gloves/Combat_robo_arm.rsi
+  - type: Insulated
+  - type: Fiber
+    fiberMaterial: fibers-insulative
+  - type: Armor
+    modifiers:
+      coefficients:
+        Slash: 0.5
+        Blunt: 0.5
+  - type: MeleeWeapon
+    attackRate: 1.5
+    damage:
+      types:
+       Blunt: 8
+       Slash: 8
+       Structural: 15
+    soundHit:
+      collection: metal
+    animation: WeaponArcFist
+    mustBeEquippedToUse: true
+  - type: Unremoveable
+    deleteOnDrop: true
diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -706,3 +706,30 @@
     modifiers:
       coefficients:
         Heat: 0.80
+
+- type: entity
+  parent: ClothingMaskPullableBase
+  id: ClothingMaskPlaguedet
+  name: creepy plague doctor mask
+  description: A true bad omen.
+  components:
+  - type: Sprite
+    sprite: Clothing/Mask/TDplaguedoctormask.rsi
+  - type: Clothing
+    sprite: Clothing/Mask/TDplaguedoctormask.rsi
+  - type: BreathMask
+  - type: HideLayerClothing
+    slots:
+    - Snout
+    hideOnToggle: true
+
+- type: entity
+  parent: ClothingMaskPullableBase
+  id: ClothingMaskbandage
+  name: bandage
+  description: A sad reminder of what happened.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Misc/bandage.rsi
+  - type: Clothing
+    sprite: Clothing/Head/Misc/bandage.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
@@ -477,3 +477,23 @@
     sprite: Clothing/OuterClothing/Coats/NTPD-Engi.rsi
   - type: Clothing
     sprite: Clothing/OuterClothing/Coats/NTPD-Engi.rsi
+
+- type: entity
+  parent: ClothingOuterStorageFoldableBase
+  id: ClothingOuterCoatoldRobo
+  name: old roboticist lab coat
+  description: Looks like it has been through thousands of years of action.
+  components:
+  - type: Sprite
+    sprite: Clothing/OuterClothing/Coats/labcoat_robo_det.rsi
+  - type: Clothing
+    sprite: Clothing/OuterClothing/Coats/labcoat_robo_det.rsi
+  - type: Armor
+    modifiers:
+      coefficients:
+        Caustic: 1
+
+- type: entity
+  parent: [ClothingOuterStorageFoldableBaseOpened, ClothingOuterCoatoldRobo]
+  id: ClothingOuterCoatoldRoboOpened
+  name: old roboticist lab coat
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -607,17 +607,3 @@
     layers:
       - state: green
       - state: zookeeper
-
-# survivor
-
-- type: entity
-  id: SpawnPointsurvivor
-  parent: SpawnPointJobBase
-  name: survivor
-  components:
-  - type: SpawnPoint
-    job_id: survivor
-  - type: Sprite
-    layers:
-      - state: green
-      - state: survivor
Original file line number	Diff line number	Diff line change
Expand Up		@@ -100,3 +100,4 @@ petting-success-flesh = You uh... tap {THE($target)} on its skin?
		petting-failure-flesh = You reach out to pet {THE($target)}, but something tells you to not pet it.

		hugging-success-toweg = You hug me, thanks :)
		hugging-success-gib = You got close enough to hug the gib monster.