From e78b23b5097c15de5d1809c3e571cd09ec1ab047 Mon Sep 17 00:00:00 2001 From: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:10:06 -0400 Subject: [PATCH 01/18] nfsd fixes and more correction to hou requirements (#1222) --- .../Clothing/Head/hardsuit-helmets.yml | 4 ++-- .../Clothing/OuterClothing/hardsuits.yml | 4 ++-- .../_NF/Roles/Jobs/NFSD/brigmedic.yml | 2 +- .../_NF/Roles/Jobs/NFSD/detective.yml | 2 +- .../_NF/Roles/Jobs/NFSD/head_of_security.yml | 11 +++++++---- .../_NF/Roles/Jobs/NFSD/security_cadet.yml | 2 +- .../_NF/Roles/Jobs/NFSD/security_officer.yml | 3 +++ .../_NF/Roles/Jobs/NFSD/senior_officer.yml | 2 +- .../Prototypes/_NF/Roles/Jobs/NFSD/warden.yml | 8 ++++---- .../Hardsuits/nfsd_experimental.rsi/icon.png | Bin 1161 -> 831 bytes 10 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml index e77bcb29ce5..4d72617e0ac 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hardsuit-helmets.yml @@ -189,8 +189,8 @@ parent: ClothingHeadHelmetHardsuitSyndieReverseEngineered id: ClothingHeadHelmetHardsuitNfsdExperimental noSpawn: true - name: nfsd experimental hardsuit helmet - description: An experimental nfsd hardsuit helmet. + name: experimental nfsd hardsuit helmet + description: experimental nfsd hardsuit helmet components: - type: Sprite sprite: _NF/Clothing/Head/Hardsuits/nfsd_experimental.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index cbaf78b0255..c62f44654b9 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -255,7 +255,7 @@ - type: entity parent: ClothingOuterHardsuitSyndieReverseEngineered id: ClothingOuterHardsuitNfsdExperimental - name: an experimental nfsd hardsuit + name: experimental nfsd hardsuit description: An experimental nfsd hardsuit, never before seen! components: - type: Sprite @@ -263,4 +263,4 @@ - type: Clothing sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitNfsdExperimental \ No newline at end of file + clothingPrototype: ClothingHeadHelmetHardsuitNfsdExperimental diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml index 6c9548fd55d..243351931bd 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 10800 # 3 hrs + time: 21600 # 6 hrs - !type:OverallPlaytimeRequirement time: 36000 # Frontier - 10 hrs startingGear: BrigmedicGear diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml index 4acb6132b43..3c8e00e5472 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 10800 # 3 hrs + time: 21600 # 6 hrs - !type:OverallPlaytimeRequirement time: 36000 # Frontier - 10 hrs startingGear: DetectiveGear diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml index 13775f6fc52..ad47e032135 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml @@ -6,10 +6,13 @@ requirements: - !type:WhitelistRequirement - !type:OverallPlaytimeRequirement - time: 108000 # Frontier - 30 hours + time: 129600 # Frontier - 36 hours - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 10800 #3 hrs + role: JobSeniorOfficer + time: 43200 # Frontier - 12 hrs + - !type:RoleTimeRequirement + role: JobWarden + time: 43200 # Frontier - 12 hrs - !type:DepartmentTimeRequirement department: Security time: 43200 # 12 hrs @@ -18,7 +21,7 @@ alwaysUseSpawner: true icon: "JobIconHeadOfSecurity" # Frontier requireAdminNotify: true - supervisors: job-supervisors-hop # Frontier + supervisors: job-supervisors-centcom # Frontier whitelistRequired: true canBeAntag: false access: diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml index 4268ee53969..9208b49150e 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml @@ -5,7 +5,7 @@ playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement - time: 10800 + time: 36000 # Frontier 10 hrs - !type:DepartmentTimeRequirement department: Security time: 36000 # Frontier - 10 hrs diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml index e3eab519dd4..a640a4866e3 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml @@ -5,6 +5,9 @@ playTimeTracker: JobSecurityOfficer requirements: - !type:OverallPlaytimeRequirement + time: 43200 # Frontier - 12 hrs + - !type:DepartmentTimeRequirement + department: Security time: 21600 # Frontier - 6 hrs startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml index 39f16bbdf84..a1618d7cc81 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml @@ -8,7 +8,7 @@ time: 108000 # Frontier - 30 hours - !type:RoleTimeRequirement role: JobSecurityOfficer - time: 10800 #3 hrs + time: 43200 # Frontier - 12 hrs - !type:DepartmentTimeRequirement department: Security time: 32400 # 9 hrs diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml index e3640c68c6b..173b7e7b16b 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml @@ -5,13 +5,13 @@ playTimeTracker: JobWarden requirements: - !type:OverallPlaytimeRequirement - time: 54000 # Frontier - 15 hours + time: 108000 # Frontier - 30 hours - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 10800 # Frontier - 3 hrs + role: JobSeniorOfficer + time: 21600 # Frontier - 6 hrs - !type:DepartmentTimeRequirement department: Security - time: 21600 # 6 hrs + time: 32400 # 9 hrs startingGear: WardenGear icon: "JobIconWarden" # Frontier supervisors: job-supervisors-hos diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi/icon.png index de143bc8a228262cc8c7745ee9a2d1da753f87dc..bc6f890ba0ea701620e6b323cee190a6ab391c57 100644 GIT binary patch delta 778 zcmV+l1NHog3BLxAFn%uF7WHt9n&sMx1q4T`By5!8w< zT!@cdaU-~JBQE?0+;!`pAcAhY5?qRcxQaBC)>_(HADL)lGebL_WlaF^EV0}$#I8mi6Du1;!(IS8w>%fqbDvav{Z9dX)!vds)|vM)TJPh=#q}ZoaoW0N{e8 zvlhB3c=)1|C@|ya#%T2EMWdL%fU@+ESw+h~R4iQyB zHw6(@arbmnU`IkoiUdFa5LN-jFQaFSj@aoTr?Xc@l7GF7UmA5DPd(YO5;XympG}VL zQC$dt#Z;D&_z>Fs2Tol(#>?p$hK~=im{@Xezw}yjV`%TRnr&!GG$MUr$FBz1Hxk7b zTZDRpY<}HBQi6P1)X13@dd6rfX2UvAX}%Dw&ZX(>QCXc!;|sMCrA2_8X(7p8&Q6XI ziUc`3Ie&&Ed&!wr`vLrFfZ_N7)>8(yC{nUZ*rLdK%3wHtpe2C1ub|S5%nyajnHIsW z0MbD(dU}KR^Plmn0Yt9QUV!qH18iouunQ&fX5QTk_l2>VY(-N5el_5(AK!jK&lnx$ zmjSdi2Tjeu$;+cP&(B>y(Ov+Nvx%MQ2ewxOAb)nIACa@$3((c0y7F5tcX^c*iLM^C zy#Q9lz_oJzS6WToj`l|#BV(|CB+904xjJB(R#SRk%bIFIr4F>7XSXN{eQG$mbr0GC1cM2mxlW6 z=B`Hj%sYcm1my}KZ}pA!wq<4k*idwy1i}@-*hHNA#(F22t{PZomJLPcl{ZiB3&P{Z zd1vzY!zU6(QzJKTU?pcAaKkOo{8oYk-<&qn* zD8T9dW42!?Ct58rn=(kQYI_vOm^sEK;-r!>zI?Bim4s4i{^9`jA@8o0N2?_O2PCurWLB`CHP_m57uI(y8evEIHImyL<0Bjx8&0UQ}Rqz&b2+JaA z)gUa3&RkkGu)>x2L>~YWU}z>{Kp?%Oc)Cuu*uh#EpWvnM)lPf(;~)Q1iGl!Qf2kZl zBs&lQQ}I=f^|p|BFwgVny18|Al-8aWrbecn)qhXlO*kO88&Be|-1ZID%7mlAQot@o_rAE$x<*DhW6XlptEH^2Mc6ObiZdyldbSFnsMIV*={ zWLb$TwDuka;O8s1JOJ97&b3R|i*7?#9}Y>D?0l^|`kRO}RFjIW^5FI?0a-#>QqWY* zRm`H>aHr+F9AJHQ1Ix^jQ8Uh5s4j%|xPKG}0uYcTXIz+EB)z0~!gV1#Kd-w?4lZv* z{jYTveE#D3=MEOY&@H+K8iCzv0CWvBV(8Yv0#wz=&heX Date: Mon, 15 Apr 2024 15:10:29 +0000 Subject: [PATCH 02/18] Automatic Changelog (#1222) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3f72c946e57..f59fb8d028a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4021,3 +4021,9 @@ Entries: message: Temporarily changed plants to lose less health when clipped id: 4910 time: '2024-04-08T22:40:38.0000000+00:00' +- author: Leander + changes: + - type: Tweak + message: NFSD hours requirements increased upon majority request. + id: 4911 + time: '2024-04-15T15:10:06.0000000+00:00' From be742b782473e88467a9c7ca8688bf25ffaaa6df Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Mon, 15 Apr 2024 18:11:12 +0300 Subject: [PATCH 03/18] fix (#1220) --- .../_NF/Entities/Clothing/Back/messenger.yml | 2 + ...PACK.png => holding-equipped-BACKPACK.png} | Bin .../Back/Messenger/holding.rsi/meta.json | 138 ++---------------- 3 files changed, 17 insertions(+), 123 deletions(-) rename Resources/Textures/_NF/Clothing/Back/Messenger/holding.rsi/{equipped-BACKPACK.png => holding-equipped-BACKPACK.png} (100%) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml index 575974d5307..cc23e11194f 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/messenger.yml @@ -176,6 +176,8 @@ - state: icon - state: icon-unlit shader: unshaded + - type: Clothing + equippedPrefix: holding - type: entity parent: ClothingBackpackMessenger diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/holding.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Clothing/Back/Messenger/holding.rsi/holding-equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_NF/Clothing/Back/Messenger/holding.rsi/equipped-BACKPACK.png rename to Resources/Textures/_NF/Clothing/Back/Messenger/holding.rsi/holding-equipped-BACKPACK.png diff --git a/Resources/Textures/_NF/Clothing/Back/Messenger/holding.rsi/meta.json b/Resources/Textures/_NF/Clothing/Back/Messenger/holding.rsi/meta.json index cfd0bcca250..52922776306 100644 --- a/Resources/Textures/_NF/Clothing/Back/Messenger/holding.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Back/Messenger/holding.rsi/meta.json @@ -10,70 +10,26 @@ { "name": "icon", "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] }, { "name": "icon-unlit", "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] }, { "name": "broken" }, { - "name": "equipped-BACKPACK", + "name": "holding-equipped-BACKPACK", "directions": 4, "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] }, { @@ -88,84 +44,20 @@ "name": "inhand-left", "directions": 4, "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] }, { "name": "inhand-right", "directions": 4, "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ], - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ], + [ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ] ] } ] From 6e86b24e947c78ef3b84d870177d10ec416447d7 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 15 Apr 2024 15:11:38 +0000 Subject: [PATCH 04/18] Automatic Changelog (#1220) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f59fb8d028a..4217589f598 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4027,3 +4027,9 @@ Entries: message: NFSD hours requirements increased upon majority request. id: 4911 time: '2024-04-15T15:10:06.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Fix + message: Messenger Bag of Holding is now visible when worn. + id: 4912 + time: '2024-04-15T15:11:12.0000000+00:00' From 5d9015e80bb72f62ed8b860c8862da4816645c01 Mon Sep 17 00:00:00 2001 From: ThatOneGoblin25 <145570657+ThatOneGoblin25@users.noreply.github.com> Date: Wed, 17 Apr 2024 04:01:53 +1000 Subject: [PATCH 05/18] Adds Frontier.yml Palette (#1217) * Adds Frontier Palette * _NF * Delete Resources/Prototypes/Palettes/frontier.yml * Update frontier.yml --------- Co-authored-by: Dvir --- Resources/Prototypes/_NF/Palettes/frontier.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Resources/Prototypes/_NF/Palettes/frontier.yml diff --git a/Resources/Prototypes/_NF/Palettes/frontier.yml b/Resources/Prototypes/_NF/Palettes/frontier.yml new file mode 100644 index 00000000000..afa91e87a83 --- /dev/null +++ b/Resources/Prototypes/_NF/Palettes/frontier.yml @@ -0,0 +1,8 @@ +- type: palette # Frontier + id: Frontier + name: Frontier + colors: + nfsd brown: "#49392696" + nfsd green: "#4b653e96" + mercenary: "#5e7c1696" + From ffe0e243c3f4ee0ab07274481522f5b7660052fc Mon Sep 17 00:00:00 2001 From: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Wed, 17 Apr 2024 17:38:15 -0400 Subject: [PATCH 06/18] NFSD uplink update (#1227) * NFSD uplink update * stinger cost fix --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 24 ++- .../_NF/Catalog/Fills/Boxes/nfsd.yml | 98 +++++++++ .../_NF/Catalog/security_uplink_catalog.yml | 186 +++++++++++++++--- Resources/Prototypes/_NF/Store/categories.yml | 7 +- Resources/Prototypes/_NF/Store/presets.yml | 1 + 5 files changed, 283 insertions(+), 33 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index ab446a4b247..8286f52cb3f 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -5,6 +5,8 @@ store-category-sechardsuits = EVA Suits store-category-secweapons = Weapons store-category-secutility = Utility store-category-secammo = Ammunition +store-category-secexplosives = Explosives + uplink-security-hardsuit-name = Security HardSuit uplink-security-hardsuit-desc = Standard issue armored EVA suit. Bulky armor plating slightly limits movement speed. @@ -14,8 +16,8 @@ uplink-security-hardsuit-brigmedic-name = BrigMedic HardSuit uplink-security-hardsuit-brigmedic-desc = A lightly armored EVA suit. Designed for rescue operations, it sacrifices most of its armor in favor of movement speed. uplink-security-hardsuit-warden-name = Bailiff HardSuit uplink-security-hardsuit-warden-desc = A moderately reinforced variant of the Security EVA suit. Modern plating increases resistances without sacrificing range of motion. -uplink-security-hardsuit-syndie-re-name = Reverse Engineered Combat Suit -uplink-security-hardsuit-syndie-re-desc = An advanced combat suit recovered from the Syndicate Wars. Heavily protected and extremely mobile. +uplink-security-hardsuit-experimental-name = Experimental Combat Suit +uplink-security-hardsuit-experimental-desc = An advanced combat suit researched by the greatest Nanotrasen minds. Heavily protected and extremely mobile. uplink-security-hardsuit-sheriff-name = Sheriff's HardSuit uplink-security-hardsuit-sheriff-desc = A heavily reinforced Security EVA suit. Provides maximum resistance while maintaining the range of motion expected of security forces. uplink-security-mk58-name = MK 58 @@ -54,7 +56,7 @@ uplink-security-holo-name = Holo Barrier uplink-security-holo-desc = A battery powered holo projecter that places temporary barriers to bar movement. uplink-security-jetpack-name = Jetpack uplink-security-jetpack-desc = A pre-filled jetpack for EVA. Comes in a fashionable red. -uplink-security-magboots-name = Combat Magboots +uplink-security-magboots-name = NFSD Magboots uplink-security-magboots-desc = Light weight magboots designed to keep the wearer grounded in low and no gravity environments. uplink-security-techfab-name = Security Techfab uplink-security-techfab-desc = A circuit board for a Security Techfab. Allows the production of ammunition, magazines, weapons, and numerous other utilities. Uses raw resources. Can be upgraded. @@ -112,3 +114,19 @@ uplink-security-shotslug-name = Lethal Shotgun Slug Shells uplink-security-shotslug-desc = A box of lethal .50 calibre slug shotgun shells. uplink-security-cash1000-name = 1000 Spesos uplink-security-cash1000-desc = Cold, hard cash. +uplink-security-empgrenade-box-name = EMP Grenades +uplink-security-empgrenade-box-desc = A box containing 4 EMP grenades. +uplink-security-explosivegrenade-box-name = Explosive Grenade Box +uplink-security-explosivegrenade-box-desc = A box containing 4 explosive grenades. +uplink-security-incendiarygrenade-box-name = Incendiary Grenade Box +uplink-security-incendiarygrenade-box-desc = A box containing 4 incendiary grenades. +uplink-security-shrapnelgrenade-box-name = Shrapnel Grenade Box +uplink-security-shrapnelgrenade-box-desc = A box containing 4 shrapnel grenades. +uplink-security-smokegrenade-box-name = Smoke Grenade Box +uplink-security-smokegrenade-box-desc = A box containing 4 smoke grenades. +uplink-security-teargasgrenade-box-name = Tear gas Grenade Box +uplink-security-teargasgrenade-box-desc = A box containing 4 tear gas grenades. +uplink-security-flashbanggrenade-box-name = Flashbang Grenade Box +uplink-security-flashbanggrenade-box-desc = A box containing 4 flasbang grenades. +uplink-security-stingergrenade-box-name = Stinger Grenade Box +uplink-security-stingergrenade-box-desc = A box containing 4 stinger grenades. diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml new file mode 100644 index 00000000000..20805719d05 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml @@ -0,0 +1,98 @@ +##Grenade fills +- type: entity + name: box of nfsd items + parent: BoxCardboard + id: BoxBundleNFSD + description: A box full of nfsd items. + components: + - type: Sprite + layers: + - state: box_security + +- type: entity + name: box of explosive grenades + parent: BoxBundleNFSD + id: BoxExplosiveGrenades + description: A box full of explosive grenades. + components: + - type: StorageFill + contents: + - id: ExGrenade + amount: 4 + +- type: entity + name: box of incendiary grenades + parent: BoxBundleNFSD + id: BoxIncendiaryGrenades + description: A box full of incendiary grenades. + components: + - type: StorageFill + contents: + - id: GrenadeIncendiary + amount: 4 + +- type: entity + name: box of shrapnel grenades + parent: BoxBundleNFSD + id: BoxShrapnelGrenades + description: A box full of shrapnel grenades. + components: + - type: StorageFill + contents: + - id: GrenadeShrapnel + amount: 4 + +- type: entity + name: box of smoke grenades + parent: BoxBundleNFSD + id: BoxSmokeGrenades + description: A box full of smoke grenades. + components: + - type: StorageFill + contents: + - id: SmokeGrenade + amount: 4 + +- type: entity + name: box of tear gas grenades + parent: BoxBundleNFSD + id: BoxTeargasGrenades + description: A box full of tear gas grenades. + components: + - type: StorageFill + contents: + - id: TearGasGrenade + amount: 4 + +- type: entity + name: box of EMP grenades + parent: BoxBundleNFSD + id: BoxEMPGrenades + description: A box full of EMP grenades. + components: + - type: StorageFill + contents: + - id: EmpGrenade + amount: 4 + +- type: entity + name: box of flashbang grenades + parent: BoxBundleNFSD + id: BoxFlashBangGrenades + description: A box full of flashbang grenades. + components: + - type: StorageFill + contents: + - id: GrenadeFlashBang + amount: 4 + +- type: entity + name: box of stinger grenades + parent: BoxBundleNFSD + id: BoxStingerGrenades + description: A box full of stinger grenades. + components: + - type: StorageFill + contents: + - id: GrenadeStinger + amount: 4 diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index 9c420c52ed8..8eafc183a1a 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -85,12 +85,12 @@ - type: listing id: UplinkSecurityHardsuitSyndieReverseEngineered - name: uplink-security-hardsuit-syndie-re-name - description: uplink-security-hardsuit-syndie-re-desc - productEntity: ClothingOuterHardsuitSyndieReverseEngineered - icon: { sprite: Nyanotrasen/Clothing/OuterClothing/ReverseEngineering/syndicate.rsi, state: icon } + name: uplink-security-hardsuit-experimental-name + description: uplink-security-hardsuit-experimental-desc + productEntity: ClothingOuterHardsuitNfsdExperimental + icon: { sprite: _NF/Clothing/OuterClothing/Hardsuits/nfsd_experimental.rsi, state: icon } cost: - FrontierUplinkCoin: 30 + FrontierUplinkCoin: 20 categories: - UplinkSecurityHardsuits conditions: @@ -400,26 +400,6 @@ whitelist: - HeadOfSecurity -- type: listing - id: UplinkSecurityEmpGrenade - name: uplink-security-empgrenade-name - description: uplink-security-empgrenade-desc - productEntity: EmpGrenade - icon: { sprite: Objects/Weapons/Grenades/empgrenade.rsi, state: icon} - cost: - FrontierUplinkCoin: 1 - categories: - - UplinkSecurityUtility - conditions: - - !type:StoreWhitelistCondition - whitelist: - tags: - - SecurityUplink - - !type:BuyerJobCondition - whitelist: - - Warden - - SeniorOfficer - - HeadOfSecurity - type: listing id: UplinkSecurityHolo @@ -441,8 +421,8 @@ id: UplinkSecurityJetpack name: uplink-security-jetpack-name description: uplink-security-jetpack-desc - productEntity: JetpackSecurityFilled - icon: { sprite: Objects/Tanks/Jetpacks/security.rsi, state: icon } + productEntity: JetpackNFSDFilled + icon: { sprite: _NF/Objects/Tanks/Jetpacks/nfsd.rsi, state: icon } cost: FrontierUplinkCoin: 1 categories: @@ -457,8 +437,8 @@ id: UplinkSecurityMagboots name: uplink-security-magboots-name description: uplink-security-magboots-desc - productEntity: ClothingShoesBootsMagCombat - icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-combat.rsi, state: icon } + productEntity: ClothingShoesBootsMagNfsdFilled + icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-nfsd.rsi, state: icon } cost: FrontierUplinkCoin: 1 categories: @@ -978,3 +958,151 @@ whitelist: tags: - SecurityUplink + +- type: listing + id: UplinkSecurityEmpGrenadeBox + name: uplink-security-empgrenade-box-name + description: uplink-security-empgrenade-box-desc + productEntity: BoxEMPGrenades + icon: { sprite: Objects/Weapons/Grenades/empgrenade.rsi, state: icon} + cost: + FrontierUplinkCoin: 2 + categories: + - UplinkSecurityExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - !type:BuyerJobCondition + whitelist: + - Warden + - SeniorOfficer + - HeadOfSecurity + +- type: listing + id: UplinkSecurityExplosiveGrenadeBox + name: uplink-security-explosivegrenade-box-name + description: uplink-security-explosivegrenade-box-desc + productEntity: BoxExplosiveGrenades + icon: { sprite: Objects/Weapons/Grenades/grenade.rsi, state: icon} + cost: + FrontierUplinkCoin: 3 + categories: + - UplinkSecurityExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - !type:BuyerJobCondition + whitelist: + - Warden + - SeniorOfficer + - HeadOfSecurity + +- type: listing + id: UplinkSecurityIncendiaryGrenadeBox + name: uplink-security-incendiarygrenade-box-name + description: uplink-security-incendiarygrenade-box-desc + productEntity: BoxIncendiaryGrenades + icon: { sprite: Objects/Weapons/Grenades/pyrogrenade.rsi, state: icon} + cost: + FrontierUplinkCoin: 3 + categories: + - UplinkSecurityExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - !type:BuyerJobCondition + whitelist: + - Warden + - SeniorOfficer + - HeadOfSecurity + +- type: listing + id: UplinkSecurityShrapnelGrenadeBox + name: uplink-security-shrapnelgrenade-box-name + description: uplink-security-shrapnelgrenade-box-desc + productEntity: BoxShrapnelGrenades + icon: { sprite: Objects/Weapons/Grenades/shrapnelgrenade.rsi, state: icon} + cost: + FrontierUplinkCoin: 2 + categories: + - UplinkSecurityExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - !type:BuyerJobCondition + whitelist: + - Warden + - SeniorOfficer + - HeadOfSecurity + +- type: listing + id: UplinkSecuritySmokeGrenadeBox + name: uplink-security-smokegrenade-box-name + description: uplink-security-smokegrenade-box-desc + productEntity: BoxSmokeGrenades + icon: { sprite: Objects/Weapons/Grenades/smoke.rsi, state: icon} + cost: + FrontierUplinkCoin: 1 + categories: + - UplinkSecurityUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + +- type: listing + id: UplinkSecurityTeargasGrenadeBox + name: uplink-security-teargasgrenade-box-name + description: uplink-security-teargasgrenade-box-desc + productEntity: BoxTeargasGrenades + icon: { sprite: Objects/Weapons/Grenades/tear_gas.rsi, state: icon} + cost: + FrontierUplinkCoin: 2 + categories: + - UplinkSecurityUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + +- type: listing + id: UplinkSecurityFlashbangGrenadeBox + name: uplink-security-flashbanggrenade-box-name + description: uplink-security-flashbanggrenade-box-desc + productEntity: BoxFlashBangGrenades + icon: { sprite: Objects/Weapons/Grenades/flashbang.rsi, state: icon} + cost: + FrontierUplinkCoin: 1 + categories: + - UplinkSecurityUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + +- type: listing + id: UplinkSecurityStingerGrenadeBox + name: uplink-security-stingergrenade-box-name + description: uplink-security-stingergrenade-box-desc + productEntity: BoxStingerGrenades + icon: { sprite: Objects/Weapons/Grenades/stingergrenade.rsi, state: icon} + cost: + FrontierUplinkCoin: 2 + categories: + - UplinkSecurityUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink diff --git a/Resources/Prototypes/_NF/Store/categories.yml b/Resources/Prototypes/_NF/Store/categories.yml index 788f70db625..4ed53144bec 100644 --- a/Resources/Prototypes/_NF/Store/categories.yml +++ b/Resources/Prototypes/_NF/Store/categories.yml @@ -10,7 +10,7 @@ - type: storeCategory id: UplinkSecurityWeapons name: store-category-secweapons - + - type: storeCategory id: UplinkSecurityAmmo name: store-category-secammo @@ -18,3 +18,8 @@ - type: storeCategory id: UplinkSecurityUtility name: store-category-secutility + +- type: storeCategory + id: UplinkSecurityExplosives + name: store-category-explosives + diff --git a/Resources/Prototypes/_NF/Store/presets.yml b/Resources/Prototypes/_NF/Store/presets.yml index bf8587e4491..7bcb9f31ad6 100644 --- a/Resources/Prototypes/_NF/Store/presets.yml +++ b/Resources/Prototypes/_NF/Store/presets.yml @@ -24,5 +24,6 @@ - UplinkSecurityWeapons - UplinkSecurityAmmo - UplinkSecurityUtility + - UplinkSecurityExplosives currencyWhitelist: - FrontierUplinkCoin From f909c30e14b1bd09d0b0a33af44711b1d67d75ae Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 17 Apr 2024 21:38:36 +0000 Subject: [PATCH 07/18] Automatic Changelog (#1227) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4217589f598..83a3d756379 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4033,3 +4033,11 @@ Entries: message: Messenger Bag of Holding is now visible when worn. id: 4912 time: '2024-04-15T15:11:12.0000000+00:00' +- author: Leander + changes: + - type: Add + message: >- + added grenade bundles to the NFSD uplink and make the experimental + combat hardsuit available. + id: 4913 + time: '2024-04-17T21:38:15.0000000+00:00' From 0fddcc041e12db7fb0eafdf03fb613f374fb4282 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Thu, 18 Apr 2024 00:40:05 +0300 Subject: [PATCH 08/18] IFF Back (#1224) --- Resources/Maps/_NF/POI/lodge.yml | 2 +- .../Inventories/expeditionaryflatpackvend.yml | 9 +++ .../Inventories/flatpackvend.yml | 4 -- .../Structures/Machines/vending_machines.yml | 11 ++++ .../expeditionaryflatpackvend.rsi/broken.png | Bin 0 -> 872 bytes .../deny-unshaded.png | Bin 0 -> 16979 bytes .../eject-unshaded.png | Bin 0 -> 24783 bytes .../expeditionaryflatpackvend.rsi/meta.json | 53 ++++++++++++++++++ .../normal-unshaded.png | Bin 0 -> 24783 bytes .../expeditionaryflatpackvend.rsi/off.png | Bin 0 -> 615 bytes .../expeditionaryflatpackvend.rsi/panel.png | Bin 0 -> 259 bytes 11 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/broken.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/deny-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/eject-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/off.png create mode 100644 Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/panel.png diff --git a/Resources/Maps/_NF/POI/lodge.yml b/Resources/Maps/_NF/POI/lodge.yml index 95e62eb9f85..7edb788816a 100644 --- a/Resources/Maps/_NF/POI/lodge.yml +++ b/Resources/Maps/_NF/POI/lodge.yml @@ -10028,7 +10028,7 @@ entities: - type: Transform pos: 9.5,10.5 parent: 1 -- proto: VendingMachineFlatpackVend +- proto: VendingMachineExpeditionaryFlatpackVend entities: - uid: 512 components: diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml new file mode 100644 index 00000000000..b79d6217271 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/expeditionaryflatpackvend.yml @@ -0,0 +1,9 @@ +- type: vendingMachineInventory + id: ExpeditionaryFlatpackVendInventory + startingInventory: + ComputerCrewMonitoringFlatpack: 12 + TelecomServerFlatpack: 12 + PowerCellRechargerFlatpack: 16 + WeaponCapacitorRechargerFlatpack: 16 + BorgChargerFlatpack: 16 + ComputerIFFFlatpack: 3 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml index ec27b26aa9e..63b4848031d 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/flatpackvend.yml @@ -5,7 +5,6 @@ OreProcessorFlatpack: 10 AutolatheFlatpack: 6 HydroponicsTrayEmptyFlatpack: 16 - ComputerCrewMonitoringFlatpack: 6 ExosuitFabricatorFlatpack: 4 ProtolatheFlatpack: 6 CircuitImprinterFlatpack: 6 @@ -16,7 +15,6 @@ MedicalTechFabFlatpack: 4 MaterialReclaimerFlatpack: 4 UniformPrinterFlatpack: 6 - TelecomServerFlatpack: 6 TilePrinterNFFlatpack: 8 PowerCellRechargerFlatpack: 8 WeaponCapacitorRechargerFlatpack: 8 @@ -26,5 +24,3 @@ AirlockGlassFlatpack: 20 AirlockShuttleFlatpack: 20 AirlockGlassShuttleFlatpack: 20 - emaggedInventory: - ComputerIFFFlatpack: 1 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml index 9e5db33817d..ece28c431bf 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/vending_machines.yml @@ -90,6 +90,17 @@ - type: MarketModifier mod: 25 +- type: entity + parent: [BaseStructureUnanchorable, VendingMachineFlatpackVend] + id: VendingMachineExpeditionaryFlatpackVend + name: Expeditionary FlatpackVend + description: Essential tech for the space-men on an expedition + components: + - type: VendingMachine + pack: ExpeditionaryFlatpackVendInventory + - type: Sprite + sprite: _NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi + - type: entity parent: [BaseStructureUnanchorable, VendingMachine] id: VendingMachineSyndieContraband diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/broken.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..2323a3853234cd411a160013ae214ad40ebcf31c GIT binary patch literal 872 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/eject-unshaded.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/eject-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..7999bba80d0c1e24444e38f0d234a6b77fbbd232 GIT binary patch literal 24783 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/off.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..61d7c61ff8e4209c8913af6ecc01f63fed55945b GIT binary patch literal 615 zcmV-t0+{`YP)Px%AxT6*R9J=0ma$J0Q5?rVlt%x9rXq=NEJj&~ zL(>jUN~lf4h*Q%|z!(#g>(C}9aD}uHTWA_W!ib5*L3^QG-@9w?9q~K8-2LvppZmSv z?|yH9GrAkPb&7fooWHPM_-3rV=Wjkf3|;X9bgV@Z#n&tfx&z?&sL9X# zCaus7)5BIT62%XXPf#lr?E$p4v6{Cuv!ie{LakJkLYM%`dWD>(D*?!9I*C-ATB(S~ z=kNM|F#(JP1EA?#z5T$EdHw500On&!5~(L zQx2d~OD~3)c{C-B=~{%UwD4vh$Vy{`06+ACBXcis{n<_KoPo@j?C+ad#t=&=8N{3bVj@lu4drL^I6LnSG(ZlV66WxP*H@7zf+Kr$GMt; z*^^)WXTW>7=NMr5@+FWIpb%j0;XOyj?SZ!V>NVBsuCp%abvBFz1I9qBR(Ba08I{Ic z0`xkX=Yj!aefG;mA7bl2kVwTX4=Lej#F%g z1367sc1p4h(9VL2j_3=(&ciBX0{Fgt;JWF5r9bD6)!yldmt+6{002ovPDHLkV1nx9 BA8G&q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/panel.png b/Resources/Textures/_NF/Structures/Machines/VendingMachines/expeditionaryflatpackvend.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..4c92e1fe2e28a90737c6bb20a51f2e1899d82428 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7e+r z#WAE}&fANIT!#!KSRaI&$Q?-DVNvq_fx;IqCoyqH85!1tes^WNE~t7R(B8q>lzr}j zW0MQ>qm-?u Date: Wed, 17 Apr 2024 21:40:28 +0000 Subject: [PATCH 09/18] Automatic Changelog (#1224) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 83a3d756379..bfe82b0ffbe 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4041,3 +4041,11 @@ Entries: combat hardsuit available. id: 4913 time: '2024-04-17T21:38:15.0000000+00:00' +- author: dvir01 + changes: + - type: Tweak + message: >- + Added the new Expeditionary FlatpackVend to the Lodge, not restockable + but contains expedition unique machines like the IFF, + id: 4914 + time: '2024-04-17T21:40:06.0000000+00:00' From 37352fcd43f14f4b96baefe19d8f0a03ae78daa6 Mon Sep 17 00:00:00 2001 From: GreaseMonk <1354802+GreaseMonk@users.noreply.github.com> Date: Wed, 17 Apr 2024 23:43:04 +0200 Subject: [PATCH 10/18] Artifact construct update (#1218) * Fix some issues with construct * Remove body and butcherable to artifact fragments * Add ShowExamineText for battery components * Add chatter and fix examine text * Add Ability to stop sound when MobState is Dead (#26905) * Add stopsWhenEntityDead to sound components * Convert component * Review * Fix dupe sub --------- Co-authored-by: metalgearsloth # Conflicts: # Content.Server/Sound/EmitSoundSystem.cs # Content.Shared/Audio/SharedAmbientSoundSystem.cs * Remove deathPenalty --- Content.Server/Bed/Sleep/SleepingSystem.cs | 1 + Content.Server/Cargo/Systems/PricingSystem.cs | 1 + .../Power/Components/BatteryComponent.cs | 7 ++ .../Power/EntitySystems/BatterySystem.cs | 2 +- .../Components/SpamEmitSoundComponent.cs | 27 ------ Content.Server/Sound/EmitSoundSystem.cs | 1 + .../Audio/SoundWhileAliveComponent.cs | 10 ++ .../Components/SpamEmitSoundComponent.cs | 24 +++++ Content.Shared/Sound/SharedEmitSoundSystem.cs | 18 ++++ .../Audio/_NF/Ambience/monster-flange.ogg | Bin 0 -> 31398 bytes .../Entities/Mobs/NPCs/artifact_construct.yml | 91 ++++++++++-------- .../Entities/Mobs/NPCs/bloodcultistmob.yml | 4 +- .../_NF/Mobs/Aliens/grim_forged.rsi/dead.png | Bin 3933 -> 4142 bytes 13 files changed, 119 insertions(+), 67 deletions(-) delete mode 100644 Content.Server/Sound/Components/SpamEmitSoundComponent.cs create mode 100644 Content.Shared/Audio/SoundWhileAliveComponent.cs create mode 100644 Content.Shared/Sound/Components/SpamEmitSoundComponent.cs create mode 100644 Resources/Audio/_NF/Ambience/monster-flange.ogg diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs index f9bb015ffd2..9ece12bdc19 100644 --- a/Content.Server/Bed/Sleep/SleepingSystem.cs +++ b/Content.Server/Bed/Sleep/SleepingSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Slippery; +using Content.Shared.Sound.Components; using Content.Shared.StatusEffect; using Content.Shared.Stunnable; using Content.Shared.Verbs; diff --git a/Content.Server/Cargo/Systems/PricingSystem.cs b/Content.Server/Cargo/Systems/PricingSystem.cs index 635ae9a758a..a7915a351c9 100644 --- a/Content.Server/Cargo/Systems/PricingSystem.cs +++ b/Content.Server/Cargo/Systems/PricingSystem.cs @@ -232,6 +232,7 @@ public double GetEstimatedVendPrice(EntityPrototype prototype) public double GetPrice(EntityUid uid) { var ev = new PriceCalculationEvent(); + ev.Price = 0; // Structs doesnt initialize doubles when called by constructor. RaiseLocalEvent(uid, ref ev); if (ev.Handled) diff --git a/Content.Server/Power/Components/BatteryComponent.cs b/Content.Server/Power/Components/BatteryComponent.cs index 0fbee9aa346..10527410e58 100644 --- a/Content.Server/Power/Components/BatteryComponent.cs +++ b/Content.Server/Power/Components/BatteryComponent.cs @@ -57,6 +57,13 @@ public float CurrentCharge [Obsolete("Use system method")] public bool TryUseCharge(float value) => _entMan.System().TryUseCharge(Owner, value, this); + + /// + /// Whether or not information about + /// the battery will be shown on examine. + /// + [DataField] + public bool ShowExamineText = true; } /// diff --git a/Content.Server/Power/EntitySystems/BatterySystem.cs b/Content.Server/Power/EntitySystems/BatterySystem.cs index c844988b065..5874ee08d06 100644 --- a/Content.Server/Power/EntitySystems/BatterySystem.cs +++ b/Content.Server/Power/EntitySystems/BatterySystem.cs @@ -39,7 +39,7 @@ private void OnExamine(EntityUid uid, ExaminableBatteryComponent component, Exam { if (!TryComp(uid, out var batteryComponent)) return; - if (args.IsInDetailsRange) + if (args.IsInDetailsRange && batteryComponent.ShowExamineText) { var effectiveMax = batteryComponent.MaxCharge; if (effectiveMax == 0) diff --git a/Content.Server/Sound/Components/SpamEmitSoundComponent.cs b/Content.Server/Sound/Components/SpamEmitSoundComponent.cs deleted file mode 100644 index d17bbb9e8f6..00000000000 --- a/Content.Server/Sound/Components/SpamEmitSoundComponent.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Content.Shared.Sound.Components; - -namespace Content.Server.Sound.Components -{ - /// - /// Rolls to play a sound every few seconds. - /// - [RegisterComponent] - public sealed partial class SpamEmitSoundComponent : BaseEmitSoundComponent - { - [DataField("accumulator")] - public float Accumulator = 0f; - - [DataField("rollInterval")] - public float RollInterval = 2f; - - [DataField("playChance")] - public float PlayChance = 0.5f; - - // Always Pvs. - [DataField("popUp")] - public string? PopUp; - - [DataField("enabled")] - public bool Enabled = true; - } -} diff --git a/Content.Server/Sound/EmitSoundSystem.cs b/Content.Server/Sound/EmitSoundSystem.cs index 059800c3f9d..9f71bbba4cd 100644 --- a/Content.Server/Sound/EmitSoundSystem.cs +++ b/Content.Server/Sound/EmitSoundSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Sound.Components; using Content.Shared.UserInterface; using Content.Shared.Sound; +using Content.Shared.Sound.Components; using Robust.Shared.Random; namespace Content.Server.Sound; diff --git a/Content.Shared/Audio/SoundWhileAliveComponent.cs b/Content.Shared/Audio/SoundWhileAliveComponent.cs new file mode 100644 index 00000000000..977d9372ce2 --- /dev/null +++ b/Content.Shared/Audio/SoundWhileAliveComponent.cs @@ -0,0 +1,10 @@ +using Content.Shared.Sound.Components; +using Robust.Shared.GameStates; + +namespace Content.Shared.Audio; + +/// +/// Toggles and off when this entity's MobState isn't Alive. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class SoundWhileAliveComponent : Component; diff --git a/Content.Shared/Sound/Components/SpamEmitSoundComponent.cs b/Content.Shared/Sound/Components/SpamEmitSoundComponent.cs new file mode 100644 index 00000000000..91bb73ab183 --- /dev/null +++ b/Content.Shared/Sound/Components/SpamEmitSoundComponent.cs @@ -0,0 +1,24 @@ +namespace Content.Shared.Sound.Components; + +/// +/// Rolls to play a sound every few seconds. +/// +[RegisterComponent] +public sealed partial class SpamEmitSoundComponent : BaseEmitSoundComponent +{ + [DataField("accumulator")] + public float Accumulator = 0f; + + [DataField("rollInterval")] + public float RollInterval = 2f; + + [DataField("playChance")] + public float PlayChance = 0.5f; + + // Always Pvs. + [DataField("popUp")] + public string? PopUp; + + [DataField("enabled")] + public bool Enabled = true; +} diff --git a/Content.Shared/Sound/SharedEmitSoundSystem.cs b/Content.Shared/Sound/SharedEmitSoundSystem.cs index 22ba8e0e3ee..5995e7bb86b 100644 --- a/Content.Shared/Sound/SharedEmitSoundSystem.cs +++ b/Content.Shared/Sound/SharedEmitSoundSystem.cs @@ -1,7 +1,10 @@ +using Content.Shared.Audio; using Content.Shared.Hands; +using Content.Shared.Hands.Components; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; using Content.Shared.Maps; +using Content.Shared.Mobs; using Content.Shared.Popups; using Content.Shared.Sound.Components; using Content.Shared.Throwing; @@ -28,6 +31,7 @@ public abstract class SharedEmitSoundSystem : EntitySystem [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDefMan = default!; [Dependency] protected readonly IRobustRandom Random = default!; + [Dependency] private readonly SharedAmbientSoundSystem _ambient = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] protected readonly SharedPopupSystem Popup = default!; @@ -43,6 +47,20 @@ public override void Initialize() SubscribeLocalEvent(OnEmitSoundOnDrop); SubscribeLocalEvent(OnEmitSoundOnCollide); + + SubscribeLocalEvent(OnMobState); + } + + private void OnMobState(Entity entity, ref MobStateChangedEvent args) + { + // Disable this component rather than removing it because it can be brought back to life. + if (TryComp(entity, out var comp)) + { + comp.Enabled = args.NewMobState == MobState.Alive; + Dirty(entity.Owner, comp); + } + + _ambient.SetAmbience(entity.Owner, args.NewMobState != MobState.Dead); } private void OnEmitSpawnOnInit(EntityUid uid, EmitSoundOnSpawnComponent component, MapInitEvent args) diff --git a/Resources/Audio/_NF/Ambience/monster-flange.ogg b/Resources/Audio/_NF/Ambience/monster-flange.ogg new file mode 100644 index 0000000000000000000000000000000000000000..bf25c0e40cf49bc2229873baf3c463601cdf4ee2 GIT binary patch literal 31398 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 T>=dB_00000NkvXXu0mjfVeFx@ From df439d1a5ba908cf438ae8c5553d4fc3bd26c804 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 17 Apr 2024 21:43:25 +0000 Subject: [PATCH 11/18] Automatic Changelog (#1218) --- Resources/Changelog/Changelog.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bfe82b0ffbe..345b97bc7ce 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4049,3 +4049,13 @@ Entries: but contains expedition unique machines like the IFF, id: 4914 time: '2024-04-17T21:40:06.0000000+00:00' +- author: GreaseMonk + changes: + - type: Fix + message: Fixed various issues with artifact construct including sell price. + - type: Tweak + message: Increased artifact construct health. + - type: Add + message: Added artifact construct chatter sound. + id: 4915 + time: '2024-04-17T21:43:04.0000000+00:00' From b948898b9780358807e0c51b9f7caaadab58953d Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Wed, 17 Apr 2024 17:46:29 -0400 Subject: [PATCH 12/18] 04/08/2024 - NFSD Completion. (#1205) * 04/08/2024 - NFSD Completion. Fixes: Brigmedic Duffle. Added: Whistle NFSD and Sheriff gas masks Eyepatch HUD On-spawn Brigmedic HUD (Medical and Security) Bedsheets (NFSD, Brigmedic and Sheriff) {Wearable] NFSDLite NFSD Survival box containing the same items aside from the new gas mask Circuit Boards for NFSD Fabricator. (Updated Sheriff spawn loadout to include) * Fixed a single file.. Fixed unneeded file. * Update emergency.yml * 04/09/2024 Added regular NFSD doors. * 04/09/2024 - NFSD Radio Chat Color Updated radio chat color to be distinct from other channels. Green #7eac69 -> Beige #fffdd0 * Update radio_channels.yml Fixed conflict * 04/13/2024 Added Holobarrier w/ brand new inhand sprites. Added inhand sprites to whistle. * 04/13/2024 Added four whitelisted slots to the Sheriff's hat to allow for ease of access for cigars and lighters. Fixed HoS backpack spawns and updated door remote colors. Updated NFSDTec to include everything updated in this pr. * 04/13/2024 Updated Sheriffs Headset to include CentComm Channel. Updated Bailiff Headset to include Command Channel. Added NFSD gyroscope (regular and small) Added NFSD Thruster * 04/13/2024 Fix for gyroscope yml * 04/14/2024 Updated filled bag variants to not allow spawning. * Boots * NFSD+ * 04/15/2024 Updated spawner names Updated empress mothership console sprite Updated warden.yml to bailiff.yml in roles * Door * Update detective.yml * 04/16/2024 Fix what was broke... --------- Co-authored-by: Dvir --- .../Fills/Backpacks/StarterGear/backpack.yml | 6 +- .../Fills/Backpacks/StarterGear/duffelbag.yml | 6 +- .../Fills/Backpacks/StarterGear/satchel.yml | 6 +- .../Catalog/Fills/Boxes/emergency.yml | 23 +++ .../Entities/Clothing/Ears/headsets_alt.yml | 1 + .../Entities/Markers/Spawners/jobs.yml | 16 +- .../Circuitboards/Machine/production.yml | 19 ++ .../Devices/Circuitboards/computer.yml | 25 +++ .../Roles/Jobs/Civilian/detective.yml | 0 .../Roles/Jobs/Security/detective.yml | 39 ++++ .../Roles/Jobs/Security/head_of_security.yml | 59 ++++++ .../Roles/Jobs/Security/security_cadet.yml | 43 ++++ .../Roles/Jobs/Security/security_officer.yml | 41 ++++ .../Prototypes/Roles/Jobs/Security/warden.yml | 43 ++++ .../Prototypes/Roles/Jobs/departments.yml | 18 +- .../Fills/Backpacks/StarterGear/backpack.yml | 2 +- .../Fills/Backpacks/StarterGear/duffelbag.yml | 2 +- .../Fills/Backpacks/StarterGear/satchel.yml | 2 +- .../_NF/Catalog/Fills/Items/misc.yml | 8 + .../VendingMachines/Inventories/nfsddrobe.yml | 4 +- .../VendingMachines/Inventories/nfsdtec.yml | 5 +- .../_NF/Entities/Clothing/Back/backpacks.yml | 14 +- .../_NF/Entities/Clothing/Back/duffel.yml | 3 + .../_NF/Entities/Clothing/Back/satchel.yml | 14 +- .../Entities/Clothing/Ears/headsets_alt.yml | 4 +- .../_NF/Entities/Clothing/Eyes/hud.yml | 32 ++- .../_NF/Entities/Clothing/Head/hats.yml | 27 +++ .../_NF/Entities/Clothing/Masks/masks.yml | 42 +++- .../_NF/Entities/Clothing/Shoes/boots.yml | 4 +- .../Entities/Objects/Devices/door_remote.yml | 15 ++ .../Objects/Devices/holoprojectors.yml | 27 +++ .../Entities/Objects/Devices/production.yml | 12 ++ .../_NF/Entities/Objects/Fun/whistles.yml | 11 + .../_NF/Entities/Objects/Misc/bedsheets.yml | 30 +++ .../Entities/Objects/Tools/flashlights.yml | 46 +++++ .../Structures/Doors/Airlocks/access.yml | 10 + .../Structures/Doors/Airlocks/airlocks.yml | 8 + .../Structures/Holographic/projections.yml | 30 +++ .../Computers/mothership-computers.yml | 2 +- .../Structures/Shuttles/thrusters.yml | 175 ++++++++++++++++ Resources/Prototypes/_NF/Maps/POI/nfsd.yml | 10 +- .../Jobs/NFSD/{warden.yml => bailiff.yml} | 8 +- .../_NF/Roles/Jobs/NFSD/brigmedic.yml | 6 +- .../NFSD/{security_cadet.yml => cadet.yml} | 10 +- .../NFSD/{security_officer.yml => deputy.yml} | 8 +- .../NFSD/{detective.yml => detectivenf.yml} | 6 +- .../_NF/Roles/Jobs/NFSD/senior_officer.yml | 2 +- .../{head_of_security.yml => sheriff.yml} | 13 +- .../_NF/Roles/play_time_trackers_old.yml | 14 ++ .../_NF/Shipyard/Security/cleric.yml | 3 +- .../_NF/Shipyard/Security/empress.yml | 8 +- .../_NF/Shipyard/{ => Security}/enforcer.yml | 0 .../_NF/Shipyard/Security/fighter.yml | 3 +- .../Shipyard/{ => Security}/hospitaller.yml | 0 .../Shipyard/{ => Security}/inquisitor.yml | 0 .../Shipyard/{ => Security}/interceptor.yml | 3 +- .../_NF/Shipyard/{ => Security}/marauder.yml | 0 .../_NF/Shipyard/{ => Security}/prowler.yml | 3 +- .../_NF/Shipyard/Security/rogue.yml | 3 +- .../_NF/Shipyard/{ => Security}/templar.yml | 3 +- .../_NF/Shipyard/{ => Security}/trident.yml | 0 .../_NF/Shipyard/{ => Security}/wasp.yml | 0 .../_NF/Shipyard/{ => Security}/whiskey.yml | 0 .../Prototypes/_NF/Shipyard/canister.yml | 3 +- .../Prototypes/_NF/Shipyard/svorange.yml | 3 +- Resources/Prototypes/_NF/Shipyard/svtide.yml | 3 +- Resources/Prototypes/_NF/radio_channels.yml | 3 +- .../Objects/Misc/bedsheets.rsi/meta.json | 9 + .../Objects/Misc/bedsheets.rsi/sheetnfsd.png | Bin 0 -> 640 bytes .../Misc/bedsheets.rsi/sheetnfsdbrigmed.png | Bin 0 -> 659 bytes .../Misc/bedsheets.rsi/sheetnfsdsheriff.png | Bin 0 -> 630 bytes .../Objects/Misc/module.rsi/cpu_nfsd.png | Bin 0 -> 552 bytes .../Objects/Misc/module.rsi/meta.json | 2 +- .../Textures/Objects/Misc/module.rsi/nfsd.png | Bin 0 -> 491 bytes .../Misc/module.rsi/nfsdmodschematic.png | Bin 0 -> 391 bytes .../Eyes/Hud/nfsd_patch.rsi/equipped-EYES.png | Bin 0 -> 253 bytes .../Clothing/Eyes/Hud/nfsd_patch.rsi/icon.png | Bin 0 -> 372 bytes .../Eyes/Hud/nfsd_patch.rsi/meta.json | 18 ++ .../nfsd.rsi/equipped-MASK-reptilian.png | Bin 0 -> 540 bytes .../nfsd.rsi/equipped-MASK-vulpkanin.png | Bin 0 -> 526 bytes .../Clothing/Masks/nfsd.rsi/equipped-MASK.png | Bin 0 -> 506 bytes .../_NF/Clothing/Masks/nfsd.rsi/icon.png | Bin 0 -> 401 bytes .../Clothing/Masks/nfsd.rsi/inhand-left.png | Bin 0 -> 243 bytes .../Clothing/Masks/nfsd.rsi/inhand-right.png | Bin 0 -> 242 bytes .../_NF/Clothing/Masks/nfsd.rsi/meta.json | 38 ++++ .../Masks/nfsd.rsi/up-equipped-MASK.png | Bin 0 -> 526 bytes .../equipped-MASK-reptilian.png | Bin 0 -> 862 bytes .../equipped-MASK-vulpkanin.png | Bin 0 -> 1047 bytes .../Masks/nfsd_sheriff.rsi/equipped-MASK.png | Bin 0 -> 846 bytes .../Clothing/Masks/nfsd_sheriff.rsi/icon.png | Bin 0 -> 537 bytes .../Masks/nfsd_sheriff.rsi/inhand-left.png | Bin 0 -> 607 bytes .../Masks/nfsd_sheriff.rsi/inhand-right.png | Bin 0 -> 629 bytes .../Clothing/Masks/nfsd_sheriff.rsi/meta.json | 34 +++ .../Bedsheets/NFSD/nfsd.rsi/equipped-NECK.png | Bin 0 -> 1022 bytes .../Bedsheets/NFSD/nfsd.rsi/inhand-left.png | Bin 0 -> 446 bytes .../Bedsheets/NFSD/nfsd.rsi/inhand-right.png | Bin 0 -> 438 bytes .../Neck/Bedsheets/NFSD/nfsd.rsi/meta.json | 23 +++ .../NFSD/nfsd_brigmed.rsi/equipped-NECK.png | Bin 0 -> 1050 bytes .../NFSD/nfsd_brigmed.rsi/inhand-left.png | Bin 0 -> 460 bytes .../NFSD/nfsd_brigmed.rsi/inhand-right.png | Bin 0 -> 476 bytes .../Bedsheets/NFSD/nfsd_brigmed.rsi/meta.json | 23 +++ .../NFSD/nfsd_sheriff.rsi/equipped-NECK.png | Bin 0 -> 991 bytes .../NFSD/nfsd_sheriff.rsi/inhand-left.png | Bin 0 -> 483 bytes .../NFSD/nfsd_sheriff.rsi/inhand-right.png | Bin 0 -> 505 bytes .../Bedsheets/NFSD/nfsd_sheriff.rsi/meta.json | 23 +++ .../Devices/Holoprojectors/nfsd.rsi/icon.png | Bin 0 -> 611 bytes .../Holoprojectors/nfsd.rsi/inhand-left.png | Bin 0 -> 459 bytes .../Holoprojectors/nfsd.rsi/inhand-right.png | Bin 0 -> 449 bytes .../Devices/Holoprojectors/nfsd.rsi/meta.json | 30 +++ .../_NF/Objects/Fun/nfsdwhistle.rsi/icon.png | Bin 0 -> 586 bytes .../Fun/nfsdwhistle.rsi/inhand-left.png | Bin 0 -> 178 bytes .../Fun/nfsdwhistle.rsi/inhand-right.png | Bin 0 -> 175 bytes .../_NF/Objects/Fun/nfsdwhistle.rsi/meta.json | 22 ++ .../Tools/nfsdlite.rsi/equipped-BELT.png | Bin 0 -> 210 bytes .../Tools/nfsdlite.rsi/inhand-left-light.png | Bin 0 -> 244 bytes .../Tools/nfsdlite.rsi/inhand-left.png | Bin 0 -> 407 bytes .../Tools/nfsdlite.rsi/inhand-right-light.png | Bin 0 -> 338 bytes .../Tools/nfsdlite.rsi/inhand-right.png | Bin 0 -> 434 bytes .../_NF/Objects/Tools/nfsdlite.rsi/meta.json | 40 ++++ .../Tools/nfsdlite.rsi/nfsdlite-on.png | Bin 0 -> 265 bytes .../Tools/nfsdlite.rsi/nfsdlite-overlay.png | Bin 0 -> 126 bytes .../Objects/Tools/nfsdlite.rsi/nfsdlite.png | Bin 0 -> 268 bytes .../Airlocks/Standard/nfsd.rsi/assembly.png | Bin 0 -> 1055 bytes .../Standard/nfsd.rsi/bolted_unlit.png | Bin 0 -> 144 bytes .../Airlocks/Standard/nfsd.rsi/closed.png | Bin 0 -> 1196 bytes .../Standard/nfsd.rsi/closed_unlit.png | Bin 0 -> 144 bytes .../Airlocks/Standard/nfsd.rsi/closing.png | Bin 0 -> 2237 bytes .../Standard/nfsd.rsi/closing_unlit.png | Bin 0 -> 432 bytes .../Airlocks/Standard/nfsd.rsi/deny_unlit.png | Bin 0 -> 321 bytes .../Standard/nfsd.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Airlocks/Standard/nfsd.rsi/meta.json | 195 ++++++++++++++++++ .../Doors/Airlocks/Standard/nfsd.rsi/open.png | Bin 0 -> 363 bytes .../Airlocks/Standard/nfsd.rsi/opening.png | Bin 0 -> 2240 bytes .../Standard/nfsd.rsi/opening_unlit.png | Bin 0 -> 284 bytes .../Standard/nfsd.rsi/panel_closing.png | Bin 0 -> 445 bytes .../Airlocks/Standard/nfsd.rsi/panel_open.png | Bin 0 -> 315 bytes .../Standard/nfsd.rsi/panel_opening.png | Bin 0 -> 470 bytes .../Airlocks/Standard/nfsd.rsi/sparks.png | Bin 0 -> 697 bytes .../Standard/nfsd.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../Standard/nfsd.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Standard/nfsd.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Airlocks/Standard/nfsd.rsi/welded.png | Bin 0 -> 296 bytes .../_NF/Structures/Holo/nfsd.rsi/icon.png | Bin 0 -> 2535 bytes .../_NF/Structures/Holo/nfsd.rsi/meta.json | 32 +++ .../Shuttles/nfsdgyroscope.rsi/base.png | Bin 0 -> 496 bytes .../Shuttles/nfsdgyroscope.rsi/meta.json | 43 ++++ .../Shuttles/nfsdgyroscope.rsi/thrust.png | Bin 0 -> 3103 bytes .../nfsdgyroscope.rsi/thrust_burn.png | Bin 0 -> 1706 bytes .../thrust_burn_unshaded.png | Bin 0 -> 3300 bytes .../Shuttles/thrusternfsd.rsi/base.png | Bin 0 -> 2486 bytes .../Shuttles/thrusternfsd.rsi/meta.json | 83 ++++++++ .../Shuttles/thrusternfsd.rsi/thrust.png | Bin 0 -> 1504 bytes .../thrusternfsd.rsi/thrust_burn_unshaded.png | Bin 0 -> 4298 bytes 153 files changed, 1493 insertions(+), 111 deletions(-) delete mode 100644 Resources/Prototypes/Roles/Jobs/Civilian/detective.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/detective.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/security_officer.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/warden.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Devices/door_remote.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Fun/whistles.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Tools/flashlights.yml create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml rename Resources/Prototypes/_NF/Roles/Jobs/NFSD/{warden.yml => bailiff.yml} (93%) rename Resources/Prototypes/_NF/Roles/Jobs/NFSD/{security_cadet.yml => cadet.yml} (89%) rename Resources/Prototypes/_NF/Roles/Jobs/NFSD/{security_officer.yml => deputy.yml} (91%) rename Resources/Prototypes/_NF/Roles/Jobs/NFSD/{detective.yml => detectivenf.yml} (94%) rename Resources/Prototypes/_NF/Roles/Jobs/NFSD/{head_of_security.yml => sheriff.yml} (91%) create mode 100644 Resources/Prototypes/_NF/Roles/play_time_trackers_old.yml rename Resources/Prototypes/_NF/Shipyard/{ => Security}/enforcer.yml (100%) rename Resources/Prototypes/_NF/Shipyard/{ => Security}/hospitaller.yml (100%) rename Resources/Prototypes/_NF/Shipyard/{ => Security}/inquisitor.yml (100%) rename Resources/Prototypes/_NF/Shipyard/{ => Security}/interceptor.yml (92%) rename Resources/Prototypes/_NF/Shipyard/{ => Security}/marauder.yml (100%) rename Resources/Prototypes/_NF/Shipyard/{ => Security}/prowler.yml (92%) rename Resources/Prototypes/_NF/Shipyard/{ => Security}/templar.yml (91%) rename Resources/Prototypes/_NF/Shipyard/{ => Security}/trident.yml (100%) rename Resources/Prototypes/_NF/Shipyard/{ => Security}/wasp.yml (100%) rename Resources/Prototypes/_NF/Shipyard/{ => Security}/whiskey.yml (100%) create mode 100644 Resources/Textures/Objects/Misc/bedsheets.rsi/sheetnfsd.png create mode 100644 Resources/Textures/Objects/Misc/bedsheets.rsi/sheetnfsdbrigmed.png create mode 100644 Resources/Textures/Objects/Misc/bedsheets.rsi/sheetnfsdsheriff.png create mode 100644 Resources/Textures/Objects/Misc/module.rsi/cpu_nfsd.png create mode 100644 Resources/Textures/Objects/Misc/module.rsi/nfsd.png create mode 100644 Resources/Textures/Objects/Misc/module.rsi/nfsdmodschematic.png create mode 100644 Resources/Textures/_NF/Clothing/Eyes/Hud/nfsd_patch.rsi/equipped-EYES.png create mode 100644 Resources/Textures/_NF/Clothing/Eyes/Hud/nfsd_patch.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Eyes/Hud/nfsd_patch.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/equipped-MASK-reptilian.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/equipped-MASK-vulpkanin.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/up-equipped-MASK.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/equipped-MASK-reptilian.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/equipped-MASK-vulpkanin.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Devices/Holoprojectors/nfsd.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Devices/Holoprojectors/nfsd.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Devices/Holoprojectors/nfsd.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Devices/Holoprojectors/nfsd.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-left-light.png create mode 100644 Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-right-light.png create mode 100644 Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/nfsdlite-on.png create mode 100644 Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/nfsdlite-overlay.png create mode 100644 Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/nfsdlite.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/assembly.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/deny_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/open.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/opening_unlit.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closing.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_open.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_opening.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_broken.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_damaged.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_open.png create mode 100644 Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/welded.png create mode 100644 Resources/Textures/_NF/Structures/Holo/nfsd.rsi/icon.png create mode 100644 Resources/Textures/_NF/Structures/Holo/nfsd.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Shuttles/nfsdgyroscope.rsi/base.png create mode 100644 Resources/Textures/_NF/Structures/Shuttles/nfsdgyroscope.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Shuttles/nfsdgyroscope.rsi/thrust.png create mode 100644 Resources/Textures/_NF/Structures/Shuttles/nfsdgyroscope.rsi/thrust_burn.png create mode 100644 Resources/Textures/_NF/Structures/Shuttles/nfsdgyroscope.rsi/thrust_burn_unshaded.png create mode 100644 Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/base.png create mode 100644 Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/meta.json create mode 100644 Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/thrust.png create mode 100644 Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/thrust_burn_unshaded.png diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 0d7c84c81d9..b7370711a4c 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -138,12 +138,12 @@ components: - type: StorageFill contents: - - id: BoxSurvivalSecurity + - id: BoxSurvivalNFSD - id: Flash - id: MagazinePistol - id: RubberStampSheriff # Frontier - - id: DoorRemoteSecurity # Frontier - - id: SecurityTechFabCircuitboard # Frontier + - id: DoorRemoteNfsd # Frontier + - id: NFSDTechFabCircuitboard # Frontier - id: BaseSecurityUplinkRadioSheriff # Frontier - id: ClothingNeckNfsdBadgeHoS # Frontier diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index b98e784095e..6539f845777 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -148,12 +148,12 @@ components: - type: StorageFill contents: - - id: BoxSurvivalSecurity + - id: BoxSurvivalNFSD - id: Flash - id: MagazinePistol - id: RubberStampSheriff # Frontier - - id: DoorRemoteSecurity # Frontier - - id: SecurityTechFabCircuitboard # Frontier + - id: DoorRemoteNfsd # Frontier + - id: NFSDTechFabCircuitboard # Frontier - id: BaseSecurityUplinkRadioSheriff # Frontier - id: ClothingNeckNfsdBadgeHoS # Frontier diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 1f33a5863ac..343dd2e174e 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -162,12 +162,12 @@ components: - type: StorageFill contents: - - id: BoxSurvivalSecurity + - id: BoxSurvivalNFSD - id: Flash - id: MagazinePistol - id: RubberStampSheriff # Frontier - - id: DoorRemoteSecurity # Frontier - - id: SecurityTechFabCircuitboard # Frontier + - id: DoorRemoteNfsd # Frontier + - id: NFSDTechFabCircuitboard # Frontier - id: BaseSecurityUplinkRadioSheriff # Frontier - id: ClothingNeckNfsdBadgeHoS # Frontier diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index 88c9f680574..7ab9db35d31 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -63,6 +63,29 @@ - state: internals - state: extendedtank # Frontier +- type: entity + name: survival box + parent: BoxCardboard + id: BoxSurvivalNFSD + description: It's a box with basic internals inside. This one is labelled to contain an extended-capacity tank. + suffix: NFSD + components: + - type: StorageFill + contents: + - id: ClothingMaskGasNFSD +# - id: EmergencyOxygenTankFilled + - id: ExtendedEmergencyOxygenTankFilled # Frontier + - id: SpaceMedipen + - id: EmergencyMedipen + ##- id: Flare + - id: FoodPSB + - id: DrinkWaterBottleFull + - id: EncryptionKeyTraffic # Frontier + - type: Sprite + layers: + - state: internals + - state: extendedtank # Frontier + - type: entity name: survival box parent: BoxCardboard diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index aa2439a2ae0..5433242f188 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -111,6 +111,7 @@ # - EncryptionKeyCommand # - EncryptionKeyCommon - EncryptionKeyStationMaster + - EncryptionKeyCentCom - type: Sprite sprite: Clothing/Ears/Headsets/security.rsi - type: Clothing diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 012ee18487c..f89373e30de 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -441,10 +441,10 @@ - type: entity id: SpawnPointHeadOfSecurity parent: SpawnPointJobBase - name: headofsecurity + name: sheriff components: - type: SpawnPoint - job_id: HeadOfSecurity + job_id: Sheriff - type: Sprite layers: - state: green @@ -453,10 +453,10 @@ - type: entity id: SpawnPointWarden parent: SpawnPointJobBase - name: warden + name: bailiff components: - type: SpawnPoint - job_id: Warden + job_id: Bailiff - type: Sprite layers: - state: green @@ -465,10 +465,10 @@ - type: entity id: SpawnPointSecurityOfficer parent: SpawnPointJobBase - name: securityofficer + name: deputy components: - type: SpawnPoint - job_id: SecurityOfficer + job_id: Deputy - type: Sprite layers: - state: green @@ -480,7 +480,7 @@ name: detective components: - type: SpawnPoint - job_id: Detective + job_id: DetectiveNF - type: Sprite layers: - state: green @@ -491,6 +491,8 @@ parent: SpawnPointJobBase name: brigmedic components: + - type: SpawnPoint + job_id: Brigmedic - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index d18ca9aa799..47df34a1d57 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -99,6 +99,25 @@ DefaultPrototype: Beaker ExamineName: Glass Beaker +- type: entity + id: NFSDTechFabCircuitboard + parent: BaseMachineCircuitboard + name: nfsd techfab machine board + description: A machine printed circuit board for an nfsd techfab. + components: + - type: Sprite + state: nfsd + - type: MachineBoard + prototype: NFSDTechFab + requirements: + MatterBin: 2 + Manipulator: 2 + tagRequirements: + GlassBeaker: + Amount: 2 + DefaultPrototype: Beaker + ExamineName: Glass Beaker + - type: entity id: AmmoTechFabCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index 061278cb8a9..633a6cc4abf 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -71,6 +71,19 @@ - type: ComputerTabletopBoard # Frontier prototype: ComputerTabletopCriminalRecords # Frontier +- type: entity + parent: BaseComputerCircuitboard + id: NFSDCriminalRecordsComputerCircuitboard + name: nfsd criminal records computer board + description: A computer printed circuit board for a criminal records computer. + components: + - type: Sprite + state: cpu_nfsd + - type: ComputerBoard + prototype: ComputerCriminalRecords + - type: ComputerTabletopBoard # Frontier + prototype: ComputerTabletopCriminalRecords # Frontier + - type: entity parent: BaseComputerCircuitboard id: StationRecordsComputerCircuitboard @@ -342,6 +355,18 @@ - type: ComputerTabletopBoard # Frontier prototype: ComputerTabletopAdvancedRadar # Frontier +- type: entity + parent: BaseComputerCircuitboard + id: NFSDAdvancedRadarConsoleCircuitboard # Frontier + name: nfsd advanced radar console computer board + components: + - type: Sprite + state: cpu_nfsd + - type: ComputerBoard + prototype: ComputerAdvancedRadar + - type: ComputerTabletopBoard # Frontier + prototype: ComputerTabletopAdvancedRadar # Frontier + - type: entity parent: BaseComputerCircuitboard id: SolarControlComputerCircuitboard diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml b/Resources/Prototypes/Roles/Jobs/Civilian/detective.yml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml new file mode 100644 index 00000000000..08a584658bb --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -0,0 +1,39 @@ +- type: job + id: Detective + name: job-name-detective + description: job-description-detective + playTimeTracker: JobDetectiveOld + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 54000 # 15 hours + startingGear: DetectiveGear + icon: "JobIconDetective" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - Detective + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + setPreference: false # Frontier + +- type: startingGear + id: DetectiveGear + equipment: + jumpsuit: ClothingUniformJumpsuitDetective + back: ClothingBackpackFilledDetective + shoes: ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSecurity + head: ClothingHeadHatFedoraBrown + outerClothing: ClothingOuterVestDetective + id: DetectivePDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltHolsterFilled + innerClothingSkirt: ClothingUniformJumpskirtDetective + satchel: ClothingBackpackSatchelFilledDetective + duffelbag: ClothingBackpackDuffelFilledDetective diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml new file mode 100644 index 00000000000..73cb0761150 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -0,0 +1,59 @@ +- type: job + id: HeadOfSecurity + name: job-name-hos + description: job-description-hos + playTimeTracker: JobHeadOfSecurityOld + requirements: + - !type:RoleTimeRequirement + role: JobWarden + time: 10800 #3 hrs + - !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 36000 #10 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 108000 # 30 hrs + - !type:OverallPlaytimeRequirement + time: 144000 #40 hrs + weight: 10 + startingGear: HoSGear + icon: "JobIconHeadOfSecurity" + requireAdminNotify: true + supervisors: job-supervisors-captain + canBeAntag: false + access: + - HeadOfSecurity + - Command + - Brig + - Security + - Armory + - Maintenance + - Service + - External + - Detective + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + setPreference: false # Frontier + +- type: startingGear + id: HoSGear + equipment: + jumpsuit: ClothingUniformJumpsuitHoS + back: ClothingBackpackHOSFilled + shoes: ClothingShoesBootsCombatFilled + outerClothing: ClothingOuterCoatHoSTrench + eyes: ClothingEyesGlassesSecurity + head: ClothingHeadHatBeretHoS + id: HoSPDA + gloves: ClothingHandsGlovesCombat + ears: ClothingHeadsetAltSecurity + belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58 + innerClothingSkirt: ClothingUniformJumpskirtHoS + satchel: ClothingBackpackSatchelHOSFilled + duffelbag: ClothingBackpackDuffelHOSFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml new file mode 100644 index 00000000000..b7491ddd0fa --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -0,0 +1,43 @@ +- type: job + id: SecurityCadet + name: job-name-cadet + description: job-description-cadet + playTimeTracker: JobSecurityCadetOld + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 #10 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 54000 #15 hrs + inverted: true # stop playing intern if you're good at security! + startingGear: SecurityCadetGear + icon: "JobIconSecurityCadet" + supervisors: job-supervisors-security + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + setPreference: false # Frontier + +- type: startingGear + id: SecurityCadetGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorRed + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + outerClothing: ClothingOuterArmorBasic + id: SecurityCadetPDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58 + pocket2: BookSecurity + innerClothingSkirt: ClothingUniformJumpskirtColorRed + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml new file mode 100644 index 00000000000..2624148ae3e --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -0,0 +1,41 @@ +- type: job + id: SecurityOfficer + name: job-name-security + description: job-description-security + playTimeTracker: JobSecurityOfficerOld + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 36000 #10 hrs + startingGear: SecurityOfficerGear + icon: "JobIconSecurityOfficer" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + - External + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + setPreference: false # Frontier + +- type: startingGear + id: SecurityOfficerGear + equipment: + jumpsuit: ClothingUniformJumpsuitSec + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSecurity + head: ClothingHeadHelmetBasic + outerClothing: ClothingOuterArmorBasic + id: SecurityPDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58 + innerClothingSkirt: ClothingUniformJumpskirtSec + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml new file mode 100644 index 00000000000..00c5bb3c6db --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -0,0 +1,43 @@ +- type: job + id: Warden + name: job-name-warden + description: job-description-warden + playTimeTracker: JobWardenOld + requirements: + - !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 36000 #10 hrs + startingGear: WardenGear + icon: "JobIconWarden" + supervisors: job-supervisors-hos + canBeAntag: false + access: + - Security + - Brig + - Armory + - Maintenance + - Service + - External + - Detective + - Cryogenics + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant ] + setPreference: false # Frontier + +- type: startingGear + id: WardenGear + equipment: + head: ClothingHeadHatWarden + jumpsuit: ClothingUniformJumpsuitWarden + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsCombatFilled + eyes: ClothingEyesGlassesSecurity + outerClothing: ClothingOuterCoatWarden + id: WardenPDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + pocket1: WeaponPistolMk58 + innerClothingSkirt: ClothingUniformJumpskirtWarden + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index ef5a594be3c..f917522a642 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -30,7 +30,6 @@ - Reporter - Visitor - Zookeeper - - Detective - ServiceWorker - Valet ##nyanojobs below - MartialArtist @@ -84,14 +83,21 @@ color: "#DE3A3A" weight: 20 roles: - - HeadOfSecurity - - SecurityCadet - - SecurityOfficer - - Warden + - Detective # Frontier - No Longer Usable + - HeadOfSecurity # Frontier - No Longer Usable + - SecurityCadet # Frontier - No Longer Usable + - SecurityOfficer # Frontier - No Longer Usable + - Warden # Frontier - No Longer Usable - PrisonGuard ##nyano - Prisoner ##nyano - - Brigmedic + - Brigmedic # Frontier - SecurityGuard # Frontier + - DetectiveNF # Frontier + - Cadet # Frontier + - Deputy # Frontier + - Bailiff # Frontier + - Sheriff # Frontier + - SeniorOfficer # Frontier - type: department id: Science diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 9620064a6e6..7207aa1bca3 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -68,7 +68,7 @@ components: - type: StorageFill contents: - - id: BoxSurvivalSecurity + - id: BoxSurvivalNFSD - id: Flash - id: MagazinePistol - id: BaseSecurityUplinkRadioOfficer # Frontier diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index bedb635eba8..f2db3238a19 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -68,7 +68,7 @@ components: - type: StorageFill contents: - - id: BoxSurvivalSecurity + - id: BoxSurvivalNFSD - id: Flash - id: MagazinePistol - id: BaseSecurityUplinkRadioOfficer # Frontier \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml index a05a54feb00..77c5c4726d3 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -68,7 +68,7 @@ components: - type: StorageFill contents: - - id: BoxSurvivalSecurity + - id: BoxSurvivalNFSD - id: Flash - id: MagazinePistol - id: BaseSecurityUplinkRadioOfficer # Frontier \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml index 37b2b62c8ad..69e363a567b 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml @@ -13,3 +13,11 @@ - type: entity id: ClothingShoesBootsMagMercenaryFilled parent: [ClothingShoesBootsMagMercenary, ClothingShoesBootsMercenaryFilled] + +- type: entity + id: ClothingShoesBootsNFSDBrownFilled + parent: [ClothingShoesBootsNFSDBrown, ClothingShoesBootsCombatFilled] + +- type: entity + id: ClothingShoesBootsNFSDCreamFilled + parent: [ClothingShoesBootsNFSDCream, ClothingShoesBootsCombatFilled] diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml index 4bacda032a8..99bf414c2b3 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsddrobe.yml @@ -22,13 +22,13 @@ ClothingHeadsetNFSDgreenSafe: 6 # Frontier - Ask SR or Sheriff for keys ClothingHeadsetNFSDbrownSafe: 6 # Frontier - Ask SR or Sheriff for keys ClothingHeadsetNFSDcbSafe: 6 # Frontier - Ask SR or Sheriff for keys - ClothingMaskGasSecurity: 6 ClothingHeadHelmetNFSD: 6 # Frontier ClothingOuterArmorNfsdArmor: 6 ClothingOuterCoatNfsdBomber: 6 ClothingOuterCoatNfsdLongCoat: 6 ClothingOuterCoatNfsdFormal: 6 - ClothingMaskBreathMedicalSecurity: 6 + ClothingMaskGasNFSD: 8 + nfsdWhistle: 3 ClothingEyesBlindfold: 3 ClothingShoesBootsNFSDBrown: 6 ClothingShoesBootsNFSDCream: 6 diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml index a2e766d0f84..f0906ed72f8 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/nfsdtec.yml @@ -9,12 +9,13 @@ ClusterBangFull: 2 GrenadeStinger: 4 Flash: 10 - FlashlightSeclite: 10 + FlashlightNFSDLite: 10 + HoloprojectorNFSD: 4 Tourniquet: 5 ClothingEyesGlassesSunglasses: 5 ClothingEyesGlassesNFSD: 5 # Frontier ClothingEyesHudNfsd: 10 - ClothingEyesEyepatchHudSecurity: 5 + ClothingEyesHudNfsdPatch: 5 ClothingBeltNfsdWebbing: 10 ClothingBeltNfsd: 10 # Frontier RiotShield: 3 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml index c520c78f3ea..b970eca09b8 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml @@ -40,6 +40,7 @@ - type: entity parent: ClothingBackpackSecurityFilled id: ClothingBackpacknfsdFilled + noSpawn: true name: nfsd backpack description: A backpack for Deputy Sheriff. suffix: Filled @@ -51,7 +52,7 @@ parent: ClothingBackpack id: ClothingBackpacknfsd name: nfsd backpack - description: A backpack for Deputy Sheriff. + description: A backpack for a Deputy Sheriff. components: - type: Sprite sprite: _NF/Clothing/Back/Backpacks/nfsd_backpack.rsi @@ -59,6 +60,7 @@ - type: entity parent: ClothingBackpackHOSFilled id: ClothingBackpacknfsdsheriffFilled + noSpawn: true name: nfsd backpack description: A backpack for the Sheriff. suffix: Filled - Sheriff @@ -66,18 +68,10 @@ - type: Sprite sprite: _NF/Clothing/Back/Backpacks/nfsd_backpack.rsi -- type: entity - parent: ClothingBackpack - id: ClothingBackpacknfsdsheriff - name: nfsd backpack - description: A backpack for the Sheriff. - components: - - type: Sprite - sprite: _NF/Clothing/Back/Backpacks/nfsd_backpack.rsi - - type: entity parent: ClothingBackpackBrigmedicFilled id: ClothingBackpacknfsdBrigmedFilled + noSpawn: true name: nfsd brigmedic backpack description: A backpack for Deputized Physician. suffix: Filled diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml index 7f8a6c57537..9d9ac527638 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml @@ -28,6 +28,7 @@ - type: entity parent: ClothingBackpackDuffelSecurityFilled id: ClothingBackpackDuffelnfsdFilled + noSpawn: true name: nfsd duffel description: A duffelbag produced for a Deputy Sheriff. suffix: Filled @@ -47,6 +48,7 @@ - type: entity parent: ClothingBackpackHOSFilled id: ClothingBackpackDuffelnfsdsheriffFilled + noSpawn: true name: nfsd duffel description: A duffelbag produced for a Deputy Sheriff. suffix: Filled - Sheriff @@ -66,6 +68,7 @@ - type: entity parent: ClothingBackpackDuffelBrigmedicFilled id: ClothingBackpackDuffelnfsdBrigmedFilled + noSpawn: true name: nfsd brigmedic duffel description: A duffelbag produced for a Deputized Physician. suffix: Filled diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml index cbef2983ce4..adce3003e52 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml @@ -28,6 +28,7 @@ - type: entity parent: ClothingBackpackSatchelSecurityFilled id: ClothingBackpackSatchelnfsdFilled + noSpawn: true name: nfsd satchel description: A satchel produced for a Deputy Sheriff. suffix: Filled @@ -45,8 +46,9 @@ sprite: _NF/Clothing/Back/Satchels/nfsd_satchel.rsi - type: entity - parent: ClothingBackpackHOSFilled + parent: ClothingBackpackSatchelHOSFilled id: ClothingBackpackSatchelnfsdsheriffFilled + noSpawn: true name: nfsd satchel description: A satchel produced for the Sheriff. suffix: Filled - Sheriff @@ -54,18 +56,10 @@ - type: Sprite sprite: _NF/Clothing/Back/Satchels/nfsd_satchel.rsi -- type: entity - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelnfsdsheriff - name: nfsd satchel - description: A satchel produced for the Sheriff. - components: - - type: Sprite - sprite: _NF/Clothing/Back/Satchels/nfsd_satchel.rsi - - type: entity parent: ClothingBackpackSatchelBrigmedicFilled id: ClothingBackpackSatchelnfsdBrigmedFilled + noSpawn: true name: nfsd brigmedic satchel description: A satchel produced for a Deputized Physician. suffix: Filled diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml index 824610cb9d8..381358d54e8 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml @@ -7,7 +7,7 @@ containers: key_slots: # - EncryptionKeySecurity -# - EncryptionKeyCommand + - EncryptionKeyCommand - EncryptionKeyNFSD - EncryptionKeyCommon - type: Sprite @@ -66,7 +66,7 @@ sprite: _NF/Clothing/Ears/Headsets/nfsd_h_brown.rsi - type: entity - parent: ClothingHeadsetAltCommand + parent: ClothingHeadsetAltSecurity id: ClothingHeadsetAltNFSDCreamandBrown name: sheriff's over-ear headset components: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml index 6a03d428186..b8e3ebbaa8f 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/hud.yml @@ -2,7 +2,7 @@ parent: ClothingEyesHudSecurity id: ClothingEyesHudNfsd name: nfsd hud - description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. + description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and criminal records. components: - type: Sprite sprite: _NF/Clothing/Eyes/Hud/nfsd_hud.rsi @@ -20,3 +20,33 @@ sprite: _NF/Clothing/Eyes/Hud/mail.rsi - type: Clothing sprite: _NF/Clothing/Eyes/Hud/mail.rsi + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudNFSDMed + name: brigmedic hud + description: An eye display that looks like a mixture of medical and nfsd huds. + components: + - type: Sprite + sprite: _NF/Clothing/Eyes/Hud/nfsd_hud.rsi + - type: Clothing + sprite: _NF/Clothing/Eyes/Hud/nfsd_hud.rsi + - type: Construction + graph: HudMedSec + node: medsecHud + - type: ShowSecurityIcons + - type: ShowHealthBars + damageContainers: + - Biological + +- type: entity + parent: ClothingEyesHudSecurity + id: ClothingEyesHudNfsdPatch + name: nfsd hud eyepatch + description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and criminal records. + components: + - type: Sprite + sprite: _NF/Clothing/Eyes/Hud/nfsd_patch.rsi + - type: Clothing + sprite: _NF/Clothing/Eyes/Hud/nfsd_patch.rsi + - type: ShowSecurityIcons diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml index b50ff7961b1..20c2a890e57 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml @@ -197,6 +197,33 @@ tags: - ClothMade - WhitelistChameleon + - type: Storage + grid: + - 0,0,1,1 + whitelist: + components: + - Welder + - Cigar + - type: UserInterface + interfaces: + - key: enum.StorageUiKey.Key + type: StorageBoundUserInterface + - type: ContainerContainer + containers: + storagebase: !type:Container + +- type: entity + parent: ClothingHeadHatNfsdCampaign + id: ClothingHeadHatNfsdCampaignFilled + name: nfsd campaign hat + description: yee-haw partner. + suffix: Filled + components: + - type: StorageFill + contents: + - id: FlippoEngravedLighter + - id: CigarGold + amount: 3 - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml index 746c5778206..2beb3fbdcdf 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Masks/masks.yml @@ -44,4 +44,44 @@ sprite: _NF/Clothing/Masks/pilot.rsi - type: Clothing sprite: _NF/Clothing/Masks/pilot.rsi - - type: BreathMask \ No newline at end of file + - type: BreathMask + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasNFSD + name: nfsd gas mask + description: A standard issue nfsd gas mask. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: _NF/Clothing/Masks/nfsd.rsi + - type: Clothing + sprite: _NF/Clothing/Masks/nfsd.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + +- type: entity + parent: ClothingMaskGas + id: ClothingMaskGasSheriff + name: nfsd sheriff gas mask + description: A gas mask worthy of a sheriff. + components: + - type: Item + size: Tiny + - type: Sprite + sprite: _NF/Clothing/Masks/nfsd_sheriff.rsi + - type: Clothing + sprite: _NF/Clothing/Masks/nfsd_sheriff.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml index 8fae5818cf1..ce8f004b7d2 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml @@ -11,7 +11,7 @@ - type: Matchbox - type: entity - parent: ClothingShoesMilitaryBase + parent: ClothingShoesBootsCombat id: ClothingShoesBootsNFSDBrown name: nfsd brown boots description: Stylish boots for running in circles on a deck during emergencies. @@ -22,7 +22,7 @@ sprite: _NF/Clothing/Shoes/Boots/nfsd_brown_boots.rsi - type: entity - parent: ClothingShoesMilitaryBase + parent: ClothingShoesBootsCombat id: ClothingShoesBootsNFSDCream name: nfsd cream boots description: Stylish boots for running in circles on a deck during emergencies. diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/door_remote.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/door_remote.yml new file mode 100644 index 00000000000..642c2d2abdd --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/door_remote.yml @@ -0,0 +1,15 @@ +- type: entity + parent: DoorRemoteDefault + id: DoorRemoteNfsd + name: nfsd door remote + components: + - type: Sprite + layers: + - state: door_remotebase + - state: door_remotelightscolour + color: "#79644b" + - state: door_remotescreencolour + color: "#4b653e" + - type: Access + groups: + - Security diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml new file mode 100644 index 00000000000..55b6de7c39b --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/holoprojectors.yml @@ -0,0 +1,27 @@ +- type: entity + parent: Holoprojector + id: HoloprojectorNFSD + name: nfsd holobarrier projector + description: Creates a solid but fragile holographic barrier. + components: + - type: HolosignProjector + signProto: HolosignNFSD + chargeUse: 120 + - type: Sprite + sprite: _NF/Objects/Devices/Holoprojectors/nfsd.rsi + state: icon + - type: Tag + tags: + - HolofanProjector + - type: StaticPrice + price: 50 + +- type: entity + parent: HoloprojectorNFSD + id: HoloprojectorNFSDEmpty + suffix: Empty + components: + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml index 4a03755ec0d..7b0764880cf 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/production.yml @@ -54,6 +54,18 @@ materialRequirements: Steel: 5 +- type: entity + id: ThrusterNFSDMachineCircuitboard + parent: BaseMachineCircuitboard + name: nfsd thruster machine board + components: + - type: MachineBoard + prototype: ThrusterNFSD + requirements: + Capacitor: 3 + materialRequirements: + Steel: 5 + - type: entity id: TilePrinterNFMachineCircuitboard parent: BaseMachineCircuitboard diff --git a/Resources/Prototypes/_NF/Entities/Objects/Fun/whistles.yml b/Resources/Prototypes/_NF/Entities/Objects/Fun/whistles.yml new file mode 100644 index 00000000000..f9fcfe44b40 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Fun/whistles.yml @@ -0,0 +1,11 @@ +- type: entity + parent: BaseWhistle + id: nfsdWhistle + name: nfsd whistle + description: Sound of it make you feel fear. + components: + - type: Sprite + sprite: _NF/Objects/Fun/nfsdwhistle.rsi + state: icon + - type: Item + sprite: _NF/Objects/Fun/nfsdwhistle.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml new file mode 100644 index 00000000000..be035660d65 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/bedsheets.yml @@ -0,0 +1,30 @@ +- type: entity + id: BedsheetNFSD + parent: BedsheetBase + name: nfsd bedsheet + components: + - type: Sprite + state: sheetnfsd + - type: Clothing + sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi + +- type: entity + id: BedsheetNFSDBrigmed + parent: BedsheetBase + name: brigmedic bedsheet + components: + - type: Sprite + state: sheetnfsdbrigmed + - type: Clothing + sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi + +- type: entity + id: BedsheetNFSDSheriff + parent: BedsheetBase + name: sheriff bedsheet + components: + - type: Sprite + state: sheetnfsdsheriff + - type: Clothing + sprite: _NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi + diff --git a/Resources/Prototypes/_NF/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/_NF/Entities/Objects/Tools/flashlights.yml new file mode 100644 index 00000000000..7a3187c06b8 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Tools/flashlights.yml @@ -0,0 +1,46 @@ +- type: entity + name: nfsdlite + parent: FlashlightLantern + id: FlashlightNFSDLite + description: A robust flashlight used by the nfsd. + components: + - type: Tag + tags: + - SecBeltEquip + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellHigh + - type: HandheldLight + addPrefix: false + - type: ToggleableLightVisuals + inhandVisuals: + left: + - state: inhand-left-light + shader: unshaded + right: + - state: inhand-right-light + shader: unshaded + - type: Sprite + sprite: _NF/Objects/Tools/nfsdlite.rsi + layers: + - state: nfsdlite + - state: nfsdlite-overlay + shader: unshaded + visible: false + map: [ "light" ] + - type: MeleeWeapon + damage: + types: + Blunt: 10 + - type: Item + sprite: _NF/Objects/Tools/nfsdlite.rsi + - type: PointLight + enabled: false + radius: 8 + - type: Clothing + sprite: _NF/Objects/Tools/nfsdlite.rsi + quickEquip: false + slots: + - Belt diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml index e8d04fb6600..84ced86b664 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml @@ -87,6 +87,16 @@ id: AirlockNFSDGlassLocked suffix: NFSD, Locked components: + - type: AccessReader + access: [["Security"]] + - type: Wires + layoutId: AirlockSecurity + +- type: entity + parent: AirlockNFSD + id: AirlockNFSDLocked + suffix: NFSD, Locked + components: - type: AccessReader access: [["Security"]] - type: Wires diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml index 0aa55c431bc..d27121cba66 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -6,6 +6,14 @@ - type: Sprite sprite: _NF/Structures/Doors/Airlocks/Standard/mercenary.rsi +- type: entity + parent: Airlock + id: AirlockNFSD + suffix: NFSD + components: + - type: Sprite + sprite: _NF/Structures/Doors/Airlocks/Standard/nfsd.rsi + # Glass - type: entity parent: AirlockGlass diff --git a/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml b/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml new file mode 100644 index 00000000000..77bffbf7cda --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Holographic/projections.yml @@ -0,0 +1,30 @@ +- type: entity + id: HolosignNFSD + parent: HolosignWetFloor + name: nfsd holographic barrier + description: A barrier of hard light that blocks movement, but pretty weak. + components: + - type: Physics + bodyType: Static + canCollide: true + - type: Sprite + sprite: _NF/Structures/Holo/nfsd.rsi + state: icon + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.3,0.3,0.3" + mask: + - TableMask + layer: + - TableLayer + - type: TimedDespawn + lifetime: 180 + - type: PointLight + enabled: true + radius: 3 + color: red + - type: Climbable + - type: Clickable \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml index 9c336a54623..dfa086dfac0 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml @@ -28,7 +28,7 @@ - map: ["computerLayerKeyboard"] state: generic_keyboard - map: ["computerLayerScreen"] - state: shipyard_security + state: shipyard_nfsd - map: ["computerLayerKeys"] state: telesci_key - type: ShipyardListing diff --git a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml index 05dd6aa9b4d..c057d56a5b1 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Shuttles/thrusters.yml @@ -91,6 +91,94 @@ - !type:DoActsBehavior acts: ["Destruction"] +- type: entity + id: ThrusterNFSD + parent: [ BaseStructureUnanchorable, BaseThrusterSecurity, ConstructibleMachine ] + name: thruster + suffix: NFSD + components: + - type: Machine + board: ThrusterNFSDMachineCircuitboard + - type: Sprite + sprite: _NF/Structures/Shuttles/thrusternfsd.rsi + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 # Considering we need a lot of thrusters didn't want to make an individual one too tanky + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + +- type: entity + id: ThrusterNFSDUnanchored + parent: ThrusterUnanchored + suffix: Unanchored, NFSD + components: + - type: Sprite + sprite: _NF/Structures/Shuttles/thrusternfsd.rsi + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 # Considering we need a lot of thrusters didn't want to make an individual one too tanky + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + +- type: entity + id: DebugThrusterNFSD + parent: [BaseStructureDisableToolUse, DebugThruster] + name: thruster + suffix: DEBUG, NFSD + components: + - type: Sprite + sprite: _NF/Structures/Shuttles/thrusternfsd.rsi + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + offset: 0, 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 # Considering we need a lot of thrusters didn't want to make an individual one too tanky + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - type: entity id: SmallThruster parent: Thruster @@ -231,6 +319,93 @@ - type: Physics bodyType: Dynamic +- type: entity + id: GyroscopeNFSD + parent: [BaseStructureDisableToolUse, Gyroscope] + suffix: NFSD + components: + - type: Sprite + sprite: _NF/Structures/Shuttles/nfsdgyroscope.rsi + snapCardinals: true + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn + map: [ "enum.ThrusterVisualLayers.Thrusting" ] + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + +- type: entity + id: DebugGyroscopeNFSD + parent: [BaseStructureDisableToolUse, DebugGyroscope] + name: gyroscope + suffix: DEBUG, NFSD + components: + - type: Sprite + sprite: _NF/Structures/Shuttles/nfsdgyroscope.rsi + snapCardinals: true + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + +- type: entity + id: SmallGyroscopeNFSD + parent: GyroscopeNFSD + name: small gyroscope + suffix: NFSD + components: + - type: Thruster + thrusterType: Angular + requireSpace: false + baseThrust: 250 + thrust: 250 + - type: ApcPowerReceiver + powerLoad: 200 + - type: Sprite + scale: 0.8, 0.8 + sprite: _NF/Structures/Shuttles/nfsdgyroscope.rsi + snapCardinals: true + layers: + - state: base + map: ["enum.ThrusterVisualLayers.Base"] + - state: thrust + map: ["enum.ThrusterVisualLayers.ThrustOn"] + shader: unshaded + visible: false + - state: thrust_burn_unshaded + map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"] + shader: unshaded + visible: false + - type: StaticPrice + price: 250 + - type: Machine + board: SmallGyroscopeMachineCircuitboard + +- type: entity + id: SmallGyroscopeNFSDUnanchored + parent: SmallGyroscopeNFSD + suffix: Unanchored, NFSD + components: + - type: Transform + anchored: false + - type: Physics + bodyType: Dynamic + - type: entity id: SmallGyroscope parent: Gyroscope diff --git a/Resources/Prototypes/_NF/Maps/POI/nfsd.yml b/Resources/Prototypes/_NF/Maps/POI/nfsd.yml index aedf8054114..84b179c7a3e 100644 --- a/Resources/Prototypes/_NF/Maps/POI/nfsd.yml +++ b/Resources/Prototypes/_NF/Maps/POI/nfsd.yml @@ -12,12 +12,12 @@ - type: StationJobs overflowJobs: [] availableJobs: - HeadOfSecurity: [ 1, 1 ] - Warden: [ 0, 0 ] + Sheriff: [ 1, 1 ] + Bailiff: [ 0, 0 ] SeniorOfficer: [ 0, 0 ] Brigmedic: [ 0, 0 ] - Detective: [ 0, 0 ] - SecurityOfficer: [ 0, 0 ] - SecurityCadet: [ 0, 0 ] + DetectiveNF: [ 0, 0 ] + Deputy: [ 0, 0 ] + Cadet: [ 0, 0 ] # Others: Lawyer: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/bailiff.yml similarity index 93% rename from Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml rename to Resources/Prototypes/_NF/Roles/Jobs/NFSD/bailiff.yml index 173b7e7b16b..6796e46fe81 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/warden.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/bailiff.yml @@ -1,5 +1,5 @@ - type: job - id: Warden + id: Bailiff name: job-name-warden description: job-description-warden playTimeTracker: JobWarden @@ -12,7 +12,7 @@ - !type:DepartmentTimeRequirement department: Security time: 32400 # 9 hrs - startingGear: WardenGear + startingGear: BailiffGear icon: "JobIconWarden" # Frontier supervisors: job-supervisors-hos canBeAntag: false @@ -31,12 +31,12 @@ implants: [ MindShieldImplant, TrackingImplant ] # Frontier - type: startingGear - id: WardenGear + id: BailiffGear equipment: head: ClothingHeadHatNfsdBeretBrown # Frontier jumpsuit: ClothingUniformJumpsuitNfsdTacCream # Frontier back: ClothingBackpackOfficerFilled # Frontier - shoes: ClothingShoesBootsNFSDCream # Frontier + shoes: ClothingShoesBootsNFSDCreamFilled # Frontier eyes: ClothingEyesGlassesNFSD # Frontier outerClothing: ClothingOuterCoatNfsdFormal # Frontier id: NfsdBailiff # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml index 243351931bd..c57df8157d5 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/brigmedic.yml @@ -31,9 +31,9 @@ jumpsuit: ClothingUniformJumpsuitNfsd # Frontier outerClothing: ClothingOuterCoatNfsdBomberBrigmed # Frontier back: ClothingBackpacknfsdBrigmedFilled # Frontier - shoes: ClothingShoesBootsNFSDCream # Frontier + shoes: ClothingShoesBootsNFSDCreamFilled # Frontier gloves: ClothingHandsGlovesNitrile - eyes: ClothingEyesHudMedical + eyes: ClothingEyesHudNFSDMed # Frontier head: ClothingHeadHatNfsdBeretCream # Frontier id: NfsdBrigmedic # Frontier ears: ClothingHeadsetNFSDbrown # Frontier @@ -42,5 +42,5 @@ pocket1: WeaponPistolMk58Nonlethal # Frontier innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier satchel: ClothingBackpackSatchelnfsdBrigmedFilled # Frontier - duffelbag: ClothingBackpackDuffelnfsdBrigmed # Frontier + duffelbag: ClothingBackpackDuffelnfsdBrigmedFilled # Frontier messenger: ClothingBackpackMessengerBrigmedicFilled # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/cadet.yml similarity index 89% rename from Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml rename to Resources/Prototypes/_NF/Roles/Jobs/NFSD/cadet.yml index 9208b49150e..c86753cdf83 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_cadet.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/cadet.yml @@ -1,5 +1,5 @@ - type: job - id: SecurityCadet + id: Cadet name: job-name-cadet description: job-description-cadet playTimeTracker: JobSecurityCadet @@ -10,9 +10,9 @@ department: Security time: 36000 # Frontier - 10 hrs inverted: true # stop playing intern if you're good at security! - startingGear: SecurityCadetGear + startingGear: CadetGear icon: "JobIconSecurityCadet" # Frontier - supervisors: job-supervisors-hos # Frontier + supervisors: job-supervisors-security canBeAntag: false access: - Security @@ -27,11 +27,11 @@ implants: [ MindShieldImplant, TrackingImplant ] - type: startingGear - id: SecurityCadetGear + id: CadetGear equipment: jumpsuit: ClothingUniformJumpsuitNfsdShort # Frontier back: ClothingBackpacknfsdFilled # Frontier - shoes: ClothingShoesBootsNFSDBrown # Frontier + shoes: ClothingShoesBootsNFSDBrownFilled # Frontier outerClothing: ClothingOuterArmorNfsdArmor # Frontier id: NfsdCadet # Frontier ears: ClothingHeadsetNFSDbrown # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/deputy.yml similarity index 91% rename from Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml rename to Resources/Prototypes/_NF/Roles/Jobs/NFSD/deputy.yml index a640a4866e3..7ac5530e09b 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/security_officer.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/deputy.yml @@ -1,5 +1,5 @@ - type: job - id: SecurityOfficer + id: Deputy name: job-name-security description: job-description-security playTimeTracker: JobSecurityOfficer @@ -9,7 +9,7 @@ - !type:DepartmentTimeRequirement department: Security time: 21600 # Frontier - 6 hrs - startingGear: SecurityOfficerGear + startingGear: DeputyGear icon: "JobIconSecurityOfficer" # Frontier supervisors: job-supervisors-hos canBeAntag: false @@ -26,11 +26,11 @@ implants: [ MindShieldImplant, TrackingImplant ] - type: startingGear - id: SecurityOfficerGear + id: DeputyGear equipment: jumpsuit: ClothingUniformJumpsuitNfsd # Frontier back: ClothingBackpacknfsdFilled # Frontier - shoes: ClothingShoesBootsNFSDBrown # Frontier + shoes: ClothingShoesBootsNFSDBrownFilled # Frontier eyes: ClothingEyesGlassesNFSD # Frontier head: ClothingHeadHatNfsdSmallCampaign # Frontier outerClothing: ClothingOuterArmorNfsdArmor # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detectivenf.yml similarity index 94% rename from Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml rename to Resources/Prototypes/_NF/Roles/Jobs/NFSD/detectivenf.yml index 3c8e00e5472..8ba8a4c957d 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detective.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/detectivenf.yml @@ -1,5 +1,5 @@ - type: job - id: Detective + id: DetectiveNF name: job-name-detective description: job-description-detective playTimeTracker: JobDetective @@ -9,7 +9,7 @@ time: 21600 # 6 hrs - !type:OverallPlaytimeRequirement time: 36000 # Frontier - 10 hrs - startingGear: DetectiveGear + startingGear: DetectiveNFGear icon: "JobIconDetective" supervisors: job-supervisors-hos canBeAntag: false @@ -27,7 +27,7 @@ implants: [ MindShieldImplant, TrackingImplant ] - type: startingGear - id: DetectiveGear + id: DetectiveNFGear equipment: jumpsuit: ClothingUniformJumpsuitDetective back: ClothingBackpackFilledDetective diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml index a1618d7cc81..5491d6a9446 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/senior_officer.yml @@ -33,7 +33,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitNfsdTacBlack # Frontier back: ClothingBackpackOfficerFilled # Frontier - shoes: ClothingShoesBootsNFSDBrown # Frontier + shoes: ClothingShoesBootsNFSDBrownFilled # Frontier eyes: ClothingEyesGlassesNFSD # Frontier head: ClothingHeadHatNfsdBeretGreen # Frontier outerClothing: ClothingOuterCoatNfsdLongCoat # Frontier diff --git a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/sheriff.yml similarity index 91% rename from Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml rename to Resources/Prototypes/_NF/Roles/Jobs/NFSD/sheriff.yml index ad47e032135..b62e2cebfb2 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/NFSD/head_of_security.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/NFSD/sheriff.yml @@ -1,5 +1,5 @@ - type: job - id: HeadOfSecurity + id: Sheriff name: job-name-hos description: job-description-hos playTimeTracker: JobHeadOfSecurity @@ -17,7 +17,7 @@ department: Security time: 43200 # 12 hrs weight: 10 - startingGear: HoSGear + startingGear: SheriffGear alwaysUseSpawner: true icon: "JobIconHeadOfSecurity" # Frontier requireAdminNotify: true @@ -68,20 +68,21 @@ - type: CommandStaff - type: startingGear - id: HoSGear + id: SheriffGear equipment: jumpsuit: ClothingUniformJumpsuitNfsdTacGray # Frontier back: ClothingBackpacknfsdsheriffFilled # Frontier - shoes: ClothingShoesBootsNFSDBrown # Frontier + shoes: ClothingShoesBootsNFSDBrownFilled # Frontier outerClothing: ClothingOuterCoatNfsdFormalSheriff # Frontier eyes: ClothingEyesGlassesNFSD # Frontier - head: ClothingHeadHatNfsdCampaign # Frontier + head: ClothingHeadHatNfsdCampaignFilled # Frontier id: NfsdSheriff # Frontier + mask: ClothingMaskGasSheriff # Frontier gloves: ClothingHandsGlovesCombatNfsdCream # Frontier ears: ClothingHeadsetAltNFSDCreamandBrown # Frontier belt: ClothingBeltNfsdWebbingFilled # Frontier pocket1: WeaponPistolMk58Nonlethal - pocket2: HoloprojectorSecurity # Frontier + pocket2: HoloprojectorNFSD # Frontier neck: ClothingNeckMantleSheriffFilled # Frontier suitstorage: WeaponEnergyGunMultiphase # Frontier - DeltaV gun innerClothingSkirt: ClothingUniformJumpskirtNfsd # Frontier diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers_old.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers_old.yml new file mode 100644 index 00000000000..6d6df1324ad --- /dev/null +++ b/Resources/Prototypes/_NF/Roles/play_time_trackers_old.yml @@ -0,0 +1,14 @@ +- type: playTimeTracker + id: JobSecurityCadetOld + +- type: playTimeTracker + id: JobSecurityOfficerOld + +- type: playTimeTracker + id: JobHeadOfSecurityOld + +- type: playTimeTracker + id: JobWardenOld + +- type: playTimeTracker + id: JobDetectiveOld diff --git a/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml b/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml index da770deda75..9c9a2488ff3 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/cleric.yml @@ -24,5 +24,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml b/Resources/Prototypes/_NF/Shipyard/Security/empress.yml index 9d059f9eabd..d4f2987fa1c 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/empress.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/empress.yml @@ -24,8 +24,8 @@ - type: StationJobs overflowJobs: [] availableJobs: - PrisonGuard: [ 0, 0 ] - SecurityOfficer: [ 0, 0 ] - Warden: [ 0, 0 ] - Brigmedic: [ 0, 0 ] +# PrisonGuard: [ 0, 0 ] +# SecurityOfficer: [ 0, 0 ] +# Warden: [ 0, 0 ] +# Brigmedic: [ 0, 0 ] Chef: [ 0, 0 ] diff --git a/Resources/Prototypes/_NF/Shipyard/enforcer.yml b/Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/enforcer.yml rename to Resources/Prototypes/_NF/Shipyard/Security/enforcer.yml diff --git a/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml b/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml index b1acb94d8df..1763ac0bf41 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/fighter.yml @@ -24,5 +24,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/hospitaller.yml b/Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/hospitaller.yml rename to Resources/Prototypes/_NF/Shipyard/Security/hospitaller.yml diff --git a/Resources/Prototypes/_NF/Shipyard/inquisitor.yml b/Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/inquisitor.yml rename to Resources/Prototypes/_NF/Shipyard/Security/inquisitor.yml diff --git a/Resources/Prototypes/_NF/Shipyard/interceptor.yml b/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml similarity index 92% rename from Resources/Prototypes/_NF/Shipyard/interceptor.yml rename to Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml index 0679a8d9af5..8ba2c15754e 100644 --- a/Resources/Prototypes/_NF/Shipyard/interceptor.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/interceptor.yml @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Detective: [ 0, 0 ] + availableJobs: {} \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/marauder.yml b/Resources/Prototypes/_NF/Shipyard/Security/marauder.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/marauder.yml rename to Resources/Prototypes/_NF/Shipyard/Security/marauder.yml diff --git a/Resources/Prototypes/_NF/Shipyard/prowler.yml b/Resources/Prototypes/_NF/Shipyard/Security/prowler.yml similarity index 92% rename from Resources/Prototypes/_NF/Shipyard/prowler.yml rename to Resources/Prototypes/_NF/Shipyard/Security/prowler.yml index 7e392a06a89..d91e0dd294c 100644 --- a/Resources/Prototypes/_NF/Shipyard/prowler.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/prowler.yml @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - SecurityOfficer: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml b/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml index d4d5cb7a2c6..60b9fb9a401 100644 --- a/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/rogue.yml @@ -24,5 +24,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/templar.yml b/Resources/Prototypes/_NF/Shipyard/Security/templar.yml similarity index 91% rename from Resources/Prototypes/_NF/Shipyard/templar.yml rename to Resources/Prototypes/_NF/Shipyard/Security/templar.yml index aada2515779..80f815f0210 100644 --- a/Resources/Prototypes/_NF/Shipyard/templar.yml +++ b/Resources/Prototypes/_NF/Shipyard/Security/templar.yml @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - SecurityOfficer: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/trident.yml b/Resources/Prototypes/_NF/Shipyard/Security/trident.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/trident.yml rename to Resources/Prototypes/_NF/Shipyard/Security/trident.yml diff --git a/Resources/Prototypes/_NF/Shipyard/wasp.yml b/Resources/Prototypes/_NF/Shipyard/Security/wasp.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/wasp.yml rename to Resources/Prototypes/_NF/Shipyard/Security/wasp.yml diff --git a/Resources/Prototypes/_NF/Shipyard/whiskey.yml b/Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml similarity index 100% rename from Resources/Prototypes/_NF/Shipyard/whiskey.yml rename to Resources/Prototypes/_NF/Shipyard/Security/whiskey.yml diff --git a/Resources/Prototypes/_NF/Shipyard/canister.yml b/Resources/Prototypes/_NF/Shipyard/canister.yml index f6d79438753..010f6d3f881 100644 --- a/Resources/Prototypes/_NF/Shipyard/canister.yml +++ b/Resources/Prototypes/_NF/Shipyard/canister.yml @@ -27,5 +27,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Pilot: [ 0, 0 ] \ No newline at end of file + availableJobs: {} \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Shipyard/svorange.yml b/Resources/Prototypes/_NF/Shipyard/svorange.yml index 91246e651f5..eecf8c3dd65 100644 --- a/Resources/Prototypes/_NF/Shipyard/svorange.yml +++ b/Resources/Prototypes/_NF/Shipyard/svorange.yml @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/Shipyard/svtide.yml b/Resources/Prototypes/_NF/Shipyard/svtide.yml index b2d4a6390ae..b5397916cc6 100644 --- a/Resources/Prototypes/_NF/Shipyard/svtide.yml +++ b/Resources/Prototypes/_NF/Shipyard/svtide.yml @@ -23,5 +23,4 @@ prefixCreator: '14' - type: StationJobs overflowJobs: [] - availableJobs: - Passenger: [ 0, 0 ] + availableJobs: {} diff --git a/Resources/Prototypes/_NF/radio_channels.yml b/Resources/Prototypes/_NF/radio_channels.yml index 3dfb8a50138..5757146c64f 100644 --- a/Resources/Prototypes/_NF/radio_channels.yml +++ b/Resources/Prototypes/_NF/radio_channels.yml @@ -10,4 +10,5 @@ name: chat-radio-nfsd keycode: 's' frequency: 1023 - color: "#fffdd0" + color: "#7eac69" + diff --git a/Resources/Textures/Objects/Misc/bedsheets.rsi/meta.json b/Resources/Textures/Objects/Misc/bedsheets.rsi/meta.json index f91263ff9a3..b545c6157fd 100644 --- a/Resources/Textures/Objects/Misc/bedsheets.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bedsheets.rsi/meta.json @@ -109,6 +109,15 @@ }, { "name": "sheetyellow" + }, + { + "name": "sheetnfsd" + }, + { + "name": "sheetnfsdbrigmed" + }, + { + "name": "sheetnfsdsheriff" } ] } diff --git a/Resources/Textures/Objects/Misc/bedsheets.rsi/sheetnfsd.png b/Resources/Textures/Objects/Misc/bedsheets.rsi/sheetnfsd.png new file mode 100644 index 0000000000000000000000000000000000000000..3f2c271e7487cbb0c888572fc5ba3a940b00f38e GIT binary patch literal 640 zcmV-`0)PF9P)Px%I!Q!9R9J=WmOXFNP!xur1Phzs#xWw6s?a5oXtpAe1u4HE3j;_D>@1m)7+ClN zFeP(;1j<~Aj$NuONu{zxq4^LP$8PHDSPFv`*Cr`4O$1BcEw8TM^PF?9Zwy;)wbfQz zZS|j(+C)gB(U?bn*X#Afxha6X-G}pxEQRJhSwdH3Oh<4f{2TqL@Ok(C1GQQ$7TRjH z5<^H&_8-l4Ri^_D%b{u7>huIk13~CW#ERG= zMbVHMTkcAKu|AW@+`2e`1YnC4c};qwA;B>G}ZC&KI5iK9QSz*LATh>-GRw!e{qE zhHpQw?|kL%9nShzB7ZO#&~CS5p??D;O@+_Jk14u(eW{p^Kv(5NzUO&NCX-mGZQF?f z(m?nR7cG+1pUq}Vp}y}gd4B|mhDJM1;;#bmJTEao_&t#LiHL+ZU0000P)Px%O-V#SR9J=Wmd|V2U>wGuicAv|5qa53=652v!+6ugv|T#GcF6-`^6=*Se7@iJB?O2R zDN>|Jk^Zwb!YI;ix0mkwR;v}b?gjw7eD-jeOeP$2Gn0m{n_!p(eqKs9`i5cRQS%iV zjfSUax7!U25r6yo`I1kus8nl^2mt`-3PEl=kLhHLa#?g1>k2`kSi}VsyN;GupW>8%Spb7^;c)=bvzJbm*)P z1%U1?;2m!|D?pbG0PsMhvqC804#0I|&u!;@W0x*w*KWt!0IR3HP%J?r1pB*nG_wx? z0ETKJnM$C!RmT2qJ(L6J0Jz7#y0;7`I^k|HoQUC|zcxUeUJM6)RH`+M&Q8E^S1+I8 zppQ587nn}Q9$!}o_UcdZRnyi2h`Gb*Bxq;1`Sjo#hJo2^=K0-4aa}jDbH9MoFUO9_ zb1a5~K6sA3)t40w%grQuy`HD&T_EDJs^Ro}1U_~3N|jX&xvdPQKQ901Tb70SeC{bK z%W`0Vm|>XUQ!Hdvb3*tO3t7ib tJrMW_mu%ZcW@pdmcRHO=K6L(xegPxZZyyWb6GQ+2002ovPDHLkV1jY}FDd{4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/bedsheets.rsi/sheetnfsdsheriff.png b/Resources/Textures/Objects/Misc/bedsheets.rsi/sheetnfsdsheriff.png new file mode 100644 index 0000000000000000000000000000000000000000..cc53625c3618d0c15c10f588202f46ded0281509 GIT binary patch literal 630 zcmV-+0*U>JP)Px%FiAu~R9J=Wmd$PwQ5c3F$TSluI8dS$ND~7FToBo?aDg|#4H#p*0^(g5;{^z} z;f@<+ycyjW6?|IMpn1P*k+G(eqcKXi> zZKFt|(O9nkuGi}u*9`$ArT8)y6&)BA1vK4qzOUn|rt|*8M{2d2t7xm$+Sr6peDZi1 z5d{iaiP_u)U^vkz=Th_r3c2(HXYs2SGOhL@wemNrm8ZP>G$D~lAW71u8}=y-P{>O3 z28z?%HdDw-3@4hytCc*nxk=j8PKGL>lb&dnVIv$;w7AnIx!$koLqR~J+(dB@zn z4Zv#Wb`k*b$X*}^I5|D1kiC2KE(1Za$0K|628xTfy8{5)-GOr)TQLw6`+9Sm+p$+G zdFME`V!#{kO|jb-aBBv~u%f&=GQro8<4><5|DA;)K9O1UJmy2LOHrqijb z=xjFI*gzN{liFu~_0+SQ%c}0Px$;z>k7R9J=Wl)r0JQ51kbMJ0K>Kz;H81)po);1HriUxd8H)NWD4MGyiyIHYs` zhyDc)8C;r8>SQtPl1ONWCJ1J*bj%RQ!&u3)d5|Fv;odZucN^m*zHhld&bjBFbM848 zA|fIp{&%i~2_6+6i~&r`0O0xc&-A_r9O!GI#vb}dByYy3jM4yjojw2`-!?+;xfUkS zS2W^@m|RyzY0xM0^}DZda}Krop&YC2^2E8()P`vp(uqHI0KjW$0QA50Nab~ggMj1R z4xiYXtAGEAMLZFkIcM0)`@GR?+; z+`qGyS_M_Px$rAb6VR9J=Wl)pM0a&yikuKQZi|%!Z0;0RglHsi^j#S%0qUPb_Xe%^PMO?|u2cnE{1D zp-_APSp`6_n0F0y#ncVvt8*8}B6@--dp7&_|NM-ZCGXcPi zkz{phH?n}yqf>Ri+}rm(FBI^Y19edc*|A2f>5l70W*Q+SLP`uXjbWw%XiaJWjh-T8o6ly#>}{nkP=N7 z_j0NgKU~+E+x7tS3(o5W+;m{y-C{o??|W}2nl31oTnsZ!vE-uZBKGpd3b^S&|8OUL z<`CW1Pgb0@FfMNY0d9}yxjg9=0F;lav?jG%@h-IsSw5=bE?01h4%QFrW&c3_??wV3 zXEy{RsYCqcbHwNRFp>iQ-#K$Z27q6Q4LF6lAj4qu4x`7HtT=0&9haYC#M{%-qz5fc hdJvzfP$(4tJ6AGaqW=0qWpDrh002ovPDHLkV1hu?*PH+V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/module.rsi/nfsdmodschematic.png b/Resources/Textures/Objects/Misc/module.rsi/nfsdmodschematic.png new file mode 100644 index 0000000000000000000000000000000000000000..e64f283142d39f12b1f22980659a7115da5be0a0 GIT binary patch literal 391 zcmV;20eJq2P)Px$K}keGR9J=Wl(9+!K@f(&h(#ozh%ATaHdY2KL@t89z!uktzJL~D=|k8WEMlcq z0`_*kLJE^6U4(#eYe3c}V&DqlEEY_J6PLhgvmY!w#qiI+GwguJA`Q6U4a~bHcCN{y2ue3_{<2NDSmtD*{XI!f#S(b>UDvq-wXQ7=Fj(58 zAM63puC7mt%gGrYy6HL_=tPj6+PL+4%f;Iz&5A$-0nLg4K->vyL_^qc({&y}tqXK* zEFJ`{-7>4e3IJQxHSU+o#4@o7I$tA?nL1#046#l~$0HsG&!poKM_1|B>xXC1*>}^O zsRKxR^^pyo*VR-#mE9d*{0?YWrYct*JmD|g`Jx*?t`F&_@X7}ZH0`lLV=d`~s zDmh;odhFyTpUS((J5`XG1L-AMEHt!irnZukmlWYqT<>|2m()DZ~iY;#SFMT;pl~sc+w05Z}|)&t;ucLK6T0_hYgE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Eyes/Hud/nfsd_patch.rsi/icon.png b/Resources/Textures/_NF/Clothing/Eyes/Hud/nfsd_patch.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..83fc3534e79780c2eefb562b4e1d3086c2d89cb4 GIT binary patch literal 372 zcmV-)0gL{LP)Px$E=fc|R9J=Wl+9{`Koo_KZNN4<$`D&LRB-2}%jN|_^3*MT0rLXg6_i+rVVY`$ z0b#lbiiDWVl+sP-TMgXHxqpWNG#ZWOzhkH*$B{3FVl{8NcbXT{y3&bpRYg$-j~js(AypD~*~rQlh|N1ASi% zF_IB$N%O)815Z$wh^N^M#6H}*toB$X3GA`iJx}wDj-4T{G2M zCz19*d;c)-L|N^@v#&0;$r#Ma`B4MPD+>cpR5i!337=nHfA7=LXfztlU-Au!x^q3x SXq2e{0000jt;!~9=EM#H4 zn=mE&eNfdV;TIq57U%q_owT)9-@(P@OMK6?b*Dd{kFe*fv=lT1ax}IJGMwoxvhVhN z(ygxaqWGYYVDiorcOHK}ZGS%PGGp0P-hXKU$G6%hnaMI_m|0750TtK%jY*y!a$C6} zZF4#Q>l5qs#b@3Q{r1J?$n*)*yNjg1=BZqYS-8#p$D+)27j{qlVE#C&3n;p!W^*OO zj_L?^+q>)PE-*4U#75ezHCyiNQQW%xDqCsy>+8q*^H*=4U6cP;`5=2i{qC+yF%LK7 z|2vV$zhvj3zqz~FI*@^#<>IB*=KbbTyPhiTuJB9PdE(yM>#EZQY%Y91`p4#9sarzc zl-WG4t1bV!mrXsIW96W9?;3N%$pD6oUtDtqwo7IF@?p5pA~uVy;rMfL6(zUaesTG! zzZs6r?_v62B|M=+;$MPON#3Q5mtU^)l%^KmVBX(#_G%H6o42_c*I&U2JgleQzdpCM z>Gr54XwGOu3JDBkUd8p{E5`)ku5ew=@Cs)eWR{g(53`~}6^ zztvn`w=bBP;nSK2iCY)ixBWh@{wuj6BKO4RLtjJJ*8JR3^>tGI-+$`ocz5iLtNfgL zq%OR6;$OaJr#o)HE@KC}9sz!uNA+)B!|DCtsKcdM8`h{FeJ(Za-@Cc_b06nh_8yi#TP?xkSC9MCj&#?r*Acaj{hZVPo6$iIQhlh zr;HDttt+^5L~mapBg2A~(Kcz`GV>Yu{q-&E809vrN_F2qf9!4Px2LN6qyKjnGKy_J z!>Mj~ZS}kEHQ^2xof~J|RCRDc0woVpgjVi*&iGH6|8dzopr0IXTxfB*mh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/icon.png b/Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1941725c3f10d74dfac89e29dc7b399627728d22 GIT binary patch literal 401 zcmV;C0dD?@P)Px$OG!jQR9J=Wl)-DlFc`&OXECj-NZFunWLW7TS3xh{^gs7c7&!r#8HN-^=&X0tSP@VEAXOI-6M7RhRFJIH^^qmH`%aRVE}>d~E^1 z%hRK35xce#?G44LFPmTTTO&7{4;WRqmB4^e^*y4WuysT(vEh3}tDvr~;7&)B3yE|u zt}fqn7^wlHYC4R{H5PVNx);cW)Ha|sf$UuH`QaWeIYr?#8}K~>r`bRekM9w@e|(mD z9keFUA~rgV;@I~QjC;t11m9!;0KUnP3yEOd!?Ew9!zhZ&_-6(dabh`bU^`C`&z1-$ zQ5j1vB!Uq|JX>NrPvEqxeFa(u3W{dHDVEp8o0SO(*CPl<6#4nN3fcw^J0P4yIP8Fw vi}GKv;%h7A0k44ofy`glX(f`CmzUSP{%?%rOgg-lks&DT%%;B<|BLQFIwrQn z?Yo^z*uI2aKSd({a$Yail4M}8pICcjtN$;XrMsG?tj?}@w?Xi2Lf~CRAuxGrHiPZM a?z~hb#`QwWeoh2h%HZkh=d#Wzp$P!tqgwX> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c453e9bb1f6d5b56102b927d1f3ab8ae833d50a0 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`C7#S^Unwk=DDu zFZ|}d_43)}Rtjru*DbCJ=4LpseG_Y}{(Bo0kH4NC0iT@Zgsx>9D)4i@-ulaF-;Yk# b{iRH~>lxSI_I%|4w3ETp)z4*}Q$iB}U<+3~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/meta.json b/Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/meta.json new file mode 100644 index 00000000000..5143f703d5c --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Ghost Prince for use on Frontier Server.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "equipped-MASK-vulpkanin", + "directions": 4 + }, + { + "name": "up-equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/up-equipped-MASK.png b/Resources/Textures/_NF/Clothing/Masks/nfsd.rsi/up-equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..26e8d911ae405bbf0361ee8606424c67907b7185 GIT binary patch literal 526 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zPk6dGhE&XX zd&@BUwu8j6kNdkO=Hw*zuyZedsBqY~(cv%St@pF_FKDVJ7cN-M*32e6MR7(FYh*$I zd+54LD!KmKc76Gon=V`RKCZG_UO-UrXMUyL?DaVz&yF@)cr54XwGOu3JDBkUd8p{E5`)ku5ew=@Cs)eWR{g(53`~}6^ zztvn`w=bBP;nSK2iCY)ixBWh@{wuj6BKO4RLtjJJ*8JR3^>tGI-+$`ocz5iLtNfgL zq%OR6;$OaJr#o)HE@KC}9sz!uNA+)B!|DCtsKcdM8`h{FeJ(Za-@Cc_b06nh_8yi#TP?Px&7)eAyRCt{2noUpQP!xvW4oxo<#1u?uu_lO%u1HLTt%*Oxf9S%kTiqEJljw%T zjK&hHvDj#tevp#RLT&>y3%wPXWac~@KAPM2oYQk}7v}|t{~Iaq!hOq3`S>6N(NAn2w$VH8EnHs}JH}S3&I-+oz&}+cW5?JM))#tg{ON~&1m6o#VlsR$K(Wl$ z(giA$vlvQD&XWI%wonI*-Xb*XWn7XTLsHrI2dbmElLbG1R=q<_>#Ao4c&b7ig z$zqznE`m@2Y{!+9j*dpxTsQ+7T@y-2hwZp4eG}M@D=94GG_uVMEM^}6Xp^@r*@&J}Hoy~*u z5-e!)n0OIHIzgxdxG{n!Zq!tSagzB3xKrflU~lQ2aCESja(4>%B!qDS-VHpiP;f#l zJ{*k`@ckc6rf3^ggnoqQ`v6*np>0&N0xc779HVVip;Z{3?*oK>gtk#dG?}8P6rfd@ zaPolQ76{@5>dctHTTrVoL>E6$o&}jVkdFxCBs=UhczC(+fSKm}b`bRl2>SyzEfb@+ z2tk}=TSDpRnC@!ev-?#z#s+tfnGayPt3m1LS@OZmD6wgo!X5$PEx_mVw&O~?+T1fx z+`vjr61L+?#SJX@5rQ}Yk0*~u;7doh?YNT4^fc@bv1z?~23Aev1DlqKr~WXDVfCs6 oK@bE%5ClOG1VIo4LHsNH0&OGIC1tNQ`2YX_07*qoM6N<$f&=`B7XSbN literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/equipped-MASK-vulpkanin.png b/Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/equipped-MASK-vulpkanin.png new file mode 100644 index 0000000000000000000000000000000000000000..eb42f4560335dc28523a4c38baf3cbb746ff055b GIT binary patch literal 1047 zcmV+y1nB#TP)Px&(Md!>RCt{2n$K_ASP;j*EEYBa!=xx<& zE|ppi)wUN_D9skuPE-ium;G$n@*c=@?QB~40ao@fA1O-UJ^4E`Z{AqS3?M+KRS!=) zM)=U$X~zgVt@?v&`yvZ{Nn~?TmT+_+Ke+b2@ApX-`nj|lPdi4aS5#QHHXPSSQT`S? z{+X|T7>rXt_p$YVO1sfMf$+z#Py0Aojm`Z?@LSS0002< z0$f^)|D@Z|fs9LQ0p zya3j%4Rg9qtY?8%RsaA)a}KSnM9wlVfL2y8H0OzZX%Wf*bGilq^v-)YK5N6Au5op@qz=G`!8lixB{;4RXUVXf*(k~qmNOg9 zl0}6mivq~?RapYJ0YKzD*H*XC7s`O?f}x?6@agqOM>MpOZ~+p< zzH^*wIj$es6kiuXC;%gCk}I6lQR^Cs6s&a(6i(_GS(8joKcU~MV`$DXvL?B~)pc%U zO>#qXjzViYeW3sVfU|OO(;uUJvN5E5QpZhy4CgK#v*z8Ke(t`bBWsd-_oly9@Pz|# z@v5Jzbq%oPMwl&uTGznEtL+RR2!bF8f*=TjAP9mW2!iID=TQ~)y%I2cb@CUZP{iv zK_~#7Ry}NJr9>Z||E*WlsB@boYHS$ez8wv%1kqX`lrFsR9UaI~XBPODhK}pQcKyt* zLQ}7X@eXl(79nnv$Tbi;GA?RP*Jx-ZD1|&Otp$4LJ_~+shMOnhHjbFmq%7tE0 z@yFZ0b_&LeXTOEkt(|c2_^gei`XS!Ge2=zX2J?bwNJI1*2Uu-BPIdWbpPx&2uVaiRCt{2noUpQP!xvW4oxoW%@x%It#cB%q+%RDU-~cXTwKx`<`=p?(O2d0P%k#WnFk+8VUdY^>&o` zK7U(Z&a%kt=t--troV%Zp4>h>Z>$LG)c=x2yu@UL(-{CDoX${UGR%&i{9)-@FgtqE zZj@K_+l_K&ec=L>n2aEb;Z7oi(;3`JgdmDhVwsvr7=NJ+AT5GBiQq?ZruzvMfLD2N zGQiGJ7f<6K*g5KAa57lAo)^2V?L=J^niqk8s!YaiYg<@f=&|vqA9x`=*GGxT@LV6o zGTTTOs7y{{C^0!r{xjM_9WZ_m(QcG+b9Rlwy^B^|Md9AX&Dk~DjWWjXVWuEH3U70+ z6-03w)ADr@gbHBUj->Q-H2cQN8PMz-PGt7SvTR4X zdwPS?$)+!S2nLe~FT)Y4y?G$jo{pE{2*IKq^XBS&DE*qKWjoT<`EWC@!Hd(O)a)Aw zy}5Ac0nNUFi_>fY5ClOG1VIo4K@bE%5ClOG#O7FwKLFUgM_^t0nHC+GMxs?1ib^5< z&wlkcR)ho7Sn&t&2~`$-;lT(`o(uC4b*rv!#3Qh5j#$>$D(tte_y|HH)#c;?tYtcz z1^d-s(d04lB8YT?PzP{h1W&wGR}n;U>KE8V5lT!>JqbY+gLeauD-fIziw{Sm7<~VS z(;2$0DgrOW_eUREh2i*cKeugge7K)z6^8GRJ_0X9w^c z4SaT=7u*Lh+tZ-*^fY;YVU(zuhOkFKcnk3Pyk$EQuQvA#6t|G8Ny4%nskns|KY|~{ z;PGVf2z=_)vTR3EnVtm05o+e#Gmtl-2h>ahFT+t9L;k7+K@bE%5ClOG1VIo4LHsNH Y1mj)6B?I)Y4gdfE07*qoM6N<$f_uGyd;kCd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/icon.png b/Resources/Textures/_NF/Clothing/Masks/nfsd_sheriff.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..be1ba76fef92263988ae400a21b52c7a9fb621a7 GIT binary patch literal 537 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..989472295258a2c1ca81d90d058481be2ceee7f3 GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zD?D8sLn`LH zy=CZqI6#E;K{JPLrmBXXkZjDQh27cL^H`t1>+AbB@!dbA^n;F89o{FD8fSfS@=)+g z`!vX;S%Jfxvhq>iFyUD-g^F9exPrjVi33F)234yO$Z>N6|e9~^ksW#RE=+pktUvcCOT z{?bxshrNt?-+!3JTC;3nhFVdQ&MBb@03GAWV*mgE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..eb0c3da853b650c4c6e6898fd16944bb0ed998b3 GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z3p`yMLn`LH zy=CuxI6#E;Lo-Kf0H>&UC!gNS3rDxEjy`zv{euu!FGJ@ zxn1iti&GgH3}zoY`gP~-nO`3L@-{ZFTYCL*w@sf@&bF8Jn`L`cir?}^td)(EJO82J z^_4?E)y~F5JIJ&~?9uCH|K4a)oXa>nx9j6mf$!%vA8B0id@&Ow#L&gQSJys-Nv=r+ zXo23z4N=x_>U_@mGw)Cd=6%&{Qv5Xf!D&^7hNJJ9VG;M#CU@`I^+2t&edW1w>@EBCe8U(MQSyx_0?)*oyU?|9y%ou9w% zN?zj*hSPH!Kjr8?V$vyRJGFUh2RB1bIopbP0l+XkK>kh(n literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/meta.json new file mode 100644 index 00000000000..6175bf01241 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Ghost Prince for use on Frontier Server.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..4fbc4c2316bd8d59462151ba0d470aa8d9d409da GIT binary patch literal 1050 zcmV+#1m*jQP)Px&)Ja4^RCt{2noVdEK@`XTDPquI*xG-=4yA!wWK6S45;_)4Oayo-Y&przK z&=9A+WMp{AHVgxrra2n_eEs%=|2qNq2CvwsPqd;xrs3V&H;%4p8W!_&$o=^%Tm^?b z_p;9P$28<~Syu%t=I78K(~$f0LAbppFP*D5mQ}>~sNvFh@Z+NfEUPHorf+V6w4Sgv zO~a|v5sZ%-_*Te)6^dv%*^H|vqK-Z@n-v<6$rX^+6QoBB)vi|Zxh#&KI^zUynarh& zLQa5L*znYDFD&Ng&~maF%L}X9bWwbD3(U6#Ts?mztYCRz6^a^k^wx|ebPM?ADPR^h zz(R*yWpA0x6})9K;R^KCQ=n4W^We*MD&z!E=h?N)$EhUL4&3O!fV1m|0c-_du8ZKS z3IG6WeFZ(;o!g!QTo=VR31Dn%k~2A-saW=t(;1f?g*_#p-pk)gOipJIjh^3D_FNam zHx&SE1!=9X0N5(~a$N*c0tQlXn_60o6+Isa^<>O$JJy1p?oJqn0n=P_{>CPLJ30Vd zz8Dv(Oy5*Mw67PYxrS(8FJ@-50DzgA}*V47>r|E`XREBI1f zGzsJcy#D%=G`*zS?FAlud9Yj;fs}yf@4pKLC2CKhTG?09McC0%KA2St=-Q=ocC{Yg z?Y9*8V5TTR;otH>`_<=B-z@kf5{X12kw_#57CjlOdI+MCyF)wqAnFHso~$QhcKMt< ztcIMWX`>EEaMF6h=GQKN7r`k-oAK7YsLaA&|c(tenjRVAmXdM1t>;G=L_}r z!*i%U%L>?U2lgA8fc46_Igez~NI$KlOeoyfedU$fb96L~!Tf%K!lU15JqV UD=N*;6aWAK07*qoM6N<$f~RWtTL1t6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..967112459090016c1c1c2650049a6796d1f0dc65 GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z+dN$yLn`LH zy|vNnaDW8sgXRb+fi-t`b-!5B%;gs*pf1RM&~umNYwj<)znHo>YFRHHbT63baPpq6 zrqaC$ihggeL|>X+oP6N3??b-l(=I!-{bzT9fjP1B-#v3Z7qhu0BC*X>s@ExfU8G$A zH%C+2LgVW?@+(*w4isEC|J?R}>9n(2)&^3oJ6^^=`B)LOT1Wbq^oN~!A3mpEc(>)l zkB@P)b)>5pFV}0!`2z*ACZ{^TVMqJ#rpMz;p6_|SXa(yJsYHFFyNVY3ZOgRg zg&ny1H}YL^Uw&{|d&4ibA9Eh-@7jFk?iQw+^B;3hy%V^=^}+V|cFo<+4%!VHg*WIN wvt!D&fAI8c?zhD;gJuaKftbs=`irKDxp}0rY}~X#K<9GgYwjnypIBagl6c9I8>BH&;Goln z+oFQ$H^6f*XJ+!g z;ALO&Th8u2uiUl9R11bnXJ)!DcvsC4cc0*ucP-av!G(LTU-HbD zX;S=5kmHcR?~`m&Yt`Q6`i?^O%SI^q*a0jIR^46^#(hrK# z5_WA9D`c*FcYl3UI`@Cx8SB=%g3a3ul>f&HG~>)QH6_vb12Rv%UsYyW0Hce+)78&q Iol`;+0GP|rV*mgE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/meta.json new file mode 100644 index 00000000000..6175bf01241 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_brigmed.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Ghost Prince for use on Frontier Server.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Bedsheets/NFSD/nfsd_sheriff.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..cdde814b9c6f095711d2af54cfdd66bcdaa6e2a2 GIT binary patch literal 991 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/Holoprojectors/nfsd.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Devices/Holoprojectors/nfsd.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..e00ad664874ac45450d79f53917c0151530df6e8 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zt36#DLn`LH zy|po`IY5N%f&JP9ZqbQs`YH;I*G@VXoSU?;f5P-P+$ra8+`Z&F!GuMpQ79-wY@@T# zMj_GDzIz-0-+p8|&;C2x^kN1j7+_+^zjD57zV77{r>=*j%sjTfr~X__UBFe-tEQ>@ zRz*ofSgHLp`2XpMd>XU&^qFsUZl%4usynUxeeveCd*fMijk80!@2!|$c}{lQZjobW zO&JtoUPMZ)pL(xF{l6T;r#rqgwapKhm3F+8$eiL}!?9)&%ei;Fi8}UMe3Gn=X?cC9 zIFXYdCwT2neD$oO^#>n4mR>dAZo~OEH@3H5{-1Rw=BE%#gF)Q)O9zey35$Px+*tc; zsoDg#cSlpyVD1OftaD#&{eS&TgV1Kq*mFE{R{P~hP3eof%C9{=b714P zGqcvpl~koI*vYKzyz|>gTe~DWM4f;A6!E literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/Holoprojectors/nfsd.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/Holoprojectors/nfsd.rsi/meta.json new file mode 100644 index 00000000000..b289cee8504 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Devices/Holoprojectors/nfsd.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Ghost Prince for use on Frontier Server.", + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.3, + 0.3, + 0.3, + 0.3 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/icon.png b/Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..00b8d26a8cf2c606f8350af30d7e31b0088a2ffd GIT binary patch literal 586 zcmV-Q0=4~#P)Px%1W80eR9J=Wl|gG0Q51#0(NbDy(gx#;6G%5IQ508h+=^WaR*)H{>|He*8(Xel}g1w$K!Ej4lMxywry+W zpVJl4n{ZitcAnmZ`}dDefR+QPD{Gjs3qTLqkroGE*C;4*XgM&m9;0z=VLJ^P#}+f| zF=Y-V2Xe2*+)yZtZP!S@F8I?vy%A>mx}{tk6dWk#Gp;a)8K2A}!w2^}?tedbgRWXocd8v?yjFz5gDlLY-Tr|g>Q0r_ zog>xydhb9o(qwh#h}(%88=rrWj5L)wx|)IhfgwL`cVjBMWF#X^ggHzy(qt;TbasEk zcI%7zjJvu*EdsWLv9JDUOY;0@lN1fGUhNwrrbH8E>=!{_0&E+{9o7xr2bAb<{j Y0*J!5bc?lM>;M1&07*qoM6N<$f?6vD0RR91 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6262ec8b96461b8f1ed84b3b8f414551446b7976 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ay(reLn`LH zy?K!Huz>)J!^2sB{MZ?jgE}Y7+Odu2SgdCJep$@~N@9 TcJM<3U65K&S3j3^P6*bY!9alJK!WeSw+aeLs*bZgqML4n{`oCr(q$2R;BC=+UPhpD28&n6wmq41`nK&k zsb3ZK*BADu&byR84mdKI;Vst032vOhX4Qo literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/meta.json b/Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/meta.json new file mode 100644 index 00000000000..9dc72e4809a --- /dev/null +++ b/Resources/Textures/_NF/Objects/Fun/nfsdwhistle.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Ghost Prince for use on Frontier Server.", + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/equipped-BELT.png b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..6e76839310dc119323656c5bafcff8ccf5e893af GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|dOTemLn`LH zy=2IB$U(&QqP(l`M1`ac9>%>14}~`U(^0kFAfS_^xH8wy@xz>~u7`(g)R=(U8vX~R zy68QByk|~%X|V6*DHCIls%c*-&yC6d{_1PZnfv+w`=&7dTGty~+|hBK|3t<*)zpTk zA0Jz|X{svkoHd2<)n79urMAQqCm4Z-LBNEEyhZFVdQ&MBb@0Fc5@ AtpET3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-left-light.png b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-left-light.png new file mode 100644 index 0000000000000000000000000000000000000000..32022fea8eba20f89793707a1bcf2b80e59ba4f1 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)_J-(hE&XX zdvhc2VFdxVhx1R&Rqt50Aem|X15P7#VS`@o)4~Ch)h5QM3AHCZt+hSQ+4;&7s1FSO z^gb}XaYiJ0iptbUw{7m*?^}Is@!HqQ9+$S|-uiww)BEK!v!6?++zE=>SM_4bv;eQX zIBVYIG^5QA(-~n#F!VgW_{}EGFLwFdJ(qVZ(X0GD=XUk8qU$#ItPA6{W?ru{>DLc< hT{zdBf#Jb+TgJxOI>&PY4Niizd%F6$taD0e0sxOnU*!M* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e73524b685df2c8f65ecf55f9d15c38a620132f0 GIT binary patch literal 407 zcmV;I0cie-P)Px$QAtEWRCt{2+A&MRKp4jHrz+}T2$C2}>Cj1sTLi!V$8dL$C?&O&6tRMwLp-TC zq-ox(TK>PO9q!2c<}SzLJ~d;qTW;=+cb!6BO1JSsJCG<_-9KNI%LG-CkWvl3w55r43I+k)_^E za-AL@N|GL*6JJ(!rv`Rm{tb|tCX`hzsVRQGTy#a6tj3KQUiiee3v3FhT}n5 z)!&*Bllc`0!c~x(qNcOO#%nKz<3aiK5cTNqgmX^Lxt*;80000000000*jpAkgs8K@ zn2Id*qde)okLhgi=6dXi2U?l(m002ovPDHLkV1iC# Bwxs|7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-right-light.png b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-right-light.png new file mode 100644 index 0000000000000000000000000000000000000000..793d92cf7f26ee9c393fe9404beef82662bfd206 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zc|2VlLn`LH zy=9o!Vj$4^&|Rc6NxD4DgjH7k#;L#a6rMj}vEyZRD#>wt8xpxtr%UN(x4_T+=iKDd z+?cu?nSjQDz=QiMwwX;&_1S(qUDdPpezrtg?Pje5XRes^s%Re5i`A2#y>(x1?zXpE zyEc03pUF2jEL)koe)iG-r_Q9L>3d|_r>|gy7{tIJb40R@Z}#Gi`#;@#f3M}z_tRMo zDwfa7vYTd}v%CSzF{!*8^L);$U3y~Cr*aOIFFd#NxW=#NTV-Ag zZdbYczTEfn6xnj!-+~ftj-PGpuPr_P>UG6u8~M-itj56{j;D>5U3$-Ke0fukW=lcW edOijQ_D`&VH{HH8wP;QTxy94f&t;ucLK6Tp3ym27 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..cf5c40e87eb5dacae855faff6ef01e23ce7cfd5c GIT binary patch literal 434 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zb39!fLn`LH zz2)nD*g=5pfw@-L62&Vu63%?{_Pn|HzkmOM$KY3nK@N689QKr%W|1wd*4Ft^iVS(>*(IAr8>`%FD1xqy3P7!sfdxXA8KzOqmpZ$l_v?2J45}f6{hq-<@sESbx%sA>vHBZ0imF zsWk#iH^jzsKUUek{Db|0vRd7W=+m0}YE^$L0(Asoq TrNftjk-*^T>gTe~DWM4f@Y%nF literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/meta.json b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/meta.json new file mode 100644 index 00000000000..0fe512aad54 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Ghost Prince for use on Frontier Server.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "nfsdlite" + }, + { + "name": "nfsdlite-on" + }, + { + "name": "nfsdlite-overlay" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-light", + "directions": 4 + }, + { + "name": "inhand-right-light", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/nfsdlite-on.png b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/nfsdlite-on.png new file mode 100644 index 0000000000000000000000000000000000000000..7994b44226b1b568315e9ff005f8ac775b5b1934 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}hdo^!Ln2z= zPPXMfWFXKcZ@+=BOQf4s@ZwSqJ*WRI_V+>yf@O53tm;tG@{m<=jrNEVk=c{J)4S-- z-Y32e0xXU{%Dt8~`Rx{6ZF5Ji=d0_=XOebu7H|B+8-CnY+QP&z?KSJ+e;oIVuZFEz z?Vl_ZbME$wqTR{nYg{}mtQjtp&iXNLcISsZJHxr{g%|?XhjNsqGpJpbV<9>z`#Sp=Jm;)mw0&!rmU-j?TOa#FHoV=RKIdz2G%0ZKSLFxPdu;n24fGC! Mr>mdKI;Vst02~=(NdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/nfsdlite-overlay.png b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/nfsdlite-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..d76f34707d0fb3f6a44885e0b504759674b7aea1 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}7M?DSArY-_ z&u!#nP!M1_c-`;Kehp`BgKI)9?uIi@zQ4i2@F3yb#<+jizic`_bwiCq_a}1(h8-!) Y?_*f6+axEh0h+FVdQ&MBb@0L#uQn*aa+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/nfsdlite.png b/Resources/Textures/_NF/Objects/Tools/nfsdlite.rsi/nfsdlite.png new file mode 100644 index 0000000000000000000000000000000000000000..1ffee5df32ed583f5854091066e35975c06ad47a GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}$2?seLn2z= zUOvm!U>(;LxazT z>1-_mPJecHt~#*w?5cV4{^_ZI13ufex9@W<+sPP`-2Q@xAwg1Vcde61#n+&#q5nNa zD{hr9e*L#`ss3z*=;N#jZzWtBuS-2FEq<^2M~mS=mZ7pAH-p&}hKOI2EOeuk1GcXX ze*SgGw#djfw`tQ|8r|oJ$xN#8NK56OlCN;u+v$ELpZssZe}AO86k7!RznHu4?36mv Q3iJ_!r>mdKI;Vst0Nd?rB>(^b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/assembly.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..18ba80b1529473b454aaf3b95199f85dbdd97b3c GIT binary patch literal 1055 zcmV+)1mOFLP)Px&*-1n}R9J7%`k+YV;{^y_-g|i7 z_glP87PoDVPA+{{ zz!5MGM29>cixQWwSFvddG+XBY#AFdom1$cYz#5C7ZFNW`6kp$>L%wU22VP#yrD?X# zaYQQ8#8~72sf6O|yK>ql;w8^7Cfy5gRreG71zhn}YoO2Z(eHcLD3eMkh+gtA_$D8x zX$nB5>y3r$c5p1@7n2kZYU~f@d zD+m>7g4?rG;RFQDtZj9ONn&X7ap0~%{mk?wZ&??#tP9#!hq;>{E@c0>;kHG%-e&v9 zjh2J}R*T(=<6eJmjD6p77`Q zzhRp81jQGBAMpE6ag@n<;;O>Rm-8&WE%C$8O=fB>F0Zmy7+exh^fQ>j$eP9wHwBh`&CuF+65p!efVr>Hhg+eWBJ|^k!O{G zv3M-%J5%V5h03`-5v6^^v2o<~D_8fC$tdyiWF%1-1o;>#z+1hif&LMr^juSP-{k*W$c(f^$5t)xz(D4?Ug(B$M{v Z_kYqUyOc9fiZTEI002ovPDHLkV1j}Z`t1M! literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/bolted_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..6857f2a24154b06497367e4b2474465b750393e2 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DPPx(W=TXrR9J<*m%ne@Mij?ClxT{wDJznz%0J?y4obKR>~`_cAcH*^ZPBSi(j|XF z=WZT4Wb4$wp-a&&9orz?QWyaU6sUy=0bx0|lPHQR$(HPhq^!6DeKbW>8@5T)0m{zhWyY7&6mL;2D%!oO*{oLgI4NO$hsIThrp z5+|c2E}TiZ(jt>``@A@K>j@YI zP8Wb=LMEdnu$&&?L=sp|k6cPc07`N>4U8I1H9P;iHpxWAtKQ?=wq`~C6`wF`o_RrvLN{|_-rY~ zEqyXlL=b)vspMF{09A?isU8+D4^BdDZfsmE!XF#4q1lEYvYZ|->&HX;n8}X6n}Ft# z9T|kG5*ivP+FLBEK!Z0>Ig>vs0?_^S3F~i8)f5$|oPqv3R`C*Wb69ZghBimd*SSwW*P{rI8#v36$vv+ViuVnCTrvye@4zckJdYYw$)m0Uj0hB3*)?Kdce8Dg&v`awSsfeW@tUhZxqZX)721N0!ak3TZSI%md1P#}QP>X=`0@8|I|FTrM1t$r zuVb#R^2fbFnPlWjP!!QgM7Tk7C)6Pyo zK!Di8TDQlO-=9Wi!za%g?h$=j3)w_!^~XZ3>k3w_7gS0wymnCu)b<;mFK-Lddk2xT z9M(Qc->cQ8_w5Pr=jbS0W`Ebdu|Y}V|3XaM(;`6>pEZUa9L$E7rE=lBFBypyXm`5Y zD&$8J@u1jd(`7q(m_!QN(fDGs9Qi#|rRYM|zDOMorVKQhngX93Rn$BY#p5IzR z#Gpq7;MD_uhh zT_@h_^}Z_<3bc-GPV8gaovvGwNqDtixzeI}WYg|+nVp(o@AVN#(6&x_e{#$dC)y<> zY6l%;IfjIU96!JDEvLt8d%}AmOHt4BMq~JsFbc9+_m=fP&;JD;Iw0By6in*?0000< KMNUMnLSTaSv_Aa+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closed_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..c78d01c42d084dd5be78e8a33a599a90cc86107f GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DPP>^Ss#&mpghvZkX~#s0-h3N2b6`K?}O)meqDd+l#VI$hWM`6MlQ q&#%(rqf#%I&Hk(pG?9U!&gT+u#1#>y1s3nVf%u-TelF{r5}E)5_cy%& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/closing.png new file mode 100644 index 0000000000000000000000000000000000000000..84591675ed05c038cb8a02335214e4e8cc1b1a33 GIT binary patch literal 2237 zcmV;u2txOXP)Px-cS%G+RCt{2n>}nB=N*S1QYU^$q$pBV^x^2s2xH5jk_;Lu1gJe2?l;gySpsj( zlsQ|_$y=w41-fx)(Wzr9PtOCqenn3m(%3eA#~L|Z&kqL_iY)A4-decu_d z|A1kMcYL4c?nJ)F|NCQLX=$kkkj-WTcu+TQ-t6h^pgt~{Wx+uBVuU{vXO!9--S$X^at5wHc^q4{N;26YeMZ*HgSQtNC7N-T`(Q!{* z#7>uZbezR$;p`RQb0uS80Q_*d{pC{tw$|rpwvIhVtL5Ma>1stfl~nhkLHLXfY*LW;I3Nr(19L7N-T8?EpKaLr?F9qzOt{Zo6o43%hl0 zy!QrA_D@`KQ8O2(1#W-&l+0?X{|Zop{VXqC#7=kQb~jwq%%Glxm*u64*y-}5_S{n! zEoSg#n1lfu&)S|&!jaGz7Z;{Hb~wL{Ma@-LvmJ2UWf-&BJ|9kg3-apr zQ%eX2@4wx0QFE0O?ZNW2D=u10B})iq=Hc51b{M8Bn3*5G(M1<4og_czQ z^Ys>|tz%D^o%=QU=T~|T0Jv3zwfBz*tuGM#?!a*uEoNvw0e*Hv|NHsq19Qtoi~H&N zBUfEU9cwroCh+r*e$-R$>}5Cfou8}?-R_o)7Wd@1+rJA^zXBX`Q8SbC3I6u`9p1XU zaXtqqSB1Q)VRM1oE^6*qyLGPo_!7Z;Ro7gU%<6If^G8H{{Q53Ps>C<@zOY_jfU}ZT zsk~;rz5qT~5b(7FsV=Wvj4Ze~?V`mL0AIVI>hh`^YGlF1>29bN^QGyAD$A>GDD)TP zVX#H)q>C0)Vik7l`1;->_1)D!d%=BDd(Op$DQ>*?2F-SWrlJkuhKrKfY#p<;K1V#< z^LG-K7C*{+hrX=`KiNN#PrjQj>h<7ns?R7tZ6h>%YQ@6&U&Z3gQhgGg9iU4eEY)~qdOuJZNrqgNi`8)tZ zEEaP-D{m%;9}xS!@mOriwucoiOv)$Uii;IysnoyV`FtM1&8+;WvHRPh@oelYk?fp@ z5w5f%JbB^#vlMC1jQRBm|; z<4R+fN+raD3X3z7^4*VJ7d>YGZm316R6>w)>dJB>E3eGND=V{_A|4&r+~$PGFz(j+ z9MuDnfLMFs2DHS~m03*<9Izb^vs^%COJ5nX>SC6uT;wtQ zN!U(SUa#|L^nlHJjN&SpkSC6;keblH0CuzT zqjLCW%B+V|Tr)0Km?JNMS6O+zziclv`(C>Qhc)B8$jU35U|xDCxmx9h%P^)84GEO@ z4hLR3cCzwDGVzko#f2#fyLI{HY{$baS1M^-X+JA2W|;%u572twvYVCH%ftgOFrDzQ z%GF{Sb+N)cSe};O>I8Lm(TS|QUM7BXb5q`Sdg&ho)hvr1X1KXr4yen|nVC=Y!&xR> ztT2^h1pz)@IzK44v+|ppo8)pia=9F}T5W*mriYrVJTY2KCtQp$gWItp3v)AU$BLF9 zW~<$9^YGzA{{6GN{P|aZlplB7L(Ofsho4lZT#PVYK6yj~_A zU^)9101v9W{OOZ8kxBa=X1H7%d`{xJ)#IhmComWkgh zJ|5s{bs+6{7~w`#`&N&;eD#-mmR-y+tB>mPSem^cH?s0p#&p8N=ootYnQ_tE_svQ} z{#o+^xRI5&GNuzAM#s?G&y0(ieP8+S2k15C+%Cfxz-kxL$RdiAPNM!90AOF5rE3+IA(P_gV{hAEx=d_IqG z)K%u>!HKNAUM60dsZ6Ej0I1jNwmr;orAbyKuebUR&i(je0cL#ec*0}-@j8|{(iQzwzWT#=l!&5f jT;0h840aHhFykh_!rG~;5AeP$1@S#y{an^LB{Ts5_a?jl literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/deny_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..7c56263f83958a17893b3db0b04ce3078c15cea0 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^2|(x;TbZ%z1lzVbEa*5x0l` zFLCLtQfk)goBm*9Wqa5)W5IyH?gg7O+Vq@#{gzqI_j{ICbSF<}<0|vo?Y_6yOll7; z+AsO(r`@v>Kf7}$KR*umYV~i&zP&s*_xJv-=38t1deYzEyLbMqy6^o$Z`IbavsGXD zr!(F8`6z;|L6RYjVFqIYc7~Z}LvrZvRZ(vk567Q>-*~3QX2MKG<^wzo#tdf|3@{iQ zO7s8d*3Gv+{xi?r|HRuDl15mS!8LAhWr_IppL3FmClFnFq60fUCY M)78&qol`;+0G5h<`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_unlit.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..817f2fb3f95c53ee8720a7c5be418b6208a6a7e6 GIT binary patch literal 588 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 O0000X)s_s z#KIwr!I-V$V11^#dUpKLjjy-9DY|#Kuw+Jjzzl{&rWQ^CH3uAwt;hGhNWR~>|B3$l qhyP2a-~C|qG6v`^C}^l(vC57yE3)EC^YOwKkf5ilpUXO@geCx+nr^EA literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closing.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..db7be0bc4a0ec0b2bc29e8718fb6b71796846f16 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^2|(qk=b{5eiK-()1~xQ&@cMV`(mao8yQ?TZq;#^Y}m${ zacWZ!Yev-i>$j948lYsxftl|YY`yljZkp{(pFL*+-lj#WWzI6YweB*{ESZG)8eLCP zH-4D=_wruJUKQWqugks*3w-~bxAmsS_S>R@6K&4#1!`fty>^f8^xkc+O+xqazTJA; z{=7~2>uGDRIhyR%SJ)ONH}BrkKUz=f@~-S!d-avVtb5`KJrkcF_ZOUaf4N)v?bouY zpX0AZna`Cr-@$dKByUdGcPkF5{Og%j`&-%%FXZlavSVWw{8-KzzB@7SM0TXvt!o+A zif+H$q2jsc@9*!WwR0M*e5Y<-(ETyu&`qBj{lx9nl5Os{*Qk05m8bu?%XoF&`KQ?? l*%zfe7FQS8+W~`WRsIyAi(3!btSA5lf~TvW%Q~loCIEIM%9sEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/panel_open.png new file mode 100644 index 0000000000000000000000000000000000000000..24eb2aedc2248aeb772b38f63ff992254e7aaec0 GIT binary patch literal 315 zcmV-B0mS}^P)G_@Zv*NK(#C83< z0hCg#mPY_q%Og#e`P2l!*GQEjpT`0MYBKbMv^%3TIE=g7KF`WXCR28pn>(x2n zemoXytpJ?bfcIZ;wOEjBHdt%rI!S!%PGhZ=2c^1AoGrxJR_5RoDx&OEP+E*gAHf&mPbH>ZE8FCH9e&*rpCoP%1 zIy_fR`1DT4EhW}ImG2+Fy>#^EcBOlIu{N4r8M|lHdv8DdMa^XX`Q)41s%D;5@l3t_ z>U!DiCu(!NfiicFek|lsbn*16WPNgF)9u86nlDcO+<9uZb*sRm>zlTKo#3wDtk_cV zGUiQg0fX*;t18(yxo?DbZh3Nv5#oCg`Gddm{r7*~nV;{o)~0;#=kiD}oLj`YgzrYV zCx61j+EYJuRBRcZ$AIaEWtl7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_broken.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_damaged.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_open.png b/Resources/Textures/_NF/Structures/Doors/Airlocks/Standard/nfsd.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Holo/nfsd.rsi/meta.json b/Resources/Textures/_NF/Structures/Holo/nfsd.rsi/meta.json new file mode 100644 index 00000000000..e15e3df3bcb --- /dev/null +++ b/Resources/Textures/_NF/Structures/Holo/nfsd.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Made by Ghost Prince for use on Frontier Server.", + "states": [ + { + "name": "icon", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/Shuttles/nfsdgyroscope.rsi/base.png b/Resources/Textures/_NF/Structures/Shuttles/nfsdgyroscope.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..ca7a4b1a7e32b56e0a3a31433c153fa2cf93a054 GIT binary patch literal 496 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 TT`wIW|3f<4H>QuS-?sNJTaGl2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/base.png b/Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..d830c49afe81ff6b9bcaa0a69ce5b220580f7437 GIT binary patch literal 2486 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 AApigX literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/meta.json b/Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/meta.json new file mode 100644 index 00000000000..a2f0f44fa2d --- /dev/null +++ b/Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/meta.json @@ -0,0 +1,83 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "copyright": "Created by Ghost Prince for use on Frontier Station.", + "license": "CC-BY-SA-4.0", + "states": [ + { + "name": "base", + "directions": 4 + }, + { + "name": "thrust", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "thrust_burn_unshaded", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/thrust.png b/Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/thrust.png new file mode 100644 index 0000000000000000000000000000000000000000..15c480707f8819d185c72f5928c41f5d069e89d6 GIT binary patch literal 1504 zcma)6Z8+0w82@j^L>rTuBQ|I0WjS8Dd;GcF;*8BBeuZbn-HdRFW9G zLXJ8Og%E9ONg*XivXW?%EAOl6ALjhI`qqcjhx_HZujhL1-|v3z`%c^GO+y)&8vp=+ zqIDQ~*QWoGCR zMXS!7x0H9kD_qv9G;b|jE-UC7lJX+P@&km8hnja#c1d?8+fO#`{QyoHOv`~ppFs!gtoqkvoj_l143H&6h zUE}E|;|Zlf#IdZ7^vZ~Rx-GA{t!TEIn>==(89p}JT*1qk+tc>ylJe$fX83w(V}0XP z=?7Jd!P)roDz@vY?h|enias+cxFtCFU7yWRbB3)O4fdV2`lgsnqU_ZZF$ep!KtwO7 z+|Y1`zv7r)_8O-ou>PkmA3#o&9>*pk7}L*Yxu?Zhk*rDS+~Cb*smMtTJ+1_??V&p!@O#Evbf8iF2<`X6;4Xg(hnlr|bS) z6u=8Mjam5f^0QdCSW zK}x}RVtU-EkoLsr--Q-fdb$knB+EE4u?t+bS{<0m7sUi2wK?y-NV~mvXz_kA0Jec-~a#s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/thrust_burn_unshaded.png b/Resources/Textures/_NF/Structures/Shuttles/thrusternfsd.rsi/thrust_burn_unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..bfdfde09fb0e838c613b4422b3e54b19350a285f GIT binary patch literal 4298 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 literal 0 HcmV?d00001 From 2ff536c94e212242c420c8a942d3611f7e455f61 Mon Sep 17 00:00:00 2001 From: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Wed, 17 Apr 2024 17:04:59 -0500 Subject: [PATCH 13/18] SR fashion update featuring Bing Guss (#1226) * recolor to green * phase 1 * phase 2 * phase 3 * phase 4 - signage * bah * sd * fix conflict maybe * oof * fixed the sheriff meta file for the yaml checker * Update * Update v.2 * error * Job * Update job-description.ftl * Update departments.yml --------- Co-authored-by: Dvir Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Locale/en-US/_NF/job/job-description.ftl | 1 + .../Locale/en-US/_NF/job/job-names-old.ftl | 7 ++ Resources/Locale/en-US/_NF/job/job-names.ftl | 3 +- .../en-US/_NF/paper/stamp-component.ftl | 1 + .../Locale/en-US/paper/stamp-component.ftl | 2 +- Resources/Maps/_NF/Outpost/frontier.yml | 4 +- .../Fills/Backpacks/StarterGear/backpack.yml | 4 - .../Fills/Backpacks/StarterGear/duffelbag.yml | 4 - .../Fills/Backpacks/StarterGear/satchel.yml | 4 - .../Catalog/Fills/Lockers/heads.yml | 40 ++++------ .../Entities/Clothing/Shoes/winter-boots.yml | 2 +- .../Entities/Clothing/Head/hats.yml | 4 +- .../Entities/Clothing/Head/hoods.yml | 2 +- .../Entities/Clothing/Neck/cloaks.yml | 2 +- .../Entities/Clothing/Neck/mantles.yml | 2 +- .../Clothing/OuterClothing/wintercoats.yml | 2 +- .../Entities/Clothing/Uniforms/jumpskirts.yml | 2 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 2 +- .../Objects/Misc/identification_cards.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 4 +- .../Storage/Closets/Lockers/lockers.yml | 4 +- .../Structures/Wallmounts/Signs/signs.yml | 2 +- .../Roles/Jobs/Command/head_of_personnel.yml | 72 ++++++++---------- .../Prototypes/Roles/Jobs/departments.yml | 3 + .../Fills/Backpacks/StarterGear/backpack.yml | 14 ++++ .../Fills/Backpacks/StarterGear/duffelbag.yml | 16 +++- .../Fills/Backpacks/StarterGear/messenger.yml | 7 +- .../Fills/Backpacks/StarterGear/satchel.yml | 16 +++- .../_NF/Catalog/Fills/Lockers/dressers.yml | 15 ++++ .../_NF/Catalog/Fills/Lockers/heads.yml | 16 ++++ .../_NF/Entities/Clothing/Hands/gloves.yml | 8 ++ .../_NF/Entities/Clothing/Head/hats.yml | 10 +++ .../_NF/Entities/Clothing/Neck/cloaks.yml | 11 ++- .../_NF/Entities/Clothing/Neck/mantles.yml | 11 +++ .../Entities/Clothing/OuterClothing/armor.yml | 4 +- .../Entities/Clothing/OuterClothing/coats.yml | 11 +++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 28 ++++++- .../Entities/Clothing/Uniforms/jumpsuits.yml | 26 ++++++- .../Devices/Misc/identification_cards.yml | 14 ++++ .../_NF/Entities/Objects/Devices/pda.yml | 34 +++++++++ .../Misc/{paper.yml => rubber_stamp.yml} | 12 +++ .../Storage/Closets/Lockers/lockers.yml | 13 +++- .../Structures/Wallmounts/Signs/signs.yml | 17 +++++ .../Prototypes/_NF/Maps/Outpost/frontier.yml | 5 +- .../Prototypes/_NF/Markers/Spawners/jobs.yml | 12 +++ .../_NF/Recipes/Construction/clothing.yml | 8 +- .../Prototypes/_NF/Roles/Jobs/Command/sr.yml | 44 +++++++++++ .../_NF/Roles/play_time_trackers_old.yml | 3 + .../sr_cap.rsi/equipped-HELMET-hamster.png | Bin 0 -> 3181 bytes .../Head/Hats/sr_cap.rsi/equipped-HELMET.png | Bin 0 -> 405 bytes .../Clothing/Head/Hats/sr_cap.rsi/icon.png | Bin 0 -> 216 bytes .../Clothing/Head/Hats/sr_cap.rsi/meta.json | 22 ++++++ .../Neck/Cloaks/sr.rsi/equipped-NECK.png | Bin 0 -> 1324 bytes .../_NF/Clothing/Neck/Cloaks/sr.rsi/icon.png | Bin 0 -> 551 bytes .../Neck/Cloaks/sr.rsi/inhand-left.png | Bin 0 -> 358 bytes .../Neck/Cloaks/sr.rsi/inhand-right.png | Bin 0 -> 369 bytes .../_NF/Clothing/Neck/Cloaks/sr.rsi/meta.json | 26 +++++++ .../Mantles/nfsdsheriff.rsi/inhand-left.png | Bin 0 -> 621 bytes .../Mantles/nfsdsheriff.rsi/inhand-right.png | Bin 0 -> 624 bytes .../Neck/Mantles/nfsdsheriff.rsi/meta.json | 38 +++++---- .../Neck/Mantles/sr.rsi/equipped-NECK.png | Bin 0 -> 687 bytes .../_NF/Clothing/Neck/Mantles/sr.rsi/icon.png | Bin 0 -> 3061 bytes .../Neck/Mantles/sr.rsi/inhand-left.png | Bin 0 -> 358 bytes .../Neck/Mantles/sr.rsi/inhand-right.png | Bin 0 -> 369 bytes .../Clothing/Neck/Mantles/sr.rsi/meta.json | 26 +++++++ .../equipped-OUTERCLOTHING.png | Bin 3639 -> 537 bytes .../Armor/sr_carapace.rsi/icon.png | Bin 3126 -> 270 bytes .../Armor/sr_carapace.rsi/inhand-left.png | Bin 3250 -> 365 bytes .../Armor/sr_carapace.rsi/inhand-right.png | Bin 3277 -> 377 bytes .../Armor/sr_carapace.rsi/meta.json | 2 +- .../sr_jacket.rsi/equipped-OUTERCLOTHING.png | Bin 0 -> 1175 bytes .../OuterClothing/Misc/sr_jacket.rsi/icon.png | Bin 0 -> 439 bytes .../Misc/sr_jacket.rsi/meta.json | 18 +++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 3970 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 4076 bytes .../Jumpskirt/private_security.rsi/icon.png | Bin 0 -> 3358 bytes .../private_security.rsi/inhand-left.png | Bin 0 -> 3316 bytes .../private_security.rsi/inhand-right.png | Bin 0 -> 3567 bytes .../Jumpskirt/private_security.rsi/meta.json | 30 ++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 3997 -> 4002 bytes .../equipped-INNERCLOTHING.png | Bin 4077 -> 4098 bytes .../Jumpskirt/security_guard.rsi/icon.png | Bin 3370 -> 3358 bytes .../security_guard.rsi/inhand-left.png | Bin 3319 -> 3281 bytes .../security_guard.rsi/inhand-right.png | Bin 3572 -> 3508 bytes .../sr.rsi/equipped-INNERCLOTHING-monkey.png | Bin 0 -> 936 bytes .../sr.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1386 bytes .../Uniforms/Jumpskirt/sr.rsi/icon.png | Bin 0 -> 504 bytes .../Uniforms/Jumpskirt/sr.rsi/inhand-left.png | Bin 0 -> 438 bytes .../Jumpskirt/sr.rsi/inhand-right.png | Bin 0 -> 428 bytes .../Uniforms/Jumpskirt/sr.rsi/meta.json | 30 ++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 4320 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 4138 bytes .../Jumpsuit/private_security.rsi/icon.png | Bin 0 -> 3208 bytes .../private_security.rsi/inhand-left.png | Bin 0 -> 3316 bytes .../private_security.rsi/inhand-right.png | Bin 0 -> 3567 bytes .../Jumpsuit/private_security.rsi/meta.json | 30 ++++++++ .../equipped-INNERCLOTHING-monkey.png | Bin 4328 -> 4351 bytes .../equipped-INNERCLOTHING.png | Bin 4221 -> 4278 bytes .../Jumpsuit/security_guard.rsi/icon.png | Bin 3213 -> 3203 bytes .../security_guard.rsi/inhand-left.png | Bin 3319 -> 3281 bytes .../security_guard.rsi/inhand-right.png | Bin 3572 -> 3508 bytes .../sr.rsi/equipped-INNERCLOTHING-monkey.png | Bin 0 -> 734 bytes .../sr.rsi/equipped-INNERCLOTHING.png | Bin 0 -> 1199 bytes .../Uniforms/Jumpsuit/sr.rsi/icon.png | Bin 0 -> 421 bytes .../Uniforms/Jumpsuit/sr.rsi/inhand-left.png | Bin 0 -> 420 bytes .../Uniforms/Jumpsuit/sr.rsi/inhand-right.png | Bin 0 -> 385 bytes .../Uniforms/Jumpsuit/sr.rsi/meta.json | 30 ++++++++ .../_NF/Objects/Devices/pda.rsi/meta.json | 7 +- .../_NF/Objects/Devices/pda.rsi/pda-sr.png | Bin 0 -> 680 bytes .../Wallmounts/signs.rsi/direction_sr.png | Bin 0 -> 3246 bytes .../Structures/Wallmounts/signs.rsi/meta.json | 29 +++++++ 112 files changed, 685 insertions(+), 135 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/job/job-names-old.ftl create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Lockers/dressers.yml rename Resources/Prototypes/_NF/Entities/Objects/Misc/{paper.yml => rubber_stamp.yml} (80%) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml create mode 100644 Resources/Prototypes/_NF/Roles/Jobs/Command/sr.yml create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/equipped-HELMET-hamster.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Mantles/sr.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Mantles/sr.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Mantles/sr.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Mantles/sr.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Mantles/sr.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Misc/sr_jacket.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Misc/sr_jacket.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Misc/sr_jacket.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/sr.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/sr.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/sr.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/sr.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/sr.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/sr.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/private_security.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/private_security.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/private_security.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/private_security.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/private_security.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/private_security.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-sr.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_sr.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json diff --git a/Resources/Locale/en-US/_NF/job/job-description.ftl b/Resources/Locale/en-US/_NF/job/job-description.ftl index a8cc0c07f37..09a8661151c 100644 --- a/Resources/Locale/en-US/_NF/job/job-description.ftl +++ b/Resources/Locale/en-US/_NF/job/job-description.ftl @@ -3,3 +3,4 @@ job-description-mercenary = Execute the bidding of anyone- for the right price. job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar. job-description-security-guard = Patrol the empty halls, whistle simple tunes you heard on radio, jingle your keychain and scurry away at the sight of danger. job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships. +job-description-sr = Handle access reassignment fairly using your ID console, manage Frontier outpost, and keep Clippy safe. \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/job/job-names-old.ftl b/Resources/Locale/en-US/_NF/job/job-names-old.ftl new file mode 100644 index 00000000000..fd229308aa1 --- /dev/null +++ b/Resources/Locale/en-US/_NF/job/job-names-old.ftl @@ -0,0 +1,7 @@ +# Role timers +JobSecurityCadetOld = Security Cadet +JobSecurityOfficerOld = Security Officer +JobHeadOfSecurityOld = Head of Security +JobWardenOld = Warden +JobDetectiveOld = Detective +JobHeadOfPersonnelOld = Head of Personnel \ No newline at end of file diff --git a/Resources/Locale/en-US/_NF/job/job-names.ftl b/Resources/Locale/en-US/_NF/job/job-names.ftl index 8be5e8a7de5..dbffef49fc1 100644 --- a/Resources/Locale/en-US/_NF/job/job-names.ftl +++ b/Resources/Locale/en-US/_NF/job/job-names.ftl @@ -3,10 +3,11 @@ job-name-mercenary = Mercenary job-name-pilot = Pilot job-name-security-guard = Security Guard job-name-stc = Station Traffic Controller +job-name-sr = Station Representative # Role timers - Make these alphabetical or I cut you JobERTMailCarrier = ERT Mail Carrier JobMercenary = Mercenary JobPilot = Pilot JobSecurityGuard = Security Guard -JobSTC = Station Traffic Controller \ No newline at end of file +JobSTC = Station Traffic Controller diff --git a/Resources/Locale/en-US/_NF/paper/stamp-component.ftl b/Resources/Locale/en-US/_NF/paper/stamp-component.ftl index 93bf418f785..1bedf30b5fd 100644 --- a/Resources/Locale/en-US/_NF/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/_NF/paper/stamp-component.ftl @@ -5,3 +5,4 @@ stamp-component-signee-name = {$user} stamp-component-stamped-name-psychologist = Psychologist stamp-component-stamped-name-lawyer = Lawyer stamp-component-stamped-name-stc = Station Traffic Controller +stamp-component-stamped-name-sr = Station Representative \ No newline at end of file diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index c6666963dfe..32046710625 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -7,7 +7,7 @@ stamp-component-stamped-name-clown = Clown stamp-component-stamped-name-cmo = Chief Medical Officer stamp-component-stamped-name-denied = DENIED stamp-component-stamped-name-approved = APPROVED -stamp-component-stamped-name-hop = Station Representative +stamp-component-stamped-name-hop = Head of Personnel stamp-component-stamped-name-hos = Sheriff stamp-component-stamped-name-qm = Quartermaster stamp-component-stamped-name-rd = Research Director diff --git a/Resources/Maps/_NF/Outpost/frontier.yml b/Resources/Maps/_NF/Outpost/frontier.yml index b150d9a63b9..d6141438a54 100644 --- a/Resources/Maps/_NF/Outpost/frontier.yml +++ b/Resources/Maps/_NF/Outpost/frontier.yml @@ -31658,7 +31658,7 @@ entities: showEnts: False occludes: True ent: null -- proto: LockerHeadOfPersonnelFilled +- proto: LockerStationRepresentativeFilled entities: - uid: 4969 components: @@ -36556,7 +36556,7 @@ entities: - type: Transform pos: 27.5,18.5 parent: 2173 -- proto: SpawnPointHeadOfPersonnel +- proto: SpawnPointStationRepresentative entities: - uid: 4844 components: diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index b7370711a4c..a876388a6bd 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -104,10 +104,6 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton - - id: RubberStampHop # Frontier - - id: DoorRemoteService # Frontier - - id: AccessConfigurator # Frontier - - id: PhoneInstrument # Frontier - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 6539f845777..e741f22f666 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -114,10 +114,6 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton - - id: RubberStampHop # Frontier - - id: DoorRemoteService # Frontier - - id: AccessConfigurator # Frontier - - id: PhoneInstrument # Frontier - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 343dd2e174e..ed12703efc3 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -128,10 +128,6 @@ - id: BoxSurvival - id: Flash #- id: TelescopicBaton - - id: RubberStampHop # Frontier - - id: DoorRemoteService # Frontier - - id: AccessConfigurator # Frontier - - id: PhoneInstrument # Frontier - type: entity noSpawn: true diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 956b8cc73da..a5105b02696 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -113,36 +113,24 @@ - type: StorageFill contents: - id: HoPIDCard -# - id: ClothingHeadsetCommand # Frontier - - id: ClothingHeadsetCentCom # Frontier -# - id: BoxPDA # Frontier - bloat -# - id: BoxID # Frontier - bloat -# - id: BoxHeadset # Frontier - bloat - - id: BoxHandcuff # Frontier + - id: ClothingHeadsetCommand + - id: BoxPDA + - id: BoxID + - id: BoxHeadset - id: IDComputerCircuitboard - - id: CommsComputerCircuitboard # Frontier -# - id: WeaponDisabler # Frontier - bloat - - id: ClothingOuterWinterHoP # Frontier - - id: ClothingShoesBootsWinterHoP # Frontier -# - id: CigarGoldCase # Frontier -# prob: 0.25 + - id: WeaponDisabler + - id: CigarGoldCase + prob: 0.25 # Fuck the HoP they don't deserve fucking cigars. # Yes they do fuck you. -# - id: DoorRemoteService # Frontier -# - id: ClothingNeckGoldmedal # Frontier -# - id: RubberStampHop # Frontier -# - id: BoxEncryptionKeyPassenger # Frontier - bloat -# - id: BoxEncryptionKeyService # Frontier - bloat + - id: DoorRemoteService + - id: ClothingNeckGoldmedal + - id: RubberStampHop + - id: BoxEncryptionKeyPassenger + - id: BoxEncryptionKeyService - id: ClothingBackpackIan -# prob: 0.5 # Frontier -# - id: AccessConfigurator # Frontier - - id: MedalCase # Frontier -# - id: JetpackCaptainFilled #TODO replace with new item! -# - id: ClothingBeltSheathFilled #TODO replace with new item! -# - id: ClothingHandsGlovesCaptain #TODO replace with new item! -# - id: ClothingOuterHardsuitCap #TODO replace with new item! -# - id: ClothingMaskGasCaptain #TODO replace with new item! - - id: Demag # Frontier + prob: 0.5 + - id: AccessConfigurator - type: entity id: LockerChiefEngineerFilledHardsuit diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml index aca2c5e9766..8f9dcd6b70f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml @@ -91,7 +91,7 @@ - type: entity parent: ClothingShoesBaseWinterBoots id: ClothingShoesBootsWinterHoP - name: station representative's winter boots + name: head of personnel's winter boots components: - type: Sprite sprite: DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 29af35764ad..6ccee9e5587 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -298,8 +298,8 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatHopcap - name: station representative's cap - description: A grand, stylish station representative's cap. + name: head of personnel's cap + description: A grand, stylish head of personnel's cap. components: - type: Sprite sprite: Clothing/Head/Hats/hopcap.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index ebb4f79f41e..0a9e28a11da 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -317,7 +317,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOP noSpawn: true - name: station representative's winter coat hood + name: head of personnel's winter coat hood components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodhop.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index a554815b8c9..d2a932088f8 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -78,7 +78,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakHop - name: station representative's cloak + name: head of personnel's cloak description: A blue cloak with red shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index 476b79c6cee..ef4963f541f 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -34,7 +34,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckMantleHOP - name: station representative's mantle + name: head of personnel's mantle description: A good SR knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 5deebd69ac1..5030ac495be 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -214,7 +214,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterHoP - name: station representative's winter coat + name: head of personnel's winter coat components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coathop.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 7c7be0d97cd..586a294e66c 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -155,7 +155,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtHoP - name: station representative's jumpskirt + name: head of personnel's jumpskirt description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 92a81d49460..5ebb998666b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -311,7 +311,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitHoP - name: station representative's jumpsuit + name: head of personnel's jumpsuit description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index a97f3c185d3..0b2dbed0557 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -459,7 +459,7 @@ - type: entity parent: BasePDA id: HoPPDA - name: station representative PDA + name: head of personnel PDA description: Looks like it's been chewed on. components: - type: Pda diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 830df2622a1..d44f5e3461f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -369,7 +369,7 @@ - type: entity parent: IDCardStandard id: HoPIDCard - name: station representative ID card + name: head of personnel ID card components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2fe3a998b7f..316c5ba69d3 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1051,8 +1051,8 @@ - ClothingHeadHatWarden - ClothingUniformJumpsuitWarden - ClothingUniformJumpskirtWarden - - ClothingUniformJumpsuitSecGuard #Frontier - - ClothingUniformJumpskirtSecGuard #Frontier + - ClothingUniformJumpsuitPrivateSec #Frontier + - ClothingUniformJumpskirtPrivateSec #Frontier # Winter outfits - ClothingOuterWinterCap - ClothingOuterWinterCE diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 70e11afd0b5..61c05848095 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -61,8 +61,8 @@ - type: entity id: LockerHeadOfPersonnel - parent: [BaseStructureIndestructible, BaseStructureLockImmuneToEmag, BaseStructureAccessReaderImmuneToEmag, LockerBaseSecure] # Frontier - name: station representative's locker + parent: LockerBaseSecure + name: head of personnel's locker components: - type: Appearance - type: EntityStorageVisuals diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index f3f7bbbc053..a256f6e6f4c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -119,7 +119,7 @@ parent: BaseSignDirectional id: SignDirectionalHop name: hop sign - description: A direction sign, pointing out which way the station representative's office is. + description: A direction sign, pointing out which way the head of personnel's office is. components: - type: Sprite state: direction_hop diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index e647913ec76..86035456151 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -2,24 +2,31 @@ id: HeadOfPersonnel name: job-name-hop description: job-description-hop - playTimeTracker: JobHeadOfPersonnel + playTimeTracker: JobHeadOfPersonnelOld # Frontier requirements: - - !type:OverallPlaytimeRequirement - time: 36000 # Frontier - - !type:WhitelistRequirement + - !type:DepartmentTimeRequirement + department: Engineering + time: 36000 # 10 hours + - !type:DepartmentTimeRequirement + department: Medical + time: 36000 # 10 hours + - !type:DepartmentTimeRequirement + department: Security + time: 36000 # 10 hrs + - !type:DepartmentTimeRequirement + department: Command + time: 36000 # 10 hours weight: 20 startingGear: HoPGear - alwaysUseSpawner: true icon: "JobIconHeadOfPersonnel" requireAdminNotify: true - supervisors: job-supervisors-centcom # Frontier + supervisors: job-supervisors-captain canBeAntag: false access: - Command - HeadOfPersonnel - Bar - Service - - Frontier - Maintenance - Janitor - Theatre @@ -27,38 +34,28 @@ - Chapel - Hydroponics - External + - Cryogenics # I mean they'll give themselves the rest of the access levels *anyways*. # As of 15/03/23 they can't do that so here's MOST of the rest of the access levels. # Head level access that isn't their own was deliberately left out, get AA from the captain instead. - - Chemistry # Frontier - - Engineering # Frontier - - Quartermaster # Frontier - - Research # Frontier - - Detective # Frontier - - Salvage # Frontier - - Security # Frontier - - Brig # Frontier - - Cargo # Frontier - - Atmospherics # Frontier - - Medical # Frontier - - EmergencyShuttleRepealAll # Frontier - - Captain # Frontier - - ChiefEngineer # Frontier - - ChiefMedicalOfficer # Frontier - - HeadOfSecurity # Frontier - Whitelist for sheriff only. - - ResearchDirector # Frontier - - Armory # Frontier - - Mercenary # Frontier - - Pilot # Frontier - - Lawyer # Frontier - - Cryogenics # Frontier - - Mail # Frontier + - Chemistry + - Engineering + - Research + - Detective + - Salvage + - Security + - Brig + - Lawyer + - Cargo + - Atmospherics + - Medical special: - !type:AddImplantSpecial - implants: [ MindShieldImplant, TrackingImplant ] # Frontier - Added TrackingImplant + implants: [ MindShieldImplant ] - !type:AddComponentSpecial components: - type: CommandStaff + setPreference: false # Frontier - type: startingGear id: HoPGear @@ -68,14 +65,9 @@ shoes: ClothingShoesColorBrown head: ClothingHeadHatHopcap id: HoPPDA - gloves: ClothingHandsGlovesHop # Frontier - ears: ClothingHeadsetAltCentCom - eyes: ClothingEyesGlassesSunglasses - belt: BoxFolderQmClipboard # Frontier - neck: ClothingNeckCloakHop # Frontier - outerClothing: ClothingOuterArmorSRCarapace # Frontier - pocket1: WeaponDisabler # Frontier + gloves: ClothingHandsGlovesHop + ears: ClothingHeadsetAltCommand + belt: BoxFolderClipboard innerClothingSkirt: ClothingUniformJumpskirtHoP satchel: ClothingBackpackSatchelHOPFilled - duffelbag: ClothingBackpackDuffelHOPFilled - messenger: ClothingBackpackMessengerHOPFilled # Frontier + duffelbag: ClothingBackpackDuffelHOPFilled \ No newline at end of file diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index f917522a642..f2516d66208 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -38,6 +38,7 @@ - Mercenary # Frontier - Pilot # Frontier - StationTrafficController # Frontier + - StationRepresentative # Frontier - type: department id: Command @@ -52,6 +53,8 @@ - HeadOfSecurity - ResearchDirector - Quartermaster + - StationRepresentative # Frontier + - Sheriff # Frontier primary: false weight: 100 diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 7207aa1bca3..44f03a33774 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -86,3 +86,17 @@ - id: RubberStampCentcom - id: PenCentcom - id: BoxFolderCentCom + +- type: entity + noSpawn: true + parent: ClothingBackpack + id: ClothingBackpackSrFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Flash + - id: RubberStampSr + - id: DoorRemoteCommand + - id: AccessConfigurator + - id: PhoneInstrument diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index f2db3238a19..9538378ce87 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -71,4 +71,18 @@ - id: BoxSurvivalNFSD - id: Flash - id: MagazinePistol - - id: BaseSecurityUplinkRadioOfficer # Frontier \ No newline at end of file + - id: BaseSecurityUplinkRadioOfficer # Frontier + +- type: entity + noSpawn: true + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelSrFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Flash + - id: RubberStampHop + - id: DoorRemoteCommand + - id: AccessConfigurator + - id: PhoneInstrument diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml index 43603e5fdad..638fd075d1c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/messenger.yml @@ -167,4 +167,9 @@ - type: entity noSpawn: true parent: [ClothingBackpackMessengerSecurity, ClothingBackpackOfficerFilled] - id: ClothingBackpackMessengerOfficerFilled \ No newline at end of file + id: ClothingBackpackMessengerOfficerFilled + +- type: entity + noSpawn: true + parent: [ClothingBackpackMessenger, ClothingBackpackSrFilled] + id: ClothingBackpackMessengerSrFilled diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 77c5c4726d3..ebec25aff2d 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -71,4 +71,18 @@ - id: BoxSurvivalNFSD - id: Flash - id: MagazinePistol - - id: BaseSecurityUplinkRadioOfficer # Frontier \ No newline at end of file + - id: BaseSecurityUplinkRadioOfficer # Frontier + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelSrFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: Flash + - id: RubberStampSr + - id: DoorRemoteCommand + - id: AccessConfigurator + - id: PhoneInstrument diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/dressers.yml new file mode 100644 index 00000000000..2bd93a3f0f8 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/dressers.yml @@ -0,0 +1,15 @@ +- type: entity + id: DresserStationRepresentativeFilled + parent: Dresser + suffix: Filled, Station Representative + components: + - type: StorageFill + contents: + - id: ClothingNeckMantleSr + - id: ClothingHeadHatSrCap + - id: ClothingOuterJacketSr + - id: ClothingUniformJumpsuitSr + - id: ClothingUniformJumpskirtSr + - id: ClothingUniformJumpsuitSecGuard + - id: ClothingUniformJumpskirtSecGuard + - id: ClothingShoesLeather \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml index f56b6e6094d..d845dfcfa5b 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/heads.yml @@ -30,3 +30,19 @@ - id: AirTankFilled - id: ClothingMaskGasExplorer # Frontier - id: ClothingOuterHardsuitLuxury # Frontier + +- type: entity + id: LockerStationRepresentativeFilled + suffix: Filled + parent: LockerStationRepresentative + components: + - type: StorageFill + contents: + - id: SrIDCard + - id: ClothingHeadsetCentCom # Frontier + - id: BoxHandcuff # Frontier + - id: IDComputerCircuitboard + - id: CommsComputerCircuitboard # Frontier + - id: ClothingBackpackIan + - id: MedalCase # Frontier + - id: Demag # Frontier diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml index 8a66062fa73..fa7f6a78c25 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml @@ -170,3 +170,11 @@ sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi - type: Clothing sprite: _NF/Clothing/Hands/Gloves/npc_guns_visuals/npc_laser_pistol.rsi + +- type: entity + parent: ClothingHandsGlovesHop + id: ClothingHandsGlovesSr + name: papercut-proof gloves + description: Perfect for dealing with paperwork and matters with bureaucracy. + components: + - type: Insulated diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml index 20c2a890e57..29e98535139 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml @@ -240,3 +240,13 @@ - ClothMade - WhitelistChameleon +- type: entity + parent: ClothingHeadHatHopcap + id: ClothingHeadHatSrCap + name: station representative's cap + description: A cap issued to Frontier Outpost's station representative. Try not to lose it. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hats/sr_cap.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hats/sr_cap.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml index 2dd8bc28136..9138eaca6de 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml @@ -7,4 +7,13 @@ - type: Sprite sprite: _NF/Clothing/Neck/Cloaks/nfsdsheriff.rsi - type: StealTarget - stealGroup: HeadCloak \ No newline at end of file + stealGroup: HeadCloak + +- type: entity + parent: ClothingNeckCloakHop + id: ClothingNeckCloakSr + name: station representative's cloak + description: A top of the line cloak for Frontier Outpost's station representative. Made from exquisite fibers and furs, this thing must have cost a fortune! The fact this cloak was even issued shows the trust Central Command is placing in their representative on this outpost. + components: + - type: Sprite + sprite: _NF/Clothing/Neck/Cloaks/sr.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml index f4867fbf3e6..cf84e747fd6 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/mantles.yml @@ -46,3 +46,14 @@ sprite: _NF/Clothing/Neck/Mantles/nfsdsheriff.rsi - type: Clothing sprite: _NF/Clothing/Neck/Mantles/nfsdsheriff.rsi + +- type: entity + parent: ClothingNeckMantleHOP + id: ClothingNeckMantleSr + name: station representative's mantle + description: This mantle protects the station representative's neck and shoulders from vicious papercuts. This mantle is a symbol of Central Command's trust. + components: + - type: Sprite + sprite: _NF/Clothing/Neck/Mantles/sr.rsi + - type: Clothing + sprite: _NF/Clothing/Neck/Mantles/sr.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml index 1dd5d735183..0f3217e9657 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/armor.yml @@ -1,7 +1,7 @@ - type: entity parent: ClothingOuterBaseLarge - id: ClothingOuterArmorSRCarapace - name: "station rep's carapace" + id: ClothingOuterArmorSrCarapace + name: "station representative's carapace" description: "A premium armored chestpiece that provides above average protection for its size. It offers maximum mobility and flexibility thanks to the premium composite materials. Issued only to the station representative." components: - type: Sprite diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml index 47f60714d90..c14e4d24182 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml @@ -105,3 +105,14 @@ sprite: _NF/Clothing/OuterClothing/Misc/nfsd_long.rsi - type: Clothing sprite: _NF/Clothing/OuterClothing/Misc/nfsd_long.rsi + +- type: entity + parent: ClothingOuterWinterHoP + id: ClothingOuterJacketSr + name: station representative's jacket + description: The upper part of the station representative's uniform. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Misc/sr_jacket.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Misc/sr_jacket.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml index 44818b16036..c98f8b1f6cc 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml @@ -46,8 +46,8 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSecGuard - name: security guard jumpskirt - description: A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business. + name: security guard's uniform + description: A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business. components: - type: Sprite sprite: _NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi @@ -74,4 +74,26 @@ - type: Sprite sprite: _NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi - type: Clothing - sprite: _NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi \ No newline at end of file + sprite: _NF/Clothing/Uniforms/Jumpskirt/nfsd_skirt_short.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtPrivateSec + name: private security jumpskirt + description: A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpskirt/private_security.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpskirt/private_security.rsi + +- type: entity + parent: ClothingUniformJumpskirtHoP + id: ClothingUniformJumpskirtSr + name: station representative's uniform + description: A top of the line outfit for Frontier Outpost's station representative. No expense was spared in the tailoring, every stitch is a masterpiece. The fact this suit was even issued shows the trust Central Command is placing in their representative on this outpost. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpskirt/sr.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpskirt/sr.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index 9dc7f30867a..b93181fe3f5 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -46,8 +46,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSecGuard - name: security guard jumpsuit - description: A specialized uniform for a security guard. Crisp and official to let dock loiterers know you mean business. + name: security guard's uniform + description: A specialized uniform for Frontier Outpost's station guard. Crisp and official to let dock loiterers know you mean business. components: - type: Sprite sprite: _NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi @@ -187,3 +187,25 @@ randomMode: false mode: SensorOff - type: Contraband + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitPrivateSec + name: private security jumpsuit + description: A specialized uniform for a private security guard. For the discerning private contractor in need of a professional look. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpsuit/private_security.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpsuit/private_security.rsi + +- type: entity + parent: ClothingUniformJumpsuitHoP + id: ClothingUniformJumpsuitSr + name: station representative's uniform + description: A top of the line outfit for Frontier Outpost's station representative. No expense was spared in the tailoring, every stitch is a masterpiece. The fact this suit was even issued shows the trust Central Command is placing in their representative on this outpost. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpsuit/sr.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpsuit/sr.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml index 4ad19490f5a..9960bf51171 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -181,3 +181,17 @@ jobTitle: ERT Mail Carrier - type: Clothing sprite: _NF/Objects/Misc/id_cards.rsi + +- type: entity + parent: HoPIDCard + id: SrIDCard + name: station representative ID card + components: + - type: Sprite + layers: + - state: silver + - state: idheadofpersonnel + - type: Item + heldPrefix: silver + - type: PresetIdCard + job: StationRepresentative diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index 0b450d9c936..74aab913af7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -268,3 +268,37 @@ - type: Icon sprite: _NF/Objects/Devices/pda.rsi state: pda-bailiff + +- type: entity + parent: HoPPDA + id: SrPDA + name: station representative PDA + description: Looks like it's been clawed on. + components: + - type: Pda + id: SrIDCard + state: pda-sr + penSlot: + startingItem: PenCentcom + priority: -1 + whitelist: + tags: + - Write + - type: PdaBorderColor + borderColor: "#789876" + accentHColor: "#447987" + - type: Sprite + sprite: _NF/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false + - type: Icon + sprite: _NF/Objects/Devices/pda.rsi + state: pda-sr \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_NF/Entities/Objects/Misc/rubber_stamp.yml similarity index 80% rename from Resources/Prototypes/_NF/Entities/Objects/Misc/paper.yml rename to Resources/Prototypes/_NF/Entities/Objects/Misc/rubber_stamp.yml index d5ed6152b9f..462ce70a1d6 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Misc/rubber_stamp.yml @@ -1,3 +1,15 @@ +- type: entity + name: station representative's rubber stamp + parent: RubberStampHop + id: RubberStampSr + components: + - type: Stamp + stampedName: stamp-component-stamped-name-sr + stampedColor: "#6ec0ea" + stampState: "paper_stamp-hop" + - type: Sprite + state: stamp-hop + - type: entity name: psychologist rubber stamp parent: RubberStampBase diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml index 614a31d5792..303f69fced9 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Closets/Lockers/lockers.yml @@ -314,4 +314,15 @@ visible: false map: ["enum.WeldableLayers.BaseWelded"] - type: AccessReader - access: [["HeadOfSecurity"]] \ No newline at end of file + access: [["HeadOfSecurity"]] + +# SR +- type: entity + id: LockerStationRepresentative + parent: [BaseStructureIndestructible, BaseStructureLockImmuneToEmag, BaseStructureAccessReaderImmuneToEmag, LockerHeadOfPersonnel] # Frontier + name: station representative's locker + components: + - type: EntityStorageVisuals + stateBaseClosed: hop + stateDoorOpen: hop_open + stateDoorClosed: hop_door diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml new file mode 100644 index 00000000000..7c5ecaeebc0 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml @@ -0,0 +1,17 @@ +# Directional Station Guide Signs +- type: entity + parent: BaseSignDirectional + id: BaseSignDirectionalNF + abstract: true + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/signs.rsi + +- type: entity + parent: BaseSignDirectionalNF + id: SignDirectionalSr + name: sr sign + description: A direction sign, pointing out which way the station representative's office is. + components: + - type: Sprite + state: direction_sr diff --git a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml index 0fbcf8e0071..d383d158f4a 100644 --- a/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml +++ b/Resources/Prototypes/_NF/Maps/Outpost/frontier.yml @@ -18,7 +18,7 @@ - Passenger availableJobs: Passenger: [ -1, -1 ] - HeadOfPersonnel: [ 1, 1 ] + StationRepresentative: [ 1, 1 ] SecurityGuard: [ 1, 1 ] StationTrafficController: [ 1, 1 ] Valet: [ 1, 1 ] @@ -26,5 +26,4 @@ MailCarrier: [ 1, 1 ] # Others: Borg: [ 0, 0 ] - Chaplain: [ 0, 0 ] - Psychologist: [ 0, 0 ] + Chaplain: [ 0, 0 ] # Remove this when we fix bible user spawn in some other way. diff --git a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml index ae9c9249f5e..4e55ff0d770 100644 --- a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml @@ -62,3 +62,15 @@ layers: - state: green - state: ertmailcarrier + +- type: entity + id: SpawnPointStationRepresentative + parent: SpawnPointHeadOfPersonnel + name: station representative + components: + - type: SpawnPoint + job_id: StationRepresentative + - type: Sprite + layers: + - state: green + - state: hop diff --git a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml index 4e799b9710c..e1726625f72 100644 --- a/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/_NF/Recipes/Construction/clothing.yml @@ -10,15 +10,15 @@ objectType: Item - type: latheRecipe - id: ClothingUniformJumpskirtSecGuard - result: ClothingUniformJumpskirtSecGuard + id: ClothingUniformJumpskirtPrivateSec + result: ClothingUniformJumpskirtPrivateSec completetime: 4 materials: Cloth: 300 - type: latheRecipe - id: ClothingUniformJumpsuitSecGuard - result: ClothingUniformJumpsuitSecGuard + id: ClothingUniformJumpsuitPrivateSec + result: ClothingUniformJumpsuitPrivateSec completetime: 4 materials: Cloth: 300 diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/sr.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/sr.yml new file mode 100644 index 00000000000..206d6f488e2 --- /dev/null +++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/sr.yml @@ -0,0 +1,44 @@ +- type: job + id: StationRepresentative + name: job-name-sr + description: job-description-sr + playTimeTracker: JobHeadOfPersonnel + requirements: + - !type:OverallPlaytimeRequirement + time: 36000 + - !type:WhitelistRequirement + weight: 20 + startingGear: SrGear + alwaysUseSpawner: true + icon: "JobIconHeadOfPersonnel" + requireAdminNotify: true + supervisors: job-supervisors-centcom + canBeAntag: false + accessGroups: + - AllAccess + special: + - !type:AddImplantSpecial + implants: [ MindShieldImplant, TrackingImplant ] + - !type:AddComponentSpecial + components: + - type: CommandStaff + +- type: startingGear + id: SrGear + equipment: + jumpsuit: ClothingUniformJumpsuitSr + back: ClothingBackpackSrFilled + shoes: ClothingShoesLeather + head: ClothingHeadHatSrCap + id: SrPDA + gloves: ClothingHandsGlovesSr + ears: ClothingHeadsetAltCentCom + eyes: ClothingEyesGlassesSunglasses +# belt: BoxFolderQmClipboard # Bugged + neck: ClothingNeckCloakSr + outerClothing: ClothingOuterArmorSrCarapace + pocket1: WeaponDisabler + innerClothingSkirt: ClothingUniformJumpskirtSr + satchel: ClothingBackpackSatchelSrFilled + duffelbag: ClothingBackpackDuffelSrFilled + messenger: ClothingBackpackMessengerSrFilled diff --git a/Resources/Prototypes/_NF/Roles/play_time_trackers_old.yml b/Resources/Prototypes/_NF/Roles/play_time_trackers_old.yml index 6d6df1324ad..559da950aa2 100644 --- a/Resources/Prototypes/_NF/Roles/play_time_trackers_old.yml +++ b/Resources/Prototypes/_NF/Roles/play_time_trackers_old.yml @@ -12,3 +12,6 @@ - type: playTimeTracker id: JobDetectiveOld + +- type: playTimeTracker + id: JobHeadOfPersonnelOld diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/equipped-HELMET-hamster.png b/Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/equipped-HELMET-hamster.png new file mode 100644 index 0000000000000000000000000000000000000000..db24538c354d8a35397d3c4150d59d432db82d89 GIT binary patch literal 3181 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..6e16c36bc5541710b1611a91429419758b82260f GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zO+8&4Ln`LH zy|vNruz^VHL+92@R*4P{GiJ<~Fk^<*#}FIF^T&=z8yFgH?a(yIZJVL!SLhv37~I_O zfAXS`t&^%BrR)y>_59nmy&qm!ZGZcI`tFz4zQ2s#o!|DLdso+Y-j7djC5KzTj93%X z_Im?Q^8$wOouP_T`8Q8}{4q^KG|zU~DeLv}|Ed}m+%>99Q$0Cn>Dg$Hd(2b(jXi@b zYkR+m&al~h`0_-ylgGb@g>My`Tv_ngS)kpXKtFhJ=xLqWdSZnrRbC2|!cD5DWRX6AB&%euj{_dFr zjVdRPWd+W*+5AlD>d&`}X1Yu4{O^BBEjpC_e)00pjQe8q5BXnZh1ql<{v%t6aMiU$ kum8J&VtlC)o@u_m3|c@o2UN|a;K?ACr>mdKI;Vst0B-cK+5i9m literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7dd4f208b370c64bd795f3edb67394dcdb610433 GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6`n4RArY;~ z2@A&*_fI#!`(E|sLF&x~lAn|O)`}O-Tont)FcYw`fYYo_N zF1Ldk60FTk3=GTG$g|C8-<1S(17B){XPU1sgBFm@0mLA1DR?r7@^tlcS?83{1OWfs BNn`*3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/meta.json new file mode 100644 index 00000000000..92fe0bb6876 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hats/sr_cap.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Created by GentleButter for Frontier Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-hamster", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..2b308539f056c4641da576578b2e862a6680e9ca GIT binary patch literal 1324 zcmV+{1=IS8P)Px(%t=H+RCt{2nqO!mMI6V!O$BdnvuO<{X z9NZav$jedWREiH(p{Lw|l!N2m?(pS~~5?$9|&Y;XXg8x-~480llcJ>i9{liNdB)3h*T!KIst%z;l!bKPWSwT>U5$P z?GSIp;%eR$wj04-v-SL>xSA(UgQs?g>T`LF3g2714*+;R_1vL4_IrLt0@c5DCy(TK zqN{#sQ^)Mt86kbHO2ySYVMSR(?84NTsTXH_b3l;#u9a@yxIzFRIi3K}dG=Xh04Qzh z0Dw2&de^fPZr->;c(gm&z@z_|TZOq#Gr%5j{lg_oIcto4;ByNZKy|g1o6@F^ z39@$Z;OHUcC6(YIfIR?BqpbYZ6Zr1oMF7C;*%{orlLr92cKj0J@BL*|3d3-~aiI0n zo~I~Krd7gD0F4F!<`SUTC!qC#^`oM1j)>=hB9LQnmEW+R~|9NgDd~T-sINIRcU@p`NF- z%H2Jx#8s&lVD|TQ0dPg2;P4~Lz5=_c^Bxl56*Uu4zNE!9v?pD_*Avr4}08#I_L+{o^J_s ziGr>U@jLu^`|Uy3-2pU|cspmdAm3p7>ShO9E}-q|fSpgCTvF$R5O%e;=+RL<)F*8~X)J$q*p6#!$6D;3bGZgwo&^Sh!Uq}> z6Jw@!;k+i?pU`a8b7>OGtOI}BZnTY0>o;#_dAul3s|17l7wntNF`%+EDRd?v^dc0? zS`!f}Uml#k^lR_{(E9yAi?snbY@-`u4?#9*i4FNS(9-+o002-DDlw;zMneyYQN1Tf z3?2ygd+>g0_T~UTPk#NPN1KEk;5A{PABfuMIY+3F5#M_J!Vm4<9iSTfE_+G*| z4-_(5f0v{(trBHg<;ueB7xi44P`mmfc9aHBIjVL^B$A`eKL{5=_pkM7rvLx|4rN$L iW=%~1DgXcg2mk;800000(o>TF0000Px$$4Nv%R9J=WmA^{@VHn3hNsIU^Ttr$m>v7MGf93JM}9XsWrE zmT0RnlKuc`2*L&v18)hrMN*TtuHn4vJkPsV4O;FC!uh_>^L;+=^PI2X%a^Zz*4Us4 z+J~a`HJgwI_6vvx77KaJtvKj##X{aS#x5aZqwwuro^(oLMxO48c`22tR25cNmULsm zZU_Yx3wh02)CyuRY{1MeEd33@&GosKPDuccC%5aRR0g0@Rajf!^7J3~bnKX=Q<7=k zZv@tOQF#&uvmuQ(TpgYQV06O(aVorVumd6ZdTx9Ay9NZaA^nYR1E2budYR#&zS#v* zsVXeSFG%EG^@T7H(jUDbTsNEdb6Q=kAs;nN0IMGNBFrDRdN;yQ+K&-WB#ACR4G&(MW)JBKdpz4gerD2G@(Iv>kI?Pvl;acN;__0p#6AcX5GyVF3B8 z;hL<}+|9l6VUQ7k<9pDfu;qEw5f~;zNife9K;(BkYQFHlA<*64VfKdxu(q>b5!>wl z3_v}}I78S!w&G@g+ zEtRpZ3)v?GG!O(9>?^wSz4BpAoQ3?aPltX2Ip6nHmxlSIiB1tew|dgF#eHS}m(IGo zt?Ka9CrjRLS!LRn8g`~XGN?4C>hRT2>0kEKL=(3$OmzXW%Nw$m!H=DAYoX5~9#l&#lnn9+% nM?6AKLmjA-FEzq5&DWPf3&`exns+I9GKl5r>gTe~DWM4f7n6s9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/sr.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9b2d24ad3ddbba3e249691395f1b38608ead1026 GIT binary patch literal 369 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z1wCCHLn`LH zy=CZk*g)jiM}3{#f_9^YUZUwI9INKeTQvRUo!}CeSI3%W%v#83HFIHYQ&aZIxD5~g zN3V$}{PO3K`A<)vks$El{@2$#^R1uXK36$A+xq$MuXm1L`)k&HdtNU8#vQXSq};Y# z?^qRg_vPQE*MHQlx>=-e`7+m<<@yu_^>?!$OmDkv5dBWyZMJ@x+ns|fIbzMT9&0A< zKHjXd($egf&Z%<_es>Ng7ydT*IO&P|{H4kAb+uL^(M*UqMNe5yVxIy&d(NE$NcigEiOo zHBNXUTkxOnf&Nd1tKvQ4FVj5c0nOk`jqptK^<~fkvN@n;UJ9NJVtKmyxvXVB+<3aSW-L z^Y)fw_N@d7_7C+cll1i3CJ0?V=fo!Jz3_pfzxCH$?=R$E)4$wY^2MYo+T7#V0?C6y zPFsYOYs)X}u-tz2O1S>-|9(o({@YdFyMFmMg9{A&7j+GrkSg_P>$->076Ent?ffoX zdL6M$vFm*3RwjlHIibw2Vj+@>(=t0&MK!Kld(1M7m%+>Qpb@WOJ>U9gGau)4y-=JO z_-@jvWsFBp&!4mX!tNIf-|p<5`+CdlM;F%Z)%bp4o$lU0+j8zOFnrjh`{OS|`1I=; zC9^ZC*J<<>*qpgwSvIZj%YLARR>%1sC9*O6_*J{@b#Gp<+e+;vCJK9a7i4R_`6c(K zu0cai(J$y}-2^6vdwcA4r-uLeS2sb)FG#h^{lo9Zo}loYI}H||Qy)Ig*?#P%$W0aZ zkM-x5`>&Y4bH{E@@6>yDTY$_H%l*4eH+k;MTzUKHjb#Nn#ZPBMFH^i``){_5Gb}tn z^zO2f4f`iY%bqqla`E6l`TRwvo_Oq(`8##p$`z}oUTU54@s5qt%&kk!7QEfLsQlvL zla<-oz7uTw6;hp+TzFwtSX#-OU}pT`=VA4kAGwd(G~MU_@NF(TgHo3}L)|&$nm?QF zg>+pJe(;_7##h@Hv${T*O_1E{^30~`itq&AqMpr>Pd*qP_HJ7|&-lE^u4P`c-6y=t zFJ{^u)xMe4#bwJr`RPY*EU=r|jaSW-L z^Y+%ktlJI(Y!B|cId1IH5tEGc%MDO;TR7oCGjHphqO;ad&i>-4?G*FzexbR28N2p$ zi*mKSePaeeD7aX^bXvKy#I7&RA8!7w+phbZ zUofsOU--0%3d51p%S&=%_jp}fU{I3TsrE;q#%$e6u0^hMX3oh~{K6*nDl4-8qLJje z-tF_gFS6a-x$ySnlUrZkD5^0#cJL&FwU_Ln3#s=uhkA?M3lM!X^X%6BwNn`qUli@g zKRDn0B~ale<5v$)FVCOhXJfJWAlo55_w*~w3^8|E7#Qm15_jZ3{g*h?`oZ0o>57Q4x zsQerr13T%%rEh|sYlJ+ky=h!fDtti5x5UjB=t71C)lVK=|2}_dcyH^%(+Aznbx-cM zFZ=NIbN{7h8he;my^)*|TX7+TH7(oRw<3~DeZi`Ej6mOhZohi2x@TI4SmDiJk>Jwv z2cqBjDkv?={Vpxt_FPa}p;HE!Q20_KJkxxA8MJ_G4j=}BOTm*tl&7no%Q~loCIE1C B5G?=z literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/meta.json index e5ea590a161..5aaf4f934c0 100644 --- a/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Neck/Mantles/nfsdsheriff.rsi/meta.json @@ -1,18 +1,26 @@ { - "version": 1, - "license": "CC-BY-NC-SA-4.0", - "copyright": "Content created by GhostPrince for Frontier Server", - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Content created by GhostPrince for Frontier Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-NECK", - "directions": 4 - } - ] + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] } diff --git a/Resources/Textures/_NF/Clothing/Neck/Mantles/sr.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Mantles/sr.rsi/equipped-NECK.png new file mode 100644 index 0000000000000000000000000000000000000000..e9cff932eee736f44c57ddf590760b1a360cfe84 GIT binary patch literal 687 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Mantles/sr.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Mantles/sr.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9b2d24ad3ddbba3e249691395f1b38608ead1026 GIT binary patch literal 369 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 LNkvXXu0mjfXBo;Z diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/sr_carapace.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/sr_carapace.rsi/inhand-left.png index 304ea119e7abab4216c216881c8347b81658cfe1..d1b48f76b56695b0012f7771c93e84345b4f24b7 100644 GIT binary patch delta 338 zcmdla`Ic#dNGZx^prw85kIOJzX3_D(1YswXy4vgGlSc%~^>vZk^k+Q2){G zA6DCLUOJW*Aa-|SK(avOy2@&*`}fsW zQ`1&%iajfTPhM;FdVY5g)7>IAQ_JS>JiF#q$QJwg@6C2zuirc;vi3&PuGa1QRBHFf zZ7_a4vs3qF&>M@pO8r)U>aPhayPx>lTgv?|ZhQWh{>{HO@HnLG^LMyp_^kZ$Ca4NUbP0l+XkK&$5*2 delta 3246 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 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Armor/sr_carapace.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Armor/sr_carapace.rsi/inhand-right.png index b7e863807536b27c15cd514fead0032306f37559..a304124c533ac208522f8c73beda65d7fdeb696d 100644 GIT binary patch delta 350 zcmX>r`IBjaNGZx^prw85kHPJzX3_D(1YswK4CIfk^Aa%ZD7E%HnS{4s%uupMG#KoQVMp?%gijU3ArLoks8HSbeX@ zt9tJg?*0^4->Ny&evi41e5=@{%>3Dgu9N!pkh-_)l^h zXI6(F$jdb~{`_of^li_F|Gca}Pxu#`@bNYO(YPhWk9Iqx&18hQjlsjS?=O>K6CZcc z8*vU%8LQ)UjRN6^+tato{AOihk?nteLtmilU&D-pmfyH}I-?kOe&hbqd7IUun*GE1 sJB+_fySc=+eQF09#+Mr5nda-upao=eKn=eXJQ>9DboFyt=akR{09*T+jQ{`u literal 3277 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..14fda7d65ff37abdb7cd572c652dfa3075f45780 GIT binary patch literal 3316 zcmVpPPiaF#P*7-ZbZ>KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}0006HNklG%Zzni-eI z#_5j*M$L?uwCMQTe#XYBwA;__+?AXGni-cJ5fjdt8mGB%hA<@N$(x=lBc&z#la5xU-J;hfG!UE9*sYwpjxJv<-}Y8@E1N+bh+t z>;Sp+vG4^#@CS`=B+6C?x*}BD1<;?S3qiQEog1>VQ!@p zYm1L~etpONQx2({hoZkRr~T|6mok88xJQokcK_J6e}0YKlgpw3oc445F7P!eX}ynz zdt||Q#ru{045-FmxO^5M009U<00Izz00bZa0SG_<0uX=z1RwwbY6n178r|sCgD*^@ zt)SFOqw%?#Y-^>~ldHmZ(&JbrBWm^x0Mw<&p1cOAOpiSYpfWwKiQAx)^w_h}*njD< y>*=uD^~N@)f}8cD^W^9K=W2LYwKMut#Ix{)qv0YL;5 zBrpHNeYp3mwa;Gr;jFXH-Y+N4$Uu{nh>-{YK&q{!W^&6a{{e!3+sj>BXuIgRy$~csjd2bpjx89&L(*o9@smo-Ut2 zbz@O)bUjUIAgm_P1Qc}&H$NL8g-$G6{v3^Q$31m*Jf^<9Slpx}R3eSBAW1yYEWrj_ zK~lu~*!Y2q)sXjY)2*jl!`F>7O4}93==xEDb_hwjmV~hsilh{J|K7KV-tL~&4Pliq zB2F(r0jYOn^S$E00cW8K3Igoy1fKv-;3P2wwCm@zi!#UDkncjXtZ`70IPHEZ|L8(c z)IcRT30eeHG;mPpOm0(J{n2Q2xXWedDFe?N^wGqx*pynfJAE6+w0}v7*Y8)HI2k=6GZ660mAc)KY z)EY+!gk}e-UJAQ@O|D9Z8`yJX}ddi*($=FL0JsqVUpzE zj)wrqOQE^F_V_Argsf_0L^=sWW+Sxw8UKde-hTahbF|#+Hn>&4(D7?Qk$OgyJU+_( zx`68d&*d?3-m}vL=Q?tgMv%8Nk2v=F&l~mpSJ=6^&5ey&oo=X=-2mdnHL}yD9dY&a zZ>YlM>F;l!);Pn&ABAb+oqg*ZI?*d+9(_$1X}`FYta3kD zournXcr0GX9tVBR_l0ZX#&K;$@B&w9MGDkBQNjsH5h{7)fcr<6hr-;ieeD#0qZZGO zue=akluN|wXu!=+M1;_&~jKF9ZO!yfFS6Ri={;dck&l=8n6I z9mJQm(veWk?oKELl*kdq>|@JU5f0^z9=K>oMJC*7)3)SOyc3JW?C#q ziavK_W2`lrQ{?-Ac=%;>tESkSusUPKuOy8yY>5nGq(%Ypn4_Oqb~0^V&X`XFqhg|T z{`Oe83;BGq60BFW{X0E@ME6rs;hrvN?LUHqsSbm+>=h*CJ&ZLED{x!lemjiT2H;VK zskakK;{`xj?e42;nd_Mw%xaaeGIL7ana0W zv@#!KQf(YlLM8buTXr~tR$I5QvLJ1e(S^?C)V2D%U-P}CwEG4bV~B~t9nJ3<-*Ha@ zNJyh;B6?$yybL+?1oTLT0Q%}oy&{Im1cqL?sEpWN=5`i&mZzCHKZgG~P09dKnob&b z8WX<=ytJ&SY`Kis?AUA&o?QCa^hK41nS|+jDdE@jaIEKI7KyLNc)xj%nP<`qjzf?`=| zzAQ{aM*>lAa{R_wnP5HB`|Pcs0pT`pamI0I{4(`VzBN9kB1t{0n3J_zS$amgdAU}( zak=JRn{?HFF}kQty~W}pj7+sxhsT;n6PY}67rkvdXS!5OR7|U{DEGTcxXi7PDZfQ6 z;Il{ZL1yl!$EaLA&*J5vw(WD~7a~{iEBEu_-^a@|3yge0IM0yu~ z8N(iRslW>D((E!;BU7;B3h$>h{?#B)bnUTT=UjL1aqoH0jnB=-t*gJQe~@jWk1gUW zlGl^h>m42%E*PH9lFCsOn-Sm6+0L2CS@~#d8E7epDZw;3Y1eI77Fir%T0NpHWi1NL z%`6|)YgD2uxu#nxTZ-=$V+~Rb%5$fYT{XWj{g~2^3^kjx_zP7Scgzbrq&*$-mU}3-oIUdPK>5X&lk^=Cr1>bt=&Zy#hH8+n z+ZAn^GpUKBLt=d+j$;$zbi)UQGn9mLn0l7_+BS6jetSP!4W9Uo&Z*Do+%H+EK9D|e zJ&0L+HzfIvFV{lCcdV-q_RV;6T$%V?nyA}KMW`XnFbvta%^~6-l7gt5srgtKP16RT|ag@XGMbj!HI{z8|kD*-p1JM^Z*y$)b!xzfX@5 z*lpP*bcK@eM8!lQqLq`pV$B)H#WJJ<#us6}D{ALz>1xY4NHIg%Y9Spdex)+uCkpd2 z&63T^J;KfwLsRBxbM2?P%(BA#Rni_$KdoHuAIGer*NE3c=rTq69(e`jk93|y71Ndq zQwqwZtLViV{PX5em4d&7Hj(RyDu64AD5#UA6UiJq56S^S2AyZ zzPs6{?4(?MjVX-QMF_E&Z?#oCk*!nk4q6~ur@1Q-{Sd!Gp(!52?>=Q%zK_VL3T@*K z)^`hg+%XW|(TL-=M{Gv48TDdsac2LKp}B~~N~7I*G@40?CN92;dVwy3=H)E!V&EoI zjOW1Tti?ACrRCjN$5H1A=bf!(pnaB76Q%LI{$sbb-R;{O3O8uV}%y7)~ zr<|vpF0?P|PnE0U%687uFWeth8n}D!_u@|AUJ-DRVP>#jr&uNw;U>w`0(+Wdy$?QJ zqkjenkxG-A{rk3Ojl)YVXk+J;aOLzqsocDOVo1d*!Q=yf79@+v6KM8PwnmO=_Jx(b zRkPuc()jf5a`2_*!UOWRk_r|+#S*ZH0B$yDUgXd*fd{UTKO@1pHO0VZVIVPxeA zx#!Pj3cu9}^_zrk`BwQ6>!T*Wqq>DnDnt_^yIRi1eb;YS;W~BFu(#!HOLi63+6{XU z+}0T4e7eJwD>Jfm(iZfK_GWr2S5|SU?Ks%;^vmh*722gxAD*j`!IrrIo`cF(!&aLU zm3`GY*iy`tveotC?9auQPuc_Wj>i`@Pw}H7Mz2$TCzHeOCTArNMw3SG<^H22E4!xb zbG36>3>$SE<<6zMF1Q}7qN5cFJ)7E_85z$U&(Ao@Nd4^oyzpwbeUG7fp{KLw{-^#x z39-i~4=?sR0u}>Ue!gEJH{5v6`jYp?fE)xJc&(}6zGyuRQ(pFQ2 z2hRV<(RZOzrS84q(7xn#CnDr?q|&YZwML*G`FN-!B6bYl^B4Pag^^%j>6iw2DV?GY zKVKjrcGitFmWO;_-DpyJ`KhZ|sgZVm?VE=J3gpdf59<35{M}Qx6wPPRq@Fj&4u6J+ zuH#tQ8+@2y2?V&dfCPmj3h>(jJ@~)E12ic6-h;P?0L+W5@VX(Yr!Ii#U)S|9c~7-!VIV)~Y8P#KH1rKC@p?DydhCGb0`^jb1+zxJ(u`BjaHQnPxx$U!&NyBv+kd0&~*4?93S)Y zVD(~}Onk0&c1W1!<;u>_N{gn%Bvf#eQF?Xm-eviI$by= z#R!3STY|5$ZSLJ{8GhJ8bgS5qr#0xRmy(w%$WUn%qtafuR!I#W&c)A0bO~wtGRUe}S7v8p&WCBYrlY1y<-$W_9oyyE$ z=Jg2S=Zy^>&KciM(6tzdf6IKnT+I%mz0tQATt2gvn7bUeAHL@Wa>Z_$ eR2-F_q>KxW?FL@wi}qB5+tOAyP^*I4hW`(`LZ#aP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/meta.json new file mode 100644 index 00000000000..ffecc9fc1bb --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/private_security.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by @mureixlol, for monkey @hem0mancer, recolored by MagnusCrowe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING-monkey.png index b962d5c9626016ca941d425639e4a18b307be061..ff6dde0fcd5d377e37c4f94f97ae35fc35d41c32 100644 GIT binary patch delta 1251 zcmV<91RVRFAEFPd)Q!c zl7P1Ui3uj=W@is_?{3u5B;se&^hr6GDF}#X+_z9B^X*7yt%< z0bl?a00!XT8du0kgb)Bg&EXnKID+hI7P(Z8=RkE z0v=ogy?-`?>}nQ*BEnW{qf(ob+G=f7P()-`vlz9xaYvRdnOonHWjbne=jmVV?atG` ze>Q^$*FY^vftG)ujMu-ZfuM*;FKwYGbOr#>6FP(R(iQ|o#Py~$_Dw{miVt{_7ekTLh$+whX6}kxhR9Fr3zp<~IHOa@l_RyRB6H zf{I|fzXh)}H3Ln+=c8W{Eum3ohs$VRpIJjLl_OVsyD0$7r+&k9e6DN&cI)%9eNWhC z;+Z`CvZjDO3h0$sP()}6?LUeR4#~)-r6Yh@pO@|XMu}O!&{2RZwgb;|B0O(R0Q}N9Q1|5 zF1*>|$B{Y#f3GHu7Q zKY6@?=wb{2V1@H$2v5`3oi8*3iY|hbQllegv(oYZ1F>6wcRwuy@T^)X{bY~B3;+Yb z05AXy00Y1PFaQhy1Hb?<01N;FzyL4+48Q@if`1kdhr`Bu-pf+}NXOFTS#Uz{PdFSV z0MLKg*=bz_{QL=_yle+A+rfKz$_X3=0R32zyJphly}Z$%KhK}16-j~U4FQ~k125ab zIXGPE4pDu-KqagvbOx8YL)6@dd&`owDF6Un=ej5_JHaiak&J9YP(<*u9bfFP&vj7%#1el1X44Xyu^~ZFM11+}B)BRtKEj?fFY4jI}hSGIB!Ayrk;=$7c|6Gw45cpPuM=)>jUag0qKL!(=ws;WX& zRS-hT_A+0u(Jj%j$zyrir%xP3qg$dC0Wi?tXIiJvx4@}R4D|O|HXjIdw3c1F=oA|swEl=Z7n}LQE$|7A?aLhW4iq!qV$J=Nh(5{M}pYg zgYfJm`U_$Jfc}4i7{arY5Sx4ORof7X%5aPuc!m<_w!?Tm|PCx2HXu=HuN~h&AG~q_*QD1-3{n@fq`iJef`e_BhhV=j% z9`*ufN^pH{nneRkRB`LRQonYu6T2HLY}9dq@URy@Z!(N$5x`-6ozwM-+lJ?+lk~GX z1msyjj>KY9H=@C1<(eSb5SnnSIs+u?>zuBXUXrMv?ktcofEu$%<+@^Mg#vu`Wf{Kt z;%_{U?qPo;9Kr9ao2mo2SZP%B_x4|)AU{vhe-a3(3&0}k$$sVy)YVvEe)ALp|NN_z zQ%_c~w7v!Z<}=kGSd9in|E+QZ{@i$`l(POxXgi~IfF@n>7O9FHCHX)kb^X2C zXsxKGv9*P)Lujq2rp{8!k^1w6`!pV0WU9n~7O8)V0Kid_53@F=)CZnxFu$`808pdz zi4cy`mpiXo3?L$6|X$*FSRN0jajf?|#<_02tlVW|W(dkq5Mo4X}E@pVj;QOfcII zydfc1AXk=@pJ2A5-tT9pMn+is*Z@<_0}}1s$Re~e%gP@8&0Bgj4*sS3v{>)=v%7!8 zmuckQc2a&o&K5#GpAS}}ff_EIMcb8Xy#ID3+OAY%^|2mSqk()rAACL^7-LyG5}#)^ z8ff*gK1sXb(pgxI2FeKlPit3vpFV|kmRjIx?NTiewn$Z3*Uoqdw2uuiPiq%BX11`c z-9$Nng_$h?!2HfWG981N*m!V}L8?|F$IKQMum!U=hV6w-L|^6y97p?DF+heeza#7I zE7#SI0WyR*@B{thYBT@3AO(Q06AH6C!|%7i~s-t07*qo IM6N<$f`|fCg8%>k diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/security_guard.rsi/equipped-INNERCLOTHING.png index 49da1087fadb1f35b844969f37e0e354c30f739a..8f2fa76404f8cd544394b72fb091e7358dbd2ffb 100644 GIT binary patch delta 1348 zcmV-K1-ts~AA%sT&cOc-K0@5P1i|~rL2%kX)C0H zQp5pR4|Ko8Lb`#f0oW!p%_5GyCvHk4t?|t&~v;BU*aD;yl9As<40XGJK0bl?a z00w{oIKbwsw3FjF=Yv{Xh@Q!D<<@DN|FECv>HMxgQZv*$s-u3j2R*J*13LgySm+U; z+)|)ta-6TVg_!G=9Pz5-0HCMy@JY?q_Tu&PiyM~yCohE>1Mt^3ffASi&^HHYNfjsK zZ(@G=XPg{<1M`20CGfHzU)>b}0K+p`&mk<&iUa^Y?NNVuxqp(WLl&YtN#j=6uES4*JqvL9yq+cRRr5RS}d z%j(NK;ImQN!%QDdD-vS*4%Ek z6QUxH%w|cWzrK^cp3(Pwob>zVP*uO;ZE&RfWrRCBu=&qDd_A+ug~qmseE=%{4gjgk zPjerA_ac8Wj{{cg22f7FlI_)R0KkXcONhn0u#(sS&{cBl0f37)u9Tka@qYVp^;$Lk zJ)LpXZva4Nw2cFRSlsBuQHT(CTJY2%9|XPymp^}mu`dom(Q0d zOfU44-f$4{o^Zu>@t!bx!$C|h^m`fwH1%CYKx+E|LdRlQ1rR~LY`fK_Ali=wk=lOX z=`VjzQ{UCQ004}C8zBG?YBxsKV4&4%cYh~iISK%mK3MnsWvCu~Pu>Mg0Cq>5j7G=H zfpDWw1;CSJZUC@3K?Z;UU;r2Z27m!z02lxUfB|3t7yt&qrG>_}h&+}0-&9!2Qz_ym zY2swQx(p{MhZr&7dBNqLb7t;Ni=o0)$ztd=zKECNDfTZEVWkOm|OQ4z{51zJ+| zd?K`xO)vBlEvZ7er9g;^kOn01vLE$CK~t^NuTA7|dqy;}u^HVGpHD393xw%~eqt76 zNCOh|j1FZji}`yJ76YC5a#AN$FM-{h+isTFsL=42OjOdcV4&5i0kGRvK2LuPFsgq< zLeSG`04lU3$~r{LiVG$HBPBjQU{sIj86BTNqyxYZ^jpH_0Jxu>w?~};K(VSr4BsdL zcxP}J;m!^Kz}ouXSWf+JQQuFq>x~QzAsXohfSPL(Y64*9-2q_5w}IvBZ6*6J-nfF9 z*Xd59+iMa4;N0`eyMEPJlfYH0qf3APaM=3(>Xb@EzI=ZEr}ND~QHdHQBX6C{m#-1f za`@$fp928t?K_PFuo`k4UI@1nr@Vae@{i4JssP;j;I?0`p97+Dz*T-eDhH@N3()Z4 ziK-8v;e)FPID7g;P5JqWQ=^_o!NjT2ntV8W`ULST0{-jz0Gd9y9xO(WzvetTKfieO z8kK>Nh7Vk=f1EU(a57pQr|AR7{yEB~#25eufB`tb_U{0PVYC#;|{rQH322A%GA-2p|Ly z0tf+iG8ki`H);+aV-gJ+Tg~BPtepNa#z0DSln}CkSWP8S*Zl?_jC=_# zJxL@QV*0ThY{lY@VZyWH0HCIlkb|wp`NHFKUtBf#-|VP|)k@d40N*DLG60C(dKKA; zFLBbM<)X)(6J5h0z2q%-lp@Qz!i4h;jb&Z(hewnud?(=3Eou zorVT>RFZJweGD*-%K0c0n}jJ=vlVqr8C=K1k_Y=!+n*4H-D9t`Z}5Z;okPH zqHXo_dOLqOfI$6E|w0|FJ12Skv1tRn7rXB!@gk$TD-dfF zUci4lb)T3QLS<(_;mw2)>>;qyxPJFCIxm5|T#T@af2b>3q9 zc3<_`{$JoggO4rc@_6B?{b+8eExKRIN1b5SAG=(ojxpuy*e-{Yilo8rg*eKi13 zbl;}<@%!uow+!IHZ%cqUrL0ZyvYmcCPAQAJxEyxMAFJNO01(%Pz};L9;W-t% zuit+u*>3msI|$FIxSPwl`s8`?6T4p)?>06v0C=prdS#08tR+u+dD#dQ0M6gL=lV>* zi=Q|xjOc+B1CNgL=C>_?c}?JCs@Y2Dak@SYig$uS03m=7KnNfN5CZHh0SF;Q7eLzu zc48M9AOsKs2myouPGMD(-)htzInLx@OId&Mc*?m+4z@x~B~g3iIMYi~vqLAhbiPzx z`-}l=HAAbSiE9E#G{n5^T}FX2^Hne8U@PKu(A5{Ar4Xl-Wt%#orjiKsd~LC0C4ETy+&M4JqeEL0%m`JF*H`|^A|5sJk$LP z*ID4_k*C?)r_+`m0lWQjlmS-t`Dk<+zs>Sp3Ou3I!RM81c?4Wt3fuJuIIYh+0go8A zl|O(-47M`BNqxRe@nc9)T+f0bMR62EeAQa(iU9w&KY(Wp+r}TjD~4_74{#?t1|ohr lDqe{R0fYcTfE|qg1^_$MO`)ij>q!6r002ovPDHLkV1jggPm^RlUfwV5R2@P~}a|mu? zr4$@3cIfEj>LPCLB2Eqp?oQ$+V*diEfsZX|B0zUh;DYceFOONqbU|{FVpr zec$_i`2BwG_ns0FF47Dx*oFW@fFZzz1DK}?lv2kxWi2r;n;3uN2AyUHy{FOj)-ho} zO>UqF*t52nSxcOfgWl7LbEo8BW-YO2ZTTlD5D|X7n3OM%Y@CuqC`}6-NCm2fU&&YQy0(2x?Z>9Oep|p{%k4$YhqNohwDRt`iQpW zAE=YA@0p7*){I{rmy;p@5P4w&dwAcuBM{p>88SN-mqve0oH2{nj}N&2WRxIkv45ax z40c@qeLyLNQi@JT7%>!{zfUa)x$&S$EeP@aeMXG#daO4VG oy=)N2X9gJl35Njx9l-Aa0P2hMBEEWBkpKVy07*qoM6N<$f~CVHx&QzG delta 614 zcmV-s0-61u8mbzw&q=G8iR|6cdvJ>0u!k?o2Mvq1@G) zGillj0m)l_cklOw_u;+Yd%qteBJ|UI=(7y~1^@$qz5@h02^fE4Ej~_?iHk%L;3H^g z6_}MZn58c*!rctHt}+msnI}$?Nl2t%R@R*0LLvoDk|{JZPdzCC5#g0`ik@FCKuDyZ zXERu$Dp+6$OH_rP%|J+`@VNK^FC>Y&8SkuB<_8zw; z&VY|69siS;SFwL;ns}h9Y&ResMWbggP;hz<+|fyBX{9CDwJXndK=JV;%yJ%jHiMsU zU$cFez$oURXEQL%c^JhUw6x-?)6xozV$KO}6m#C30sC}sym<-$2u{zr>TJKQbL)yd zwIKi}mBZsF2ms7-ejD(Q@2!k|X8&s6eYfH8_{kmr$@qVbw)>uCz_y9fDh~a4hl2+K z2y#QXc~8KjI~&l=I%>ZfsG9ZOjAF(Z7-MKQ34R}gx>Hq0B~JnB9BksHSbHXEQ%BpdCbaU zTivWIA|_t)SQbU{6ky%55LXS1tQ6YnMpg=ls|MCB%e%Y4w#7(<0N|M44*-w?+tn*I z8V)D`+^`6pHRCwC#+s{e@Q4|L7?>a(GmzmroLJ_%eAtbnS(F3$m z=mEk-EyHC`(6V>v4ctZ0t~aPfP#{qhZb}RVv$8lXN=f?XpF8U4cRAMGbu`@u&SF*{F2euiIlcG67D~ z5qnvqc2dRG#(MhzLyNZ9%erTTR=?1q-QI6&V_j+|RrJ%(^Go1%cMgr~I&?y#P&~#? zJ}2RHSad?8ab3q=#qGOaI31Rqd`=3*WAxkauL_!K^i+CA^WlFLI-vmomK#L##VoU&x4ZI`%Ee(U$&3DpXU=Wj=ykuFF*hS5P$##AOHafKmY;|fB*y_ z009U<00K-7fT=V(;MbEkl}7s#z+@U7^y?*HDn0h)1ei>ZeFS|oKK#f7liZ!6VdyPwr@RjQJ_f7@Bd!|5Rc z17iRHZ%D`O>H?l`GDXoZuP4Et@fQF`ZLu&6NX8^nX9KQ;@ACxrTN86g@r|kvrm-iV^jCZ(v z79aot2tWV=5P$##AOHafKmY;|fB*y_00Bw|Kvf!D>DIx2PNU7B)J&uCwwi2drPh_J z!dBAb;Y>!9>9OPKEwIz|S9tE)ngJ?B<;>OI*iV=298H-=+6$@F?of!wPxR1YgK5(Xl( z5n9P+Xl-v3M#6tU^{|51Ma#Z-`SG~YH{~}%JDF4O+TJEsvKflZMo6Z&)k1C!fAXiO z|N09fVE_O$D}>6I3eJ9?0eb&UWxsl*5peVQ@p%Z{8ENu2uCvu2w(srdpO-#(6}?>n zs26KO8`Yp$%>klWA!wr->cyIH`h^f31$wos-rw4;s#kw`8+`Zm<3R0fDtcW3#D#%W zUdLR)!v1m?a|H{jypFgypJVB0$u9k1UV2@lNw&fYAuyksrl$|@wzX~S9$|g^K$LRd zY+qz@rsGPjIt9G8PFa6mdfobS-38XS4+H>e)aO&vUi`Lv8;C0PN?ZHNrXiKL7v#07*qoM6N<$f@^44xc~qF delta 803 zcmV+;1Kj+y8}u8n&kBD74@pEpRCwC#n>}b#Q547jSK9bd(i9R>$V&~y#>EecsGT}E z1QFUGE^+BA(h)~aQ1a%$^fB`T72Eda+3lx8#?t+L)4ghcl zhD&}d^oHV;&4)f`az}n0S$(6r)U?XN85kySC{D7x+Bk^_4Qj<~-2rSZCg|74R{{Vg z6orPuLA3Tg1ONgcWMYX3LWqKVeooKeWwm7WvU-=pK};wL-CkM}0MOjkOSbMniQfDW zGNK<|U#1&jADYfz!S;WTZ+I4Yg#MoUu(-U~n0t@W*-7k9#{~ckT(D~zlo0@0>&-?k zRn*&`PD=$esNG=w(;I9pCSdmu0st&7FIJ|XU?-D4kdLxaz0xM=ySobjuwJ}Ykk4M< zJLb&g#=orW`{4EH)dXO3Au1XjZdhF2g1p7$MWe%w&4sAYGrfQHOn)Qw^y<~U4Bol* zyrxz*J$j{0PzZr@Z4Po;kE7{mBZkK8c>G`m8^3q(bA1zuR7R|(=5ya~Y3nH4xb)6| zN{vufuaaK1da3|=I@{^$*^?!oz5V(fky!G;0jQ)`t)A*C5Q!zlzx5N5SW@(Kwo_hS zDk^)E;&UURx1N7qy=7-WrC3WZ6kNBobsWeYF24&f00zJS7ytt>uoE=0X7e)0j{pN; z01SWuFaQR?02lxRsHtc;tOLt8Y|7bpnrDCz0^c`*hDIG_;-Rv9oYZX2h4Dz1^;)L h-v${#UB?%n0RX|E&(vYLL3aQE002ovPDHLkV1gPx&NJ&INRCt{2nmupRP!xtACr(pLanzKkDyXVZhb~Ag`~b!Z6&Tnm^%t-)vhV|# z`2|QYF;D?wgAE3xE-aNmP@z&)4TeO)*p2PW;MjFS3AxS(2+ku}ihb?-9>2LClFtD_ z5ClOG1mXY0(7Cz&>6x0pz5(T98hzM*c#qPVRjod?_18CG=9tD7?BCbdFX)KBy0e;| z2fOX`NO*N;mG-A+N+$qqeIID`G`0XgpZ>sZRo7~Y7SMp8)y6zqO55Jwv^jUX2^C-l zoW}E5Y*e4Go>^D zKr09xef1@xST(z+p%0-GV9XY@^#`5;krx3Fy1`FvPu9Ms*OU83%}@RMnWNu*zhNMk z8k@_?x_B3Wx%1a3cWg6@20<84IX{BWZyo{QzP>@_>bsGRfL?uoa^Xnd@4Ry!eeEFa zYFYitfTrV*Z3oEe!|?{>(KmG;FlrW|Wm5duOs|EDHijF3c5jI$@5P1>v z>l-8qR2{U2O!ab2;l{rsFT&sPD9w~&112~PlHnihwt2Gll`Ajj(z*aFaGs91Kq3{+ z7Ap7=YR666l5FkXzBg7A7Uri_HX{sRELj+3{o)AF%nrZ5Y15mh{~J&{F7<3}z>9-{ zpUwSmr8@x-?8K?^asdwNoi3~7-#3?RApZ^kIn(0_Nn+GovN2cevA;aT2AfNE z*UJyXPzH1b;0@c;5ZXhK+knI7Vb^(5tS||BwR&UGAy?4ZLWC)M>W}5-D=V`KjtrPY zeS#nef*=TjAp9fz0A_uUrHTF0000< KMNUMnLSTZHZK{6& literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/sr.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpskirt/sr.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..ea44112e0c8a234067be420cbd963d0dbdbb531d GIT binary patch literal 1386 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/private_security.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/private_security.rsi/meta.json new file mode 100644 index 00000000000..f22d6d800a5 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/private_security.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, recolored by MagnusCrowe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/security_guard.rsi/equipped-INNERCLOTHING-monkey.png index f5bbb0366e3eaa791bff2363cdd1ff55af9de254..73f35894831140cd87877b59c212bcbb3848bd8b 100644 GIT binary patch delta 1603 zcmV-J2E6&`A^#z;&udG#BKbta|D!9RP#J#^~!(T z+NwaSc|IhcgpCQ+h_))woP0gFTT@_@S(Iev)6JJVNXNF#w88Q-n0N*mW(IveAFbwj z@`=+KQ3y3!EzN&m7_hn+C{zq)#(m;B;W#H>17MKWXtm_fy?Y`3E(zsXz_9NuhEKjl zxol3<`Nn)G$;^k~ydZ9~8_LWQGJ2^#q7krn=Nc+FFUZWeZ{D%jF$HC233>3-$;jn^ zxy}Os6VD()tqO7;0Jv-pla>am$}NtF^C>lFuy^Mg8k>I=8|3UlqEIo2&5FgOrGZM4 z1bt&ZxXtbb&$-QR_{Mya=Bt@;A3V1`V)zR{=IXi0K-qtQzVCHRL0jHPHvIB2&0LoP3o{UM8zJR@s=|#(j8g&tPF?S#NpVWV#zf)U z52o?vhtcp%J;LzBBnqGP3d2*>j@K`S33a0I@Mq zqRun*Nc4wa{R9A@zWukzML#yFS6+1S;Iy8)y-T@pve*-PO1F#Ma3sFH|c{WwDBv@8#qU9zd zY)*d{>MnF)Ew3Q}2mn%UGC~>6guTAEsHt#E?*J-xY$C$e(mR0Vl;$2g%1uTR5dL%) z0+FN(i2ZTYjs2%v0Ra0?w?e1p=INyto6{xkOAnry1z>{B>7va&cD(p5!h#UeC_sq+ zH#Zs*gY>y+{(1kk--D;UH|_T&aei+1($9b1fWgt=xk*!ZKSEvYW|m^mT*sGNg!Y9< zl>BknIg^U@1(oo|ZGdwo6*uko;haf@H*N#g7gUNmsibox5o+TeSbb^e97z=0xBAkc zHts>^NFtiL`{nfj8Gw`kh8#8|>r#Sr$+{E_Ic&>faHQK0I|-U^-3m!3l|;Jzu!euZ z|JqWYoC9P4G5{HX3_u1T1CRm80Hj(E_&3btjL{f`W$}%V5{MvQ2Ae0V0AIrouQzmTMO~&V3*_o%KH0J zy0s9yGZdoZ3KfIH4lc+>NdO!^wvQIK$0NPg3(swjSe|a^Yej-uwQSuWL9IeVUn>BA zh1hf3gZHw$sMoE+;bZ%#WB}%h@P>v$#o+k$Mp$B4uo6m(92kdM`p0uY>^D@E#DXrJ-h7U~EPHh?jUnT%P0q8tOP zY&?YvK)`6#{27bdlgWVHzVyDHG`6t5hC|WbnE*``z$%d!;~~v${!;qGK`U14(<2YS zpo#N4+GD3>c~1wGrfp6a$_{_nk(VxU5rUmx3exV5=RNZ?JFwNaWRn4|ZHy<^mk6IbRHBPamL3kW+7e<_>-m}i4d z&51UKDn$O*n7kq+1CRm80Av6%02zP`V1>%x0{{_jzDy&CazX$A002ovPDHLkV1laP B5a0j+ delta 1580 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 delta 456 zcmV;(0XP1G8I2jR&b&zi2;2_e) zHIu8Gii<;Wa&T~Tb`d8R2N8-mxad|?Y|){JXiL#j3u0Al3vuX=jX2cOC`fKe-rNWG zB=>R`VVWj?86Es_H~K~{B&nIzp427vk9*Jv9+z=)W&!VlXktfx;|*2XH=*ceJEOy}@; z4MeovguAncl%KN5s*Vy0e-_s&#bs5e{FG(&c+0*Pyj&b1`L!wpX!jTO;>ApoQZ8+; z2cBb5B)i)2J^q`9^Jz2b^Cr2jJfVd<+2aGn17`a3nJT0000`6pHRCwC#+s{e@Q4|L7?>a(GmzmroLJ_%eAtbnS(F3$m z=mEk-EyHC`(6V>v4ctZ0t~aPfP#{qhZb}RVv$8lXN=f?XpF8U4cRAMGbu`@u&SF*{F2euiIlcG67D~ z5qnvqc2dRG#(MhzLyNZ9%erTTR=?1q-QI6&V_j+|RrJ%(^Go1%cMgr~I&?y#P&~#? zJ}2RHSad?8ab3q=#qGOaI31Rqd`=3*WAxkauL_!K^i+CA^WlFLI-vmomK#L##VoU&x4ZI`%Ee(U$&3DpXU=Wj=ykuFF*hS5P$##AOHafKmY;|fB*y_ z009U<00K-7fT=V(;MbEkl}7s#z+@U7^y?*HDn0h)1ei>ZeFS|oKK#f7liZ!6VdyPwr@RjQJ_f7@Bd!|5Rc z17iRHZ%D`O>H?l`GDXoZuP4Et@fQF`ZLu&6NX8^nX9KQ;@ACxrTN86g@r|kvrm-iV^jCZ(v z79aot2tWV=5P$##AOHafKmY;|fB*y_00Bw|Kvf!D>DIx2PNU7B)J&uCwwi2drPh_J z!dBAb;Y>!9>9OPKEwIz|S9tE)ngJ?B<;>OI*iV=298H-=+6$@F?of!wPxR1YgK5(Xl( z5n9P+Xl-v3M#6tU^{|51Ma#Z-`SG~YH{~}%JDF4O+TJEsvKflZMo6Z&)k1C!fAXiO z|N09fVE_O$D}>6I3eJ9?0eb&UWxsl*5peVQ@p%Z{8ENu2uCvu2w(srdpO-#(6}?>n zs26KO8`Yp$%>klWA!wr->cyIH`h^f31$wos-rw4;s#kw`8+`Zm<3R0fDtcW3#D#%W zUdLR)!v1m?a|H{jypFgypJVB0$u9k1UV2@lNw&fYAuyksrl$|@wzX~S9$|g^K$LRd zY+qz@rsGPjIt9G8PFa6mdfobS-38XS4+H>e)aO&vUi`Lv8;C0PN?ZHNrXiKL7v#07*qoM6N<$f@^44xc~qF delta 803 zcmV+;1Kj+y8}u8n&kBD74@pEpRCwC#n>}b#Q547jSK9bd(i9R>$V&~y#>EecsGT}E z1QFUGE^+BA(h)~aQ1a%$^fB`T72Eda+3lx8#?t+L)4ghcl zhD&}d^oHV;&4)f`az}n0S$(6r)U?XN85kySC{D7x+Bk^_4Qj<~-2rSZCg|74R{{Vg z6orPuLA3Tg1ONgcWMYX3LWqKVeooKeWwm7WvU-=pK};wL-CkM}0MOjkOSbMniQfDW zGNK<|U#1&jADYfz!S;WTZ+I4Yg#MoUu(-U~n0t@W*-7k9#{~ckT(D~zlo0@0>&-?k zRn*&`PD=$esNG=w(;I9pCSdmu0st&7FIJ|XU?-D4kdLxaz0xM=ySobjuwJ}Ykk4M< zJLb&g#=orW`{4EH)dXO3Au1XjZdhF2g1p7$MWe%w&4sAYGrfQHOn)Qw^y<~U4Bol* zyrxz*J$j{0PzZr@Z4Po;kE7{mBZkK8c>G`m8^3q(bA1zuR7R|(=5ya~Y3nH4xb)6| zN{vufuaaK1da3|=I@{^$*^?!oz5V(fky!G;0jQ)`t)A*C5Q!zlzx5N5SW@(Kwo_hS zDk^)E;&UURx1N7qy=7-WrC3WZ6kNBobsWeYF24&f00zJS7ytt>uoE=0X7e)0j{pN; z01SWuFaQR?02lxRsHtc;tOLt8Y|7bpnrDCz0^c`*hDIG_;-Rv9oYZX2h4Dz1^;)L h-v${#UB?%n0RX|E&(vYLL3aQE002ovPDHLkV1gPx%en~_@RCt{2nlWqJP!Pw@Z8MYv>cKT7Ern9(qS8swL0!6O?dA_s$d{-;LZ>X* z3SQ!^9^xV3DZ~_9Ogq?4s)!&%LI>BVLwoW?$jZBCNwo0)fk8T*-~V(vJ%jIv00000 z0Du|OlY>}eFPg=y8!u+v_%@peL?$$#Wgr+VyLTSvThMAdKkotCng_ ztv(+&8}-BB_Fog=o=@1h-fsP zB*&ZtdGqpm8H~o0isUjXl?)qvO-W7KBl5&#q{CopvmTB94wv$#Wg6 zDzK`6G_p@$1#%`~Q&bfoM^w_Y0=6Y+Lt0D5qMcPzC182jO2$&sc&<~)YtZYo-FvG|*m~!djmmXByE2e{$mP|q#BSS^RsRY| zxF^qnRMDVh4c6RrF2O1R{PgEPs+kE$BcD9SVA8tJVxtP6%hh3(?dcokewpKFfK|{p z<^ldvb$|X}hyefq0001h|Crx>Pg9G7lW;l!000hUSV?A0O#mtY000O800000007cc QlK=n!07*qoM6N<$g34H4`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..cdcb5f546eb0860f560dcb9c7b3fad1d472431d5 GIT binary patch literal 1199 zcmV;g1W@~lP)Px(Pf0{URCt{2nonrkRvgE_ik*6)iIq4_O1Gt5a4222Q7DEn=%o}&kAqQmD-3oj zx%bv{PaQq&u)}s8z4esaE`>oTgRs?2+oWmY)T!OXiT*`toJ2cBQl6e=N$*+DrtSNH zu%3R>`~Kd~KRwC*JwPInNF)-8RR~4b4Dy?oMJylIVNT1EkyY<(G-|vr$In`#A-; z;kR|m4t(qMzHZq7fN!tOr1Au4(KjqKoBQ};;&jWPNnfu0a9hl~$cf>clP?@?W2cU` z`*&xYeBtQx#BeT^nLke7(FSChS#sVC0y#(w6@cVBQ1Rj0AJnYr9tKkY_NW&hR(q$2&}Rz3 z${V5)68nH%0CD~E=(9ZqE~*ani1DT9;h@v}D%nDgSE0wVO;=74tqa&2rm*DjJ? z>q{gOi9{liNF)-;hXU76*Vq64>5Px6ep}?4fFv}lvrc_e!)M?8$m|F61@z$Sn;N`! zw*ukS{2o0n<8o;_;0tRIm`K2@86dk5MpZfG4`KrK7Q} zbm~8P`~-#JJWh?|x%y)YKx5nR#l3H#yjbz~r>D+xIl%%s_>CEe@s(SXry#%B?j8xb7eO>)}2BZ|QDjKz&nlZ$YEwsq@FL zHE|{Su=+b)vlk}ra{um3U|m8IAEW4aeSpWi!?b#eChheIY?Yy6-Z{_@{G#N**vX@4 zyES{e(s{8m2?GHXcfK&~ZK)6_KU!STIPcI@g++^kIz<%Ce3xnZ z-YyheJX0W5&edgxJdbhyz1fxb&+K6o;W{e6IItJ-FUBRTMNc@yXGdSX zE~BHw!(18e;!v~DmMILY?_Q0XJ5S7CSn*)nZ2^|3X^jj2d#z%;B>ZBRMBKhcgISMW z{Al^Y?ZKobDE#ITZ^+M715c(1r8&E7=51)vX>d8a_VcpoTi2dlGk5;nPs^r%HQgTf zGq%3z3rpyoJAAG4xK<`e?dFSL#(h9z?K6h3hQwJN@`vtgA9}uzSBLS8qSt)ph?*ar z6Ijl;J=RxdoaDZ&vG#Ge2GGCt4`o?%dY)e0w9yV2x_qe-o@u_m3|c@o2M~k6rQpdR N%G1@)Wt~$(696?pt(yP< literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bebf585240a92866a4c9baf953eb64a159338a56 GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zT|8YJLn`LH zy|pm!P=Ls>kC#*UTB`q&&*ZG6ZA7nB@WS4E?3Uq90=DL)lI&<}o;O#pT z#c#ASdvE{mKlR?T(=Q*g6bmo{jRt}S<1L|SPVeqpy`Ny+D-eC9#?0{BuC+$S^L=}& z|3z0GUty9k|J(K@bD!_p!8rTq7VSI}8IQOrN=lQ&m-e(Vzb}@mjPebf*^qm;2vn-W9RRd`d*cl((X$4kN^Mo^Xrq}UyGQ&Z9o1_Uh~aQ|M1Mc*$v;m?I`CJ zxOi9Y`zA)cx49+^5A1(3ZE<^*RVI1V4`>r#YJ_K+uP=iZkj(+L`BLy?5X;lm&t;uc GLK6Vxfw3Y0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0cacec8096bec481b1193d2fb30275eeedb8afeb GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z6+K-XLn`LH zy`|W9$U)@T$Mr2=wNG&EILIYZ#D74rN{g@gP-563K^2Q81(lEo0~51;W{ZqhjO z$$w*Cbz}YY&eqSInSiE(famtdtKJ#?%RB$gnnO2AU%a&V%)8**Eb;r#{tnoG_{O81 z8Q*^IzPat3z7y-36X)Ojet+wW;XLct@oV$AUg58>9Z0<}22vK+g4+}FIt>{Z>dK#ey5b-9zV;l@e|)JCo@u_m3|c@o2gt)f Sa4C2)i1Kvxb6Mw<&;$S&Z=>)4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/meta.json new file mode 100644 index 00000000000..d6adfbf330f --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/sr.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by GentleButter for Frontier Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json index 15c4ffb482c..733d7be276b 100644 --- a/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord) | Resprited for pilot and mercenary by erhardsteinhauer (discord)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d, pda-cluwne made by brainfood1183 (github) ss14 | pda-brigmedic and pda-centcom made by PuroSlavKing (Github) | pda-brigemdic resprited by Hülle#2562 (Discord) | Resprited for pilot and mercenary by erhardsteinhauer (discord) | pda-sr Created by GentleButter for Frontier Station", "size": { "x": 32, "y": 32 @@ -50,7 +50,10 @@ "name": "pda-sergeant" }, { - "name": "pda-sheriff" + "name": "pda-sheriff" + }, + { + "name": "pda-sr" } ] } diff --git a/Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-sr.png b/Resources/Textures/_NF/Objects/Devices/pda.rsi/pda-sr.png new file mode 100644 index 0000000000000000000000000000000000000000..42113ec46065c8638a74c9a5aa7f498d05052d2b GIT binary patch literal 680 zcmV;Z0$2TsP)Px%NJ&INR9J=WmA`M(KorM6KG&&}x=~6)C4`_7Ln|T(f{m4b0wy}}2e7mYLMlj% zET|JJ6JlUsL=2r+P^E%U5vBYRB?uFeiclx<#W{vc9HSuH73$`%Wa;#M&+oqX-n(~@ zAw!0gIB~434kNBOjGzaBk>p^P^Geu)TUE*Lj?dklDQyT~^?aX3tIgWS5qINUpB=Zu zqi+SgultGdV;$_-yb>i7cV&^+FE_aK)Cq0w$|AdOH@NU*#BE+XPP)=4~My7Ko78>I5RzF3OP&rDd~|j4gF6_BnueeSF;tahZ%@+0LIbNOu8S^@19yfnhXHy z#~T3pdjWVLoa8Z+PJo1*WsT7xC;#R}$pn#ZaK;M=MgoSYyNz%?EJf7b?WqH0AoVC- zn6Cml?ZXeC_Qf3!S~62@4oMkM=#DO+?>dBo2+8Q=1;WnvgHZ;I$>eJoD^mr!j`f=r z)-Sgab0%WOL^vk(+Z8sK2ArcuURMVAfkHUiFAZWdpp?RhHkkZ}Q?&jv!1Gnesa|p; z#uq9wP)c@UEc{+TCpv`s$^Rrj$Fq4Q@`B}xq}%mbdp{KhUp^ygc|P|)X-@SNOQ!;M z_k5n!Z8~oJOPC=;h716I0O$P4DMgk}6aWAK4rN$LW=%~1DgXcg2mk;800000(o>TF O0000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_sr.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/direction_sr.png new file mode 100644 index 0000000000000000000000000000000000000000..3229ead1a7ade56c42b90b4b265e4bcd3b1d893a GIT binary patch literal 3246 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 LX{1pNwR`m+Ooj4$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json new file mode 100644 index 00000000000..26d4d75f59e --- /dev/null +++ b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station", + "states": [ + { + "name": "direction_sr", + "directions": 4, + "delays": [ + [ + 1 + ], + [ + 1 + ], + [ + 1 + ], + [ + 1 + ] + ] + } + ] +} From 58d7b4afeca7cfd4faa52b90a3a83fac4a81b715 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Wed, 17 Apr 2024 22:05:21 +0000 Subject: [PATCH 14/18] Automatic Changelog (#1226) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 345b97bc7ce..f453b087c65 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4059,3 +4059,11 @@ Entries: message: Added artifact construct chatter sound. id: 4915 time: '2024-04-17T21:43:04.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Add + message: Added new uniform for station guard and private security. + - type: Add + message: Added a full suite of clothing for the station representative. + id: 4916 + time: '2024-04-17T22:04:59.0000000+00:00' From 41ab91bbdc08d77513e50eec9368693f4357f69c Mon Sep 17 00:00:00 2001 From: Kesiath <96151729+Kesiath@users.noreply.github.com> Date: Thu, 18 Apr 2024 15:49:44 -0500 Subject: [PATCH 15/18] Bluespace Bag Rebalance (#1233) * bag balance * pleasing dvir --- Resources/Prototypes/Entities/Clothing/Back/backpacks.yml | 2 +- Resources/Prototypes/Entities/Clothing/Back/duffel.yml | 2 +- Resources/Prototypes/Entities/Clothing/Back/satchel.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index 3c64db1d59b..678e6d7f7fb 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -270,7 +270,7 @@ - type: Storage maxItemSize: Huge grid: - - 0,0,19,9 + - 0,0,11,4 - type: entity parent: ClothingBackpackClown diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 9ea33646cd8..8e0e7ec203e 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -236,7 +236,7 @@ - type: Storage maxItemSize: Huge grid: - - 0,0,19,9 + - 0,0,11,4 - type: ClothingSpeedModifier sprintModifier: 1 # makes its stats identical to other variants of bag of holding - type: HeldSpeedModifier diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index f598759056a..d1ae6d13a0b 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -177,4 +177,4 @@ - type: Storage maxItemSize: Huge grid: - - 0,0,19,9 + - 0,0,11,4 From 3473a1898eb9266ed61c16cd9342f162580c3d4d Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Thu, 18 Apr 2024 20:50:13 +0000 Subject: [PATCH 16/18] Automatic Changelog (#1233) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f453b087c65..aa7089e4db6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4067,3 +4067,9 @@ Entries: message: Added a full suite of clothing for the station representative. id: 4916 time: '2024-04-17T22:04:59.0000000+00:00' +- author: Kesiath + changes: + - type: Tweak + message: Nerfed bluespace bags to only 4 additional bag columns. + id: 4917 + time: '2024-04-18T20:49:44.0000000+00:00' From 27db14055723ff6f79c41c699d3fbcc148fb0a3f Mon Sep 17 00:00:00 2001 From: AndresE55 <80334192+Leander-0@users.noreply.github.com> Date: Thu, 18 Apr 2024 17:59:45 -0400 Subject: [PATCH 17/18] Port breaching charges from Delta-V and fix uplink (#1234) * add breaching charges and fix uplink * fix bailiff name * Update security_uplink_catalog.yml --------- Co-authored-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com> Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 4 +- .../Objects/Weapons/Bombs/plastic.yml | 28 +++++ .../_NF/Catalog/Fills/Boxes/nfsd.yml | 30 +++-- .../_NF/Catalog/security_uplink_catalog.yml | 119 ++++++++++-------- .../Weapons/Bombs/breaching.rsi/icon.png | Bin 0 -> 3388 bytes .../Bombs/breaching.rsi/inhand-left.png | Bin 0 -> 3499 bytes .../Bombs/breaching.rsi/inhand-right.png | Bin 0 -> 3502 bytes .../Weapons/Bombs/breaching.rsi/meta.json | 31 +++++ .../Weapons/Bombs/breaching.rsi/primed.png | Bin 0 -> 3520 bytes 9 files changed, 153 insertions(+), 59 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/plastic.yml create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/icon.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/inhand-left.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/inhand-right.png create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/meta.json create mode 100644 Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/primed.png diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 8286f52cb3f..829a9ab597f 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -114,7 +114,7 @@ uplink-security-shotslug-name = Lethal Shotgun Slug Shells uplink-security-shotslug-desc = A box of lethal .50 calibre slug shotgun shells. uplink-security-cash1000-name = 1000 Spesos uplink-security-cash1000-desc = Cold, hard cash. -uplink-security-empgrenade-box-name = EMP Grenades +uplink-security-empgrenade-box-name = EMP Grenade Box uplink-security-empgrenade-box-desc = A box containing 4 EMP grenades. uplink-security-explosivegrenade-box-name = Explosive Grenade Box uplink-security-explosivegrenade-box-desc = A box containing 4 explosive grenades. @@ -130,3 +130,5 @@ uplink-security-flashbanggrenade-box-name = Flashbang Grenade Box uplink-security-flashbanggrenade-box-desc = A box containing 4 flasbang grenades. uplink-security-stingergrenade-box-name = Stinger Grenade Box uplink-security-stingergrenade-box-desc = A box containing 4 stinger grenades. +uplink-security-breachingcharge-box-name = Breaching Charge Box +uplink-security-breachingcharge-box-desc = A box containing 4 breaching charges. diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/plastic.yml new file mode 100644 index 00000000000..7eb8e8d9a2a --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Bombs/plastic.yml @@ -0,0 +1,28 @@ +- type: entity + name: breaching charge + description: A breaching explosive for security officers to break through walls. + parent: SeismicCharge + id: BreachingCharge + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Bombs/breaching.rsi + state: icon + layers: + - state: icon + map: ["base"] + - type: OnUseTimerTrigger + delay: 10 + delayOptions: [10, 15, 20, 25] + initialBeepDelay: 0 + beepSound: + path: /Audio/Effects/Cargo/buzz_two.ogg + params: + volume: -6 + startOnStick: true + canToggleStartOnStick: true + - type: Explosive + explosionType: DemolitionCharge + totalIntensity: 10 + intensitySlope: 10 + maxIntensity: 10 + canCreateVacuum: false diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml index 20805719d05..bf1ffc0e94c 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Boxes/nfsd.yml @@ -2,7 +2,7 @@ - type: entity name: box of nfsd items parent: BoxCardboard - id: BoxBundleNFSD + id: BoxBundleNfsd description: A box full of nfsd items. components: - type: Sprite @@ -11,7 +11,7 @@ - type: entity name: box of explosive grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxExplosiveGrenades description: A box full of explosive grenades. components: @@ -22,7 +22,7 @@ - type: entity name: box of incendiary grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxIncendiaryGrenades description: A box full of incendiary grenades. components: @@ -33,7 +33,7 @@ - type: entity name: box of shrapnel grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxShrapnelGrenades description: A box full of shrapnel grenades. components: @@ -44,7 +44,7 @@ - type: entity name: box of smoke grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxSmokeGrenades description: A box full of smoke grenades. components: @@ -55,7 +55,7 @@ - type: entity name: box of tear gas grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxTeargasGrenades description: A box full of tear gas grenades. components: @@ -66,7 +66,7 @@ - type: entity name: box of EMP grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxEMPGrenades description: A box full of EMP grenades. components: @@ -77,7 +77,7 @@ - type: entity name: box of flashbang grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxFlashBangGrenades description: A box full of flashbang grenades. components: @@ -88,7 +88,7 @@ - type: entity name: box of stinger grenades - parent: BoxBundleNFSD + parent: BoxBundleNfsd id: BoxStingerGrenades description: A box full of stinger grenades. components: @@ -96,3 +96,15 @@ contents: - id: GrenadeStinger amount: 4 + +## plastic explosives +- type: entity + name: box of breaching charges grenades + parent: BoxBundleNfsd + id: BoxBreachingCharges + description: A box full of breaching charges. + components: + - type: StorageFill + contents: + - id: BreachingCharge + amount: 4 diff --git a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml index 8eafc183a1a..7e6e14016a0 100644 --- a/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/security_uplink_catalog.yml @@ -79,9 +79,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityHardsuitSyndieReverseEngineered @@ -100,9 +100,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityHardsuitSheriff @@ -121,7 +121,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityMK58 @@ -236,9 +236,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEnforcer @@ -257,9 +257,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityLecter @@ -278,9 +278,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityLaserCarbine @@ -299,9 +299,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityDisablerSMG @@ -320,9 +320,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEnergySword @@ -341,7 +341,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityWT550 @@ -360,7 +360,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEnergyGun @@ -379,7 +379,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEmpRpg @@ -398,7 +398,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing @@ -466,7 +466,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityKey @@ -485,7 +485,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityEmpRocket @@ -504,7 +504,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityThrusterKit @@ -523,9 +523,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityPistolMagazine @@ -560,9 +560,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityWT550Magazine @@ -581,7 +581,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityHypo @@ -601,7 +601,7 @@ - !type:BuyerJobCondition whitelist: - Brigmedic - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityAmbuzol @@ -621,7 +621,7 @@ - !type:BuyerJobCondition whitelist: - Brigmedic - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityMedkit @@ -641,7 +641,7 @@ - !type:BuyerJobCondition whitelist: - Brigmedic - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityInspector @@ -724,9 +724,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityPulsePistol @@ -745,9 +745,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityPulseCarbine @@ -766,7 +766,7 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityHammer @@ -785,9 +785,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityTeleShield @@ -822,9 +822,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecuritySwat @@ -843,9 +843,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecuritySpeedloader @@ -976,9 +976,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityExplosiveGrenadeBox @@ -997,9 +997,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityIncendiaryGrenadeBox @@ -1018,9 +1018,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecurityShrapnelGrenadeBox @@ -1039,9 +1039,9 @@ - SecurityUplink - !type:BuyerJobCondition whitelist: - - Warden + - Bailiff - SeniorOfficer - - HeadOfSecurity + - Sheriff - type: listing id: UplinkSecuritySmokeGrenadeBox @@ -1106,3 +1106,24 @@ whitelist: tags: - SecurityUplink + +- type: listing + id: UplinkSecurityBreachingChargesBox + name: uplink-security-breachingcharge-box-name + description: uplink-security-breachingcharge-box-desc + productEntity: BoxBreachingCharges + icon: { sprite: DeltaV/Objects/Weapons/Bombs/breaching.rsi, state: icon} + cost: + FrontierUplinkCoin: 3 + categories: + - UplinkSecurityExplosives + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - SecurityUplink + - !type:BuyerJobCondition + whitelist: + - Bailiff + - SeniorOfficer + - Sheriff diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..5bd58663b6e6b8ba24c6e652c1a679ed70000b81 GIT binary patch literal 3388 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%0Dy!50Qvv` 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%0Dy!50Qvv` z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01FZT01FZU(%pXi0000RbVXQn zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600O#6L_t(|obB1aYZ_r32Jq(v zA;qaujF{$Xqz*wu9E55zgcR-ErK3)DXgdX$ZtB)WI(BFw5ZkH$L6n9J77Id)grh@C z)0!$qg1AV8z_*iD5~Jsj^F7V?8E-fqKfZS;k02u4Ov)m8j1mkkLJkH;yUP744KLeQ|T*8(Jc9?DzoSFY!B zIXu0;hPOX{84@5I4tGD$MzsuKG9mfxXmo&>%Srp~3v6v~LseC{-EOF=ih8YP*l!>B z|Dpzf%6S_A27X!B0tg`}6bfCrp3CLBkA)Evb2$kB-u*o8UK`YR;7ib~!C;U& zeG7%c(5^#&2aGBzJH36ibR7z?_24c&+*rf1Z3U;b3KFmLh6VtD)XpY-`h1MTFMlTo zSoAOe126ys$nGFD48Q;kzyPv4NDTup00S_9><&`H0P_N%*B&`Bz$}K+n9E5kx0X;j zZ%=)Zng~G8V!e6u>Ir$3Wz?HZJbwP(H~;{U|L}rJEObVkpq z-hWbn-ql!-y`XoZ%Vx9214#Njw0qV>@032xI247fHXGb-H}>}Sj0KSNc?bY@&zb=A z8BO|)w9`BZV*zy5mq$w`0Kk6xLbns(_xs6WvA}M(cSqW3o`kUhX0;mYJy&L(xnS*@d|){G4>kE?ON%*~%6y}|$t caKi!q0a)(|p9l-|;s5{u07*qoM6N<$g3VoizyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/meta.json new file mode 100644 index 00000000000..678ffd9abd5 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/meta.json @@ -0,0 +1,31 @@ + { + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by rosieposieeee (github) for ss14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "primed", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/primed.png b/Resources/Textures/DeltaV/Objects/Weapons/Bombs/breaching.rsi/primed.png new file mode 100644 index 0000000000000000000000000000000000000000..135cc2d3492384253f3ff6c1d7fbbe12203d0823 GIT binary patch literal 3520 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%0Dy!50Qvv` z0D$NK0Cg|`0P0`>06Lfe02gqax=}m;000SaNLh0L01FZT01FZU(%pXi0000RbVXQn zQ*UN;cVTj607GSLb9r+hQ*?D?X>TA@Z*OeDr{R1600PWOL_t(&f$f>UOB-Pvho2V& zt;An}^NdDMsYqHvpmi|lAlA_S1Krw;LVpZh+qFyofzl3kJBK1dr&6$yBZIAibPx-+ zSTuSTx=6vnc6vLMTrZapbC-LsgZXan=PviWc`olaFLy#p$we;F63`ORn1F@xF$u7^ zw=e2ts!A2VApr~HV{)*goht(atR0kC+}jrm<70Au)Btd@pp*EY{Bs4A;opD#24H^F zVC|qptxSak)%>~w-0e~UiT#iH{ z;T$(jvnnfE789wIlNBv1u!Jc14gU>3{rrVoE?04^P$*PoUw3zzNTqmxb_Re^DmC>h z2+Dun)&{`MotsXtECk<*%mG{5U-&f6fi?CBR#UwoR=Z_$z?smq1YdYB~*s zums$b$Y!&|VlgKx6bjVJ+>NQ3CKv_Zw}5iRVlig|-VAW=Oj!E@Rs4pRK&@s|w+V*4 zAyUOx*8~;p2vzXaH9-XeRPcTEfJ`O>Kxbzs02><{)XJLO0!PXBC150(q&FUSfbI#n zGbv^04@Ok+0}BAy-rla5Ksk#-Kv;ZV0)UD&=U#)o@i;$EPB^q}Wdc<2eLWTzLdbh} zt}&opqF*26!IKrdV-;UsCEu5T*{LCUV|o;TetnSFZ$9817dMZU2~ffJ{bFQxYRLIO uar0Ps$G$EWpu*<2-VC(_v; Date: Thu, 18 Apr 2024 22:00:10 +0000 Subject: [PATCH 18/18] Automatic Changelog (#1234) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index aa7089e4db6..ec8e49b0fb3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4073,3 +4073,9 @@ Entries: message: Nerfed bluespace bags to only 4 additional bag columns. id: 4917 time: '2024-04-18T20:49:44.0000000+00:00' +- author: Leander + changes: + - type: Add + message: NFSD now has access to breaching charges. + id: 4918 + time: '2024-04-18T21:59:45.0000000+00:00'