From 5b4e3b46a61e9123203fe27d0fe3daf8922aeafe Mon Sep 17 00:00:00 2001 From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Date: Tue, 8 Apr 2025 20:23:12 +1200 Subject: [PATCH] New security box fills, renamed and replaced sechud box icon (#35057) * secglasses and sechud icons, new box fills * sunglasses box * fixes indentation --- .../Catalog/Fills/Boxes/security.yml | 108 +++++++++++++----- .../Objects/Storage/boxes.rsi/meta.json | 8 +- .../Objects/Storage/boxes.rsi/secglasses.png | Bin 0 -> 144 bytes .../Objects/Storage/boxes.rsi/sechud.png | Bin 144 -> 425 bytes .../Objects/Storage/boxes.rsi/sunglasses.png | Bin 0 -> 398 bytes .../Objects/Storage/boxicons.rsi/meta.json | 8 +- .../Storage/boxicons.rsi/secglasses.png | Bin 0 -> 439 bytes .../Objects/Storage/boxicons.rsi/sechud.png | Bin 439 -> 558 bytes .../Storage/boxicons.rsi/sunglasses.png | Bin 0 -> 561 bytes 9 files changed, 95 insertions(+), 29 deletions(-) create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/secglasses.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/sunglasses.png create mode 100644 Resources/Textures/Objects/Storage/boxicons.rsi/secglasses.png create mode 100644 Resources/Textures/Objects/Storage/boxicons.rsi/sunglasses.png diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml index c43118eff6..818810d0cc 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/security.yml @@ -6,12 +6,27 @@ components: - type: StorageFill contents: - - id: Handcuffs - amount: 4 + - id: Handcuffs + amount: 4 - type: Sprite layers: - - state: box_security - - state: handcuff + - state: box_security + - state: handcuff + +- type: entity + name: ziptie box + parent: BoxCardboard + id: BoxZiptie + description: A box full of zipties. + components: + - type: StorageFill + contents: + - id: Zipties + amount: 9 + - type: Sprite + layers: + - state: box_security + - state: ziptie - type: entity name: flashbang box @@ -21,48 +36,87 @@ components: - type: StorageFill contents: - - id: GrenadeFlashBang - amount: 4 + - id: GrenadeFlashBang + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang + +- type: entity + name: stinger grenade box + parent: BoxCardboard + id: BoxStinger + description: A box full of stinger grenades. Disperse! + components: + - type: StorageFill + contents: + - id: GrenadeStinger + amount: 4 - type: Sprite layers: - - state: box_security - - state: flashbang + - state: box_security + - state: flashbang + +- type: entity + name: tear gas grenade box + parent: BoxCardboard + id: BoxTearGas + description: A box full of tear gas grenades. Hold your breath. + components: + - type: StorageFill + contents: + - id: TearGasGrenade + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: flashbang - type: entity name: sechud box parent: BoxCardboard id: BoxSechud + description: A box of sechuds. + components: + - type: StorageFill + contents: + - id: ClothingEyesHudSecurity + amount: 4 + - type: Sprite + layers: + - state: box_security + - state: sechud + +- type: entity + name: secglasses box + parent: BoxCardboard + id: BoxSecglasses description: A box of security glasses. components: - type: StorageFill contents: - - id: ClothingEyesHudSecurity - amount: 4 + - id: ClothingEyesGlassesSecurity + amount: 4 - type: Sprite layers: - - state: box_security - - state: sechud + - state: box_security + - state: secglasses - type: entity - name: ziptie box + name: sunglasses box parent: BoxCardboard - id: BoxZiptie - description: A box full of zipties. + id: BoxSunglasses + description: A box of cool flash-proof sunglasses. components: - - type: Storage - grid: - - 0,0,4,3 - whitelist: - components: - - Handcuff - type: StorageFill contents: - - id: Zipties - amount: 10 + - id: ClothingEyesGlassesSunglasses + amount: 4 - type: Sprite layers: - - state: box_security - - state: ziptie + - state: box_security + - state: sunglasses - type: entity name: forensic pad box @@ -79,5 +133,5 @@ amount: 9 - type: Sprite layers: - - state: box_security - - state: forensic + - state: box_security + - state: forensic diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 20f3c057af..dbe80371d4 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github)", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github).", "size": { "x": 32, "y": 32 @@ -34,6 +34,12 @@ { "name": "meson" }, + { + "name": "sunglasses" + }, + { + "name": "secglasses" + }, { "name": "sechud" }, diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/secglasses.png b/Resources/Textures/Objects/Storage/boxes.rsi/secglasses.png new file mode 100644 index 0000000000000000000000000000000000000000..d92a5ea120413a63ded588e351a7738856107cec GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}UY;(FArY-_ z&u!#waNuzcG;Z50wC1$ebVHxgrdKY`N9(8Rs!md6U})HX`<~pbb1#A_=S=!`QPp$v r>fQbMYWI??&)ZZ_Ix5Y;kS+eIOXPM}>a2}GQyDy6{an^LB{Ts5CcrYQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png b/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png index d92a5ea120413a63ded588e351a7738856107cec..6a5c29d8900cf7e005b358dd0607eae9c8e5287d 100644 GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv=}#LT=BJwMkF1yemk zJ)_@yn70AdY)g&sO!M^AV&DLBSQ(@kSs56CEH5CIhO$Af(O_f-i!%Y)hKx)M0zf(n zh%?(+z~WgzHVE7-V`O;2jG)mhWdKS|U}sjH>LQ-Ev`U;>)U z1XdYjX#r$Gbr~8MfMl0z>|6I+^xzvHGs4rwF(ktM?S-?P4F)`I4_}BC@*XdU-J33D z?3Sb2bli(yYtQ+o+AN=ff!6%kJHhhPPrlH%Q3+>qlF|b8_pQ@Ae0}qU#1lD1|KE9j kUwh=yyZ$N$20OPW3|Vu9<(Yr9T>;tW>FVdQ&MBb@0PE*x+5i9m delta 102 zcmV-s0Ga=(1CRlbF<(kaL_t(oh3(F<4S+xlLs2t^vl6V!N|!NAb%N?dL&blUEhUmA z004l$+uk19&gfEkoRap@B}ucZyN_=s-eNn?JbRMG8vp=n7wU=>+lpnHu>b%707*qo IM6N<$g3-?_vH$=8 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/sunglasses.png b/Resources/Textures/Objects/Storage/boxes.rsi/sunglasses.png new file mode 100644 index 0000000000000000000000000000000000000000..110fc9ff6565c21fc4c014343f25c561f40e9893 GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*$m0n3-3i=jR%tV5(=R zXY_jy^ERNGZK)BSX`Y^13>-iXD}xjxD+42tvp@3Xlx~Oh9v) zz$$|*Er2YjE<*zYkZhmz!SKuCd;EY*TTd6qkO=p;XE$;(7;v}*UN87B%5r?SOGm;? zk(d9n_Xs-zEj^%H9-fwU{)J7|oXzWB%}jfz_f?9aAv}#cuTcDY*>u$wkfENgelF{r G5}E+kSXGVy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json index 25e914234d..19bce95e27 100644 --- a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen), modified by ps3moira (github).", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen), modified by ps3moira (github). sechud renamed to secglasses, new sechud, sunglasses by K-Dynamic (github).", "size": { "x": 32, "y": 32 @@ -16,6 +16,12 @@ { "name": "meson" }, + { + "name": "sunglasses" + }, + { + "name": "secglasses" + }, { "name": "sechud" }, diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/secglasses.png b/Resources/Textures/Objects/Storage/boxicons.rsi/secglasses.png new file mode 100644 index 0000000000000000000000000000000000000000..5d81fffb218bfe774dd90a7f23086f682c1bc4e6 GIT binary patch literal 439 zcmV;o0Z9IdP)Px$aY;l$R9J=Wmc35HFcgJP5L58n{79v&sT2_v)D;i|;wADH3{?ljfOwC-1Y$tI zS{2#~Dei*ARL2=nnv7u~h@sf7X~p7ia+I5Uj<2tB4Hygt!#`uG1Vx>&(iNDzyb3j> z2BJ<_b-M>z;=|#y)Wo(-{P^TZOZ@TS369eM=b13>R|8QetQ@BSn$VTSInUrY4W(FN z1%h?}0H6uQzP~3-G@ZXAXa^`3IXKVYdLB~7^bOQIpa}&bHr_tOr6j}#O(%X$L9?(Tvfjlq3(iALB zrOEQVSigaw9iZ3003o(iy#906aGpu0p>hv2cU!{u^~@+1IRIcfnM%b0$v8ecKh^HG hyW4xEyN1DF_yp;mbZq&mD4GBO002ovPDHLkV1f+B!7=~< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png b/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png index 5d81fffb218bfe774dd90a7f23086f682c1bc4e6..06c9c01f42b47d083335280004cd4f0713310241 100644 GIT binary patch literal 558 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijK0(?ST4UBZtG7<`kbKE_h%aW7hlVXBHeb1dc_x#zj|NsAAzkdBcgR!Kf zKW=8{ocd84X9>YYJ_K+r>7PJ2av3CK2NWMU8i(osO1+0FtM&jPYR;8PhR!wXH3=g4=LIyqCWr=I3NLK&{!%wiN-74u{2 zY7Sn7ke6Fn&qU}HEZEAL;KI)+D`2i)ByKb5s|>T}Wc5944|FHlDJv-Lvadd>+EBZA z*i~|M+Pgg&ebxsLQ E0Lb#8jsO4v delta 424 zcmV;Z0ayO61h)f_8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00D7HL_t(oh3%HTPQx%1 zg-;Mu@Z9`JrL3tG5f#)G5Ch^R@)itL2gHDQkG=$AK)_lR+6pP|g2YtE8Bv;yVIhd2 z*sf{C;%{=4n|qG0uW}6-3rC4DFf_4A^pb5pkzb8yIoxdY! z2PhUfIM3jE9#Y2i4b(fJ2?ZfG-af>oB*X?yC|a$i^6rHOekShsu9T8p-(14pA%X$L9?(Tvfjlq3(iALBrOEQVSigaw9iZ3003o(i zy#906aGpu0p>hv2cU!{u^~@+1IRIcfnM%b0$v8ecKOxobw!7PVrMrf~VE6>-o^)*a SswkQO0000-L15RjOeSEA?V8lqsTXQ*fNdk^zApqg!|5uRzDo>~kXKn^Q|6eBAGBar0< z#L`eU$d?+7%wTaQAls0Ui9rBJM*(qWI}2Dm3&;k6{bh^{FMxpoqtPs707^|@XJ7%U zG%zwYU|aw(6=Wmp0*FadfNT(80-DPNRvBbz0c1gS85$UXWch4MFST^VZ3i+tJY5_^ zEd1YIyvWzAz|;EhlJU%S3h)1Kd!3})e88t{d&>XbhWQe$r(Ej`LKwH+%wiRp74u{2 zYz|oklb2iA&+LeN;NZ=FphJ#{P2t|&6V4m*u07`RDW5P!b?Kbt3Da}Me{N{r`!Ji~ zx0|mzbHM*A*?Z=Ezu!1_GGCMZ`vo^N=iXcu_Hv0l!%`c@d;agTe~ HDWM4f6@sX3 literal 0 HcmV?d00001 -- 2.51.2