From 79f9f1bf52aac2c2ae8feb63fa4be6e080771b1d Mon Sep 17 00:00:00 2001 From: BL02DL Date: Fri, 27 Dec 2024 22:45:25 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=D0=9D=D0=93=20=D0=BE=D0=B1=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Decoration/present.yml | 10 +- .../Objects/Consumable/food/halloween.yml | 10 +- .../Structures/Wallmounts/halloween.yml | 2 +- .../Structures/Wallmounts/newyear.yml | 87 ++++++++++++++++++ .../Objects/Decoration/present.rsi/blue.png | Bin 0 -> 650 bytes .../Objects/Decoration/present.rsi/green.png | Bin 0 -> 692 bytes .../Objects/Decoration/present.rsi/meta.json | 14 ++- .../Objects/Decoration/present.rsi/purple.png | Bin 0 -> 649 bytes .../Objects/Decoration/present.rsi/red.png | Bin 0 -> 581 bytes .../Consumable/candystick.rsi/icon.png | Bin 0 -> 262 bytes .../Consumable/candystick.rsi/inhand-left.png | Bin 0 -> 2701 bytes .../candystick.rsi/inhand-right.png | Bin 0 -> 2660 bytes .../Consumable/candystick.rsi/meta.json | 22 +++++ .../Wallmounts/christmasbell.rsi/icon.png | Bin 0 -> 936 bytes .../Wallmounts/christmasbell.rsi/meta.json | 14 +++ .../Wallmounts/christmaslights.rsi/icon.png | Bin 0 -> 590 bytes .../Wallmounts/christmaslights.rsi/meta.json | 15 +++ .../Wallmounts/christmassock.rsi/green.png | Bin 0 -> 499 bytes .../Wallmounts/christmassock.rsi/meta.json | 20 ++++ .../Wallmounts/christmassock.rsi/orange.png | Bin 0 -> 479 bytes .../Wallmounts/christmassock.rsi/red.png | Bin 0 -> 466 bytes 21 files changed, 186 insertions(+), 8 deletions(-) create mode 100644 Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/newyear.yml create mode 100644 Resources/Textures/Objects/Decoration/present.rsi/blue.png create mode 100644 Resources/Textures/Objects/Decoration/present.rsi/green.png create mode 100644 Resources/Textures/Objects/Decoration/present.rsi/purple.png create mode 100644 Resources/Textures/Objects/Decoration/present.rsi/red.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/candystick.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/candystick.rsi/inhand-left.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/candystick.rsi/inhand-right.png create mode 100644 Resources/Textures/_LostParadise/Objects/Consumable/candystick.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Structures/Wallmounts/christmasbell.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Structures/Wallmounts/christmasbell.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Structures/Wallmounts/christmaslights.rsi/icon.png create mode 100644 Resources/Textures/_LostParadise/Structures/Wallmounts/christmaslights.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Structures/Wallmounts/christmassock.rsi/green.png create mode 100644 Resources/Textures/_LostParadise/Structures/Wallmounts/christmassock.rsi/meta.json create mode 100644 Resources/Textures/_LostParadise/Structures/Wallmounts/christmassock.rsi/orange.png create mode 100644 Resources/Textures/_LostParadise/Structures/Wallmounts/christmassock.rsi/red.png diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 06836df342c..f75f225f7be 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -7,7 +7,15 @@ - type: Sprite sprite: Objects/Decoration/present.rsi layers: - - state: present + - state: present + map: [ "enum.DamageStateVisualLayers.Base" ] + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + red: "" + blue: "" + purple: "" + green: "" - type: entity id: Present diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/halloween.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/halloween.yml index d002b791f8c..c4ae6c71617 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/halloween.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/halloween.yml @@ -12,10 +12,10 @@ - type: RandomSprite available: - enum.DamageStateVisualLayers.Base: - candy_1: Material - candy_2: Material - candy_3: Material - candy_4: Material + candy_1: Material + candy_2: Material + candy_3: Material + candy_4: Material - type: Item size: Tiny shape: @@ -33,4 +33,4 @@ Quantity: 1 - type: Tag tags: - - LPPCandy \ No newline at end of file + - LPPCandy diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/halloween.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/halloween.yml index 19dab476a97..e2c82c456f1 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/halloween.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/halloween.yml @@ -24,7 +24,7 @@ parent: BaseSign id: LPPPCheckboxes name: checkboxes - description: Black and orange flags, it's got a halloween feel to it. + description: Black and orange flags, it's got a halloween feel to it. components: - type: Sprite sprite: _LostParadise/Structures/Wallmounts/halloween.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/newyear.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/newyear.yml new file mode 100644 index 00000000000..98af019d54b --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/newyear.yml @@ -0,0 +1,87 @@ +- type: entity + parent: BaseSign + id: LPPNewYearSocksRed + name: socks + description: hanging socks on the wall, like you should put gifts there... + components: + - type: Sprite + sprite: _LostParadise/Structures/Wallmounts/christmassock.rsi + state: red + noRot: false + +- type: entity + parent: BaseSign + id: LPPNewYearSocksGreen + name: socks + description: hanging socks on the wall, like you should put gifts there... + components: + - type: Sprite + sprite: _LostParadise/Structures/Wallmounts/christmassock.rsi + state: green + noRot: false + +- type: entity + parent: BaseSign + id: LPPNewYearSocksOrange + name: socks + description: hanging socks on the wall, like you should put gifts there... + components: + - type: Sprite + sprite: _LostParadise/Structures/Wallmounts/christmassock.rsi + state: orange + noRot: false + +- type: entity + parent: BaseSign + id: LPPNewYearBell + name: new year bell + description: New Year's bell with a wreath, festive mood.. + components: + - type: Sprite + sprite: _LostParadise/Structures/Wallmounts/christmasbell.rsi + state: icon + noRot: false + +- type: entity + name: candy + parent: FoodBase + id: LPPCandyNewYear + description: A New Year's candy that feels like the end of the past. + components: + - type: Sprite + sprite: _LostParadise/Objects/Consumable/candystick.rsi + state: icon + - type: Item + sprite: _LostParadise/Objects/Consumable/candystick.rsi + size: Tiny + shape: + - 0, 0, 0, 0 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Sugar + Quantity: 3 + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Theobromine + Quantity: 1 + - type: Tag + tags: + - LPPCandy + +- type: entity + parent: BaseSign + id: LPPLightbulbsNewYear + name: light bulbs + description: Hanging garland, not the best source of light + components: + - type: PointLight + radius: 2.0 + energy: 2.5 + color: "#D6001C" + - type: Sprite + sprite: _LostParadise/Structures/Wallmounts/christmaslights.rsi + state: icon + noRot: false diff --git a/Resources/Textures/Objects/Decoration/present.rsi/blue.png b/Resources/Textures/Objects/Decoration/present.rsi/blue.png new file mode 100644 index 0000000000000000000000000000000000000000..f167efc382ac0f939daf958f4ed3cb943c28a131 GIT binary patch literal 650 zcmV;50(Jd~P)_aaw_B| z?KSidFlXCiFFgp-&|9y8v}iyf>Ou5Ul%mkfCRllNr(p@ z%wZmH=KbEx_p%d4MChgU^)&l^0C*%6r7-@Urirx`=Q0+m0fo{2wliH^4cNS%+!q@L zK}0P_aT8SD0lDW?t`9q|J}+)MzVZ$~4;n%mP&Gg)Fp^RkS}U$Ms?4StWz$aOYsGa) zsSGIvCfr(~S0JS_^l9lWh93iyx=;imx7Q6`iEnU`QXR|24bVg zCz4#^_{W@Y?cX0Kp&AfA0o$sTOH?bDP&Ml+0N~^hxc+$&bt`dznyLGIrV$>~5rEpw zKa4+r!TFw!5Efs4<$MdY>|1+K_|iTA;8bU8;k?2C{nQDF#YMJhYLUK%HB)bX)cUCf z)h&Qq{R+4G6$jGH&MPc3NTe>XAqHZjE#sm<2%Ui4dTtQK({*?4f=C+hf+!c@Kms+= zDF8Q!{nKoNcr_vl($5ZWT>kR_m{R7hwb25IPn_Zl84*CD=__wwuAkc4#T zfjiv8x#xV&$@lVZJVFSDX*Y&i{VD)>WrEg|IDV&{H+Xu9vzy0F1M5k|!EwskKffPq zncOVi80!ilgy^_JYrA40krVcPd`pPK2#~jba@*fE}b!BeEcUeHAxqM8>49;jPoz=3>=s+Zf|i9>DcMGH4t6ACqf< aYk+^0GHWTYl1E4Y00007Jx>h7f{PN?2+2{{i3umrFC*b=rEAN#ye>6WartN!stc@XgzZ!R_K9ZyW?6 zfq`D-2k*RlQhdMG8=Tf8`Pupfy2UtXXyB+Ah%nCSOK2dv+s2QRDk^h`@Bof zomuZ6P~SBkBWKi-12}Tl)G4gME7t4MU-tD)6sT)W{aJ}vb%6tkiW!)Q9EPJeU$M0-Nr00Y9^BWVHnL4rNP3zF)tIM^dR;(8M{-nT=!{N8IO{`@uU;Zgjq j_>Q&mKPLA8_W*wZ<*Xek7HU~$00000NkvXXu0mjf#-J!g literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Decoration/present.rsi/red.png b/Resources/Textures/Objects/Decoration/present.rsi/red.png new file mode 100644 index 0000000000000000000000000000000000000000..08661c7b8b1a6a867528eee5334f06c7203f7d13 GIT binary patch literal 581 zcmV-L0=oT)P)A-Lc3pX6(aBMQZ4$^T_&X<$0jXUHI!q)RUy`P?*PO=ga zcBv;jjs8CXJoWNQmAg(|QET~GQmr+RD!DqZx1X4lQ9Qj!g-S&ojCjE<|BX9E~3CFzCo-de3oFjh)BL)d!` zombk{{Qy^%Et$gG0Th!8_->(rKFh;P;FW>BfgUiKnrxUrFP}m8T_4cFvt0Y!E#T<1 z?=y7!E?9mA-a}+&pG+YGqMrW#=UYtFt7aYbv|oA>vpm}XK&dR(pJm`=0k176uyzRW z_m=|NOTnuKBCFp44$vvL1JB>opFO9&2D~#+Dl?5-7a_pU@1dgv0wgPJokbmND*#L2 z%i$s1+*HPXA3oi4Jgq-FisSVG0Olt6erbqfxV0Q!_-(mW3OWtvrqy&CYp87j6sFlA zD;0->1nq(n;-Jkj0K)Gu!maWGNUvR=#;j}tpa~?sc0n3zWK#eRNbZ6Z*6$%8YuyR6 z+yyCcL3|YaDsBP+eNL1hzS`)m_^+(mMl5NM*FLKgGu~+>cMAem-OYYa+&o$-N zHSQX1alxDYlb3G$s&5dyZ|M>Llc|q4Kh=9|{M7lzopr0AT1~ AU;qFB literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/candystick.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Objects/Consumable/candystick.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1e3c7c0618393d9d1284ea6e5058c97e5cb068a4 GIT binary patch literal 2701 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 Hu0mjfGpjLv literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/candystick.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Objects/Consumable/candystick.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..5d8ae5abc3cb86ed8e93302111cc1a8583177ff0 GIT binary patch literal 2660 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 KMNUMnLSTYx>8%O? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/christmasbell.rsi/meta.json b/Resources/Textures/_LostParadise/Structures/Wallmounts/christmasbell.rsi/meta.json new file mode 100644 index 00000000000..3a03f86691b --- /dev/null +++ b/Resources/Textures/_LostParadise/Structures/Wallmounts/christmasbell.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "tvoysladkii", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/christmaslights.rsi/icon.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/christmaslights.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..412389f477f66ea02c8f15c1c10f32cec11b503e GIT binary patch literal 590 zcmV-U0=?tNroIkTq-I;2Zt7wpTp(ST{N=zcA|TF=+#7W>xLAXn5F`weU5mLIjhol1KE2w>;H&bcGbjtx#W9)fiL zi^=76#gBKUhO2(RECPx$lSxEDR9J=8R=rNcFc3Zv570zjGGs$Y{8TDW;Td(L;t?3=OLQskfW(SAcjO6* zL<|@YNF%QGv^CF z-rshvFE7r61bB;(BFBB-J<$R}UYsJriN$iIKfg3pb$}v5gs?LZA|gZx`RVMB z20ANp5T*DffT{yksd~O$Z{YRu#mN(015`$uos!A~>lk80+@pwl*r+IY|6WWRD7Y+A zl_G6mTR=sU(wNwt&=g_IhRq&d`T-ag06<+tv7cVbf}lUxm`(=(Fch@?Si9b!&0s_wCpHet%07Q#nx0 zp;=`7Znm(lLdruCLBBQEq}SS+uHK@{-S}C6=|GC%;p0u)FQ~NLRbRk6@%HcU?HPx$a!Eu%R9J=8RxwTkF%TRO54h&abO;HOhMEVs$Se2)ub_c1ZC}Zp-Y+O zBx+;|Zeh=|*SmIdh>g8kd+=S?omm7VC$G1=AEL|ao8$uTZ?B{G+r``@ zAe)2|IgRJ$6brB{Tq7ch^>*h!KE0}O%PdGHApmR^b8O1AA4dR3o9I7O3Q$!-B5zn* z?)RdwqY5B$!regL#HX5&wSaa=q=c8*Y&56T3RMJ_0Xau)6x2z`cN|8e2C4{f^4R;y z1!&L$Sj8`@dI7nRQy!2Aix71LEFvsI#H(`!_;y%aI))*7_Iv Date: Fri, 27 Dec 2024 22:50:20 +0700 Subject: [PATCH 2/3] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/structures/wallmounts/newyear.ftl | 12 ++++++++++++ .../entities/structures/wallmounts/newyear.ftl | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl new file mode 100644 index 00000000000..0015196f4eb --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl @@ -0,0 +1,12 @@ +ent-LPPNewYearSocksRed = socks + .desc = hanging socks on the wall, like you should put gifts there... +ent-LPPNewYearSocksGreen = socks + .desc = hanging socks on the wall, like you should put gifts there... +ent-LPPNewYearSocksOrange = socks + .desc = hanging socks on the wall, like you should put gifts there... +ent-LPPNewYearBell = new year bell + .desc = New Year's bell with a wreath, festive mood.. +ent-LPPCandyNewYear = candy + .desc = A New Year's candy that feels like the end of the past. +ent-LPPLightbulbsNewYear = light bulbs + .desc = Hanging garland, not the best source of light diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl new file mode 100644 index 00000000000..db7e8a59548 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl @@ -0,0 +1,12 @@ +ent-LPPNewYearSocksRed = носок + .desc = Новогодний носок, как будто туда надо класть подарки... +ent-LPPNewYearSocksGreen = носок + .desc = Новогодний носок, как будто туда надо класть подарки... +ent-LPPNewYearSocksOrange = носок + .desc = Новогодний носок, как будто туда надо класть подарки... +ent-LPPNewYearBell = new year bell + .desc = Новогодний колокольчик с венком, праздничное настроение.. +ent-LPPCandyNewYear = конфетка + .desc = Новогодняя конфета, которая напоминает о конце прошлого. +ent-LPPLightbulbsNewYear = гирлянда + .desc = Новогодняя гирлянда озаряющая красками нового года. From fd8a9552ecf79f905a19e2825eb3b057e9be339c Mon Sep 17 00:00:00 2001 From: BL02DL Date: Fri, 27 Dec 2024 23:57:38 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../structures/wallmounts/newyear.ftl | 3 + .../structures/wallmounts/newyear.ftl | 3 + .../Entities/Objects/Decoration/present.yml | 8 - .../Structures/Wallmounts/newyear.yml | 357 ++++++++++++++++++ 4 files changed, 363 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl index 0015196f4eb..099a6097aae 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl @@ -10,3 +10,6 @@ ent-LPPCandyNewYear = candy .desc = A New Year's candy that feels like the end of the past. ent-LPPLightbulbsNewYear = light bulbs .desc = Hanging garland, not the best source of light +ent-LPPPresentRandom = present + .desc = A New Year's gift, I wonder what's in it! + .suffix = Filled Safe diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl index db7e8a59548..fc72a5c3913 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/newyear.ftl @@ -10,3 +10,6 @@ ent-LPPCandyNewYear = конфетка .desc = Новогодняя конфета, которая напоминает о конце прошлого. ent-LPPLightbulbsNewYear = гирлянда .desc = Новогодняя гирлянда озаряющая красками нового года. +ent-LPPPresentRandom = подарок + .desc = Новогодний подарок, интересно что же внутри! + .suffix = безопасный diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index f75f225f7be..4cfd5f30904 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -8,14 +8,6 @@ sprite: Objects/Decoration/present.rsi layers: - state: present - map: [ "enum.DamageStateVisualLayers.Base" ] - - type: RandomSprite - available: - - enum.DamageStateVisualLayers.Base: - red: "" - blue: "" - purple: "" - green: "" - type: entity id: Present diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/newyear.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/newyear.yml index 98af019d54b..a98694a644a 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/newyear.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/newyear.yml @@ -85,3 +85,360 @@ sprite: _LostParadise/Structures/Wallmounts/christmaslights.rsi state: icon noRot: false + +- type: entity + id: LPPPresentRandom + parent: [PresentBase, BaseItem] + suffix: Filled Safe + name: present + description: A New Year's gift, I wonder what's in it! + components: + - type: Sprite + sprite: Objects/Decoration/present.rsi + layers: + - state: present + map: [ "enum.DamageStateVisualLayers.Base" ] + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + red: "" + blue: "" + purple: "" + green: "" + - type: SpawnItemsOnUse + items: + - id: PresentTrash + - id: Bucket + orGroup: GiftPool + - id: JetpackMiniFilled + orGroup: GiftPool + - id: PlushieGhost + orGroup: GiftPool + - id: PlushieBee + orGroup: GiftPool + - id: PlushieRGBee + orGroup: GiftPool + - id: PlushieNuke + orGroup: GiftPool + - id: PlushieRouny + orGroup: GiftPool + - id: PlushieLizard #Weh! + orGroup: GiftPool + - id: PlushieNar + orGroup: GiftPool + - id: PlushieCarp + orGroup: GiftPool + - id: PlushieMagicarp + orGroup: GiftPool + - id: PlushieHolocarp + orGroup: GiftPool + - id: PlushieRainbowCarp + orGroup: GiftPool + - id: PlushieSlime + orGroup: GiftPool + - id: PlushieSnake + orGroup: GiftPool + - id: PlushieVox + orGroup: GiftPool + - id: PlushieRatvar + orGroup: GiftPool + - id: PlushieSpaceLizard + orGroup: GiftPool + - id: PlushieSharkBlue + orGroup: GiftPool + - id: PlushieSharkPink + orGroup: GiftPool + - id: PlushieSharkGrey + orGroup: GiftPool + - id: ToyAmongPequeno + orGroup: GiftPool + - id: PlushieDiona + orGroup: GiftPool + - id: PlushieMoth + orGroup: GiftPool + - id: PlushieMothRandom # Nyanotrasen Random Moth Plushie + orGroup: GiftPool + - id: PlushieMothBartender # Nyanotrasen Moth Bartender Plushie + orGroup: GiftPool + - id: PlushieMothMusician # Nyanotrasen Moth Musician Plushie + orGroup: GiftPool + - id: PlushieArachind + orGroup: GiftPool + - id: ClothingNeckCloakMoth + orGroup: GiftPool + - id: ToyMouse + orGroup: GiftPool + - id: ToyAi + orGroup: GiftPool + - id: ToyNuke + orGroup: GiftPool + - id: ToyFigurinePassenger + orGroup: GiftPool + - id: ToyGriffin + orGroup: GiftPool + - id: ToyHonk + orGroup: GiftPool + - id: ToyIan + orGroup: GiftPool + - id: ToyMarauder + orGroup: GiftPool + - id: ToyMauler + orGroup: GiftPool + - id: ToyGygax + orGroup: GiftPool + - id: ToyOdysseus + orGroup: GiftPool + - id: ToyOwlman + orGroup: GiftPool + - id: ToyDeathRipley + orGroup: GiftPool + - id: ToyPhazon + orGroup: GiftPool + - id: ToyFireRipley + orGroup: GiftPool + - id: ToyReticence + orGroup: GiftPool + - id: ToyRipley + orGroup: GiftPool + - id: ToySeraph + orGroup: GiftPool + - id: ToyDurand + orGroup: GiftPool + - id: ToySkeleton + orGroup: GiftPool + - id: FoamBlade + orGroup: GiftPool + - id: AcousticGuitarInstrument + orGroup: GiftPool + - id: ViolinInstrument + orGroup: GiftPool + - id: TrumpetInstrument + orGroup: GiftPool + - id: ElectricGuitarInstrument + orGroup: GiftPool + - id: AccordionInstrument + orGroup: GiftPool + - id: HarmonicaInstrument + orGroup: GiftPool + - id: TromboneInstrument + orGroup: GiftPool + - id: FrenchHornInstrument + orGroup: GiftPool + - id: BanjoInstrument + orGroup: GiftPool + - id: SaxophoneInstrument + orGroup: GiftPool + - id: GlockenspielInstrument + orGroup: GiftPool + - id: RecorderInstrument + orGroup: GiftPool + - id: FluteInstrument + orGroup: GiftPool + - id: ClarinetInstrument + orGroup: GiftPool + - id: CelloInstrument + orGroup: GiftPool + - id: KalimbaInstrument + orGroup: GiftPool + - id: MicrophoneInstrument + orGroup: GiftPool + - id: BassGuitarInstrument + orGroup: GiftPool + - id: OcarinaInstrument + orGroup: GiftPool + - id: PanFluteInstrument + orGroup: GiftPool + - id: SynthesizerInstrument + orGroup: GiftPool + - id: BagpipeInstrument + orGroup: GiftPool + - id: GunpetInstrument + orGroup: GiftPool + - id: RockGuitarInstrument + orGroup: GiftPool + - id: MusicBoxInstrument + orGroup: GiftPool + - id: ViolaInstrument + orGroup: GiftPool + - id: ClothingNeckCloakTrans + orGroup: GiftPool + - id: ClothingNeckCloakAdmin + orGroup: GiftPool + - id: ToySkeleton + orGroup: GiftPool + - id: Basketball + orGroup: GiftPool + - id: Football + orGroup: GiftPool + - id: BalloonCorgi + orGroup: GiftPool + - id: PonderingOrb + orGroup: GiftPool + - id: Skub + orGroup: GiftPool + - id: ClothingEyesGlassesGarGiga + orGroup: GiftPool + - id: ClothingEyesGlassesGarOrange + orGroup: GiftPool + - id: ClothingEyesGlassesGar + orGroup: GiftPool + - id: ClothingNeckBling + orGroup: GiftPool + - id: ClothingHeadHelmetCosmonaut + orGroup: GiftPool + - id: ClothingShoeSlippersDuck + orGroup: GiftPool + - id: ClothingUnderSocksBee + orGroup: GiftPool + - id: ClothingUnderSocksCoder + orGroup: GiftPool + - id: ClothingBeltUtilityFilled + orGroup: GiftPool + - id: WeaponFlareGun + orGroup: GiftPool + - id: ResearchDisk + orGroup: GiftPool + - id: Machete + orGroup: GiftPool + - id: BaseBallBat + orGroup: GiftPool + - id: CombatKnife + orGroup: GiftPool + - id: FlashlightLantern + orGroup: GiftPool + - id: Spear + orGroup: GiftPool + - id: LidSalami + orGroup: GiftPool + - id: Soap + orGroup: GiftPool + - id: SoapHomemade + orGroup: GiftPool + - id: SoapNT + orGroup: GiftPool + - id: SoapDeluxe + orGroup: GiftPool + - id: SoapSyndie + orGroup: GiftPool + - id: SoapOmega + orGroup: GiftPool + - id: BedsheetCosmos + orGroup: GiftPool + - id: BedsheetIan + orGroup: GiftPool + - id: FoodBoxDonkpocket + orGroup: GiftPool + - id: FoodBoxDonkpocketSpicy + orGroup: GiftPool + - id: FoodBoxDonkpocketTeriyaki + orGroup: GiftPool + - id: FoodBoxDonkpocketPizza + orGroup: GiftPool + - id: FoodBoxDonkpocketStonk + orGroup: GiftPool + - id: FoodBoxDonkpocketCarp + orGroup: GiftPool + - id: FoodBoxDonkpocketBerry + orGroup: GiftPool + - id: FoodBoxDonkpocketHonk + orGroup: GiftPool + - id: ClothingHandsGlovesColorPurple + orGroup: GiftPool + - id: ClothingHandsGlovesColorYellow + orGroup: GiftPool + - id: ClothingHandsGlovesColorYellowBudget + orGroup: GiftPool + - id: ClothingEyesGlassesSunglasses + orGroup: GiftPool + - id: ClothingHeadHatOutlawHat + orGroup: GiftPool + - id: ClothingHeadHatSantahat + orGroup: GiftPool + - id: ClothingHeadHatUshanka + orGroup: GiftPool + - id: ClothingHeadHatXmasCrown + orGroup: GiftPool + - id: ClothingHeadHatBunny + orGroup: GiftPool + - id: ClothingHeadHatFlowerWreath + orGroup: GiftPool + - id: FoodPoppy + orGroup: GiftPool + - id: ClothingMaskClown + orGroup: GiftPool + - id: ClothingOuterCoatGentle + orGroup: GiftPool + - id: ClothingOuterCoatJensen + orGroup: GiftPool + - id: ClothingOuterHoodieBlack + orGroup: GiftPool + - id: ClothingOuterHoodieGrey + orGroup: GiftPool + - id: ClothingOuterVestWebMerc + orGroup: GiftPool + - id: ClothingShoesFlippers + orGroup: GiftPool + - id: ClothingUniformJumpsuitAncient + orGroup: GiftPool + - id: ClothingUniformJumpsuitDetectiveGrey + orGroup: GiftPool + - id: ClothingUniformJumpsuitColorMaroon + orGroup: GiftPool + - id: ClothingUniformColorRainbow + orGroup: GiftPool + - id: ClothingUniformOveralls + orGroup: GiftPool + - id: ClothingUniformJumpskirtDetectiveGrey + orGroup: GiftPool + - id: ClothingUniformJumpskirtColorMaroon + orGroup: GiftPool + - id: ClothingUniformJumpskirtJanimaid + orGroup: GiftPool + - id: PersonalAI + orGroup: GiftPool + - id: DiceBag + orGroup: GiftPool + - id: CrayonBox + orGroup: GiftPool + - id: ClothingHeadHatCatEars + orGroup: GiftPool + - id: ClothingHeadHatDogEars + orGroup: GiftPool + - id: ToySword + orGroup: GiftPool + - id: RevolverCapGun + orGroup: GiftPool + - id: Ash + orGroup: GiftPool + - id: Coal1 + orGroup: GiftPool + - id: MiningDrill + orGroup: GiftPool + - id: CowToolboxFilled + orGroup: GiftPool + - id: ClothingUniformJumpsuitEngineeringHazard + orGroup: GiftPool + - id: Bola + orGroup: GiftPool + - id: GlowstickBase + orGroup: GiftPool + - id: GlowstickBlue + orGroup: GiftPool + - id: GlowstickPurple + orGroup: GiftPool + - id: GlowstickRed + orGroup: GiftPool + - id: GlowstickYellow + orGroup: GiftPool + - id: ToyRubberDuck + orGroup: GiftPool + - id: BalloonSyn + orGroup: GiftPool + - id: RGBStaff + orGroup: GiftPool + - id: ToyRenault # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml + orGroup: GiftPool + - id: ToySiobhan # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml + orGroup: GiftPool + sound: + path: /Audio/Effects/unwrap.ogg