From 2b14e9a99bfdb82568a613b42a0bb69edf49ae04 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Wed, 12 Apr 2023 18:44:52 +0000 Subject: [PATCH] [Tweak] Syndi pens are bought in boxes now (#15190) * pens are bought in wrappers now * pro * maybe * pro * pro --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Prototypes/Catalog/uplink_catalog.yml | 8 ++++--- .../Objects/Specific/Medical/hypospray.yml | 16 ++++++++++++++ .../Entities/Objects/Weapons/Bombs/pen.yml | 16 ++++++++++++++ .../Objects/Weapons/Melee/e_sword.yml | 17 +++++++++++++++ .../Objects/Storage/penbox.rsi/e_dagger.png | Bin 0 -> 760 bytes .../Storage/penbox.rsi/exploding_pen.png | Bin 0 -> 757 bytes .../Objects/Storage/penbox.rsi/hypopen.png | Bin 0 -> 752 bytes .../Objects/Storage/penbox.rsi/meta.json | 20 ++++++++++++++++++ 8 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/Objects/Storage/penbox.rsi/e_dagger.png create mode 100644 Resources/Textures/Objects/Storage/penbox.rsi/exploding_pen.png create mode 100644 Resources/Textures/Objects/Storage/penbox.rsi/hypopen.png create mode 100644 Resources/Textures/Objects/Storage/penbox.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index a0caee11d2..2b2a4c0467 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -59,7 +59,7 @@ name: uplink-edagger-name description: uplink-edagger-desc icon: { sprite: /Textures/Objects/Weapons/Melee/e_dagger.rsi, state: icon } - productEntity: EnergyDagger + productEntity: EnergyDaggerBox cost: Telecrystal: 3 categories: @@ -156,7 +156,8 @@ id: UplinkExplodingPen name: uplink-exploding-pen-name description: uplink-exploding-pen-desc - productEntity: PenExploding + icon: { sprite: /Textures/Objects/Misc/bureaucracy.rsi, state: pen } + productEntity: PenExplodingBox cost: Telecrystal: 5 categories: @@ -314,7 +315,8 @@ id: UplinkHypopen name: uplink-hypopen-name description: uplink-hypopen-desc - productEntity: Hypopen + icon: { sprite: /Textures/Objects/Misc/bureaucracy.rsi, state: pen } + productEntity: HypopenBox cost: Telecrystal: 6 categories: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 100e64120b..bc7108141d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -249,6 +249,22 @@ - type: StaticPrice # A new shitcurity meta price: 75 +- type: entity + parent: BaseItem + id: HypopenBox + name: hypopen box + description: A small box containing a hypopen. Packaging disintegrates when opened, leaving no evidence behind. + components: + - type: Sprite + sprite: Objects/Storage/penbox.rsi + state: hypopen + netsync: false + - type: SpawnItemsOnUse + items: + - id: Hypopen + sound: + path: /Audio/Effects/unwrap.ogg + - type: entity name: brigmedic hypospray parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml index f7e746e00f..e7ff65613f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml @@ -16,3 +16,19 @@ canCreateVacuum: false - type: ActivateOnPaperOpened - type: ExplodeOnTrigger + +- type: entity + parent: BaseItem + id: PenExplodingBox + name: exploding pen box + description: A small box containing an exploding pen. Packaging disintegrates when opened, leaving no evidence behind. + components: + - type: Sprite + sprite: Objects/Storage/penbox.rsi + state: exploding_pen + netsync: false + - type: SpawnItemsOnUse + items: + - id: PenExploding + sound: + path: /Audio/Effects/unwrap.ogg diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 5d35f7f0b0..e092f1f705 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -122,6 +122,23 @@ - type: DisarmMalus malus: 0 +- type: entity + parent: BaseItem + id: EnergyDaggerBox + name: e-dagger box + suffix: E-Dagger + description: A small box containing an e-dagger. Packaging disintegrates when opened, leaving no evidence behind. + components: + - type: Sprite + sprite: Objects/Storage/penbox.rsi + state: e_dagger + netsync: false + - type: SpawnItemsOnUse + items: + - id: EnergyDagger + sound: + path: /Audio/Effects/unwrap.ogg + - type: entity name: energy cutlass parent: EnergySword diff --git a/Resources/Textures/Objects/Storage/penbox.rsi/e_dagger.png b/Resources/Textures/Objects/Storage/penbox.rsi/e_dagger.png new file mode 100644 index 0000000000000000000000000000000000000000..da51302469894bca9c5e0bd9f532f5bb282dc724 GIT binary patch literal 760 zcmV2b*kPBs9v@2RbA1gtY<)7qwt8~xFunkhQvzAQM@VKZWQz- z;RE4*R|XWmRC*@hC&l@I-xRy))C7c7Pc8q4Gk@49xR!9AaJOZajo*3Hm&CI6%(T=_ z*!5gFn70isCWk?XZd~jywhN_KRAUu34!$(X;ZHtg77q z=jr8!hl1|0I5a%^{%a3Jw&82b_dgGP|LX|C4{&Z*{6)!W^j-9=iq^dkE$eW4QPDCx zaJB&*_m1xBKT=qBD3^nm6KI};wrglw2(tP;=lBlNYx0Y(V0RCC<$lZJH>4zI-#L+r zn*aa+32;bRa{vGf6951U69E94oEQKA0WnELK~z}7V_+BsqhJ(_f{_jwN!3tZUj84( z?(FPjq|^Z{q+0&@^Jj)>Np286L-~J79l=DZ za#>kfhA&^fFns;`l_EzF9c;F?w*Nss23aaDF3!Nl#>VjY@ndi(fB-i)H-ng%7|GE= zQoO+&0kRAPV2%I*m^i79AUWY+a|8&$LW5LCFp=tj!-o$u!r~qT+)r*pkta1xFp-mT zksYzw(1qdGuV3&)iJUO0S`ZNm378|0a|b9CXyyQ1jsRhrRz~;|CM-K5=MIn~Y3=}+ qBVgGP2DWeCPBrsK!6+C7Gy?##QN?8(Fx`m&0000Rpg literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/penbox.rsi/exploding_pen.png b/Resources/Textures/Objects/Storage/penbox.rsi/exploding_pen.png new file mode 100644 index 0000000000000000000000000000000000000000..efd0efad0a43dbd676fc6f9fc415c92178e090bc GIT binary patch literal 757 zcmV2b*kPBs9v@2RbA1gtY<)7qwt8~xFunkhQvzAQM@VKZWQz- z;RE4*R|XWmRC*@hC&l@I-xRy))C7c7Pc8q4Gk@49xR!9AaJOZajo*3Hm&CI6%(T=_ z*!5gFn70isCWk?XZd~jywhN_KRAUu34!$(X;ZHtg77q z=jr8!hl1|0I5a%^{%a3Jw&82b_dgGP|LX|C4{&Z*{6)!W^j-9=iq^dkE$eW4QPDCx zaJB&*_m1xBKT=qBD3^nm6KI};wrglw2(tP;=lBlNYx0Y(V0RCC<$lZJH>4zI-#L+r zn*aa+32;bRa{vGf6951U69E94oEQKA0WL{IK~z}7?UgZ#gHRBLM++OZRZ@6>6bAMH zc7fc*3s~d;!K0*JvL3*&5J=|{th5ViBLu@dGT|-B?m8ON=lvQd%?*!>~I7h$X`emCiA*stVToJic|#?R*YJ zQGoCJVB7ZKa`Z|7%{RN2x#qJP+!+hNfvoLG+F-2!amZ z7)@Q*1;a2P&vTIi$}~-I9EV*FR^12!%}@j((z)()A=r)c2m(cEa3ORqK$@l+)gHAv zeEqo3?FoHI=gJVDA4_Q4_STegV?Omm^j{JLAx{UUFd4va5V$7&8U59mG>-CgAmro# n1VQ6SN|NNYe@i7Lr6IZiOY6q2_-z{w00000NkvXXu0mjfTjE)T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/penbox.rsi/hypopen.png b/Resources/Textures/Objects/Storage/penbox.rsi/hypopen.png new file mode 100644 index 0000000000000000000000000000000000000000..f0566a22baa0244dcb799d87c3aabc583d459038 GIT binary patch literal 752 zcmV2b*kPBs9v@2RbA1gtY<)7qwt8~xFunkhQvzAQM@VKZWQz- z;RE4*R|XWmRC*@hC&l@I-xRy))C7c7Pc8q4Gk@49xR!9AaJOZajo*3Hm&CI6%(T=_ z*!5gFn70isCWk?XZd~jywhN_KRAUu34!$(X;ZHtg77q z=jr8!hl1|0I5a%^{%a3Jw&82b_dgGP|LX|C4{&Z*{6)!W^j-9=iq^dkE$eW4QPDCx zaJB&*_m1xBKT=qBD3^nm6KI};wrglw2(tP;=lBlNYx0Y(V0RCC<$lZJH>4zI-#L+r zn*aa+32;bRa{vGf6951U69E94oEQKA0VzpDK~z}7?Ug->gHRBFMhEfn?u zb_=+nQpycWTBthdy iBuTRE-%=ux%;5(2TE?L8*P5UJ0000 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/penbox.rsi/meta.json b/Resources/Textures/Objects/Storage/penbox.rsi/meta.json new file mode 100644 index 0000000000..f46856a80e --- /dev/null +++ b/Resources/Textures/Objects/Storage/penbox.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Created for SS14 by deltanedas (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "e_dagger" + }, + { + "name": "exploding_pen" + }, + { + "name": "hypopen" + } + ] +} -- 2.51.2