Merge pull request #1394 from honeyed-lemons/courier-fixes

Courier Fixes and Additions
impstation · Jan 17, 2025 · b7fb41b · b7fb41b
2 parents 8fd4620 + 5de56d0
commit b7fb41b
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 9 deletions.
diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs
@@ -56,6 +56,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List<ProtoId<Acc
         "ChiefEngineer",
         "ChiefMedicalOfficer",
         "Command",
+        "Courier", // Imp
         "Cryogenics",
         "Engineering",
         "External",

diff --git a/Resources/Locale/en-US/_Impstation/access/accesses.ftl b/Resources/Locale/en-US/_Impstation/access/accesses.ftl
@@ -0,0 +1 @@
+id-card-access-level-courier = Courier
diff --git a/Resources/Locale/en-US/_Impstation/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_Impstation/navmap-beacons/station-beacons.ftl
@@ -1 +1,3 @@
 station-beacon-smengine = Supermatter Engine
+
+station-beacon-mailroom = Mail
diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Head/soft.yml
@@ -31,7 +31,7 @@
   name: security cap
 
 - type: entity
-  parent: [ClothingHeadHeadHatBaseFlippable, BaseCommandContraband]
+  parent: ClothingHeadHeadHatBaseFlippable
   id: ClothingHeadHatCouriersoft
   name: courier's cap
   description: A soft, durable cap for couriers.

diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/station_beacon.yml
@@ -5,3 +5,12 @@
   components:
   - type: NavMapBeacon
     defaultText: station-beacon-smengine
+
+# Courier
+- type: entity
+  parent: DefaultStationBeaconSupply
+  id: DefaultStationBeaconMailroomCourier
+  suffix: Cargo Mailroom
+  components:
+  - type: NavMapBeacon
+    defaultText: station-beacon-mailroom
diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Machines/holopad.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Machines/holopad.yml
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -1,6 +1,6 @@
 - type: entity
   name: mail RPDS
-  parent: WeaponLauncherChinaLake
+  parent: [ WeaponLauncherChinaLake, BaseCargoContraband ]
   id: WeaponMailLake
   description: Rap(b?)id Parcel Delivery System
   components:

diff --git a/Resources/migration.yml b/Resources/migration.yml
@@ -554,3 +554,7 @@ LeftLegBorgCargo: LeftLegBorg
 RightLegBorgCargo: RightLegBorg
 HeadBorgCargo: LightHeadBorg
 TorsoBorgCargo: TorsoBorg
+
+# 2025-01-16
+# impstation: Removal of duplicate holopad Entity, oopsies
+HolopadCargoMailroomCourier: HolopadCargoMailroom
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		station-beacon-smengine = Supermatter Engine

		station-beacon-mailroom = Mail