merge but only a little

Resources/Locale/en-US/_Crescent/job/department.ftl

@@ -8,3 +8,4 @@ department-TAP = Taypani-Atyrian Pact
 department-ATH = Central Sol Authority
 department-NCWL-W = NCWL Homeguard Remnants
 department-DSM-W = DSM Penal Division
+department-pf = Planetfall Teams

Resources/Locale/en-US/_Crescent/job/job-description.ftl

@@ -164,3 +164,9 @@ job-description-unionfall-dsm-officer = Lead small squads. Ensure cohesion. List
 job-description-unionfall-dsm-doctor = Keep your fellow men alive.
 job-description-unionfall-dsm-rifleman = Be the rank and file. Pilot fighters and ultralights. Listen to your superiors.
 job-description-unionfall-dsm-cadet = Listen to your superiors. Keep your head down and learn.
+
+# planetfall
+job-description-planetfall-team-subleader = Enact the team leader's orders. Ensure Cohesion.
+job-description-planetfall-team-member = Follow orders from your team leader. Do your part to ensure the success of the mission. Listen to your superiors.
+job-description-planetfall-team-leader = Lead your team. Ensure the success of your mission. Listen to your superiors.
+

Resources/Locale/en-US/_Crescent/job/job-names.ftl

@@ -121,32 +121,18 @@ job-name-gliess-deputy = Gliessian Militiaman
 job-name-gliess-dockmaster = Gliessian Dockmaster
 
 # conscript-ncwl - for PLANETFALL
+# someones been here before... i am only retracing steps...
 
-job-name-conscript-ncwl-ship-captain = Clementine Admiral
-job-name-conscript-ncwl-ship-crew = Clementine Artificer
-job-name-conscript-ncwl-leader = Major
-job-name-conscript-ncwl-officer = Kommissar
-job-name-conscript-ncwl-amr = Specialist (AMR)
-job-name-conscript-ncwl-lmg = Specialist (LMG)
-job-name-conscript-ncwl-doctor = Doktor
-job-name-conscript-ncwl-smg = Breacher (SMG)
-job-name-conscript-ncwl-shotgun = Breacher (Shotgun)
-job-name-conscript-ncwl-rifleman = Soldat (Rifle)
-job-name-conscript-ncwl-cadet = Cadet
+job-name-planetfall-team1-leader = SHI Commander
+job-name-planetfall-team1-subleader = SHI Squad Leader
+job-name-planetfall-team1-member = SHI Infantry
 
 # conscript-dsm - for PLANETFALL
+# someones been here before... i am only retracing steps...
 
-job-name-conscript-dsm-ship-captain = Nemesis Grand Steward
-job-name-conscript-dsm-ship-crew = Nemesis Steward
-job-name-conscript-dsm-leader = Knight-Bannaret
-job-name-conscript-dsm-officer = Knight
-job-name-conscript-dsm-amr = Ward (AMR)
-job-name-conscript-dsm-lmg = Ward (LMG)
-job-name-conscript-dsm-doctor = Medicant
-job-name-conscript-dsm-smg = Squire (SMG)
-job-name-conscript-dsm-shotgun = Squire (Shotgun)
-job-name-conscript-dsm-rifleman = Armsman (Rifle)
-job-name-conscript-dsm-cadet = Recruit
+job-name-planetfall-team2-leader = PTA Commander
+job-name-planetfall-team2-subleader = PTA Squad Leader
+job-name-planetfall-team2-member = PTA Infantry
 
 # unionfall-ncwl
 

Resources/Locale/en-US/_Crescent/job/job-supervisors.ftl

@@ -8,6 +8,7 @@ job-supervisors-ncwl-mvd = To the Chengridz Central Committee and by extension t
 job-supervisors-ncsp = NCSP High Command
 job-supervisors-imperial = House Kircheis
 job-supervisors-shi = Shinohara Corporate Command
+job-supervisors-pf = Corporate Command, then your assigned commander for the operation.
 job-supervisors-prophet = The Mother's Will
 job-supervisors-tap = Nomadic Law
 job-supervisors-gliess = Gliessian Dockmaster

Resources/Locale/en-US/_Crescent/rank/ranks.ftl

@@ -114,3 +114,10 @@ crescent-rank-sanitat = Cpl.
 crescent-rank-kanoneer = Sgt.
 crescent-rank-steward = Steward
 crescent-rank-logistat = Marshallie
+
+# planetfall
+
+crescent-rank-PFLeader = Major.
+crescent-rank-PFSubLeader = Lt.
+crescent-rank-PFMember = Pvt.
+

Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml

