Some trash eater tweaks and additions.

-Adds a bunch of new low exploitability stuff to the garbo snack menu for suggested scene/fun shenanigans. (small non-storage gear (hat/mask/glasses/gloves/shoes), PDA, headset, organs, more toys, bones, broken emags, busted circuitry, lighters, bottles, lifecrystal cases)
-The PDAs give a warning and a delay time if owned, and come with an additional confirmation popup if they also contain an ID.

-Also fixed a bug that would cause "partially-digested" PDAs to forget the existence their IDs and thus make them unrecoverable until the PDA is deleted. (introduced by the gradual gurgles update)
This commit is contained in:
Verkister
2018-11-11 13:47:05 +02:00
parent e38cd74655
commit f0cd597b49
3 changed files with 60 additions and 30 deletions
+2 -2
View File
@@ -65,8 +65,8 @@
//PDAs need to lose their ID to not take it with them, so we can get a digested ID
/obj/item/device/pda/digest_act(var/atom/movable/item_storage = null)
if(id)
id = null
if(istype(item_storage,/obj/item/device/dogborg/sleeper) || (!isnull(digest_stage) && digest_stage <= 0))
id = null
. = ..()
/obj/item/weapon/card/id/digest_act(var/atom/movable/item_storage = null)
+18 -1
View File
@@ -554,6 +554,23 @@
return
if(is_type_in_list(I,edible_trash))
if(istype(I,/obj/item/device/pda))
var/obj/item/device/pda/P = I
if(P.owner)
visible_message("<span class='warning'>[src] threatens to make [P] disappear!</span>")
if(P.id)
var/confirm = alert(src, "The PDA you're holding contains a vulnerable ID card. Will you risk it?", "Confirmation", "Definitely", "Cancel")
if(confirm != "Definitely")
return
if(!do_after(src, 50, P))
return
visible_message("<span class='warning'>[src] successfully makes [P] disappear!</span>")
to_chat(src, "<span class='notice'>You can taste the sweet flavor of delicious technology.</span>")
drop_item()
I.forceMove(vore_selected)
updateVRPanel()
return
drop_item()
I.forceMove(vore_selected)
updateVRPanel()
@@ -588,7 +605,7 @@
to_chat(src, "<span class='notice'>You can taste the flavor of pain. This can't possibly be healthy for your guts.</span>")
else
to_chat(src, "<span class='notice'>You can taste the flavor of really bad ideas.</span>")
else if(istype(I,/obj/item/toy/figure))
else if(istype(I,/obj/item/toy))
visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")
else if(istype(I,/obj/item/device/paicard) || istype(I,/obj/item/device/mmi/digital/posibrain) || istype(I,/obj/item/device/aicard))
visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")