From 008f2d9d1c7900c452789e61344782541467b13e Mon Sep 17 00:00:00 2001 From: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Date: Thu, 28 Sep 2023 06:09:44 +0200 Subject: [PATCH] Wearable Wet Floor Sign and 'Janitorial Suicide Vest' (#20311) * Explosive wet floor sign & janitorial suicide vest * fix attributions * Remove name & desc from explosive wet floor sign * Make wet floor sign chameleonable --- .../Components/OnUseTimerTriggerComponent.cs | 6 +++ .../EntitySystems/TriggerSystem.OnUse.cs | 37 +++++++++++++----- .../Audio/Items/Janitor/floor_sign_beep.ogg | Bin 0 -> 4950 bytes .../en-US/weapons/grenades/timer-trigger.ftl | 2 + .../Objects/Specific/Janitorial/janitor.yml | 29 ++++++++------ .../Janitorial/wet_floor_sign.rsi/caution.png | Bin 234 -> 0 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 415 bytes .../Janitorial/wet_floor_sign.rsi/icon.png | Bin 0 -> 251 bytes .../wet_floor_sign.rsi/inhand-left.png | Bin 347 -> 329 bytes .../wet_floor_sign.rsi/inhand-right.png | Bin 366 -> 329 bytes .../Janitorial/wet_floor_sign.rsi/meta.json | 8 +++- 11 files changed, 59 insertions(+), 23 deletions(-) create mode 100644 Resources/Audio/Items/Janitor/floor_sign_beep.ogg delete mode 100644 Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/caution.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/icon.png diff --git a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs index 008bbbe284..f2e94239a0 100644 --- a/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs +++ b/Content.Server/Explosion/Components/OnUseTimerTriggerComponent.cs @@ -29,6 +29,12 @@ namespace Content.Server.Explosion.Components [DataField("beepInterval")] public float BeepInterval = 1; + /// + /// Whether the timer should instead be activated through a verb in the right-click menu + /// + [DataField("useVerbInstead")] + public bool UseVerbInstead = false; + /// /// Should timer be started when it was stuck to another entity. /// Used for C4 charges and similar behaviour. diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs index 1a3323b1ce..fb1f72eb44 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs @@ -48,6 +48,32 @@ public sealed partial class TriggerSystem if (!args.CanInteract || !args.CanAccess) return; + if (component.UseVerbInstead) + { + args.Verbs.Add(new AlternativeVerb() + { + Text = Loc.GetString("verb-start-detonation"), + Act = () => HandleTimerTrigger( + uid, + args.User, + component.Delay, + component.BeepInterval, + component.InitialBeepDelay, + component.BeepSound + ), + Priority = 2 + }); + } + + if (component.AllowToggleStartOnStick) + { + args.Verbs.Add(new AlternativeVerb() + { + Text = Loc.GetString("verb-toggle-start-on-stick"), + Act = () => ToggleStartOnStick(uid, args.User, component) + }); + } + if (component.DelayOptions == null || component.DelayOptions.Count == 1) return; @@ -86,15 +112,6 @@ public sealed partial class TriggerSystem }, }); } - - if (component.AllowToggleStartOnStick) - { - args.Verbs.Add(new AlternativeVerb() - { - Text = Loc.GetString("verb-toggle-start-on-stick"), - Act = () => ToggleStartOnStick(uid, args.User, component) - }); - } } private void CycleDelay(OnUseTimerTriggerComponent component, EntityUid user) @@ -140,7 +157,7 @@ public sealed partial class TriggerSystem private void OnTimerUse(EntityUid uid, OnUseTimerTriggerComponent component, UseInHandEvent args) { - if (args.Handled || HasComp(uid)) + if (args.Handled || HasComp(uid) || component.UseVerbInstead) return; HandleTimerTrigger( diff --git a/Resources/Audio/Items/Janitor/floor_sign_beep.ogg b/Resources/Audio/Items/Janitor/floor_sign_beep.ogg new file mode 100644 index 0000000000000000000000000000000000000000..25f68be1c388dcdc9c417746f5fb2fe7a0c27beb GIT binary patch literal 4950 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 literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/weapons/grenades/timer-trigger.ftl b/Resources/Locale/en-US/weapons/grenades/timer-trigger.ftl index 76861c8b4f..77e2dd938d 100644 --- a/Resources/Locale/en-US/weapons/grenades/timer-trigger.ftl +++ b/Resources/Locale/en-US/weapons/grenades/timer-trigger.ftl @@ -7,6 +7,8 @@ examine-trigger-timer = The timer is set to {$time} seconds. popup-trigger-timer-set = Timer set to {$time} seconds. +verb-start-detonation = Start detonation + verb-toggle-start-on-stick = Toggle auto-activation popup-start-on-stick-off = The device will no longer activate automatically when planted popup-start-on-stick-on = The device will now activate automatically when planted diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 13bd6d1665..3ae89e0d1c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -196,33 +196,30 @@ - type: entity name: wet floor sign id: WetFloorSign - parent: BaseItem + parent: ClothingOuterBase description: Caution! Wet Floor! components: - type: Sprite sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi - state: caution - type: Item sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi size: 15 + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 - type: Tag tags: - WetFloorSign + - WhitelistChameleon - type: entity - name: wet floor sign suffix: Explosive - description: Caution! Wet Floor! - parent: BaseItem + parent: WetFloorSign id: WetFloorSignMineExplosive components: - - type: Sprite - sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi - state: caution - - type: Item - sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi - size: 15 - type: StepTrigger intersectRatio: 0.2 requiredTriggeredSpeed: 0 @@ -254,6 +251,16 @@ totalIntensity: 60 # about a ~3 tile radius canCreateVacuum: false - type: DeleteOnTrigger + - type: OnUseTimerTrigger + useVerbInstead: true + beepInterval: .25 + beepSound: /Audio/Items/Janitor/floor_sign_beep.ogg + params: + volume: 1 + examinable: false + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WetFloorSign - type: entity name: janitorial trolley diff --git a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/caution.png b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/caution.png deleted file mode 100644 index fdd5c1d2cbbbe9684848a0f00a916594b857842e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmVcrlDmg3=O0Fc9|NiHux`7X3Ce(o18_6JJ;Q^jnE9CjFVPayB|L+D39gkejeJ?AQ&3jGak44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%xE||`6<^aQ={|sG~3_3bGKw*i@l5`-&RubeF{2v4uHt%1uA1K0E z;1OBOz`%D1gc(IOyc&QOuz0#ShD5l(oz}?LWWeKcoALku)7#dy+%9A7oguN=`%c*V z8lO!fDZc}R4H(x&GcL+noW-`(PAsZx6@TFOMRn{IuUHIz=_Uw9K4EeAGrK(C)Gc<0 zEA9+|31_AXotw~^Gg^Wl{c)C37E?CX2y;nhR@OsAxjyaF*`h( z@V;38ow9?H0Fe6pMtW8QXMyhlmL2a{BaVMn)LQh)oRMXPdCcp7ng?y)pOtv=ugUbx zn~e!Z*)MiHw%y>fhHdNhbxIAFWskhNAkOepyN}VsChhXS-6h=ZjEpQ(YWFcEJUGs< z)#JSqFT;aZe;e2fcCO#N*n`>gTdD5>d4_Fo8IQPlrSsePS_1=#!PC{xWt~$(69D$i BqW%B? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/icon.png b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..204e8b8813f1535fdb9e1f7a1a1d380d63c606ed GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCim11AIbU7ffgP^PfRSN9W7|pb&%nA?9u%#aa^N7yKUx7=CZ#3kC{s7I;J! zGcfQS24TkI`72U@f+?OZjv*HQZ!a9=YB1nozHsx~|NW7h!aR0fs%DY&=d3Z)WEi+?^nJK#)O<=aqfMY6XM+ n$@8D{JbPf4w&BEgg-0wu#raevg-!(m?PKtC^>bP0l+XkK%VbrT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/inhand-left.png index aa3d9fc9c14305c8351f12b5b8e2d8f169c51440..ed1e8946e7c2fee658d9809091e2fc75de989e08 100644 GIT binary patch delta 313 zcmcc3bdqU;WIZzj1H;_yjcNS%G~10G|-o z1=AV+{AbY7(K&MfD8wLth`Ad`v6ck+1^)*EhTq%xf`I~@1s;*b3=DjSL74G){)!Z! z;3iKO$B+p3x6>|i9X8-_oqX*7|7R<|)<1O9l`xZ#p2wd1?yzSDcj1NETNbc7aYrfq zS()HrvE|;K^8ySj6NJuMIv&vO<73&QDju!IIDuP4WCufqK+JUEH;f+?ZkXHHA51c9 zd1`p_b_#UaCyyG88JA_x8Ux92v*sh;Dzw))7;gH=;2 zildFz3#GHa4z(*_vbT!Ax%$oxYs2-ijK6YXGEyu`h5=k$wm=8KdeeUWnAevsF@FQr8~XFJt_f=?8L^5F z0O0=avXv~$B8H4};002ovPDHLkV1k%!lJ)=q diff --git a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/inhand-right.png index 286dec22cd18ee027898194451cfc531f3449254..355d215fcd7cf13eddc7539386a45d99aea9d687 100644 GIT binary patch delta 313 zcmaFIbdqU;WIZzj1H;_yjcNS%G~10G|-o z1=AV+{AbY7(K&MfD8wLth`Ad`v6ck+1^)*EhTq%xf`I~@1s;*b3=DjSL74G){)!Z! z;3iKO$B+p3x6>|i9X8-_O@92pzS#6w{k09faW@l|R>D(wbPMmPyWM`sgW{zb^7ou)zUV#dl4)-kj%laQi(qeQ))`$w}am z+KXS|RyrMp!Y^j_F>O3@vEL445ZJtG&NqwN+na@1jNS=(Hwm*|V&11>k{hvotazOVpc)I$ztaD0e0s!D+ Bcsc+8 delta 350 zcmV-k0ipiM0`3Bk8Gi-<0063Kaozv`0X0cPK~#90?bh^L_Ra%DgFzX$Y%y}s#bs$ w`^-R2RRPXn$)~Cc5c$l2r}!N}-yJwhTeehXKsXChM*si-07*qoM6N<$f&+J?`2YX_ diff --git a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json index bc202f443a..75c381313e 100644 --- a/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Janitorial/wet_floor_sign.rsi/meta.json @@ -1,14 +1,18 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/da42afcbaeaa04e5ba288ade027c011efb3ef0ab, modified by Skarlet and Psychpsyo", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "caution" + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 }, { "name": "inhand-left", -- 2.51.2