@@ -162,3 +162,32 @@
     range: 3
     sound:
       path: /Audio/Ambience/Objects/light_hum.ogg
+
+- type: entity
+  id: PoweredSodiumLightPostSmall
+  name: Street Light
+  description: "A light fixture. Draws power and produces light when equipped with a light tube."
+  suffix: LED
+  parent: PoweredLightPostSmallEmpty
+  components:
+  - type: Sprite
+    state: base
+  - type: PointLight
+    enabled: true
+    radius: 15
+    energy: 1
+    softness: 0.9
+    color: "#FFAF38"
+  - type: PoweredLight
+    hasLampOnSpawn: LedLightTube
+    damage:
+      types:
+        Heat: 1
+  - type: StaticPrice
+    price: 25
+  - type: AmbientOnPowered
+  - type: AmbientSound
+    volume: -15
+    range: 3
+    sound:
+      path: /Audio/Ambience/Objects/light_hum.ogg

Resources/Prototypes/Roles/Jobs/departments.yml

@@ -265,3 +265,17 @@
   - ConscriptShipCaptainDSM
   - ConscriptShipCrewDSM
   editorHidden: true
+
+- type: department
+  id: PLANETFALLROLES
+  description: department-pf-description
+  color: "#5e5858"
+  weight: 10
+  roles:
+  - PlanetfallTeam1Leader
+  - PlanetfallTeam1SubLeader
+  - PlanetfallTeam1Member
+  - PlanetfallTeam2Member
+  - PlanetfallTeam2SubLeader
+  - PlanetfallTeam2Leader
+  editorHidden: true

Resources/Prototypes/_Crescent/GameRules/hullrotGamemodes.yml

@@ -395,3 +395,25 @@
         posY: -50
         IFFColor: FireBrick
         IFFFaction: Remnant
+
+- type: gamePreset
+  id: PlanetfallMode
+  name: Planetfall SHI VS PTA HYPERWAR
+  showInVote: true
+  description: Corporate forces from Shinohara and Pang Tai are deployed onto a simulation to conduct live fire tests.
+  rules:
+  - PlanetfallGameRule
+
+- type: entity
+  id: PlanetfallGameRule
+  parent: BaseGameRule
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: AdventureRule
+    gameMapsByID:
+      PlanetfallMap:
+        gameMapID: PlanetfallMap
+        posX: 0
+        posY: 0
+        IFFColor: White
+

Resources/Prototypes/_Crescent/Maps/Stations/planetfallmap.yml

@@ -0,0 +1,32 @@
+- type: gameMap
+  id: PlanetfallMap
+  mapName: 'NT Isolated Pressurized Warfare Simulation Research Outpost'
+  mapPath: /Maps/_Crescent/Stations/Planetfallmap.yml
+  minPlayers: 0
+  stations:
+    PlanetfallMap:
+      stationProto: StandardCrescentStation
+      gridComponents:
+        - type: BlockShipWeaponProjectileGrid
+        - type: PreventPilot
+        - type: VesselIcon
+          iffIcon:
+            sprite: _Crescent/ShipIcons/ifficons.rsi
+            state: outpost
+      components:
+        - type: StationNameSetup
+          mapNameTemplate: 'NT Isolated Pressurized Warfare Simulation Research Outpost'
+        - type: VesselDesignation
+          designation: vessel-designation-headquarters
+        - type: Grammar
+          attributes:
+            proper: true
+        - type: StationJobs
+          overflowJobs: []
+          availableJobs:
+            PlanetfallTeam1Leader: [ 1, 1 ]
+            PlanetfallTeam1SubLeader: [ 1, 1 ]
+            PlanetfallTeam1Member: [ 100, 100 ]
+            PlanetfallTeam2Leader: [ 1, 1 ]
+            PlanetfallTeam2SubLeader: [ 1, 1 ]
+            PlanetfallTeam2Member: [ 100, 100 ]

Resources/Prototypes/_Crescent/Markers/jobspawners.yml

@@ -1294,3 +1294,75 @@
       - state: green
       - state: passenger
 
