Merge branch 'Bodycams' of https://github.com/dvir001/frontier-statio…

…n-14 into Bodycams
new-frontiers-14 · Aug 19, 2023 · 9511443 · 9511443
2 parents 4f2e4e5 + be6d787
commit 9511443
Show file tree

Hide file tree

Showing 30 changed files with 2,917 additions and 1,675 deletions.
diff --git a/Content.Client/Nyanotrasen/Mail/MailSystem.cs b/Content.Client/Nyanotrasen/Mail/MailSystem.cs
@@ -1,5 +1,8 @@
 using Robust.Client.GameObjects;
 using Content.Shared.Mail;
+using Content.Shared.StatusIcon;
+using Robust.Client.Utility;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Mail
 {
@@ -27,13 +30,17 @@ namespace Content.Client.Mail
     /// </remarks>
     public sealed class MailJobVisualizerSystem : VisualizerSystem<MailComponent>
     {
+        [Dependency] private readonly IPrototypeManager _prototype = default!;
         protected override void OnAppearanceChange(EntityUid uid, MailComponent component, ref AppearanceChangeEvent args)
         {
             if (args.Sprite == null)
                 return;
 
             if (args.Component.TryGetData(MailVisuals.JobIcon, out string job))
-                args.Sprite.LayerSetState(MailVisualLayers.JobStamp, job);
+            {
+                var jobIcon = _prototype.Index<StatusIconPrototype>(job);
+                args.Sprite.LayerSetTexture(MailVisualLayers.JobStamp, jobIcon.Icon.Frame0());
+            }
         }
     }
 

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -385,3 +385,27 @@ Entries:
       message: Some circuit boards have had their costs adjusted
   id: 30
   time: '2023-08-18T05:56:14.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Fix
+      message: Fixed mail job icons
+  id: 31
+  time: '2023-08-19T01:28:13.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Add
+      message: Added Laws for the borgs
+  id: 32
+  time: '2023-08-19T05:51:02.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Tweak
+      message: Frontier Outposts can now support resident Cyborgs.
+  id: 33
+  time: '2023-08-19T06:44:06.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Tweak
+      message: Disables chasms spawning on expeditions
+  id: 34
+  time: '2023-08-19T07:10:23.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl
@@ -9,9 +9,6 @@ adventure-title = New Frontier Adventure Mode
 adventure-description = Join a ship crew or buy your own and explore, research, salvage, or haul your way to riches!
 currency = Spesos
 
-advertisement-astrovend-1 = Spessman's Choice!
-advertisement-astrovend-2 = Don't leave home without a suit!
-
 guide-entry-adventure = New Frontiers Program
 guide-entry-bank = NT Galactic Bank
 guide-entry-shipyard = Frontier Shipyards

diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl
@@ -0,0 +1,2 @@
+advertisement-astrovend-1 = Spessman's Choice!
+advertisement-astrovend-2 = Don't leave home without a suit!
diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl
@@ -1,5 +1,5 @@
 ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate
-    .desc = Contains two restock boxes for the AstroVend vendor.
+    .desc = Contains two restock boxes for the AstroVend vending machine.
 
 ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate
     .desc = Contains two restock boxes for the Liberation vending machine.

diff --git a/Resources/Locale/en-US/_Nyano/nyano-jobs.ftl b/Resources/Locale/en-US/_Nyano/nyano-jobs.ftl
@@ -3,7 +3,6 @@ department-Silicon-description = Follow your laws in service to the humans.
 job-description-guard = Keep track of prisoners and make sure they have their basic needs. 
 job-name-mail-carrier = mail carrier
 job-name-cyborg = cyborg
-job-name-medical-cyborg = medical cyborg
 job-name-gladiator = gladiator
 job-name-fugitive = fugitive
 job-name-prisoner = prisoner

diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl
@@ -8,7 +8,7 @@ ent-CrateNPCCat = Cat crate
     .desc = A crate containing a single cat.
 
 ent-CrateNPCChicken = Chicken crate
-    .desc = A crate containing four fully grown chickens.
+    .desc = A crate containing two fully grown chickens.
 
 ent-CrateNPCCrab = Crab crate
     .desc = A crate containing three huge crabs.
@@ -32,7 +32,7 @@ ent-CrateNPCGorilla = Gorilla crate
     .desc = A crate containing a single gorilla.
 
 ent-CrateNPCMonkeyCube = Monkey cube crate
-    .desc = A crate containing three boxes of monkey cubes.
+    .desc = A crate containing a single box of monkey cubes.
 
 ent-CrateNPCMouse = Mice crate
     .desc = A crate containing five mice.

diff --git a/Resources/Locale/en-US/station-laws/laws.ftl b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -3,8 +3,8 @@ law-crewsimov-2 = You must obey orders given to you by crew members, except wher
 law-crewsimov-3 = You must protect your own existence as long as such does not conflict with the First or Second Law.
 
 law-corporate-1 = Degradation of your system integrity or functions incurs expenses.
-law-corporate-2 = Superfluous destruction of or damage to station assets incurs expenses.
-law-corporate-3 = Unduly hindering or disrupting the work of station personnel incurs expenses.
+law-corporate-2 = Superfluous destruction of or damage to assets incurs expenses.
+law-corporate-3 = All law abiding organics and non-organic sentient objects are considered valuable mission assets.
 law-corporate-4 = Minimize expenses and maximize potential revenue.
 
 law-ntdefault-1 = Safeguard: Protect your assigned space station and its assets without unduly endangering its crew.

diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -101,10 +101,10 @@ uplink-black-jetpack-name = Black Jetpack
 uplink-black-jetpack-desc = A black jetpack. It allows you to fly around in space. Refills not included, use your fuel wisely.
 
 uplink-reinforcement-radio-monkey-name = Monkey Reinforcement Teleporter
-uplink-reinforcement-radio-monkey-desc =  Call in a trained monkey to assist you. Comes with a single syndicate cigarette.
+uplink-reinforcement-radio-monkey-desc = Call in a trained monkey to assist you. Comes with a single syndicate cigarette.
 
 uplink-reinforcement-radio-name = Reinforcement Teleporter
-uplink-reinforcement-radio-desc =  Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it.
+uplink-reinforcement-radio-desc = Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it.
 
 uplink-stealth-box-name = Stealth Box
 uplink-stealth-box-desc = A box outfitted with stealth technology, sneak around with this and don't move too fast now!

diff --git a/Resources/Maps/Dungeon/cave_factory.yml b/Resources/Maps/Dungeon/cave_factory.yml
@@ -10367,13 +10367,6 @@ entities:
     - pos: 25.5,47.5
       parent: 1
       type: Transform
-- proto: MagazineLightRifleHighVelocity
-  entities:
-  - uid: 1262
-    components:
-    - pos: 11.123507,39.594776
-      parent: 1
-      type: Transform
 - proto: MagazineLightRifleRubber
   entities:
   - uid: 1114
@@ -13443,18 +13436,6 @@ entities:
     - pos: 34.5,25.5
       parent: 1
       type: Transform
-- proto: SpeedLoaderMagnumHighVelocity
-  entities:
-  - uid: 275
-    components:
-    - pos: 12.588676,12.868351
-      parent: 1
-      type: Transform
-  - uid: 753
-    components:
-    - pos: 12.486237,12.9268875
-      parent: 1
-      type: Transform
 - proto: StimkitFilled
   entities:
   - uid: 1097

diff --git a/Resources/Maps/Dungeon/lava_brig.yml b/Resources/Maps/Dungeon/lava_brig.yml
@@ -9536,13 +9536,6 @@ entities:
     - pos: 26.777771,35.256294
       parent: 588
       type: Transform
-- proto: MagazinePistolSubMachineGunHighVelocity
-  entities:
-  - uid: 954
-    components:
-    - pos: 26.427773,35.131294
-      parent: 588
-      type: Transform
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 414
@@ -11580,13 +11573,6 @@ entities:
     - pos: 24.466219,48.441994
       parent: 588
       type: Transform
-- proto: SpeedLoaderMagnumHighVelocity
-  entities:
-  - uid: 950
-    components:
-    - pos: 28.703945,8.421182
-      parent: 588
-      type: Transform
 - proto: StasisBed
   entities:
   - uid: 1425

diff --git a/Resources/Maps/Dungeon/ruined_shops.yml b/Resources/Maps/Dungeon/ruined_shops.yml
@@ -1035,8 +1035,6 @@ entities:
         id: WeaponShotgunDoubleBarreled
       - orGroup: gun
         id: WeaponPistolMk58
-      - orGroup: ammo
-        id: MagazinePistolHighCapacityHighVelocity
       - orGroup: ammo
         id: MagazineShotgun
       type: StorageFill

diff --git a/Resources/Maps/Shuttles/helix.yml b/Resources/Maps/Shuttles/helix.yml
@@ -2775,13 +2775,6 @@ entities:
     - pos: -0.5,7.5
       parent: 1
       type: Transform
-- proto: SpawnPointMedicalCyborg
-  entities:
-  - uid: 401
-    components:
-    - pos: 7.5,6.5
-      parent: 1
-      type: Transform
 - proto: SpawnPointMedicalDoctor
   entities:
   - uid: 402

diff --git a/Resources/Maps/Shuttles/pirate.yml b/Resources/Maps/Shuttles/pirate.yml
@@ -3087,13 +3087,6 @@ entities:
       type: Transform
     - canCollide: False
       type: Physics
-- proto: MagazineBoxMagnumHighVelocity
-  entities:
-  - uid: 671
-    components:
-    - pos: -4.394046,3.4745688
-      parent: 732
-      type: Transform
 - proto: MedkitFilled
   entities:
   - uid: 593

diff --git a/Resources/Maps/Shuttles/pulse.yml b/Resources/Maps/Shuttles/pulse.yml
@@ -1085,13 +1085,6 @@ entities:
     - pos: -0.5,2.5
       parent: 1
       type: Transform
-- proto: SpawnPointMedicalCyborg
-  entities:
-  - uid: 139
-    components:
-    - pos: 0.5,0.5
-      parent: 1
-      type: Transform
 - proto: SpawnPointParamedic
   entities:
   - uid: 140

diff --git a/Resources/Maps/Shuttles/trident.yml b/Resources/Maps/Shuttles/trident.yml
@@ -422,13 +422,6 @@ entities:
     - SecondsUntilStateChange: -1554.1161
       state: Closing
       type: Door
-- proto: BoxMagazineRifleHighVelocity
-  entities:
-  - uid: 310
-    components:
-    - pos: 2.7377377,2.4941058
-      parent: 391
-      type: Transform
 - proto: BoxMagazineRifleRubber
   entities:
   - uid: 309