From 75e60321c7b7b0beac6ea25f5e69d479502d1368 Mon Sep 17 00:00:00 2001 From: Alex C Date: Thu, 16 Jan 2025 17:00:25 -0500 Subject: [PATCH 1/4] Fix courier issues --- .../Access/Components/IdCardConsoleComponent.cs | 1 + Resources/Locale/en-US/_Impstation/access/accesses.ftl | 1 + .../en-US/_Impstation/navmap-beacons/station-beacons.ftl | 2 ++ .../Entities/Objects/Devices/station_beacon.yml | 9 +++++++++ .../_Impstation/Entities/Structures/Machines/holopad.yml | 2 +- 5 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Resources/Locale/en-US/_Impstation/access/accesses.ftl diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 4f1c27fb4d3685..c529fe7df4b4be 100644 --- 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 Date: Thu, 16 Jan 2025 18:57:22 -0500 Subject: [PATCH 2/4] Contraband fixes --- .../Prototypes/_Impstation/Entities/Clothing/Head/soft.yml | 2 +- .../_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Head/soft.yml index f12ec012ea97a6..78df629f788574 100644 --- 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/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 2804953fcfc3d3..8d840028f5d2d7 100644 --- 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: From c40e6cd6127ac878e58d0312a7a40bd066bbfebf Mon Sep 17 00:00:00 2001 From: Alex C Date: Thu, 16 Jan 2025 21:25:32 -0500 Subject: [PATCH 3/4] whoops --- .../_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 8d840028f5d2d7..d81bfb1fc05302 100644 --- 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, BaseCargoContraband ] + parent: [ WeaponLauncherChinaLake, BaseCargoContraband ] id: WeaponMailLake description: Rap(b?)id Parcel Delivery System components: From 5de56d0f8d930a5ecdcf197f0d4b1a25fb0fbac3 Mon Sep 17 00:00:00 2001 From: Alex C Date: Thu, 16 Jan 2025 23:40:42 -0500 Subject: [PATCH 4/4] following suggested fixes --- .../en-US/_Impstation/navmap-beacons/station-beacons.ftl | 2 +- .../Entities/Objects/Devices/station_beacon.yml | 2 +- .../_Impstation/Entities/Structures/Machines/holopad.yml | 7 ------- Resources/migration.yml | 4 ++++ 4 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 Resources/Prototypes/_Impstation/Entities/Structures/Machines/holopad.yml diff --git a/Resources/Locale/en-US/_Impstation/navmap-beacons/station-beacons.ftl b/Resources/Locale/en-US/_Impstation/navmap-beacons/station-beacons.ftl index 3fbad3d83956ca..738fd50947f124 100644 --- a/Resources/Locale/en-US/_Impstation/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/en-US/_Impstation/navmap-beacons/station-beacons.ftl @@ -1,3 +1,3 @@ station-beacon-smengine = Supermatter Engine -station-beacon-mailroom = Mailroom +station-beacon-mailroom = Mail diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/station_beacon.yml index 551584ad168ecd..0e9b1ff1bcd64c 100644 --- a/Resources/Prototypes/_Impstation/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/_Impstation/Entities/Objects/Devices/station_beacon.yml @@ -10,7 +10,7 @@ - type: entity parent: DefaultStationBeaconSupply id: DefaultStationBeaconMailroomCourier - suffix: Cargo Reception + 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 deleted file mode 100644 index 6527bb39ea5ecc..00000000000000 --- a/Resources/Prototypes/_Impstation/Entities/Structures/Machines/holopad.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: entity - parent: Holopad - id: HolopadCargoMailroomCourier - suffix: Cargo Mailroom - components: - - type: Label - currentLabel: holopad-cargo-mailroom diff --git a/Resources/migration.yml b/Resources/migration.yml index 22875c6697de4b..a7491923abd4e9 100644 --- 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