+#planetfall
+- type: entity
+  id: SpawnPointConscriptPFT1Leader
+  parent: SpawnPointJobBase
+  name: PlanetfallTeam1Leader
+  components:
+  - type: SpawnPoint
+    job_id: PlanetfallTeam1Leader
+  - type: Sprite
+    layers:
+      - state: green
+      - state: passenger
+
+- type: entity
+  id: SpawnPointConscriptPFT2Leader
+  parent: SpawnPointJobBase
+  name: PlanetfallTeam2Leader
+  components:
+  - type: SpawnPoint
+    job_id: PlanetfallTeam2Leader
+  - type: Sprite
+    layers:
+      - state: green
+      - state: passenger
+
+- type: entity
+  id: SpawnPointConscriptPFT1SubLeader
+  parent: SpawnPointJobBase
+  name: PlanetfallTeam1SubLeader
+  components:
+  - type: SpawnPoint
+    job_id: PlanetfallTeam1SubLeader
+  - type: Sprite
+    layers:
+      - state: green
+      - state: passenger
+
+- type: entity
+  id: SpawnPointConscriptPFT2SubLeader
+  parent: SpawnPointJobBase
+  name: PlanetfallTeam2SubLeader
+  components:
+  - type: SpawnPoint
+    job_id: PlanetfallTeam2SubLeader
+  - type: Sprite
+    layers:
+      - state: green
+      - state: passenger
+
+- type: entity
+  id: SpawnPointConscriptPFT1Member
+  parent: SpawnPointJobBase
+  name: PlanetfallTeam1Member
+  components:
+  - type: SpawnPoint
+    job_id: PlanetfallTeam1Member
+  - type: Sprite
+    layers:
+      - state: green
+      - state: passenger
+
+- type: entity
+  id: SpawnPointConscriptPFT2Member
+  parent: SpawnPointJobBase
+  name: PlanetfallTeam2Member
+  components:
+  - type: SpawnPoint
+    job_id: PlanetfallTeam2Member
+  - type: Sprite
+    layers:
+      - state: green
+      - state: passenger

Resources/Prototypes/_Crescent/Roles/Jobs/Planetfall/PlanetfallTeam1Leader.yml

@@ -0,0 +1,94 @@
+- type: job
+  id: PlanetfallTeam1Leader
+  name: job-name-planetfall-team1-leader
+  description: job-description-planetfall-team1-leader
+  playTimeTracker: ConscriptDSM
+  requirements:
+    - !type:CharacterWhitelistRequirement
+    - !type:CharacterOverallTimeRequirement
+      min: 20000
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Muted
+        - Blindness
+        - Pacifist
+        - WheelchairBound
+  weight: 9
+  startingGear: PlanetfallT1LeaderGear
+  alwaysUseSpawner: true
+  icon: "JobIconPFT1lead"
+  requireAdminNotify: true
+  supervisors: job-supervisors-pf
+  canBeAntag: false
+  special:
+  - !type:AddComponentSpecial
+    components:
+      - type: ChatRank
+        rank: crescent-rank-PFLeader
+      - type: HullrotFaction
+        faction: DSM
+      - type: LanguageAdder
+        addSpoken:
+          - Tradeband
+        addUnderstood:
+          - Tradeband
+  access:
+  - EmergencyShuttleRepealAll
+  - Captain
+  - HeadOfPersonnel
+  - ChiefEngineer
+  - ChiefMedicalOfficer
+  - HeadOfSecurity
+  - ResearchDirector
+  - Frontier # Frontier
+  - Cryogenics
+  - Security
+  - Detective
+  - Armory
+  - Brig
+  - Lawyer
+  - Engineering
+  - Mail # Frontier
+  - Medical
+  - Mercenary # Frontier
+  - Quartermaster
+  - Salvage
+  - Cargo
+  - Research
+  - Service
+  - StationTrafficController # Frontier
+  - Maintenance
+  - External
+  - Janitor
+  - Theatre
+  - Bar
+  - Chemistry
+  - Kitchen
+  - Chapel
+  - Hydroponics
+  - Atmospherics
+  - Command
+  - Service
+  - Empire
+
+#testshit
+- type: startingGear
+  id: PlanetfallT1LeaderGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitShinoharaHOS
+    shoes: ClothingShoesBootsCombat
+    gloves: ClothingHandsGlovesCombat
+    id: HighsecPDA
+    ears: ClothingHeadsetShinohara
+    pocket1: WeaponPistolLiquidator
+    back: ClothingBackpackSHISatchel
+    head: ClothingHeadHatShinoharaBeretHOS
+    mask: ClothingMaskSHIHOSMask
+    outerClothing: ClothingOuterArmorShinoharaHOSVest
+    belt: ClothingBeltSecurityFilled
+    eyes: ClothingEyesHudSecurity
+  storage:
+    belt:
+      - Flash
+      - Tourniquet