From 79e2e2d498d4b1f5e3296559754302abee7fdb15 Mon Sep 17 00:00:00 2001 From: TryHardo7 Date: Mon, 13 Jan 2025 12:48:03 +0300 Subject: [PATCH 1/4] bupdate --- Resources/PhotocopierForms/FormIndex.yml | 1 + .../main/cc_cmd_dcr_ailaw.xml | 4 ++-- .../main/cc_cmd_dcr_arrival.xml | 4 ++-- .../main/cc_cmd_dcr_evac.xml | 4 ++-- .../main/cc_cmd_dcr_exec.xml | 4 ++-- .../main/cc_cmd_dcr_goal.xml | 4 ++-- .../main/cc_cmd_dcr_goal_rep.xml | 4 ++-- .../main/cc_cmd_dcr_hhc.xml | 4 ++-- .../main/cc_cmd_dcr_hire.xml | 4 ++-- .../main/cc_cmd_dcr_law.xml | 4 ++-- .../main/cc_cmd_dcr_reply.xml | 4 ++-- .../main/cc_cmd_dcr_roi.xml | 4 ++-- .../main/cc_cmd_dcr_shift_end.xml | 4 ++-- .../main/cc_cmd_dcr_sitrep.xml | 4 ++-- .../main/cc_cmd_dcr_sop.xml | 4 ++-- .../main/cc_cmd_dcr_uvd.xml | 4 ++-- .../nanotrasen_station/cargo/sup_ord.xml | 7 ++++-- .../nanotrasen_station/cargo/sup_ord_dng.xml | 7 ++++-- .../nanotrasen_station/cargo/sup_sitrep.xml | 11 ++++++---- .../command/cc_req_bonus.xml | 4 ++-- .../nanotrasen_station/command/cmd_acap.xml | 6 ++++- .../nanotrasen_station/command/cmd_acom.xml | 6 ++++- .../nanotrasen_station/command/cmd_cc_frs.xml | 7 +++--- .../nanotrasen_station/command/cmd_cc_inv.xml | 5 +++-- .../nanotrasen_station/command/cmd_cc_srt.xml | 5 +++-- .../command/cmd_dcr_award.xml | 4 ++-- .../nanotrasen_station/command/cmd_fcom.xml | 6 +++-- .../engineering/eng_permit.xml | 4 ++-- .../engineering/eng_permit_2.xml | 6 ++--- .../engineering/eng_req_tw.xml | 6 ++--- .../engineering/eng_sitrep.xml | 8 ++++--- .../nanotrasen_station/goal/goal_capsule.xml | 2 +- .../goal/goal_expedition.xml | 4 ++-- .../nanotrasen_station/goal/goal_guests.xml | 4 +++- .../goal/goal_robotisation.xml | 4 +++- .../nanotrasen_station/goal/goal_simple.xml | 8 ++++--- .../nanotrasen_station/hr/cmd_acr.xml | 4 +++- .../nanotrasen_station/hr/cmd_acwt.xml | 4 +++- .../nanotrasen_station/hr/cmd_afe.xml | 4 ++-- .../nanotrasen_station/hr/cmd_dsc.xml | 6 ++--- .../nanotrasen_station/hr/cmd_ept.xml | 6 ++--- .../nanotrasen_station/hr/cmd_qlf.xml | 4 ++-- .../nanotrasen_station/hr/cmd_req_id.xml | 8 ++++--- .../nanotrasen_station/hr/cmd_req_pda.xml | 8 ++++--- .../nanotrasen_station/law/cmd_comp.xml | 4 ++-- .../law/law_anonymousdenunciation.xml | 2 +- .../nanotrasen_station/law/law_request.xml | 6 +++-- .../nanotrasen_station/law/sec_gop.xml | 6 +++-- .../nanotrasen_station/law/sec_rep_ia.xml | 6 +++-- .../nanotrasen_station/law/sec_sopb.xml | 6 +++-- .../nanotrasen_station/law/sec_sopb_crit.xml | 4 +++- .../nanotrasen_station/law/sec_vdc.xml | 7 +++--- .../nanotrasen_station/law/sec_vdc_gop.xml | 8 ++++--- .../nanotrasen_station/medical/med_eut.xml | 4 ++-- .../medical/med_ord_chem.xml | 8 +++++-- .../nanotrasen_station/medical/med_rcp.xml | 4 +++- .../medical/med_rep_death.xml | 6 +++-- .../medical/med_rep_hhc.xml | 6 +++-- .../medical/med_rep_psych.xml | 6 ++--- .../medical/med_rep_psych_tourette.xml | 4 ++-- .../nanotrasen_station/medical/med_sitrep.xml | 7 ++++-- .../nanotrasen_station/science/rnd_ord.xml | 8 +++++-- .../nanotrasen_station/science/rnd_rar.xml | 4 ++-- .../nanotrasen_station/science/rnd_rnt.xml | 4 +++- .../nanotrasen_station/science/rnd_ror.xml | 4 ++-- .../nanotrasen_station/security/sec_awt.xml | 8 +++++-- .../nanotrasen_station/security/sec_dty.xml | 4 +++- .../nanotrasen_station/security/sec_exc.xml | 2 +- .../nanotrasen_station/security/sec_inw.xml | 6 ++--- .../nanotrasen_station/security/sec_itg.xml | 4 +++- .../security/sec_ord_imp.xml | 2 +- .../nanotrasen_station/security/sec_pmt.xml | 9 +++++--- .../nanotrasen_station/security/sec_prig.xml | 8 +++---- .../security/sec_rep_itg.xml | 11 +++++++--- .../nanotrasen_station/security/sec_roc.xml | 22 +++++++++++++++++++ .../security/sec_sitrep.xml | 7 ++++-- .../nanotrasen_station/security/sec_sur.xml | 4 ++-- .../nanotrasen_station/security/sec_swt.xml | 8 +++++-- .../security/sup_ord_wep.xml | 6 ++++- .../nanotrasen_station/service/svc_mcf.xml | 4 +++- .../nanotrasen_station/service/svc_mds.xml | 4 +++- .../nanotrasen_station/service/svc_sitrep.xml | 7 ++++-- 82 files changed, 288 insertions(+), 161 deletions(-) create mode 100644 Resources/PhotocopierForms/nanotrasen_station/security/sec_roc.xml diff --git a/Resources/PhotocopierForms/FormIndex.yml b/Resources/PhotocopierForms/FormIndex.yml index 7e9c5f91745d..e2827bc77325 100644 --- a/Resources/PhotocopierForms/FormIndex.yml +++ b/Resources/PhotocopierForms/FormIndex.yml @@ -97,6 +97,7 @@ - /PhotocopierForms/nanotrasen_station/security/sec_pmt.xml - /PhotocopierForms/nanotrasen_station/security/sec_rep_itg.xml - /PhotocopierForms/nanotrasen_station/security/sec_sur.xml + - /PhotocopierForms/nanotrasen_station/security/sec_roc.xml - /PhotocopierForms/nanotrasen_station/security/sec_swt.xml - /PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml - /PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_ailaw.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_ailaw.xml index 7c0cc719a633..8eaea8e3d3a8 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_ailaw.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_ailaw.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_arrival.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_arrival.xml index 460d0fdabd72..97aa112de601 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_arrival.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_arrival.xml @@ -7,7 +7,7 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_evac.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_evac.xml index 93a9bdfc7de7..5f689bb45fe2 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_evac.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_evac.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_exec.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_exec.xml index af1698fab1c2..3448e0bff403 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_exec.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_exec.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal.xml index 25c7253e01cc..0226d9a8f993 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal.xml @@ -6,7 +6,7 @@ Приказ о назначении цели станции diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal_rep.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal_rep.xml index 7b22d9b61976..006147856261 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal_rep.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal_rep.xml @@ -7,13 +7,13 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hhc.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hhc.xml index 89ed822c47e2..1603fa86219d 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hhc.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hhc.xml @@ -7,12 +7,12 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hire.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hire.xml index b81a7c01ccde..ab4b7234e17c 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hire.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hire.xml @@ -7,7 +7,7 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_law.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_law.xml index 11cafb3eae8b..14b311ede41b 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_law.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_law.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_reply.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_reply.xml index 1fa0299166e2..99ec1fb2d3b0 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_reply.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_reply.xml @@ -7,11 +7,11 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_roi.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_roi.xml index 686030a05f45..4ead8897862e 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_roi.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_roi.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_shift_end.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_shift_end.xml index 6a1768f871c4..e55febe1c54f 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_shift_end.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_shift_end.xml @@ -7,13 +7,13 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sitrep.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sitrep.xml index 41198dcfba7e..37ab252ea76f 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sitrep.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sitrep.xml @@ -7,7 +7,7 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sop.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sop.xml index cc58df70484d..048ee19dbd9b 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sop.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sop.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_uvd.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_uvd.xml index c4ae8927dd2f..26207eee33c3 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_uvd.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_uvd.xml @@ -7,12 +7,12 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord.xml b/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord.xml index f27b427a1859..8b1395790983 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord.xml @@ -7,11 +7,14 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord_dng.xml b/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord_dng.xml index bbf202e5837c..f4357116a8c9 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord_dng.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord_dng.xml @@ -7,11 +7,14 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cc_req_bonus.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cc_req_bonus.xml index f286b93b9b75..83aa045bfa7a 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cc_req_bonus.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cc_req_bonus.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_acom.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_acom.xml index e87ee80d47f7..cefffc42937c 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_acom.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_acom.xml @@ -7,8 +7,12 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_frs.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_frs.xml index 0f80a182931d..b3401c389dd8 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_frs.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_frs.xml @@ -7,13 +7,14 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_inv.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_inv.xml index 724eea6e00b8..ab56183d3464 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_inv.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_inv.xml @@ -7,10 +7,11 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_srt.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_srt.xml index 42226ce0c9c9..6e1665620634 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_srt.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_srt.xml @@ -7,10 +7,10 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_dcr_award.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_dcr_award.xml index 1a8bb5b450f6..408d200f6fa7 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_dcr_award.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_dcr_award.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit.xml b/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit.xml index 58e0172f3af0..f171368da7ab 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit_2.xml b/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit_2.xml index 3f720a14b408..39080e1c1e1c 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit_2.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit_2.xml @@ -7,10 +7,10 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/goal/goal_capsule.xml b/Resources/PhotocopierForms/nanotrasen_station/goal/goal_capsule.xml index 5a029bcd9b29..4893b6d3f2b0 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/goal/goal_capsule.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/goal/goal_capsule.xml @@ -7,7 +7,7 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_id.xml b/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_id.xml index f9b8dfb5496c..8b768cfa9ced 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_id.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_id.xml @@ -7,15 +7,17 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_pda.xml b/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_pda.xml index 2d1d9e9c39bd..25793185ea13 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_pda.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_pda.xml @@ -7,14 +7,16 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/cmd_comp.xml b/Resources/PhotocopierForms/nanotrasen_station/law/cmd_comp.xml index 3a3da459ef94..50f11eba9514 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/cmd_comp.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/cmd_comp.xml @@ -7,9 +7,9 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_gop.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_gop.xml index 14a7667c8557..8ca1b6d4893a 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_gop.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_gop.xml @@ -7,12 +7,14 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_rep_ia.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_rep_ia.xml index a52dc64c01e3..1dfc63d2e2fe 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_rep_ia.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_rep_ia.xml @@ -7,11 +7,13 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb.xml index c2bbb670a2b1..f6ad695164eb 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb.xml @@ -7,12 +7,14 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb_crit.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb_crit.xml index 4e7e351d86e6..ca2b7d24ced8 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb_crit.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb_crit.xml @@ -7,14 +7,16 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc.xml index db9232fe3ecc..cfda312b8036 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc.xml @@ -7,16 +7,17 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc_gop.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc_gop.xml index 59697a53b9cb..929e0efd23be 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc_gop.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc_gop.xml @@ -7,11 +7,13 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_eut.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_eut.xml index 3ed7be2eb2ef..587c1c67e1c4 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_eut.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_eut.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rcp.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rcp.xml index 748860c4e57b..3fb2e1fe28c6 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rcp.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rcp.xml @@ -7,7 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_hhc.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_hhc.xml index bf6d00d57085..a2b356c76866 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_hhc.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_hhc.xml @@ -7,7 +7,7 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych.xml index c347f4fb691d..89680dbbd8bc 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych.xml @@ -7,11 +7,11 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych_tourette.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych_tourette.xml index cd8f3c6b8117..1b658fdda038 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych_tourette.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych_tourette.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_ord.xml b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_ord.xml index b91ba3fb7a5a..6d2bca16a5e6 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_ord.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_ord.xml @@ -7,11 +7,15 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rar.xml b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rar.xml index 5ba782fdc4b1..a7beea100276 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rar.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rar.xml @@ -7,13 +7,13 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rnt.xml b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rnt.xml index 359076324717..185e9d838f98 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rnt.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rnt.xml @@ -7,7 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_awt.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_awt.xml index 3eb6831ce8b8..061c44d0815c 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_awt.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_awt.xml @@ -7,10 +7,14 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_dty.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_dty.xml index cc343a52ef48..59b521e91f32 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_dty.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_dty.xml @@ -7,7 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_ord_imp.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_ord_imp.xml index 3aa2cae711b2..4850be5021ab 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_ord_imp.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_ord_imp.xml @@ -7,7 +7,7 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_prig.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_prig.xml index 0e6be6d082cd..a6b8343c03dc 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_prig.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_prig.xml @@ -7,12 +7,12 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_roc.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_roc.xml new file mode 100644 index 000000000000..03ced8d899ec --- /dev/null +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_roc.xml @@ -0,0 +1,22 @@ + +
+ cmd_comp + PaperNtFormLaw + форма НТ-КОМ-ЗОП + Заявление о преступлении + +
\ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml index 1c460a3f4d75..4fcfff8b0129 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml @@ -7,9 +7,10 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_sur.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_sur.xml index ce57a86e275f..9a84ef4e38b1 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_sur.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_sur.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml index a7d4a2af556f..4c330f7d738f 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml @@ -7,12 +7,16 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/service/svc_mcf.xml b/Resources/PhotocopierForms/nanotrasen_station/service/svc_mcf.xml index 2ce6cc29aa92..d6a1515c3700 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/service/svc_mcf.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/service/svc_mcf.xml @@ -7,7 +7,9 @@ \ No newline at end of file From 9ef977d0732922728974d84b053ecb4d868e1498 Mon Sep 17 00:00:00 2001 From: TryHardo7 Date: Mon, 13 Jan 2025 15:01:09 +0300 Subject: [PATCH 2/4] added time req --- .../Entities/Markers/Spawners/ghost_roles.yml | 18 ++++ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 9 ++ .../Entities/Mobs/NPCs/regalrat.yml | 3 + .../Entities/Mobs/NPCs/revenant.yml | 3 + .../Entities/Mobs/Player/dragon.yml | 3 + .../Entities/Mobs/Player/familiars.yml | 3 + .../Entities/Mobs/Player/guardian.yml | 12 +++ .../Entities/Mobs/Player/humanoid.yml | 93 ++++++++++++++++--- .../Entities/Mobs/Player/silicon.yml | 18 ++++ .../Entities/Mobs/Player/skeleton.yml | 9 ++ .../reinforcement_teleporter.yml | 21 +++++ .../Prototypes/SS220/DemonRofler/rune.yml | 6 ++ 12 files changed, 183 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index eda6816aa552..2499886e096e 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -19,6 +19,9 @@ name: ghost-role-information-rat-king-name description: ghost-role-information-rat-king-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostRoleMobSpawner @@ -61,6 +64,9 @@ name: ghost-role-information-cerberus-name description: ghost-role-information-cerberus-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostRoleMobSpawner @@ -147,6 +153,9 @@ name: ghost-role-information-space-dragon-name description: ghost-role-information-space-dragon-description rules: ghost-role-information-space-dragon-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end - type: Sprite layers: - state: green @@ -162,6 +171,9 @@ name: ghost-role-information-space-ninja-name description: ghost-role-information-space-ninja-description rules: ghost-role-information-antagonist-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: Sprite @@ -180,6 +192,12 @@ name: ghost-role-information-derelict-cyborg-name description: ghost-role-information-derelict-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (10h overall) end raffle: settings: default - type: Sprite diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 603ac06a420c..9f52baa49fae 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1392,6 +1392,9 @@ name: ghost-role-information-monkey-name description: ghost-role-information-monkey-description rules: ghost-role-information-syndicate-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable @@ -2388,6 +2391,9 @@ name: ghost-role-information-giant-spider-name description: ghost-role-information-giant-spider-description rules: ghost-role-information-giant-spider-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end # SS220-partial-revert-raffle-Begin # raffle: # settings: short @@ -2981,6 +2987,9 @@ allowMovement: true description: ghost-role-information-SyndiCat-description rules: ghost-role-information-SyndiCat-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 5d73ecf86375..aa5c6003e672 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -91,6 +91,9 @@ name: ghost-role-information-rat-king-name description: ghost-role-information-rat-king-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml index 04fe5ba1b040..54ad90e9e3dc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml @@ -40,6 +40,9 @@ name: ghost-role-information-revenant-name description: ghost-role-information-revenant-description rules: ghost-role-information-antagonist-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index f2bb8f0ce59c..45c2bcfb04bd 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -15,6 +15,9 @@ name: ghost-role-information-space-dragon-name description: ghost-role-information-space-dragon-description rules: ghost-role-information-space-dragon-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml index 272436236c59..f23625fcde9c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml @@ -44,6 +44,9 @@ name: ghost-role-information-cerberus-name description: ghost-role-information-cerberus-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml index dca47e1c8370..ead1bf853570 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml @@ -14,6 +14,9 @@ name: ghost-role-information-guardian-name description: ghost-role-information-guardian-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable @@ -124,6 +127,9 @@ name: ghost-role-information-holoparasite-name description: ghost-role-information-holoparasite-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable @@ -157,6 +163,9 @@ name: ghost-role-information-ifrit-name description: ghost-role-information-ifrit-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable @@ -186,6 +195,9 @@ name: ghost-role-information-holoclown-name description: ghost-role-information-holoclown-description rules: ghost-role-information-familiar-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index b9824c952575..573d2b90bd07 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -85,9 +85,13 @@ name: ghost-role-information-ert-leader-name description: ghost-role-information-ert-leader-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec 10h comm) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Command + time: 36000 #SS220 ghostrole-times (20h sec 10h comm) end raffle: settings: short job: ERTLeader @@ -120,6 +124,13 @@ name: ghost-role-information-ert-leader-name description: ghost-role-information-ert-leader-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec 10h comm) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Command + time: 36000 #SS220 ghostrole-times (20h sec 10h comm) end raffle: settings: short job: ERTLeader @@ -144,6 +155,13 @@ name: ghost-role-information-ert-leader-name description: ghost-role-information-ert-leader-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec 10h comm) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Command + time: 36000 #SS220 ghostrole-times (20h sec 10h comm) end raffle: settings: short job: ERTLeader @@ -179,6 +197,10 @@ name: ghost-role-information-ert-chaplain-name description: ghost-role-information-ert-chaplain-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTChaplain @@ -211,6 +233,10 @@ name: ghost-role-information-ert-chaplain-name description: ghost-role-information-ert-chaplain-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTChaplain @@ -246,9 +272,10 @@ name: ghost-role-information-ert-janitor-name description: ghost-role-information-ert-janitor-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTJanitor @@ -281,6 +308,10 @@ name: ghost-role-information-ert-janitor-name description: ghost-role-information-ert-janitor-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTJanitor @@ -315,9 +346,14 @@ name: ghost-role-information-ert-engineer-name description: ghost-role-information-ert-engineer-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec 10h eng) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Engineering + time: 36000 #SS220 ghostrole-times (20h sec 10h eng) end + raffle: settings: short job: ERTEngineer @@ -350,6 +386,13 @@ name: ghost-role-information-ert-engineer-name description: ghost-role-information-ert-engineer-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec 10h eng) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Engineering + time: 36000 #SS220 ghostrole-times (20h sec 10h eng) end raffle: settings: short job: ERTEngineer @@ -384,9 +427,10 @@ name: ghost-role-information-ert-security-name description: ghost-role-information-ert-security-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTSecurity @@ -419,6 +463,10 @@ name: ghost-role-information-ert-security-name description: ghost-role-information-ert-security-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTSecurity @@ -443,6 +491,10 @@ name: ghost-role-information-ert-security-name description: ghost-role-information-ert-security-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 #SS220 ghostrole-times (20h sec) end raffle: settings: short job: ERTSecurity @@ -477,9 +529,13 @@ name: ghost-role-information-ert-medical-name description: ghost-role-information-ert-medical-description rules: ghost-role-information-nonantagonist-rules - requirements: - - !type:OverallPlaytimeRequirement - time: 144000 #SS220 ghostrole-times (40h overall) + requirements: #SS220 ghostrole-times (20h sec 10h med) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Medical + time: 36000 #SS220 ghostrole-times (20h sec 10h med) end raffle: settings: short job: ERTMedical @@ -512,6 +568,13 @@ name: ghost-role-information-ert-medical-name description: ghost-role-information-ert-medical-description rules: ghost-role-information-nonantagonist-rules + requirements: #SS220 ghostrole-times (20h sec 10h med) start + - !type:DepartmentTimeRequirement + department: Security + time: 72000 + - !type:DepartmentTimeRequirement + department: Medical + time: 36000 #SS220 ghostrole-times (20h sec 10h med) end raffle: settings: short job: ERTMedical diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index afa8ac7228ed..6813c5e16b11 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -606,6 +606,12 @@ name: ghost-role-information-syndicate-cyborg-assault-name description: ghost-role-information-syndicate-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall 10h silicon) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (20h overall 10h silicon) end raffle: settings: default - type: GhostTakeoverAvailable @@ -639,6 +645,12 @@ name: ghost-role-information-syndicate-cyborg-saboteur-name description: ghost-role-information-syndicate-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall 10h silicon) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (20h overall 10h silicon) end raffle: settings: default - type: GhostTakeoverAvailable @@ -689,6 +701,12 @@ name: ghost-role-information-derelict-cyborg-name description: ghost-role-information-derelict-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall 10h silicon) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (20h overall 10h silicon) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index e10e2928ab2e..6bc69a42b8e1 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -18,6 +18,9 @@ name: ghost-role-information-skeleton-pirate-name description: ghost-role-information-skeleton-pirate-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable @@ -35,6 +38,9 @@ name: ghost-role-information-skeleton-biker-name description: ghost-role-information-skeleton-biker-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable @@ -51,6 +57,9 @@ name: ghost-role-information-closet-skeleton-name description: ghost-role-information-closet-skeleton-description rules: ghost-role-information-freeagent-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostTakeoverAvailable diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index 02cd376092a2..5863397f664f 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -26,6 +26,9 @@ name: ghost-role-information-syndicate-reinforcement-spy-name description: ghost-role-information-syndicate-reinforcement-spy-description rules: ghost-role-information-syndicate-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostRoleMobSpawner @@ -64,6 +67,9 @@ name: ghost-role-information-nukeop-reinforcement-name description: ghost-role-information-nukeop-reinforcement-description rules: ghost-role-information-nukeop-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostRoleMobSpawner @@ -79,6 +85,9 @@ name: ghost-role-information-syndicate-monkey-reinforcement-name description: ghost-role-information-syndicate-monkey-reinforcement-description rules: ghost-role-information-syndicate-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostRoleMobSpawner @@ -114,6 +123,9 @@ components: - type: GhostRole rules: ghost-role-information-nukeop-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end - type: GhostRoleMobSpawner prototype: MobMonkeySyndicateAgentNukeops selectablePrototypes: ["SyndicateMonkeyNukeops", "SyndicateKoboldNukeops"] @@ -128,6 +140,9 @@ name: ghost-role-information-SyndiCat-name description: ghost-role-information-SyndiCat-description rules: ghost-role-information-syndicate-reinforcement-rules + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end raffle: settings: default - type: GhostRoleMobSpawner @@ -146,6 +161,12 @@ name: ghost-role-information-syndicate-cyborg-assault-name description: ghost-role-information-syndicate-cyborg-description rules: ghost-role-information-silicon-rules + requirements: #SS220 ghostrole-times (20h overall 10h silicon) start + - !type:OverallPlaytimeRequirement + time: 72000 + - !type:RoleTimeRequirement + role: JobBorg + time: 36000 #SS220 ghostrole-times (20h overall 10h silicon) end raffle: settings: default - type: GhostRoleMobSpawner diff --git a/Resources/Prototypes/SS220/DemonRofler/rune.yml b/Resources/Prototypes/SS220/DemonRofler/rune.yml index 47733e71e177..74a8795b335d 100644 --- a/Resources/Prototypes/SS220/DemonRofler/rune.yml +++ b/Resources/Prototypes/SS220/DemonRofler/rune.yml @@ -14,6 +14,9 @@ name: Тёмный Жнец description: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!" rules: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!" + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end makeSentient: false allowSpeech: false raffle: @@ -48,6 +51,9 @@ name: Тёмный Жнец description: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!" rules: "Вы Тёмный Жнец - Демон, слуга Бога Тиндала. Пожирайте существ этой реальности, сводите их с ума и растите, пока не поглотите их всех!" + requirements: #SS220 ghostrole-times (20h overall) start + - !type:OverallPlaytimeRequirement + time: 72000 #SS220 ghostrole-times (20h overall) end - type: Sprite sprite: Markers/jobs.rsi layers: From f47b7c8a32018fb86ed893e0d3e10ff503224df0 Mon Sep 17 00:00:00 2001 From: TryHardo7 Date: Mon, 13 Jan 2025 15:15:11 +0300 Subject: [PATCH 3/4] Revert "bupdate" This reverts commit 79e2e2d498d4b1f5e3296559754302abee7fdb15. --- Resources/PhotocopierForms/FormIndex.yml | 1 - .../main/cc_cmd_dcr_ailaw.xml | 4 ++-- .../main/cc_cmd_dcr_arrival.xml | 4 ++-- .../main/cc_cmd_dcr_evac.xml | 4 ++-- .../main/cc_cmd_dcr_exec.xml | 4 ++-- .../main/cc_cmd_dcr_goal.xml | 4 ++-- .../main/cc_cmd_dcr_goal_rep.xml | 4 ++-- .../main/cc_cmd_dcr_hhc.xml | 4 ++-- .../main/cc_cmd_dcr_hire.xml | 4 ++-- .../main/cc_cmd_dcr_law.xml | 4 ++-- .../main/cc_cmd_dcr_reply.xml | 4 ++-- .../main/cc_cmd_dcr_roi.xml | 4 ++-- .../main/cc_cmd_dcr_shift_end.xml | 4 ++-- .../main/cc_cmd_dcr_sitrep.xml | 4 ++-- .../main/cc_cmd_dcr_sop.xml | 4 ++-- .../main/cc_cmd_dcr_uvd.xml | 4 ++-- .../nanotrasen_station/cargo/sup_ord.xml | 7 ++---- .../nanotrasen_station/cargo/sup_ord_dng.xml | 7 ++---- .../nanotrasen_station/cargo/sup_sitrep.xml | 11 ++++------ .../command/cc_req_bonus.xml | 4 ++-- .../nanotrasen_station/command/cmd_acap.xml | 6 +---- .../nanotrasen_station/command/cmd_acom.xml | 6 +---- .../nanotrasen_station/command/cmd_cc_frs.xml | 7 +++--- .../nanotrasen_station/command/cmd_cc_inv.xml | 5 ++--- .../nanotrasen_station/command/cmd_cc_srt.xml | 5 ++--- .../command/cmd_dcr_award.xml | 4 ++-- .../nanotrasen_station/command/cmd_fcom.xml | 6 ++--- .../engineering/eng_permit.xml | 4 ++-- .../engineering/eng_permit_2.xml | 6 ++--- .../engineering/eng_req_tw.xml | 6 ++--- .../engineering/eng_sitrep.xml | 8 +++---- .../nanotrasen_station/goal/goal_capsule.xml | 2 +- .../goal/goal_expedition.xml | 4 ++-- .../nanotrasen_station/goal/goal_guests.xml | 4 +--- .../goal/goal_robotisation.xml | 4 +--- .../nanotrasen_station/goal/goal_simple.xml | 8 +++---- .../nanotrasen_station/hr/cmd_acr.xml | 4 +--- .../nanotrasen_station/hr/cmd_acwt.xml | 4 +--- .../nanotrasen_station/hr/cmd_afe.xml | 4 ++-- .../nanotrasen_station/hr/cmd_dsc.xml | 6 ++--- .../nanotrasen_station/hr/cmd_ept.xml | 6 ++--- .../nanotrasen_station/hr/cmd_qlf.xml | 4 ++-- .../nanotrasen_station/hr/cmd_req_id.xml | 8 +++---- .../nanotrasen_station/hr/cmd_req_pda.xml | 8 +++---- .../nanotrasen_station/law/cmd_comp.xml | 4 ++-- .../law/law_anonymousdenunciation.xml | 2 +- .../nanotrasen_station/law/law_request.xml | 6 ++--- .../nanotrasen_station/law/sec_gop.xml | 6 ++--- .../nanotrasen_station/law/sec_rep_ia.xml | 6 ++--- .../nanotrasen_station/law/sec_sopb.xml | 6 ++--- .../nanotrasen_station/law/sec_sopb_crit.xml | 4 +--- .../nanotrasen_station/law/sec_vdc.xml | 7 +++--- .../nanotrasen_station/law/sec_vdc_gop.xml | 8 +++---- .../nanotrasen_station/medical/med_eut.xml | 4 ++-- .../medical/med_ord_chem.xml | 8 ++----- .../nanotrasen_station/medical/med_rcp.xml | 4 +--- .../medical/med_rep_death.xml | 6 ++--- .../medical/med_rep_hhc.xml | 6 ++--- .../medical/med_rep_psych.xml | 6 ++--- .../medical/med_rep_psych_tourette.xml | 4 ++-- .../nanotrasen_station/medical/med_sitrep.xml | 7 ++---- .../nanotrasen_station/science/rnd_ord.xml | 8 ++----- .../nanotrasen_station/science/rnd_rar.xml | 4 ++-- .../nanotrasen_station/science/rnd_rnt.xml | 4 +--- .../nanotrasen_station/science/rnd_ror.xml | 4 ++-- .../nanotrasen_station/security/sec_awt.xml | 8 ++----- .../nanotrasen_station/security/sec_dty.xml | 4 +--- .../nanotrasen_station/security/sec_exc.xml | 2 +- .../nanotrasen_station/security/sec_inw.xml | 6 ++--- .../nanotrasen_station/security/sec_itg.xml | 4 +--- .../security/sec_ord_imp.xml | 2 +- .../nanotrasen_station/security/sec_pmt.xml | 9 +++----- .../nanotrasen_station/security/sec_prig.xml | 8 +++---- .../security/sec_rep_itg.xml | 11 +++------- .../nanotrasen_station/security/sec_roc.xml | 22 ------------------- .../security/sec_sitrep.xml | 7 ++---- .../nanotrasen_station/security/sec_sur.xml | 4 ++-- .../nanotrasen_station/security/sec_swt.xml | 8 ++----- .../security/sup_ord_wep.xml | 6 +---- .../nanotrasen_station/service/svc_mcf.xml | 4 +--- .../nanotrasen_station/service/svc_mds.xml | 4 +--- .../nanotrasen_station/service/svc_sitrep.xml | 7 ++---- 82 files changed, 161 insertions(+), 288 deletions(-) delete mode 100644 Resources/PhotocopierForms/nanotrasen_station/security/sec_roc.xml diff --git a/Resources/PhotocopierForms/FormIndex.yml b/Resources/PhotocopierForms/FormIndex.yml index e2827bc77325..7e9c5f91745d 100644 --- a/Resources/PhotocopierForms/FormIndex.yml +++ b/Resources/PhotocopierForms/FormIndex.yml @@ -97,7 +97,6 @@ - /PhotocopierForms/nanotrasen_station/security/sec_pmt.xml - /PhotocopierForms/nanotrasen_station/security/sec_rep_itg.xml - /PhotocopierForms/nanotrasen_station/security/sec_sur.xml - - /PhotocopierForms/nanotrasen_station/security/sec_roc.xml - /PhotocopierForms/nanotrasen_station/security/sec_swt.xml - /PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml - /PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_ailaw.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_ailaw.xml index 8eaea8e3d3a8..7c0cc719a633 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_ailaw.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_ailaw.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_arrival.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_arrival.xml index 97aa112de601..460d0fdabd72 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_arrival.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_arrival.xml @@ -7,7 +7,7 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_evac.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_evac.xml index 5f689bb45fe2..93a9bdfc7de7 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_evac.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_evac.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_exec.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_exec.xml index 3448e0bff403..af1698fab1c2 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_exec.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_exec.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal.xml index 0226d9a8f993..25c7253e01cc 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal.xml @@ -6,7 +6,7 @@ Приказ о назначении цели станции diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal_rep.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal_rep.xml index 006147856261..7b22d9b61976 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal_rep.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_goal_rep.xml @@ -7,13 +7,13 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hhc.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hhc.xml index 1603fa86219d..89ed822c47e2 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hhc.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hhc.xml @@ -7,12 +7,12 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hire.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hire.xml index ab4b7234e17c..b81a7c01ccde 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hire.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_hire.xml @@ -7,7 +7,7 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_law.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_law.xml index 14b311ede41b..11cafb3eae8b 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_law.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_law.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_reply.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_reply.xml index 99ec1fb2d3b0..1fa0299166e2 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_reply.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_reply.xml @@ -7,11 +7,11 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_roi.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_roi.xml index 4ead8897862e..686030a05f45 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_roi.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_roi.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_shift_end.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_shift_end.xml index e55febe1c54f..6a1768f871c4 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_shift_end.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_shift_end.xml @@ -7,13 +7,13 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sitrep.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sitrep.xml index 37ab252ea76f..41198dcfba7e 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sitrep.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sitrep.xml @@ -7,7 +7,7 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sop.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sop.xml index 048ee19dbd9b..cc58df70484d 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sop.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_sop.xml @@ -7,14 +7,14 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_uvd.xml b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_uvd.xml index 26207eee33c3..c4ae8927dd2f 100644 --- a/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_uvd.xml +++ b/Resources/PhotocopierForms/nanotrasen_central_command/main/cc_cmd_dcr_uvd.xml @@ -7,12 +7,12 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord.xml b/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord.xml index 8b1395790983..f27b427a1859 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord.xml @@ -7,14 +7,11 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord_dng.xml b/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord_dng.xml index f4357116a8c9..bbf202e5837c 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord_dng.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/cargo/sup_ord_dng.xml @@ -7,14 +7,11 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cc_req_bonus.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cc_req_bonus.xml index 83aa045bfa7a..f286b93b9b75 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cc_req_bonus.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cc_req_bonus.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_acom.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_acom.xml index cefffc42937c..e87ee80d47f7 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_acom.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_acom.xml @@ -7,12 +7,8 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_frs.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_frs.xml index b3401c389dd8..0f80a182931d 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_frs.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_frs.xml @@ -7,14 +7,13 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_inv.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_inv.xml index ab56183d3464..724eea6e00b8 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_inv.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_inv.xml @@ -7,11 +7,10 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_srt.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_srt.xml index 6e1665620634..42226ce0c9c9 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_srt.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_cc_srt.xml @@ -7,10 +7,10 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_dcr_award.xml b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_dcr_award.xml index 408d200f6fa7..1a8bb5b450f6 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/command/cmd_dcr_award.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/command/cmd_dcr_award.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit.xml b/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit.xml index f171368da7ab..58e0172f3af0 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit_2.xml b/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit_2.xml index 39080e1c1e1c..3f720a14b408 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit_2.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/engineering/eng_permit_2.xml @@ -7,10 +7,10 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/goal/goal_capsule.xml b/Resources/PhotocopierForms/nanotrasen_station/goal/goal_capsule.xml index 4893b6d3f2b0..5a029bcd9b29 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/goal/goal_capsule.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/goal/goal_capsule.xml @@ -7,7 +7,7 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_id.xml b/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_id.xml index 8b768cfa9ced..f9b8dfb5496c 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_id.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_id.xml @@ -7,17 +7,15 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_pda.xml b/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_pda.xml index 25793185ea13..2d1d9e9c39bd 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_pda.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/hr/cmd_req_pda.xml @@ -7,16 +7,14 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/cmd_comp.xml b/Resources/PhotocopierForms/nanotrasen_station/law/cmd_comp.xml index 50f11eba9514..3a3da459ef94 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/cmd_comp.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/cmd_comp.xml @@ -7,9 +7,9 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_gop.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_gop.xml index 8ca1b6d4893a..14a7667c8557 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_gop.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_gop.xml @@ -7,14 +7,12 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_rep_ia.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_rep_ia.xml index 1dfc63d2e2fe..a52dc64c01e3 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_rep_ia.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_rep_ia.xml @@ -7,13 +7,11 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb.xml index f6ad695164eb..c2bbb670a2b1 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb.xml @@ -7,14 +7,12 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb_crit.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb_crit.xml index ca2b7d24ced8..4e7e351d86e6 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb_crit.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_sopb_crit.xml @@ -7,16 +7,14 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc.xml index cfda312b8036..db9232fe3ecc 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc.xml @@ -7,17 +7,16 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc_gop.xml b/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc_gop.xml index 929e0efd23be..59697a53b9cb 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc_gop.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/law/sec_vdc_gop.xml @@ -7,13 +7,11 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_eut.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_eut.xml index 587c1c67e1c4..3ed7be2eb2ef 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_eut.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_eut.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rcp.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rcp.xml index 3fb2e1fe28c6..748860c4e57b 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rcp.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rcp.xml @@ -7,9 +7,7 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_hhc.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_hhc.xml index a2b356c76866..bf6d00d57085 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_hhc.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_hhc.xml @@ -7,7 +7,7 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych.xml index 89680dbbd8bc..c347f4fb691d 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych.xml @@ -7,11 +7,11 @@ diff --git a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych_tourette.xml b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych_tourette.xml index 1b658fdda038..cd8f3c6b8117 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych_tourette.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/medical/med_rep_psych_tourette.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_ord.xml b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_ord.xml index 6d2bca16a5e6..b91ba3fb7a5a 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_ord.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_ord.xml @@ -7,15 +7,11 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rar.xml b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rar.xml index a7beea100276..5ba782fdc4b1 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rar.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rar.xml @@ -7,13 +7,13 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rnt.xml b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rnt.xml index 185e9d838f98..359076324717 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rnt.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/science/rnd_rnt.xml @@ -7,9 +7,7 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_awt.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_awt.xml index 061c44d0815c..3eb6831ce8b8 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_awt.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_awt.xml @@ -7,14 +7,10 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_dty.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_dty.xml index 59b521e91f32..cc343a52ef48 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_dty.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_dty.xml @@ -7,9 +7,7 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_ord_imp.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_ord_imp.xml index 4850be5021ab..3aa2cae711b2 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_ord_imp.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_ord_imp.xml @@ -7,7 +7,7 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_prig.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_prig.xml index a6b8343c03dc..0e6be6d082cd 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_prig.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_prig.xml @@ -7,12 +7,12 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_roc.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_roc.xml deleted file mode 100644 index 03ced8d899ec..000000000000 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_roc.xml +++ /dev/null @@ -1,22 +0,0 @@ - -
- cmd_comp - PaperNtFormLaw - форма НТ-КОМ-ЗОП - Заявление о преступлении - -
\ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml index 4fcfff8b0129..1c460a3f4d75 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_sitrep.xml @@ -7,10 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sec_sur.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sec_sur.xml index 9a84ef4e38b1..ce57a86e275f 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sec_sur.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sec_sur.xml @@ -7,9 +7,9 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml b/Resources/PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml index 4c330f7d738f..a7d4a2af556f 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/security/sup_ord_wep.xml @@ -7,16 +7,12 @@ \ No newline at end of file diff --git a/Resources/PhotocopierForms/nanotrasen_station/service/svc_mcf.xml b/Resources/PhotocopierForms/nanotrasen_station/service/svc_mcf.xml index d6a1515c3700..2ce6cc29aa92 100644 --- a/Resources/PhotocopierForms/nanotrasen_station/service/svc_mcf.xml +++ b/Resources/PhotocopierForms/nanotrasen_station/service/svc_mcf.xml @@ -7,9 +7,7 @@ \ No newline at end of file From 68b9c69cbcd7eeaf36bd388cd61f551ec1cc65f2 Mon Sep 17 00:00:00 2001 From: TryHardo7 <166473301+TryHardo7@users.noreply.github.com> Date: Tue, 14 Jan 2025 18:37:39 +0300 Subject: [PATCH 4/4] fixed spider time req --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 9f52baa49fae..3e1708f54038 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2391,9 +2391,6 @@ name: ghost-role-information-giant-spider-name description: ghost-role-information-giant-spider-description rules: ghost-role-information-giant-spider-rules - requirements: #SS220 ghostrole-times (20h overall) start - - !type:OverallPlaytimeRequirement - time: 72000 #SS220 ghostrole-times (20h overall) end # SS220-partial-revert-raffle-Begin # raffle: # settings: short