Мерджконфликт

Corvax-Frontier · Apr 23, 2024 · c08f880 · c08f880
2 parents 3da0ebb + 634f27d
commit c08f880
Show file tree

Hide file tree

Showing 16 changed files with 42,368 additions and 42,065 deletions.
diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -131,6 +131,7 @@ private void OnStartup(RoundStartingEvent ev)
         var depotOffset = _random.NextVector2(3000f, 5000f);
         var tinniaOffset = _random.NextVector2(1100f, 2800f);
         var caseysOffset = _random.NextVector2(2250f, 4600f);
+
         if (_map.TryLoad(mapId, depotMap, out var depotUids, new MapLoadOptions
             {
                 Offset = depotOffset
@@ -190,7 +191,7 @@ private void OnStartup(RoundStartingEvent ev)
 
         if (_map.TryLoad(mapId, lpbravo, out var depotUid4s, new MapLoadOptions
             {
-                Offset = _random.NextVector2(2150f, 3900f)
+                Offset = _random.NextVector2(2150f, 4850f)
             }))
         {
             var meta = EnsureComp<MetaDataComponent>(depotUid4s[0]);
@@ -221,7 +222,7 @@ private void OnStartup(RoundStartingEvent ev)
 
         if (_map.TryLoad(mapId, cove, out var depotUid6s, new MapLoadOptions
             {
-                Offset = _random.NextVector2(2250f, 4600f)
+                Offset = _random.NextVector2(4650f, 6800f)
             }))
         {
             if (_prototypeManager.TryIndex<GameMapPrototype>("Cove", out var stationProto))

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -4163,3 +4163,13 @@ Entries:
         acidifier.
   id: 4930
   time: '2024-04-23T17:39:31.0000000+00:00'
+- author: Cheackraze
+  changes:
+    - type: Add
+      message: Pirates have gained a more firm foothold in the sector.
+    - type: Tweak
+      message: >-
+        Pirate Captains are now a whitelisted role. See the discord for more
+        information.
+  id: 4931
+  time: '2024-04-23T21:36:50.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl
@@ -1,6 +1,9 @@
 job-description-ertmailcarrier = Nothing stops the mail.
 job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law.
 job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar.
+job-description-pirate = Drink grog, follow orders, swab the deck, and adhere to your Captain and your code.
+job-description-pirate-captain = Lead a crew of ne'er-do-wells across the open space and plunder, respectfully, always following the code.
+job-description-pirate-first-mate = Assist your captain in any hijinks you find yourselves in.
 job-description-security-guard = Patrol the empty halls, whistle simple tunes you heard on radio, jingle your keychain and scurry away at the sight of danger.
 job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.
 job-description-sr = Handle access reassignment fairly using your ID console, manage Frontier outpost, and keep Clippy safe.
diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl
@@ -1,6 +1,9 @@
 job-name-ertmailcarrier = ERT Mail Carrier
 job-name-mercenary = Mercenary
 job-name-pilot = Pilot
+job-name-pirate = Pirate
+job-name-pirate-captain = Pirate Captain
+job-name-pirate-first-mate = Pirate First Mate
 job-name-security-guard = Security Guard
 job-name-stc = Station Traffic Controller
 job-name-sr = Station Representative
@@ -9,5 +12,8 @@ job-name-sr = Station Representative
 JobERTMailCarrier = ERT Mail Carrier
 JobMercenary = Mercenary
 JobPilot = Pilot
+JobPirate = Pirate
+JobPirateCaptain = Pirate Captain
+JobPirateFirstMate = Pirate First Mate
 JobSecurityGuard = Security Guard
 JobSTC = Station Traffic Controller
diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml
diff --git a/Resources/Maps/_NF/POI/cove.yml b/Resources/Maps/_NF/POI/cove.yml
@@ -695,16 +695,19 @@ entities:
   - uid: 22
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -35.5,-6.5
       parent: 1
   - uid: 23
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -35.5,-5.5
       parent: 1
   - uid: 24
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -35.5,-4.5
       parent: 1
 - proto: APCBasic
@@ -2928,6 +2931,50 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -7.5590277,3.5358868
       parent: 1
+  - uid: 1998
+    components:
+    - type: Transform
+      pos: -8.796216,-0.5835842
+      parent: 1
+  - uid: 1999
+    components:
+    - type: Transform
+      pos: -8.858716,-0.3492092
+      parent: 1
+  - uid: 2000
+    components:
+    - type: Transform
+      pos: -8.624341,-0.3804592
+      parent: 1
+  - uid: 2005
+    components:
+    - type: Transform
+      pos: -8.093091,-0.5835842
+      parent: 1
+- proto: CannonBallGlassshot
+  entities:
+  - uid: 2001
+    components:
+    - type: Transform
+      pos: -8.358716,-0.5679592
+      parent: 1
+  - uid: 2002
+    components:
+    - type: Transform
+      pos: -8.155591,-0.2710842
+      parent: 1
+- proto: CannonBallGrapeshot
+  entities:
+  - uid: 2003
+    components:
+    - type: Transform
+      pos: -8.624341,-0.17733419
+      parent: 1
+  - uid: 2004
+    components:
+    - type: Transform
+      pos: -8.889966,-0.4585842
+      parent: 1
 - proto: CarpetBlack
   entities:
   - uid: 1824
@@ -4853,6 +4900,13 @@ entities:
     - type: Transform
       pos: -6.5,3.5
       parent: 1
+- proto: Rack
+  entities:
+  - uid: 2006
+    components:
+    - type: Transform
+      pos: -8.5,-0.5
+      parent: 1
 - proto: Railing
   entities:
   - uid: 1733
@@ -5128,6 +5182,32 @@ entities:
     - type: Transform
       pos: -7.5,-13.5
       parent: 1
+- proto: SpawnPointLatejoin
+  entities:
+  - uid: 1996
+    components:
+    - type: Transform
+      pos: -5.5,-9.5
+      parent: 1
+  - uid: 1997
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 1
+- proto: SpawnPointPirateCaptain
+  entities:
+  - uid: 1994
+    components:
+    - type: Transform
+      pos: -3.5,-7.5
+      parent: 1
+- proto: SpawnPointPirateFirstMate
+  entities:
+  - uid: 1995
+    components:
+    - type: Transform
+      pos: -5.5,-7.5
+      parent: 1
 - proto: SpesosTreeSeeds
   entities:
   - uid: 1701
@@ -11094,39 +11174,39 @@ entities:
       pos: -0.5,-8.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1560.3269
+      secondsUntilStateChange: -1725.3612
       state: Opening
   - uid: 1840
     components:
     - type: Transform
       pos: -0.5,-7.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1561.0078
+      secondsUntilStateChange: -1726.0421
       state: Opening
   - uid: 1841
     components:
     - type: Transform
       pos: -1.5,-1.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1534.2413
+      secondsUntilStateChange: -1699.2756
       state: Opening
   - uid: 1842
     components:
     - type: Transform
       pos: -0.5,-1.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1534.8745
+      secondsUntilStateChange: -1699.9088
       state: Opening
   - uid: 1905
     components:
     - type: Transform
       pos: -5.5,2.5
       parent: 1
     - type: Door
-      secondsUntilStateChange: -1532.7623
+      secondsUntilStateChange: -1697.7966
       state: Opening
 - proto: WoodSecretDoor
   entities:

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/implanters.yml
@@ -2,12 +2,21 @@
 
 - type: entity
   id: MedicalTrackingImplanter
-  name: medical insurance tracking implanter
+  name: medical tracking implanter
   parent: BaseImplantOnlyImplanter
   components:
     - type: Implanter
       implant: MedicalTrackingImplant
 
+- type: entity
+  id: FreelanceTrackingImplanter
+  name: freelance tracking implanter
+  suffix: Freelance
+  parent: BaseImplantOnlyImplanterSyndi
+  components:
+    - type: Implanter
+      implant: FreelanceTrackingImplant
+
 - type: entity
   id: DeathAcidifierImplanterNF
   name: death acidifier implanter

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/subdermal_implants.yml
@@ -3,7 +3,7 @@
 - type: entity
   parent: BaseSubdermalImplant
   id: MedicalTrackingImplant
-  name: medical insurance tracking implant
+  name: medical tracking implant
   description: This implant has a tracking device monitor for the Medical radio channel.
   noSpawn: true
   components:
@@ -26,6 +26,32 @@
     - type: Rattle
       radioChannel: "Medical"
 
+- type: entity
+  parent: BaseSubdermalImplant
+  id: FreelanceTrackingImplant
+  name: freelance tracking implant
+  description: This implant has a tracking device monitor for the Freelance radio channel.
+  noSpawn: true
+  components:
+    - type: SubdermalImplant
+#    - type: SuitSensor
+#      randomMode: false
+#      controlsLocked: true
+#      mode: SensorCords
+#      activationContainer: "implant"
+#    - type: DeviceNetwork
+#      deviceNetId: Wireless
+#      transmitFrequencyId: SuitSensor
+#    - type: StationLimitedNetwork
+#    - type: WirelessNetworkConnection
+#      range: 500
+    - type: TriggerOnMobstateChange
+      mobState:
+      - Critical
+      - Dead
+    - type: Rattle
+      radioChannel: "Freelance"
+
 - type: entity
   parent: BaseSubdermalImplant
   id: DeathAcidifierImplantNF

diff --git a/Resources/Prototypes/_NF/Maps/POI/cove.yml b/Resources/Prototypes/_NF/Maps/POI/cove.yml
@@ -9,3 +9,8 @@
       components:
         - type: StationNameSetup
           mapNameTemplate: 'Пиратская Бухта'
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs:
+            PirateCaptain: [ 0, 0 ]
+            PirateFirstMate: [ 0, 0 ]
diff --git a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml
@@ -24,6 +24,45 @@
       - state: green
       - state: pilot
 
+- type: entity
+  id: SpawnPointPirate
+  parent: SpawnPointJobBase
+  name: pirate
+  components:
+  - type: SpawnPoint
+    job_id: Pirate
+  - type: Sprite
+    sprite: _NF/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: pilot
+
+- type: entity
+  id: SpawnPointPirateCaptain
+  parent: SpawnPointJobBase
+  name: pirate captain
+  components:
+  - type: SpawnPoint
+    job_id: PirateCaptain
+  - type: Sprite
+    sprite: _NF/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: pilot
+
+- type: entity
+  id: SpawnPointPirateFirstMate
+  parent: SpawnPointJobBase
+  name: pirate first mate
+  components:
+  - type: SpawnPoint
+    job_id: PirateFirstMate
+  - type: Sprite
+    sprite: _NF/Markers/jobs.rsi
+    layers:
+      - state: green
+      - state: pilot
+
 - type: entity
   id: SpawnPointStc
   parent: SpawnPointJobBase

diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml b/Resources/Prototypes/_NF/Roles/Jobs/Pirates/pirate.yml
@@ -0,0 +1,35 @@
+- type: job
+  id: Pirate
+  name: job-name-pirate
+  description: job-description-pirate
+  playTimeTracker: JobPirate
+  requirements:
+    - !type:OverallPlaytimeRequirement
+      time: 86400 # Frontier - 24 hours
+  startingGear: NFPirateGear
+  alwaysUseSpawner: true
+  canBeAntag: true
+  icon: "JobIconMercenary" 
+  supervisors: job-supervisors-hire
+  setPreference: true
+  accessGroups:
+  - GeneralAccess
+  special:
+  - !type:AddImplantSpecial
+    implants: [ FreelanceTrackingImplant ]
+
+- type: startingGear
+  id: NFPirateGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitPirate
+    back: ClothingBackpackPirateFilled
+    head: ClothingHeadBandBlack
+    ears: ClothingHeadsetAltFreelancer
+    shoes: ClothingShoesBootsLaceup
+    id: PiratePDA
+    belt: ClothingBeltUtility
+    pocket1: AppraisalTool
+  innerClothingSkirt: ClothingUniformJumpsuitPirate
+  satchel: ClothingBackpackPirateFilled
+  duffelbag: ClothingBackpackPirateFilled
+  messenger: ClothingBackpackMessengerMercenaryFilled