Hot revert (#403)

* Revert "add: notification upon head arrival (#402)" This reverts commit a87b5295bc. * Revert "Constr. graph 2 recipes fix (#401)" This reverts commit 5832144695.
2024-07-01 14:19:29 +03:00
parent 494811a667
commit 65283e1c44
15 changed files with 33 additions and 192 deletions
--- a/Resources/Locale/ru-RU/_white/announce/announce.ftl
+++ b/Resources/Locale/ru-RU/_white/announce/announce.ftl
@@ -1,3 +0,0 @@
-head-arrived-message = { $character }, { $job }, Глава отдела
-head-arrived-message-global = { $job } { $character } на станции
-head-arrived-sender = Автоматическая Система Оповещений
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
@@ -32,5 +32,12 @@
              icon:
                sprite: Objects/Misc/stock_parts.rsi
                state: capacitor
+              doAfter: 5
+            - tag: CapacitorStockPart
+              name: capacitor
+              icon:
+                sprite: Objects/Misc/stock_parts.rsi
+                state: capacitor
+              doAfter: 5
    - node: medsecHud
      entity: ClothingEyesHudMedSec
--- a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/potato.yml
@@ -65,5 +65,10 @@
              icon:
                sprite: Objects/Misc/stock_parts.rsi
                state: capacitor
+            - tag: CapacitorStockPart
+              name: capacitor
+              icon:
+                sprite: Objects/Misc/stock_parts.rsi
+                state: capacitor
    - node: potatoaichip
-      entity: PotatoAIChip
+      entity: PotatoAIChip
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -15,7 +15,6 @@
  weight: 10
  startingGear: QuartermasterGear
  icon: "JobIconQuarterMaster"
-  announcementPrototype: QuartermasterArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -20,7 +20,6 @@
  icon: "JobIconCaptain"
  requireAdminNotify: true
  joinNotifyCrew: true
-  announcementPrototype: CaptainArrivalNotification
  supervisors: job-supervisors-centcom
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -19,7 +19,6 @@
  startingGear: HoPGear
  icon: "JobIconHeadOfPersonnel"
  requireAdminNotify: true
-  announcementPrototype: HeadOfPersonnelArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -16,7 +16,6 @@
  startingGear: ChiefEngineerGear
  icon: "JobIconChiefEngineer"
  requireAdminNotify: true
-  announcementPrototype: ChiefEngineerArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml
+++ b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml
@@ -14,7 +14,6 @@
      time: 36000 #10 hrs
  startingGear: InspectorGear
  icon: "JobIconInspector"
-  announcementPrototype: InspectorArrivalNotification
  supervisors: job-supervisors-captain
  access:
    - Service
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -14,7 +14,6 @@
  weight: 10
  startingGear: CMOGear
  icon: "JobIconChiefMedicalOfficer"
-  announcementPrototype: ChiefMedicalOfficerArrivalNotification
  requireAdminNotify: true
  supervisors: job-supervisors-captain
  whitelistedSpecies:
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -13,7 +13,6 @@
  startingGear: ResearchDirectorGear
  icon: "JobIconResearchDirector"
  requireAdminNotify: true
-  announcementPrototype: ResearchDirectorArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -16,7 +16,6 @@
  startingGear: HoSGear
  icon: "JobIconHeadOfSecurity"
  requireAdminNotify: true
-  announcementPrototype: HeadOfSecurityArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/_White/Announcement/ArrivalNotification.yml
+++ b/Resources/Prototypes/_White/Announcement/ArrivalNotification.yml
@@ -1,56 +0,0 @@
- type: arrivalNotification
-  id: CaptainArrivalNotification
-  message: head-arrived-message
-  globalMessage: head-arrived-message-global
-  radioChannelsPrototypes:
-  - Command
-  useGlobalAnnouncement: True
-
- type: arrivalNotification
-  id: HeadOfPersonnelArrivalNotification
-  message: head-arrived-message
-  radioChannelsPrototypes:
-  - Command
-  - Service
-
- type: arrivalNotification
-  id: HeadOfSecurityArrivalNotification
-  message: head-arrived-message
-  radioChannelsPrototypes:
-  - Command
-  - Security
-
- type: arrivalNotification
-  id: ChiefMedicalOfficerArrivalNotification
-  message: head-arrived-message
-  radioChannelsPrototypes:
-  - Command
-  - Medical
-
- type: arrivalNotification
-  id: ChiefEngineerArrivalNotification
-  message: head-arrived-message
-  radioChannelsPrototypes:
-  - Command
-  - Engineering
-
- type: arrivalNotification
-  id: ResearchDirectorArrivalNotification
-  message: head-arrived-message
-  radioChannelsPrototypes:
-  - Command
-  - Science
-
- type: arrivalNotification
-  id: QuartermasterArrivalNotification
-  message: head-arrived-message
-  radioChannelsPrototypes:
-  - Command
-  - Cargo
-
- type: arrivalNotification
-  id: InspectorArrivalNotification
-  message: head-arrived-message
-  radioChannelsPrototypes:
-  - Command
-  - Security