diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 477aee51193..7ddf960d804 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -1,24 +1,4 @@ Entries: -- author: DebugOk - changes: - - message: Moth coloration has been changed, existing characters might look slightly - weird - type: Tweak - id: 66 - time: '2023-10-17T20:09:27.0000000+00:00' -- author: Tex - changes: - - message: Added scrambled eggs. - type: Add - id: 67 - time: '2023-10-18T21:07:50.0000000+00:00' -- author: DebugOk - changes: - - message: Certain roles require whitelist now. These being the captain, head of - security and nukie commander. - type: Add - id: 68 - time: '2023-10-18T22:23:18.0000000+00:00' - author: FluffiestFloof changes: - message: Removed mediborgs as round start job. @@ -3607,3 +3587,36 @@ id: 565 time: '2024-09-20T14:02:21.0000000+00:00' url: https://github.com/DeltaV-Station/Delta-v/pull/1867 +- author: TadJohnson00 + changes: + - message: Removed tech anoms until we pull upstream fixes for superfast flicker. + type: Remove + id: 566 + time: '2024-09-21T04:07:17.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1880 +- author: TadJohnson00 + changes: + - message: Adjusts security loadouts and lockers. Notable changes include moving + detective clothing to the Rep and Autodrobes. + type: Tweak + - message: Advanced plate carriers have been added for the warden and head of security + and are located in their lockers. + type: Add + - message: Several security clothing items have been resprited, including winter + boots and winter clothes. + type: Tweak + id: 567 + time: '2024-09-21T06:21:39.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1854 +- author: TadJohnson00 + changes: + - message: Security and medical webbing now feature slots for sidearms and medkits + respectively. + type: Add + - message: Medkits now have a whitelist for stored items. + type: Tweak + - message: Security belts will now display stored items properly. + type: Fix + id: 568 + time: '2024-09-21T06:28:38.0000000+00:00' + url: https://github.com/DeltaV-Station/Delta-v/pull/1870 diff --git a/Resources/Locale/en-US/deltav/clothing/belts.ftl b/Resources/Locale/en-US/deltav/clothing/belts.ftl new file mode 100644 index 00000000000..22f13a790e9 --- /dev/null +++ b/Resources/Locale/en-US/deltav/clothing/belts.ftl @@ -0,0 +1,7 @@ +# Add sidearm and medkit slots to security belts + webbing, medical webbing respectively +clothing-belt-sidearm = Sidearm +clothing-belt-medkit = Medkit + +# Add slots to the daishou +clothing-belt-katana = Katana +clothing-belt-wakizashi = Wakizashi diff --git a/Resources/Maps/lighthouse.yml b/Resources/Maps/lighthouse.yml index d3a18d69283..c8d13daba11 100644 --- a/Resources/Maps/lighthouse.yml +++ b/Resources/Maps/lighthouse.yml @@ -281,7 +281,7 @@ entities: version: 6 -1,-4: ind: -1,-4 - tiles: IAAAAAABGAAAAAAAGAAAAAAABwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfwAAAAAAfwAAAAAABAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAACwAAAAAABAAAAAAAbwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABAAAAAAACwAAAAAAUAAAAAAAbwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACCwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAAABwAAAAAABwAAAAAAUAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAABwAAAAACCwAAAAAACwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAABBwAAAAABBwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfwAAAAAAOQAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAABBwAAAAAABwAAAAACUAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAABwAAAAACCwAAAAAACwAAAAAAfwAAAAAAOQAAAAAAbwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAACBwAAAAABBwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACCwAAAAAACwAAAAAACwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAABBwAAAAACBwAAAAAAUAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAABwAAAAAACwAAAAAACwAAAAAACwAAAAAAfwAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAAACAAAAAAABwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABAAAAAAAfwAAAAAACwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAACBwAAAAAABwAAAAAAUAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAABwAAAAACBwAAAAACBwAAAAACCwAAAAAACwAAAAAACwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABQAAAAAABQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAABBwAAAAAABwAAAAAACwAAAAAACwAAAAAACwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACBwAAAAABBwAAAAACBwAAAAAABwAAAAABBwAAAAABBwAAAAACBwAAAAAAfwAAAAAABwAAAAABCwAAAAAACwAAAAAACwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAABBwAAAAABCwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAfwAAAAAAfwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAfwAAAAAA + tiles: IAAAAAABGAAAAAAAGAAAAAAABwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAbwAAAAAAbwAAAAAAbwAAAAAAfwAAAAAAfwAAAAAABAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAACwAAAAAABAAAAAAAbwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABAAAAAAACwAAAAAAUAAAAAAAbwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACCwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAAABwAAAAAABwAAAAAAUAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAABwAAAAACCwAAAAAACwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAABBwAAAAABBwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfwAAAAAAOQAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAABBwAAAAAABwAAAAACUAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAABwAAAAACCwAAAAAACwAAAAAAfwAAAAAAOQAAAAAAbwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAACBwAAAAABBwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACCwAAAAAACwAAAAAACwAAAAAAfwAAAAAAbgAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAABBwAAAAACBwAAAAAAUAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAABwAAAAAACwAAAAAACwAAAAAACwAAAAAAfwAAAAAAOQAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAAACAAAAAAABwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABAAAAAAAfwAAAAAACwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAABwAAAAACBwAAAAAABwAAAAAAUAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAABwAAAAACBwAAAAACBwAAAAACCwAAAAAACwAAAAAACwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABQAAAAAABQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAABBwAAAAAABwAAAAAACwAAAAAACwAAAAAACwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACBwAAAAABBwAAAAACBwAAAAAABwAAAAABBwAAAAABBwAAAAACBwAAAAAAfwAAAAAABwAAAAABCwAAAAAACwAAAAAACwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAABBwAAAAABCwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAfwAAAAAAfwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAfwAAAAAA version: 6 0,-4: ind: 0,-4 @@ -349,11 +349,11 @@ entities: version: 6 -1,-5: ind: -1,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAABwAAAAAABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAABBwAAAAAABwAAAAABBwAAAAAABwAAAAACBwAAAAABBwAAAAACBwAAAAAABwAAAAAABwAAAAABBwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAABBwAAAAABBwAAAAABBwAAAAABBwAAAAABBwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAACBwAAAAABBwAAAAACBwAAAAABBwAAAAAABwAAAAABGAAAAAAAGAAAAAAAGAAAAAAAUAAAAAAABwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAABBwAAAAACBwAAAAABBwAAAAAABwAAAAABGAAAAAAAGAAAAAAAGAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACBwAAAAABBwAAAAABGAAAAAAAGAAAAAAAGAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAABBwAAAAACBwAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAABwAAAAAABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAABAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAAAAAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAABBwAAAAAABwAAAAABBwAAAAAABwAAAAACBwAAAAABBwAAAAACBwAAAAAABwAAAAAABwAAAAABBwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAABBwAAAAABBwAAAAABBwAAAAABBwAAAAABBwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAACBwAAAAABBwAAAAACBwAAAAABBwAAAAAABwAAAAABGAAAAAAAGAAAAAAAGAAAAAAAUAAAAAAABwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAGAAAAAAAGAAAAAAAGAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAA version: 6 0,-5: ind: 0,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAIAAAAAADIAAAAAAAIAAAAAADfwAAAAAABwAAAAABBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAIAAAAAACIAAAAAAAIAAAAAACIAAAAAADfwAAAAAABwAAAAABBwAAAAACBwAAAAACAAAAAAAABwAAAAAABwAAAAACfwAAAAAAIAAAAAAAIAAAAAADIAAAAAACfwAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACBwAAAAAABwAAAAABBwAAAAACfwAAAAAAIAAAAAAAIAAAAAACIAAAAAABfwAAAAAAIAAAAAACIAAAAAABIAAAAAACIAAAAAADIAAAAAACIAAAAAADfwAAAAAABwAAAAABBwAAAAAABwAAAAABBwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACBwAAAAAABwAAAAACBwAAAAACBwAAAAABUAAAAAAAIAAAAAACIAAAAAAAfwAAAAAAIAAAAAADIAAAAAABIAAAAAADbQAAAAAAIAAAAAADIAAAAAACfwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAABUAAAAAAAIAAAAAAAIAAAAAADbQAAAAAAIAAAAAABIAAAAAABIAAAAAABfwAAAAAAIAAAAAADIAAAAAACfwAAAAAABwAAAAABBwAAAAAABwAAAAABBwAAAAACBwAAAAABfwAAAAAAIAAAAAADIAAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAABBwAAAAABBwAAAAABKwAAAAADKwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAIAAAAAABIAAAAAAAIAAAAAAAfwAAAAAABwAAAAAABwAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAIAAAAAAAIAAAAAADIAAAAAAAIAAAAAADfwAAAAAABwAAAAABBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAIAAAAAACIAAAAAAAIAAAAAACIAAAAAADfwAAAAAABwAAAAABBwAAAAACBwAAAAACAAAAAAAABwAAAAAABwAAAAACfwAAAAAAIAAAAAAAIAAAAAADIAAAAAACfwAAAAAAIAAAAAACIAAAAAAAIAAAAAADIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACBwAAAAAABwAAAAABBwAAAAACfwAAAAAAIAAAAAAAIAAAAAACIAAAAAABfwAAAAAAIAAAAAACIAAAAAABIAAAAAACIAAAAAADIAAAAAACIAAAAAADfwAAAAAABwAAAAABBwAAAAAABwAAAAABBwAAAAACfwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAACBwAAAAAABwAAAAACBwAAAAACBwAAAAABUAAAAAAAIAAAAAACIAAAAAAAfwAAAAAAIAAAAAADIAAAAAABIAAAAAADbQAAAAAAIAAAAAADIAAAAAACfwAAAAAABwAAAAAAfwAAAAAABwAAAAABBwAAAAAABwAAAAABUAAAAAAAIAAAAAAAIAAAAAADbQAAAAAAIAAAAAABIAAAAAABIAAAAAABfwAAAAAAIAAAAAADIAAAAAACfwAAAAAABwAAAAABfwAAAAAABwAAAAABBwAAAAACBwAAAAABfwAAAAAAIAAAAAADIAAAAAAAfwAAAAAAIAAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAABwAAAAABfwAAAAAABwAAAAABKwAAAAADKwAAAAAAfwAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAbQAAAAAAfwAAAAAAIAAAAAABIAAAAAAAIAAAAAAAfwAAAAAABwAAAAAABwAAAAAB version: 6 1,-5: ind: 1,-5 @@ -6308,9 +6308,9 @@ entities: -1,-14: 0: 62139 -1,-16: - 0: 61152 + 0: 61166 -1,-17: - 0: 61183 + 0: 60943 0,-16: 0: 56796 0,-15: @@ -6318,7 +6318,7 @@ entities: 0,-14: 0: 63743 0,-17: - 0: 65535 + 0: 61167 1,-16: 0: 65399 1,-15: @@ -7324,12 +7324,12 @@ entities: - 17291 - uid: 15884 components: + - type: MetaData + name: burn chamber air alarm - type: Transform rot: 1.5707963267948966 rad pos: -20.5,-59.5 parent: 100 - - type: MetaData - name: burn chamber air alarm - type: DeviceList devices: - 15881 @@ -23973,6 +23973,21 @@ entities: - type: Transform pos: 25.5,17.5 parent: 100 + - uid: 13908 + components: + - type: Transform + pos: -1.5,-62.5 + parent: 100 + - uid: 13923 + components: + - type: Transform + pos: -1.5,-64.5 + parent: 100 + - uid: 13924 + components: + - type: Transform + pos: -1.5,-63.5 + parent: 100 - uid: 13928 components: - type: Transform @@ -53120,11 +53135,11 @@ entities: rot: 3.141592653589793 rad pos: 3.5,-57.5 parent: 100 - - uid: 3940 + - uid: 3704 components: - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-62.5 + rot: -1.5707963267948966 rad + pos: 0.5,-62.5 parent: 100 - uid: 4263 components: @@ -96252,6 +96267,12 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-57.5 parent: 100 + - uid: 3172 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-62.5 + parent: 100 - uid: 3393 components: - type: Transform @@ -97494,12 +97515,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-57.5 parent: 100 - - uid: 21299 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -1.5,-62.5 - parent: 100 - proto: PoweredLightBlueInterior entities: - uid: 11428 @@ -102714,17 +102729,7 @@ entities: - uid: 13907 components: - type: Transform - pos: 0.5,-64.5 - parent: 100 - - uid: 13908 - components: - - type: Transform - pos: 0.5,-65.5 - parent: 100 - - uid: 13909 - components: - - type: Transform - pos: 0.5,-66.5 + pos: 1.5,-64.5 parent: 100 - uid: 13910 components: @@ -102739,17 +102744,7 @@ entities: - uid: 13912 components: - type: Transform - pos: -0.5,-64.5 - parent: 100 - - uid: 13913 - components: - - type: Transform - pos: -0.5,-65.5 - parent: 100 - - uid: 13914 - components: - - type: Transform - pos: -0.5,-66.5 + pos: 1.5,-65.5 parent: 100 - uid: 13915 components: @@ -102764,17 +102759,7 @@ entities: - uid: 13917 components: - type: Transform - pos: -1.5,-64.5 - parent: 100 - - uid: 13918 - components: - - type: Transform - pos: -1.5,-65.5 - parent: 100 - - uid: 13919 - components: - - type: Transform - pos: -1.5,-66.5 + pos: 1.5,-66.5 parent: 100 - uid: 13920 components: @@ -102786,21 +102771,6 @@ entities: - type: Transform pos: -1.5,-68.5 parent: 100 - - uid: 13922 - components: - - type: Transform - pos: -2.5,-64.5 - parent: 100 - - uid: 13923 - components: - - type: Transform - pos: -2.5,-65.5 - parent: 100 - - uid: 13924 - components: - - type: Transform - pos: -2.5,-66.5 - parent: 100 - uid: 13925 components: - type: Transform @@ -112086,6 +112056,13 @@ entities: rot: -1.5707963267948966 rad pos: -62.5,80.5 parent: 100 +- proto: StationAnchor + entities: + - uid: 13913 + components: + - type: Transform + pos: -1.5,-64.5 + parent: 100 - proto: StationEfficiencyCircuitBoard entities: - uid: 6214 @@ -116299,6 +116276,13 @@ entities: - type: Transform pos: -1.5,-57.5 parent: 100 +- proto: TelecomServerFilledCommon + entities: + - uid: 21299 + components: + - type: Transform + pos: 1.5,-57.5 + parent: 100 - proto: TelecomServerFilledEngineering entities: - uid: 21268 @@ -116327,6 +116311,13 @@ entities: - type: Transform pos: -1.5,-56.5 parent: 100 +- proto: TelecomServerFilledService + entities: + - uid: 21413 + components: + - type: Transform + pos: 0.5,-57.5 + parent: 100 - proto: TintedWindow entities: - uid: 227 @@ -120211,11 +120202,6 @@ entities: - type: Transform pos: -52.5,0.5 parent: 100 - - uid: 3172 - components: - - type: Transform - pos: -2.5,-63.5 - parent: 100 - uid: 3185 components: - type: Transform @@ -120706,11 +120692,6 @@ entities: - type: Transform pos: -55.5,7.5 parent: 100 - - uid: 3704 - components: - - type: Transform - pos: -1.5,-63.5 - parent: 100 - uid: 3725 components: - type: Transform @@ -120937,6 +120918,12 @@ entities: - type: Transform pos: 3.5,-58.5 parent: 100 + - uid: 3940 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-66.5 + parent: 100 - uid: 3946 components: - type: Transform @@ -121210,7 +121197,8 @@ entities: - uid: 4211 components: - type: Transform - pos: -0.5,-63.5 + rot: 1.5707963267948966 rad + pos: -1.5,-66.5 parent: 100 - uid: 4213 components: @@ -123758,6 +123746,36 @@ entities: - type: Transform pos: 14.5,-66.5 parent: 100 + - uid: 13909 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-66.5 + parent: 100 + - uid: 13914 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-66.5 + parent: 100 + - uid: 13918 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-64.5 + parent: 100 + - uid: 13919 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-65.5 + parent: 100 + - uid: 13922 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-66.5 + parent: 100 - uid: 13937 components: - type: Transform diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index ab090da9bae..e37794c03dd 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -43,7 +43,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockAutoDrobeFilled - cost: 1900 # DeltaV + cost: 2000 # DeltaV category: cargoproduct-category-name-service group: market diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 96a742d0b9e..6470a0437cb 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -70,11 +70,14 @@ - id: ClothingHeadHatBeretHoS - id: ClothingHeadHatHoshat - id: ClothingNeckCloakHos - - id: ClothingUniformJumpskirtHoSAlt - - id: ClothingUniformJumpsuitHoSAlt +# - id: ClothingUniformJumpskirtHoSAlt # DeltaV - removed for incongruence +# - id: ClothingUniformJumpsuitHoSAlt # DeltaV - removed for incongruence - id: ClothingUniformJumpskirtHosFormal - id: ClothingUniformJumpsuitHosFormal - - id: ClothingOuterWinterHoS +# - id: ClothingOuterWinterHoS # DeltaV - removed for incongruence + - id: ClothingOuterCoatStasecHoS # DeltaV - add winter coat + - id: ClothingOuterGreatcoatStasecHoS # DeltaV - add greatcoat + - id: ClothingShoesBootsWinterHeadOfSecurity # DeltaV - add HoS winter boots - type: entity id: DresserQuarterMasterFilled @@ -116,3 +119,6 @@ contents: - id: ClothingHeadHatWarden - id: ClothingHeadHatBeretWarden + - id: ClothingOuterCoatStasecWarden # DeltaV - add winter coat + - id: ClothingOuterGreatcoatStasecWarden # DeltaV - add greatcoat + - id: ClothingShoesBootsWinterWarden # DeltaV - add winter boots diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index d747de62bc6..5ed7b595ef6 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -333,7 +333,7 @@ - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingMaskNeckGaiter - - id: ClothingOuterCoatHoSTrench +# - id: ClothingOuterCoatHoSTrench # DeltaV - removed for incongruence - id: ClothingShoesBootsJack - id: DoorRemoteSecurity - id: HoloprojectorSecurity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 1ceb86dd4e8..fff245e1f52 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -7,15 +7,15 @@ contents: - id: FlashlightSeclite - id: WeaponDisabler - prob: 0.3 +# prob: 0.3 # DeltaV - just give them the damn disabler - id: ClothingBeltSecurityFilled - id: Flash - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - - id: ClothingOuterCoatWarden - - id: ClothingOuterWinterWarden +# - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence +# - id: ClothingOuterWinterWarden # DeltaV - removed for incongruence - id: RubberStampWarden - id: DoorRemoteArmory - id: ClothingOuterHardsuitCombatWarden # DeltaV - ClothingOuterHardsuitWarden replaced in favour of warden's riot combat hardsuit. @@ -23,10 +23,10 @@ - id: BookSpaceLaw # Begin DeltaV additions - id: BoxPDAPrisoner - - id: ClothingShoesBootsWinterWarden - id: BoxEncryptionKeyPrisoner - id: LunchboxSecurityFilledRandom prob: 0.3 + - id: ClothingOuterVestPlateCarrierAdv # End DeltaV additions - id: ClothingNeckShockCollar amount: 2 @@ -42,25 +42,25 @@ contents: - id: FlashlightSeclite - id: WeaponDisabler - prob: 0.3 +# prob: 0.3 # DeltaV - just give them the damn disabler - id: ClothingBeltSecurityFilled - id: Flash - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetAltSecurity - id: ClothingHandsGlovesCombat - id: ClothingShoesBootsJack - - id: ClothingOuterCoatWarden - - id: ClothingOuterWinterWarden +# - id: ClothingOuterCoatWarden # DeltaV - removed for incongruence +# - id: ClothingOuterWinterWarden # DeltaV - removed for incongruence - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity - id: BookSpaceLaw # Begin DeltaV additions - id: BoxPDAPrisoner - - id: ClothingShoesBootsWinterWarden - id: BoxEncryptionKeyPrisoner - id: LunchboxSecurityFilledRandom prob: 0.3 + - id: ClothingOuterVestPlateCarrierAdv # End DeltaV additions - id: ClothingNeckShockCollar amount: 2 @@ -76,30 +76,16 @@ contents: - id: FlashlightSeclite prob: 0.8 - - id: ClothingUniformJumpsuitSecGrey - prob: 0.3 - - id: ClothingUniformJumpsuitSecBlue # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpsuitSec # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSecGrey # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSecBlue # DeltaV - consistency with other sec uniforms - prob: 0.3 - - id: ClothingUniformJumpskirtSec # DeltaV - consistency with other sec uniforms - prob: 0.3 +# - id: ClothingUniformJumpsuitSecGrey # DeltaV - remove uniforms from sec lockers +# prob: 0.3 - id: ClothingHeadHelmetBasic - id: ClothingHeadHelmetInsulated # Nyanotrasen - Insulative headgear prob: 0.4 - id: ClothingOuterArmorPlateCarrier # DeltaV - ClothingOuterArmorBasic replaced in favour of plate carrier and stabproof vest - id: ClothingOuterArmorDuraVest - - id: ClothingOuterStasecSweater # DeltaV - in case the officers get cold :3 - prob: 0.75 - - id: ClothingUniformJumpsuitSecFormal # DeltaV - emergency parade time, Central's coming to visit - prob: 0.25 - id: ClothingBeltSecurityFilled - id: Flash - prob: 0.5 +# prob: 0.5 # DeltaV - standardise spare flash - id: ClothingEyesGlassesSecurity - id: ClothingHeadsetSecurity - id: ClothingHandsGlovesColorBlack @@ -120,18 +106,20 @@ components: - type: StorageFill contents: - - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses +# - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked. - id: WeaponDisabler - id: TrackingImplanter amount: 2 -## - id: ClothingOuterHardsuitCombatCorpsman # DeltaV - ClothingOuterHardsuitBrigmedic replaced in favour of corpsman's combat hardsuit; removing from standard filled locker to place in hardsuit filled locker. +# - id: ClothingOuterHardsuitCombatCorpsman # DeltaV - ClothingOuterHardsuitBrigmedic replaced in favour of corpsman's combat hardsuit; removing from standard filled locker to place in hardsuit filled locker. - id: BoxSterileMask - id: ClothingHeadHatBeretCorpsman # DeltaV - ClothingHeadHatBeretBrigmedic replaced in favour of corpsman beret. -## - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it. + - id: ClothingHeadsetBrigmedic # DeltaV - add spare headset. +# - id: ClothingOuterCoatAMG # DeltaV - removed until I can resprite it or replace it. - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic -## - id: ClothingUniformJumpskirtOfLife # DeltaV - nah -## prob: 0.1 +# - id: ClothingUniformJumpskirtOfLife # DeltaV - removed for incongruence +# prob: 0.1 + - id: ClothingBeltCorpsmanWebbing # DeltaV - added spare webbing - id: HandheldGPSBasic # Delta V - added it for tracking the implant tracker pop up. - id: MedkitFilled - id: MedkitCombatFilled @@ -146,8 +134,8 @@ prob: 0.3 - id: MedkitBurnFilled prob: 0.7 -## - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - why -## prob: 0.15 +# - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse # DeltaV - removed for incongruence +# prob: 0.15 - id: LunchboxSecurityFilledRandom # Delta-v Lunchboxes! prob: 0.3 @@ -160,13 +148,17 @@ components: - type: StorageFill contents: - - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses +# - id: ClothingEyesGlassesCorpsman # DeltaV - Corpsman Glasses | removed until HUD/sunglasses balance can be discussed and reworked. - id: WeaponDisabler - id: TrackingImplanter amount: 2 - id: ClothingOuterHardsuitCombatCorpsman + - id: BoxSterileMask + - id: ClothingHeadHatBeretCorpsman # Add corpsman beret. + - id: ClothingHeadsetBrigmedic # Add spare headset. - id: ClothingUniformJumpsuitBrigmedic - id: ClothingUniformJumpskirtBrigmedic + - id: ClothingBeltCorpsmanWebbing # Added spare webbing - id: HandheldGPSBasic # Added GPS because I just think it should be there tbh. - id: MedkitFilled - id: MedkitCombatFilled @@ -194,11 +186,13 @@ - type: StorageFill contents: - id: ClothingEyesGlassesSecurity - prob: 0.3 - - id: ClothingHeadHatFedoraBrown - - id: ClothingNeckTieDet - - id: ClothingOuterVestDetective - - id: ClothingOuterCoatDetective +# prob: 0.3 # DeltaV - standardise until HUD balance worked out +# - id: ClothingHeadHatFedoraBrown # DeltaV - removed for incongruence +# - id: ClothingNeckTieDet # DeltaV - removed for incongruence +# - id: ClothingOuterVestDetective # DeltaV - removed for incongruence +# - id: ClothingOuterCoatDetective # DeltaV - removed for incongruence + - id: ClothingHeadsetSecurity # DeltaV - add spare headset. + - id: FlippoEngravedLighter # DeltaV - add due to removal of trench coat - id: FlashlightSeclite - id: ForensicScanner - id: LogProbeCartridge diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index 91e45c83916..b6b1dc26be4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -1,16 +1,22 @@ - type: vendingMachineInventory id: DetDrobeInventory startingInventory: - ClothingUniformJumpsuitDetective: 2 - ClothingUniformJumpskirtDetective: 2 - ClothingShoesColorBrown: 2 - ClothingOuterCoatDetectiveLoadout: 2 - ClothingHeadHatFedoraBrown: 2 - ClothingUniformJumpsuitDetectiveGrey: 2 - ClothingUniformJumpskirtDetectiveGrey: 2 - ClothingOuterVestDetective: 2 - ClothingNeckTieDet: 2 - ClothingHeadHatFedoraGrey: 2 +# ClothingUniformJumpsuitDetective: 2 # DeltaV - removed for incongruence +# ClothingUniformJumpskirtDetective: 2 # DeltaV - removed for incongruence +# ClothingShoesColorBrown: 2 # DeltaV - removed for incongruence +# ClothingOuterCoatDetectiveLoadout: 2 # DeltaV - removed for incongruence +# ClothingHeadHatFedoraBrown: 2 # DeltaV - removed for incongruence +# ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - removed for incongruence +# ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - removed for incongruence +# ClothingOuterVestDetective: 2 # DeltaV - removed for incongruence +# ClothingNeckTieDet: 2 # DeltaV - removed for incongruence +# ClothingHeadHatFedoraGrey: 2 # DeltaV - removed for incongruence + ClothingUniformJumpsuitForensicSpec: 2 # DeltaV + ClothingUniformJumpskirtForensicSpec: 2 # DeltaV ClothingHandsGlovesColorBlack: 2 ClothingHandsGlovesLatex: 2 ClothingHeadsetSecurity: 2 + ForensicPad: 10 # DeltaV + BoxFolderBlack: 2 # DeltaV + BoxEvidenceMarkers: 1 # DeltaV + HandLabeler: 1 # DeltaV diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml index 65dacf75d19..20040d40681 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml @@ -28,6 +28,6 @@ BreachingCharge: 8 # DeltaV - added breaching charges # security officers need to follow a diet regimen! contrabandInventory: - FoodDonutHomer: 12 - FoodBoxDonut: 2 +# FoodDonutHomer: 12 # DeltaV - removed for incongruence at maintainer request +# FoodBoxDonut: 2 # DeltaV - removed for incongruence at maintainer request #box evidence diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml index 3bc8f7287bb..b19ed1da6c5 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml @@ -4,21 +4,27 @@ ClothingBackpackSecurity: 3 ClothingBackpackSatchelSecurity: 3 ClothingBackpackDuffelSecurity: 3 - ClothingUniformJumpsuitSec: 3 +# ClothingUniformJumpsuitSec: 3 # DeltaV - moved* ClothingShoesBootsJack: 3 ClothingHeadHatBeretSecurity: 3 -## ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction - ClothingHeadBandRed: 3 + ClothingMaskNeckGaiter: 3 # DeltaV - add neck gaiters to secdrobe + ClothingMaskGasSecurity: 3 # DeltaV - add security gas masks to secdrobe +# ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction +# ClothingHeadBandRed: 3 # DeltaV - removed for incongruency # ClothingMaskNeckGaiterRed: 3 # DeltaV - removed ClothingHandsGlovesColorBlack: 3 ClothingHandsGlovesFingerless: 3 + ClothingUniformJumpsuitSec: 3 # DeltaV - *moved ClothingUniformJumpskirtSec: 3 ClothingUniformJumpsuitSecGrey: 3 ClothingUniformJumpskirtSecGrey: 3 ClothingUniformJumpsuitSecBlue: 3 ClothingUniformJumpskirtSecBlue: 3 # DeltaV - new skirt sprited, added to secdrobe + ClothingUniformJumpsuitSecFormal: 1 # DeltaV - add formal uniform to secdrobe + ClothingUniformJumpskirtSecFormal: 1 # DeltaV - add formal uniform to secdrobe ClothingHeadsetSecurity: 3 ClothingHeadsetPrison: 3 # DeltaV - prison headsets in secdrobe + ClothingOuterStasecSweater: 2 # DeltaV - add sweaters to secdrobe ClothingOuterCoatStasec: 2 # DeltaV - replace ClothingOuterWinterSec ClothingOuterGreatcoatStasec: 2 # DeltaV - added greatcoats to SecDrobe. Surplus, reminds the officers of the good times. ## ClothingOuterArmorBasic: 2 # DeltaV - moved body armour from SecDrobe to SecTech @@ -26,11 +32,7 @@ ClothingNeckScarfStripedRed: 3 ClothingEyesBlindfold: 1 ClothingShoesBootsCombat: 1 - ClothingShoesBootsWinterSec: 2 +# ClothingShoesBootsWinterSec: 2 # DeltaV - removed for incongruency # ClothingHeadHelmetJustice: 1 # DeltaV - lrp - # Begin DeltaV additions - ClothingShoesBootsCowboyBlack: 1 - ClothingHeadHatCowboyBlack: 1 - # End DeltaV additions contrabandInventory: - ClothingMaskClownSecurity: 1 +# ClothingMaskClownSecurity: 1 # DeltaV - removed for incongruency diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index 2f72cf2e1c2..a4750e1059b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -82,6 +82,14 @@ ClothingOuterSuitCarp: 2 # DeltaV - Move carp suit out of syndicate uplink into the AutoDrobe ClothingShoesBootsWinterClown: 2 #Delta V: Add departmental winter boots ClothingShoesBootsWinterMime: 2 #Delta V: Add departmental winter boots + ClothingUniformJumpsuitDetective: 1 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetective: 1 # DeltaV - moved from detdrobe + ClothingUniformJumpsuitDetectiveGrey: 1 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetectiveGrey: 1 # DeltaV - moved from detdrobe + ClothingOuterCoatDetectiveLoadout: 1 # DeltaV - moved from detdrobe + ClothingNeckTieDet: 1 # DeltaV - moved from detdrobe + ClothingHeadHatFedoraBrown: 1 # DeltaV - moved from detdrobe + ClothingHeadHatFedoraGrey: 1 # DeltaV - moved from detdrobe ClothingHeadHatCowboyBrown: 1 ClothingHeadHatCowboyBlack: 1 ClothingHeadHatCowboyWhite: 1 diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml index ecffae4c361..b563757acb5 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml @@ -3,10 +3,12 @@ parent: ClothingBeltKatanaSheath suffix: Filled components: - - type: StorageFill - contents: - - id: Wakizashi - - id: Katana + - type: ContainerFill + containers: + katanaslot: + - Katana + wakizashislot: + - Wakizashi - type: entity id: ClothingBeltCorpsmanWebbingFilled diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml index 31e231d0c09..2ffa4978b6e 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/heads.yml @@ -82,6 +82,6 @@ - id: BoxPDASecurity - id: WeaponEnergyGunMultiphase - id: HoSIDCard - - id: ClothingShoesBootsWinterHeadOfSecurity + - id: ClothingOuterVestPlateCarrierAdv - id: LunchboxCommandFilledRandom prob: 0.3 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml index 8629ddbf613..cef0cf394c1 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml @@ -39,7 +39,7 @@ - type: Appearance - type: entity - parent: ClothingBeltStorageBase + parent: [ClothingBeltStorageBase, ClothingSlotBase] id: ClothingBeltCorpsmanWebbing name: corpsman webbing description: A set of security webbing with blue corpsman highlights. @@ -48,7 +48,28 @@ sprite: DeltaV/Clothing/Belt/corpsman.rsi - type: Clothing sprite: DeltaV/Clothing/Belt/corpsman.rsi + - type: ItemSlots # add medkit slot + slots: + medkit: + name: clothing-belt-medkit + whitelist: + tags: + - Medkit + insertOnInteract: false # or you can't easily stow medkits in your rig. - type: Storage grid: - 0,0,2,1 - 4,0,7,1 + - type: ItemMapper # add stowed medkit sprite + mapLayers: + medkit: + whitelist: + tags: + - Medkit + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + medkit: !type:ContainerSlot {} + - type: Appearance diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml index 06e114c3d2e..40e5381b843 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml @@ -59,6 +59,19 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpskirt/detective.rsi +# Senior Officer uniform + +- type: entity + parent: ClothingUniformFoldableBase + id: ClothingUniformJumpskirtSecSenior + name: senior officer's jumpskirt + description: A tight-fitting tactical jumpsuit, made of light and breathable yet durable material. This one seems to have a skirt stitched to the waist. Curious. + components: + - type: Sprite + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi + - type: Clothing + sprite: DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi + # Warden alt uniforms - type: entity diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml index 9eaba81c7a8..93c3a597d73 100644 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml @@ -222,7 +222,7 @@ - type: Clothing sprite: DeltaV/Clothing/Uniforms/Jumpsuit/detective.rsi -# Detective uniform +# Senior Officer uniform - type: entity parent: ClothingUniformFoldableBase diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 9ff83bfd486..2b74330b141 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -111,6 +111,7 @@ tags: - HighRiskItem - Sidearm + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: StaticPrice price: 750 - type: StealTarget @@ -220,6 +221,7 @@ - type: Tag tags: - Sidearm + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: StaticPrice price: 750 diff --git a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml index b78f1c61e3b..0757fb27844 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/role_loadouts.yml @@ -25,7 +25,7 @@ - SecurityShoes - SecurityOuterClothing - MedicalGloves - - SurvivalCorpsman + - SurvivalSecurity # DeltaV - replace SurvivalCorpsman for incongruence - Trinkets - GroupSpeciesBreathToolCorpsman diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 335749959bf..473d5866da4 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -7,85 +7,91 @@ id: BeltSlotNotBelt #not a 'belt' - type: Tag - id: BulletBB + id: BionicSyrinxImplant - type: Tag - id: CartridgeSpecial # For the .38 special ammo and revolver + id: BorgModuleSecurity - type: Tag - id: CartridgeMusket #For the Craftable Musket + id: BorgSecurityArmour - type: Tag - id: Directional + id: BorgSecurityHead - type: Tag - id: DockShipyard + id: BorgSecurityLArm - type: Tag - id: ForensicBeltEquip + id: BorgSecurityLLeg - type: Tag - id: Gavel + id: BorgSecurityRArm - type: Tag - id: GasPipeHalf #Craftable Musket + id: BorgSecurityRLeg - type: Tag - id: HandLabeler + id: BorgSecurityTorso - type: Tag - id: HidesHarpyWings + id: BulletBB - type: Tag - id: MagazinePistolSpecial # For the .38 special ammo and pistol + id: CartridgeSpecial # For the .38 special ammo and revolver - type: Tag - id: ModularBreech #Craftable Musket + id: CartridgeMusket #For the Craftable Musket - type: Tag - id: ModularTrigger #Craftable Musket + id: ConcealCarry # For objects that can be stored in military-style boots or similar items - type: Tag - id: SecDogWearable # allows Laika to wear meson goggles (and more later?) + id: Directional - type: Tag - id: SpeedLoaderSpecial + id: DockShipyard - type: Tag - id: PreventLabel + id: ForensicBeltEquip - type: Tag - id: BionicSyrinxImplant + id: Gavel - type: Tag - id: PaperSlip + id: GasPipeHalf #Craftable Musket + +- type: Tag + id: HandLabeler + +- type: Tag + id: HidesHarpyWings - type: Tag id: HudMedicalSecurity #Craftable Corpsman Glasses - type: Tag - id: BorgModuleSecurity + id: MagazinePistolSpecial # For the .38 special ammo and pistol - type: Tag - id: BorgSecurityHead + id: ModularBreech #Craftable Musket - type: Tag - id: BorgSecurityTorso + id: ModularTrigger #Craftable Musket - type: Tag - id: BorgSecurityRLeg + id: PaperSlip - type: Tag - id: BorgSecurityLLeg + id: PreventLabel - type: Tag - id: BorgSecurityRArm + id: SecDogWearable # allows Laika to wear meson goggles (and more later?) - type: Tag - id: BorgSecurityLArm + id: Skirt - type: Tag - id: Skirt + id: SpeedLoaderSpecial - type: Tag - id: BorgSecurityArmour + id: Wakizashi diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 53e541b6bac..17bd290d72a 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -456,7 +456,7 @@ - type: Appearance - type: entity - parent: [ClothingBeltStorageBase, BaseRestrictedContraband] + parent: [ClothingBeltStorageBase, BaseRestrictedContraband, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase id: ClothingBeltSecurity name: security belt description: Can hold security gear like handcuffs and flashes. @@ -465,6 +465,14 @@ sprite: DeltaV/Clothing/Belt/security.rsi # DeltaV - resprite - type: Clothing sprite: DeltaV/Clothing/Belt/security.rsi # DeltaV - resprite + - type: ItemSlots # DeltaV - add sidearm slot + slots: + holster: + name: clothing-belt-sidearm + whitelist: + tags: + - Sidearm + insertOnInteract: false - type: Storage whitelist: tags: @@ -489,21 +497,26 @@ - Whistle - HolosignProjector - BalloonPopper - - type: ItemMapper + - type: ItemMapper # DeltaV - adjust for DeltaV sprites. mapLayers: - flashbang: - whitelist: - components: - - FlashOnTrigger - stunbaton: + baton: whitelist: components: - Stunbaton - tear_gas_grenade: + gasgrenade: whitelist: - components: - - SmokeOnTrigger - sprite: Clothing/Belt/belt_overlay.rsi + tags: + - Grenade + slp: + whitelist: + tags: + - Sidearm + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + holster: !type:ContainerSlot {} - type: Appearance - type: entity @@ -610,7 +623,7 @@ - CartridgeAmmo - type: entity - parent: ClothingBeltStorageBase + parent: [ClothingBeltStorageBase, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase id: ClothingBeltSecurityWebbing name: security chest rig # DeltaV - rename from "security carrier" due to already existing plate carrier description: Unique and versatile chest rig, can hold security gear. @@ -619,10 +632,31 @@ sprite: DeltaV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite - type: Clothing sprite: DeltaV/Clothing/Belt/securitywebbing.rsi # DeltaV - resprite + - type: ItemSlots # DeltaV - add sidearm slot + slots: + holster: + name: clothing-belt-sidearm + whitelist: + tags: + - Sidearm + insertOnInteract: false - type: Storage # Delta-V - Split Inventory grid: - 0,0,2,1 - 4,0,7,1 + - type: ItemMapper # DeltaV - add holstered sidearm sprite + mapLayers: + slp: + whitelist: + tags: + - Sidearm + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + holster: !type:ContainerSlot {} + - type: Appearance # DeltaV - type: entity parent: [ ClothingBeltStorageBase, BaseSecurityCargoContraband ] diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index b1c10aaf51b..559e9d36686 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -23,13 +23,13 @@ contents: - id: SmokingPipeFilledTobacco - id: FlippoEngravedLighter - - type: Armor #same as regular sec armor - modifiers: - coefficients: - Blunt: 0.70 - Slash: 0.70 - Piercing: 0.70 - Heat: 0.80 +# - type: Armor #same as regular sec armor # DeltaV - remove armour as it is no longer security equipment. +# modifiers: +# coefficients: +# Blunt: 0.70 +# Slash: 0.70 +# Piercing: 0.70 +# Heat: 0.80 - type: entity parent: ClothingOuterCoatDetective diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml index e2733b2468b..2c5760984c7 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml @@ -50,7 +50,7 @@ whitelist: tags: - Knife - - Sidearm + - ConcealCarry # DeltaV - replace Sidearm tag - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 52c934c2287..cee5b039130 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -150,9 +150,9 @@ name: security winter boots components: - type: Sprite - sprite: Clothing/Shoes/Boots/winterbootssec.rsi + sprite: DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi # DeltaV - resprite boots to meet standards - type: Clothing - sprite: Clothing/Shoes/Boots/winterbootssec.rsi + sprite: DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi # DeltaV - resprite boots to meet standards - type: entity parent: [ClothingShoesBaseWinterBoots, BaseSyndicateContraband] diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml index 5a9360e652d..25098e61d49 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/anomaly.yml @@ -20,7 +20,7 @@ - AnomalyLiquid - AnomalyFlora - AnomalyShadow - - AnomalyTech +# - AnomalyTech # DeltaV - remove until it stops being an epileptic hazard chance: 1 offset: 0.15 # not to put it higher. The anomaly sychnronizer looks for anomalies within this radius, and if the radius is higher, the anomaly can be attracted from a neighboring tile. diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml index 243a816a478..ecc57a03bdc 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml @@ -124,6 +124,7 @@ tags: - Sidearm - BrassInstrument + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: entity parent: BaseHandheldInstrument diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 921950db82b..7a6961b148a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -987,6 +987,7 @@ tags: - Sidearm - ToySidearm + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: Gun selectedMode: SemiAuto availableModes: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml index 82f91669cd1..71167106029 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/medkits.yml @@ -7,7 +7,20 @@ - type: Sprite sprite: Objects/Specific/Medical/firstaidkits.rsi state: firstaid - - type: Storage + - type: Storage # DeltaV - add whitelist to first aid kits + whitelist: + tags: + - Bloodpack + - Bottle + - Brutepack + - Gauze + - GasTank + - Ointment + - PillCanister + - Syringe + components: + - BreathMask + - Hypospray maxItemSize: Small grid: - 0,0,3,1 diff --git a/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml b/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml index 3edf26ea78e..99490ccbe1f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/appraisal.yml @@ -24,6 +24,7 @@ tags: - AppraisalTool - Sidearm + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: GuideHelp guides: - Cargo diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 7db085eb0a3..d58c2f0dd90 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -79,6 +79,7 @@ - type: Tag tags: - Sidearm + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: Clothing sprite: Objects/Weapons/Guns/Battery/taser.rsi quickEquip: false @@ -96,6 +97,7 @@ - type: Tag tags: - Sidearm + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: Clothing sprite: Objects/Weapons/Guns/Battery/taser.rsi quickEquip: false @@ -443,6 +445,7 @@ tags: - Taser - Sidearm + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: entity name: disabler @@ -519,6 +522,7 @@ tags: - Taser - Sidearm + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: Sprite sprite: Objects/Weapons/Guns/Battery/taser.rsi layers: @@ -580,6 +584,7 @@ - HighRiskItem - Sidearm - WeaponAntiqueLaser + - ConcealCarry # DeltaV - can be stowed in military boots for now - type: StaticPrice price: 750 - type: StealTarget diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 67bc8e14d11..57051746abc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -19,6 +19,7 @@ - type: Tag tags: - Sidearm + - ConcealCarry # Deltav - allow all pistols to be stowed in military boots for now. - type: Clothing sprite: Objects/Weapons/Guns/Pistols/viper.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 309c2c502d6..1de11c50474 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -15,6 +15,7 @@ - type: Tag tags: - Sidearm + - ConcealCarry # DeltaV - allow revolvers to be stowed in military boots for now - type: Clothing sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi quickEquip: false diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index a279c56378f..3de77897c41 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -35,6 +35,9 @@ enum.ConstructionVisuals.Layer: Primed: { state: primed } Unprimed: { state: icon } + - type: Tag # DeltaV - assign grenade tag to all grenades + tags: + - Grenade - type: entity name: explosive grenade diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index e8afa5a203c..d2cca17d281 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -36,6 +36,16 @@ equipment: jumpsuit: ClothingUniformJumpskirtDetectiveGrey +- type: loadout # DeltaV + id: ForensicSpecJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitForensicSpec + +- type: loadout # DeltaV + id: ForensicSpecJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtForensicSpec + # OuterClothing - type: loadout id: DetectiveArmorVest diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index 6f2d205be07..6e35e8ca032 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -9,6 +9,26 @@ equipment: jumpsuit: ClothingUniformJumpskirtHoS +- type: loadout # DeltaV + id: HeadofSecurityJumpsuitGrey + equipment: + jumpsuit: ClothingUniformJumpsuitHoSGrey + +- type: loadout # DeltaV + id: HeadofSecurityJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtHoSGrey + +- type: loadout # DeltaV + id: HeadofSecurityJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitHoSBlue + +- type: loadout # DeltaV + id: HeadofSecurityJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtHoSBlue + - type: loadout id: HeadofSecurityTurtleneck equipment: @@ -72,6 +92,16 @@ equipment: outerClothing: ClothingOuterWinterHoS +- type: loadout # DeltaV - security winter coat + id: StasecWinterCoatHoS + equipment: + outerClothing: ClothingOuterCoatStasecHoS + +- type: loadout # DeltaV - security greatcoat + id: StasecGreatcoatHoS + equipment: + outerClothing: ClothingOuterGreatcoatStasecHoS + # Shoes - DeltaV - type: loadout # DeltaV id: HeadOfSecurityWinterBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index 0a1e8ced320..f55a23e17d6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -86,6 +86,22 @@ equipment: jumpsuit: ClothingUniformJumpskirtSeniorOfficer +- type: loadout # DeltaV + id: SeniorSecOfficerJumpsuit + effects: + - !type:GroupLoadoutEffect + proto: SeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpsuitSecSenior + +- type: loadout # DeltaV + id: SeniorSecOfficerJumpskirt + effects: + - !type:GroupLoadoutEffect + proto: SeniorOfficer + equipment: + jumpsuit: ClothingUniformJumpskirtSecSenior + # Back - type: loadout id: SecurityBackpack @@ -139,6 +155,21 @@ equipment: outerClothing: ClothingOuterWinterSec +- type: loadout + id: StasecSweater + equipment: + outerClothing: ClothingOuterStasecSweater + +- type: loadout # DeltaV - security winter coat + id: StasecWinterCoat + equipment: + outerClothing: ClothingOuterCoatStasec + +- type: loadout # DeltaV - security greatcoat + id: StasecGreatcoat + equipment: + outerClothing: ClothingOuterGreatcoatStasec + # Shoes - type: loadout id: CombatBoots diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index 9c270e6d6fd..06cb118ec5d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -20,6 +20,26 @@ equipment: jumpsuit: ClothingUniformJumpskirtWarden +- type: loadout # DeltaV + id: WardenJumpsuitGrey + equipment: + jumpsuit: ClothingUniformJumpsuitWardenGrey + +- type: loadout # DeltaV + id: WardenJumpskirtGrey + equipment: + jumpsuit: ClothingUniformJumpskirtWardenGrey + +- type: loadout # DeltaV + id: WardenJumpsuitBlue + equipment: + jumpsuit: ClothingUniformJumpsuitWardenBlue + +- type: loadout # DeltaV + id: WardenJumpskirtBlue + equipment: + jumpsuit: ClothingUniformJumpskirtWardenBlue + # OuterClothing - type: loadout id: WardenCoat @@ -30,3 +50,13 @@ id: WardenArmoredWinterCoat equipment: outerClothing: ClothingOuterWinterWarden + +- type: loadout # DeltaV - security winter coat + id: StasecWinterCoatWarden + equipment: + outerClothing: ClothingOuterCoatStasecWarden + +- type: loadout # DeltaV - security greatcoat + id: StasecGreatcoatWarden + equipment: + outerClothing: ClothingOuterGreatcoatStasecWarden diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 2631b5cd3bd..8afbddd8f22 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1076,12 +1076,16 @@ loadouts: - HeadofSecurityJumpsuit - HeadofSecurityJumpskirt - - HeadofSecurityTurtleneck - - HeadofSecurityTurtleneckSkirt + - HeadofSecurityJumpsuitGrey # DeltaV + - HeadofSecurityJumpskirtGrey # DeltaV + - HeadofSecurityJumpsuitBlue # DeltaV + - HeadofSecurityJumpskirtBlue # DeltaV +# - HeadofSecurityTurtleneck # DeltaV - removed for incongruence +# - HeadofSecurityTurtleneckSkirt # DeltaV - removed for incongruence - HeadofSecurityFormalSuit - HeadofSecurityFormalSkirt - - HeadofSecurityParadeSuit - - HeadofSecurityParadeSkirt +# - HeadofSecurityParadeSuit # DeltaV - removed for incongruence +# - HeadofSecurityParadeSkirt # DeltaV - removed for incongruence - type: loadoutGroup id: HeadofSecurityNeck @@ -1096,14 +1100,18 @@ id: HeadofSecurityOuterClothing name: loadout-group-head-of-security-outerclothing loadouts: - - HeadofSecurityCoat - - HeadofSecurityWinterCoat +# - HeadofSecurityCoat # DeltaV - removed for incongruence +# - HeadofSecurityWinterCoat # DeltaV - removed for incongruence + - PlateCarrier # DeltaV + - DuraVest # DeltaV + - StasecWinterCoatHoS # DeltaV + - StasecGreatcoatHoS # DeltaV - type: loadoutGroup # DeltaV - id: HeadOfSecurityShoes + id: HeadofSecurityShoes name: loadout-group-head-of-security-shoes loadouts: - - CombatBoots +# - CombatBoots # DeltaV - removed for standardisation of equipment - JackBoots # DeltaV - SecurityWinterBoots - HeadOfSecurityWinterBoots # DeltaV @@ -1122,13 +1130,21 @@ loadouts: - WardenJumpsuit - WardenJumpskirt + - WardenJumpsuitGrey # DeltaV + - WardenJumpskirtGrey # DeltaV + - WardenJumpsuitBlue # DeltaV + - WardenJumpskirtBlue # DeltaV - type: loadoutGroup id: WardenOuterClothing name: loadout-group-warden-outerclothing loadouts: - - WardenCoat - - WardenArmoredWinterCoat +# - WardenCoat # DeltaV - removed for incongruence +# - WardenArmoredWinterCoat # DeltaV - removed for incongruence + - PlateCarrier # DeltaV + - DuraVest # DeltaV + - StasecWinterCoatWarden # DeltaV + - StasecGreatcoatWarden # DeltaV - type: loadoutGroup id: SecurityHead @@ -1137,8 +1153,8 @@ loadouts: - SecurityHelmet - SecurityBeret - - SecurityHat - - MimeHead # DeltaV - Red Beret +# - SecurityHat # DeltaV - removed for incongruence +# - MimeHead # DeltaV - Red Beret | removed for incongruence - type: loadoutGroup id: SecurityJumpsuit @@ -1150,8 +1166,10 @@ - SecurityJumpskirtGrey - SecurityJumpsuitBlue # DeltaV - SecurityJumpskirtBlue # DeltaV - - SeniorOfficerJumpsuit - - SeniorOfficerJumpskirt +# - SeniorOfficerJumpsuit # DeltaV - removed for incongruence +# - SeniorOfficerJumpskirt # DeltaV - removed for incongruence + - SeniorSecOfficerJumpsuit # DeltaV + - SeniorSecOfficerJumpskirt # DeltaV - type: loadoutGroup id: SecurityBackpack @@ -1172,11 +1190,14 @@ id: SecurityOuterClothing name: loadout-group-security-outerclothing loadouts: - - ArmorVest +# - ArmorVest # DeltaV - removed for incongruence - PlateCarrier # DeltaV - DuraVest # DeltaV - - ArmorVestSlim - - SecurityOfficerWintercoat +# - ArmorVestSlim - removed for incongruence +# - SecurityOfficerWintercoat - removed for incongruence + - StasecSweater # DeltaV + - StasecWinterCoat # DeltaV + - StasecGreatcoat # DeltaV - type: loadoutGroup id: SecurityShoes @@ -1219,10 +1240,12 @@ id: DetectiveJumpsuit name: loadout-group-detective-jumpsuit loadouts: - - DetectiveJumpsuit - - DetectiveJumpskirt - - NoirJumpsuit - - NoirJumpskirt +# - DetectiveJumpsuit # DeltaV - removed for incongruence +# - DetectiveJumpskirt # DeltaV - removed for incongruence +# - NoirJumpsuit # DeltaV - removed for incongruence +# - NoirJumpskirt # DeltaV - removed for incongruence + - ForensicSpecJumpsuit # DeltaV + - ForensicSpecJumpskirt # DeltaV - type: loadoutGroup id: DetectiveOuterClothing @@ -1249,12 +1272,12 @@ - EmergencyOxygenSecurity - LoadoutSpeciesVoxNitrogen -- type: loadoutGroup - id: SecurityStar - name: loadout-group-security-star - minLimit: 0 - loadouts: - - SecStar +#- type: loadoutGroup # DeltaV - removed for incongruence +# id: SecurityStar +# name: loadout-group-security-star +# minLimit: 0 +# loadouts: +# - SecStar # Medical - type: loadoutGroup diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 7f14e06effb..056ac9520c6 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -365,10 +365,10 @@ - SecurityBackpack - SecurityBelt - HeadofSecurityOuterClothing - - HeadOfSecurityShoes # DeltaV, replaces SecurityShoes + - HeadofSecurityShoes # DeltaV - winter boots - SurvivalSecurity - Trinkets - - SecurityStar +# - SecurityStar # DeltaV - removed for incongruence - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -383,7 +383,7 @@ - SecurityShoes - SurvivalSecurity - Trinkets - - SecurityStar +# - SecurityStar # DeltaV - removed for incongruence - GroupSpeciesBreathToolSecurity - type: roleLoadout @@ -399,28 +399,28 @@ - SecurityBelt - SurvivalSecurity - Trinkets - - SecurityStar +# - SecurityStar # DeltaV - removed for incongruence - GroupSpeciesBreathToolSecurity - type: roleLoadout id: JobDetective groups: - GroupTankHarness - - DetectiveHead - - DetectiveNeck + - SecurityHead # DeltaV - replace DetectiveHead for incongruence + - SecurityNeck # DeltaV - replace DetectiveNeck for incongruence - DetectiveJumpsuit - SecurityBackpack - - DetectiveOuterClothing + - SecurityOuterClothing # DeltaV - replace DetectiveOuterClothing for incongruence - SecurityShoes - SurvivalSecurity - Trinkets - - SecurityStar +# - SecurityStar # DeltaV - removed for incongruence - GroupSpeciesBreathToolSecurity - type: roleLoadout id: JobSecurityCadet groups: - - SecurityCadetHead # DeltaV + - SecurityHead # DeltaV - SecurityNeck # DeltaV - SecurityCadetJumpsuit - SecurityBackpack diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml index 349f819404e..3eaec9142ef 100644 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml +++ b/Resources/Prototypes/Nyanotrasen/Catalog/Fills/Vending/Inventories/repdrobe.yml @@ -4,7 +4,16 @@ ClothingUniformJumpsuitReporter: 2 ClothingShoesColorBlack: 2 ClothingShoesColorWhite: 2 + ClothingShoesBootsLaceup: 2 # DeltaV - added for more shoe options + ClothingShoesLeather: 2 # DeltaV - added for more shoe options ClothingOuterVestFlakPress: 2 + ClothingUniformJumpsuitDetective: 2 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetective: 2 # DeltaV - moved from detdrobe + ClothingUniformJumpsuitDetectiveGrey: 2 # DeltaV - moved from detdrobe + ClothingUniformJumpskirtDetectiveGrey: 2 # DeltaV - moved from detdrobe + ClothingOuterCoatDetectiveLoadout: 2 # DeltaV - moved from detdrobe + ClothingNeckTieDet: 2 # DeltaV - moved from detdrobe + ClothingHeadHatFedoraBrown: 2 # DeltaV - moved from detdrobe ClothingHeadHatFedoraGrey: 2 RadioHandheld: 2 ClothingHeadsetService: 2 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml index c4736f2a3d7..badf017ff5e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Belt/belts.yml @@ -37,7 +37,7 @@ sprite: Nyanotrasen/Clothing/Belt/Martial/black.rsi - type: entity - parent: ClothingBeltStorageBase + parent: ClothingBeltBase # DeltaV - reparent from ClothingBeltStorageBase id: ClothingBeltKatanaSheath name: katana sheaths description: An ornate belt designed to hold a pair of samurai's blades, or daisho. @@ -47,25 +47,52 @@ state: sheath - type: Clothing sprite: Nyanotrasen/Clothing/Belt/katanasheath.rsi - - type: Storage - grid: - - 0,0,3,1 - whitelist: - tags: - - Katana - - type: ItemMapper + - type: ItemSlots # DeltaV - adjust how objects are stored + slots: + katanaslot: + name: clothing-belt-katana + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/Items/sheath.ogg + ejectSound: /Audio/Items/unsheath.ogg + whitelist: + tags: + - Katana + priority: 2 + wakizashislot: + name: clothing-belt-wakizashi + insertVerbText: sheath-insert-verb + ejectVerbText: sheath-eject-verb + insertSound: /Audio/Items/sheath.ogg + ejectSound: /Audio/Items/unsheath.ogg + whitelist: + tags: + - Wakizashi + priority: 1 + - type: ItemMapper # DeltaV - adjust how stored objects are displayed mapLayers: - sheath-sabre: + katana: whitelist: tags: - Katana + wakizashi: + whitelist: + tags: + - Wakizashi + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + katanaslot: !type:ContainerSlot {} + wakizashislot: !type:ContainerSlot {} - type: Appearance - type: Tag tags: - BeltSlotNotBelt - type: entity - parent: ClothingBeltStorageBase + parent: [ClothingBeltStorageBase, ClothingSlotBase] # DeltaV - add parent ClothingSlotBase id: ClothingBeltMilitaryWebbingCMO name: chief medical officer's chest rig description: A medical chest rig with deep pockets, for use by paramedics and health professionals. @@ -76,11 +103,32 @@ sprite: DeltaV/Clothing/Belt/cmowebbing.rsi # DeltaV - resprite - type: Item size: Large + - type: ItemSlots # DeltaV - add medkit slot + slots: + medkit: + name: clothing-belt-medkit + whitelist: + tags: + - Medkit + insertOnInteract: false # or you can't easily stow medkits in your rig. - type: Storage maxItemSize: Normal grid: # DeltaV - Make the grid smaller - 0,0,2,1 - 4,0,7,1 + - type: ItemMapper # DeltaV - add stowed medkit sprite + mapLayers: + medkit: + whitelist: + tags: + - Medkit + sprite: DeltaV/Clothing/Belt/belt_overlay.rsi - type: Tag tags: - BeltSlotNotBelt + - type: ContainerContainer + containers: + storagebase: !type:Container + ents: [] + medkit: !type:ContainerSlot {} + - type: Appearance # DeltaV diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml index f2604f044fd..80207feb037 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Melee/sword.yml @@ -6,7 +6,7 @@ components: - type: Tag tags: - - Katana + - Wakizashi # DeltaV - differentiate between Katana and Wakizashi - type: Sharp - type: Utensil types: diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/baton.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/baton.png new file mode 100644 index 00000000000..a9a9e421328 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/baton.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/flashbang.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/flashbang.png new file mode 100644 index 00000000000..f3833168475 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/flashbang.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/gasgrenade.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/gasgrenade.png new file mode 100644 index 00000000000..746f8352211 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/gasgrenade.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/katana.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/katana.png new file mode 100644 index 00000000000..645b917dca5 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/katana.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/medkit.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/medkit.png new file mode 100644 index 00000000000..b18bfb58fd8 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/medkit.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/meta.json new file mode 100644 index 00000000000..c98433227c1 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "katana" + }, + { + "name": "wakizashi" + }, + { + "name": "slp" + }, + { + "name": "universal" + }, + { + "name": "flashbang" + }, + { + "name": "gasgrenade" + }, + { + "name": "baton" + }, + { + "name": "medkit" + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/slp.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/slp.png new file mode 100644 index 00000000000..975d35cc0ba Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/slp.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/universal.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/universal.png new file mode 100644 index 00000000000..7de9bb56084 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/universal.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/wakizashi.png b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/wakizashi.png new file mode 100644 index 00000000000..817105b0bc4 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Belt/belt_overlay.rsi/wakizashi.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png index fdd49ef9960..8241bbb4499 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png index cdd85d3b304..c95c7757a1d 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png index 52de63a3825..8abe5221b64 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png index 93d8d3da759..bc6e7de7ee5 100644 Binary files a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json index f0fd68e2074..4004890b236 100644 --- a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Kilk", + "copyright": "drawn by Kilk, modified by TJohnson", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png new file mode 100644 index 00000000000..6f620dc580d Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png new file mode 100644 index 00000000000..395c3a19039 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png new file mode 100644 index 00000000000..9eb52434a23 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png new file mode 100644 index 00000000000..c176c9ba3ba Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json new file mode 100644 index 00000000000..f20ba670cb0 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord). Further modified by TJohnson for DeltaV" , + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..3d750922b38 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/icon.png new file mode 100644 index 00000000000..95a1e8db127 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-left.png new file mode 100644 index 00000000000..8a40a279de3 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-right.png new file mode 100644 index 00000000000..2db19a6e844 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/meta.json new file mode 100644 index 00000000000..655b3db4c03 --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Original work by TJohnson.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "rolled-equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/rolled-equipped-INNERCLOTHING.png b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/rolled-equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..0727c404488 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi/rolled-equipped-INNERCLOTHING.png differ