cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1214 from kcin2001/trash-eat-bots

Browse Source 
Synths get a special list of Trash eat items and add a few items to normal trash eat
This commit is contained in:
Razgriz
2021-02-11 22:39:44 -07:00
committed by GitHub
parent 434e9a3891 14c7fcfef1
commit aaee7ed0fd
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/_helpers/global_lists_ch.dm
View File

@@ -13,4 +13,12 @@ var/global/list/vore_reagent_sounds = list(
'sound/vore/walkslosh10.ogg', 'sound/vore/walkslosh10.ogg',
"None" = null) "None" = null)
/var/global/list/existing_metroids = list() //Global variable for tracking metroids for the event announcement. Needs to go here for load order. /var/global/list/existing_metroids = list() //Global variable for tracking metroids for the event announcement. Needs to go here for load order.
//stuff that only synths can eat
var/global/list/edible_tech = list(/obj/item/weapon/cell,
/obj/item/weapon/circuitboard,
/obj/item/integrated_circuit,
/obj/item/broken_device,
/obj/item/brokenbug,
)

4
code/_helpers/global_lists_vr.dm
View File

@@ -183,6 +183,7 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
/obj/item/device/paicard, /obj/item/device/paicard,
/obj/item/device/pda, /obj/item/device/pda,
/obj/item/device/radio/headset, /obj/item/device/radio/headset,
/obj/item/device/starcaster_news, //chompstation addition
/obj/item/inflatable/torn, /obj/item/inflatable/torn,
/obj/item/organ, /obj/item/organ,
/obj/item/stack/material/cardboard, /obj/item/stack/material/cardboard,
@@ -219,7 +220,8 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
/obj/item/weapon/storage/fancy/crayons, /obj/item/weapon/storage/fancy/crayons,
/obj/item/weapon/storage/fancy/egg_box, /obj/item/weapon/storage/fancy/egg_box,
/obj/item/weapon/storage/wallet, /obj/item/weapon/storage/wallet,
/obj/item/weapon/storage/vore_egg) /obj/item/weapon/storage/vore_egg,
/obj/item/weapon/material/kitchen) //chompstation addition
var/global/list/contamination_flavors = list( var/global/list/contamination_flavors = list(
"Generic" = contamination_flavors_generic, "Generic" = contamination_flavors_generic,

11
code/modules/vore/eating/living_vr.dm
View File

@@ -615,7 +615,7 @@
to_chat(src, "<span class='warning'>You are not allowed to eat this.</span>") to_chat(src, "<span class='warning'>You are not allowed to eat this.</span>")
return return
if(is_type_in_list(I,edible_trash) | adminbus_trash) if(is_type_in_list(I,edible_trash) | adminbus_trash || is_type_in_list(I,edible_tech) && isSynthetic()) //chompstation add synth check
if(I.hidden_uplink) if(I.hidden_uplink)
to_chat(src, "<span class='warning'>You really should not be eating this.</span>") to_chat(src, "<span class='warning'>You really should not be eating this.</span>")
message_admins("[key_name(src)] has attempted to ingest an uplink item. ([src ? ADMIN_JMP(src) : "null"])") message_admins("[key_name(src)] has attempted to ingest an uplink item. ([src ? ADMIN_JMP(src) : "null"])")
@@ -701,6 +701,15 @@
else if (istype(I,/obj/item/clothing/accessory/collar)) else if (istype(I,/obj/item/clothing/accessory/collar))
visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>") visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")
to_chat(src, "<span class='notice'>You can taste the submissiveness in the wearer of [I]!</span>") to_chat(src, "<span class='notice'>You can taste the submissiveness in the wearer of [I]!</span>")
//kcin2000 1/29/21 - lets you eat the news digitally and adds a text for the paper news
else if(istype(I,/obj/item/device/starcaster_news))
to_chat(src, "<span class='notice'>You can taste the dry flavor of digital garbage, oh wait its just the news.</span>")
else if(istype(I,/obj/item/weapon/newspaper))
to_chat(src, "<span class='notice'>You can taste the dry flavor of garbage, oh wait its just the news.</span>")
//kcin2001 1/29/21 - Adding some special synth trash eat
else if (istype(I,/obj/item/weapon/cell))
visible_message("<span class='warning'>[src] sates their electric appeite with a [I]!</span>")
to_chat(src, "<span class='notice'>You can taste the spicy flavor of electrolytes, yum.</span>")
else else
to_chat(src, "<span class='notice'>You can taste the flavor of garbage. Delicious.</span>") to_chat(src, "<span class='notice'>You can taste the flavor of garbage. Delicious.</span>")
return return