фиксы

space-sunrise · Dec 31, 2024 · 765671d · 765671d
1 parent 31b3c84
commit 765671d
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 6 deletions.
diff --git a/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/_prototypes/entities/objects/devices/pda.ftl
@@ -153,3 +153,6 @@ ent-PiratePDA = КПК с Адамовой головой
 ent-SyndiAgentPDA = медицинский ало-красный КПК
     .suffix = КПК оперативника медика Синдиката, Ядерный Оперативник
     .desc = Смотря на этот КПК, ваше сердцебиение учащается... словно его владелец проводил немыслимые и ужасные медицинские эксперименты.
+ent-AssaultOpsPDA = { ent-PassengerPDA }
+    .desc = { ent-PassengerPDA }
+
diff --git a/Resources/Maps/_Sunrise/Shuttles/assaultops.yml b/Resources/Maps/_Sunrise/Shuttles/assaultops.yml
@@ -6362,6 +6362,50 @@ entities:
     - type: Transform
       pos: -6.5,-5.5
       parent: 1
+- proto: SpawnPointAssaultOps
+  entities:
+  - uid: 202
+    components:
+    - type: Transform
+      pos: -1.5,10.5
+      parent: 1
+  - uid: 922
+    components:
+    - type: Transform
+      pos: 7.5,6.5
+      parent: 1
+  - uid: 923
+    components:
+    - type: Transform
+      pos: 7.5,3.5
+      parent: 1
+  - uid: 924
+    components:
+    - type: Transform
+      pos: -10.5,3.5
+      parent: 1
+  - uid: 925
+    components:
+    - type: Transform
+      pos: -10.5,6.5
+      parent: 1
+  - uid: 926
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,10.5
+      parent: 1
+  - uid: 927
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,10.5
+      parent: 1
+  - uid: 929
+    components:
+    - type: Transform
+      pos: -5.5,10.5
+      parent: 1
 - proto: StasisBed
   entities:
   - uid: 871

diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/game_presets.yml b/Resources/Prototypes/_Sunrise/AssaultOps/game_presets.yml
@@ -5,11 +5,10 @@
     - assops # yeeeeah
   name: assaultops-title
   description: assaultops-description
-  showInVote: false
+  showInVote: true
   rules:
     - AssaultOps
     - LiteSubGamemodesRule
-    - MiddleSubGamemodesRule
     - BasicStationEventScheduler
     - MeteorSwarmScheduler
     - SpaceTrafficControlEventScheduler

diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/pda.yml b/Resources/Prototypes/_Sunrise/AssaultOps/pda.yml
@@ -1,6 +1,6 @@
 - type: entity
   parent: PassengerPDA
-  id: AssaultOpPDA
+  id: AssaultOpsPDA
   name: passenger PDA
   description: Why isn't it gray?
   components:

diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/spawners.yml b/Resources/Prototypes/_Sunrise/AssaultOps/spawners.yml
@@ -0,0 +1,11 @@
+- type: entity
+  id: SpawnPointAssaultOps
+  parent: MarkerBase
+  name: assaultops
+  components:
+  - type: SpawnPoint
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Objects/Fun/toys.rsi
+      state: base
diff --git a/Resources/Prototypes/_Sunrise/AssaultOps/startinggear.yml b/Resources/Prototypes/_Sunrise/AssaultOps/startinggear.yml
@@ -9,7 +9,7 @@
 #    ears: ClothingHeadsetAltSyndicate
 #    gloves: ClothingHandsGlovesCombat
     shoes: ClothingShoesColorBlack
-    id: AssaultOpPDA
+    id: AssaultOpsPDA
 #    pocket1: PinpointerIcarus
 #    pocket2: BaseUplinkRadioAssautOP
   innerclothingskirt: ClothingUniformJumpsuitTactical
@@ -28,7 +28,7 @@
     #    ears: ClothingHeadsetAltSyndicate
     #    gloves: ClothingHandsGlovesCombat
     shoes: ClothingShoesColorBlack
-    id: AssaultOpPDA
+    id: AssaultOpsPDA
   #    pocket1: PinpointerIcarus
     pocket2: UplinkRadioAssaultOperatives40TC
   innerclothingskirt: ClothingUniformJumpsuitTactical
@@ -46,7 +46,7 @@
 #    ears: ClothingHeadsetAltSyndicate
 #    gloves: ClothingHandsGlovesCombat
     shoes: ClothingShoesColorBlack
-    id: AssaultOpPDA
+    id: AssaultOpsPDA
     pocket1: RemoteAssaultOpShuttleController
     pocket2: UplinkRadioAssaultOperatives0TC
   innerclothingskirt: ClothingUniformJumpsuitTactical