shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kills off /obj/item/device (#6561)

Browse Source
This commit is contained in:
kevinz000
2018-04-30 00:06:58 -05:00
committed by Poojawa
parent ab3035a4ea
commit 3369c804b2
538 changed files with 6728 additions and 6707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/vore/eating/digest_act_vr.dm
+4 -4
View File
@@ -31,9 +31,9 @@
return FALSE
/obj/item/disk/nuclear/digest_act(...)
return FALSE
/obj/item/device/perfect_tele_beacon/digest_act(...)
/obj/item/perfect_tele_beacon/digest_act(...)
return FALSE //Sorta important to not digest your own beacons.
/obj/item/device/pda/digest_act(...)
/obj/item/pda/digest_act(...)
return FALSE
/obj/item/gun/digest_act(...)
return FALSE
@@ -73,7 +73,7 @@
/////////////
/*
//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)
/obj/item/pda/digest_act(var/atom/movable/item_storage = null)
if(id)
id = null
@@ -114,6 +114,6 @@
/////////////
// Some more complicated stuff
/////////////
/obj/item/device/mmi/digital/posibrain/digest_act(var/atom/movable/item_storage = null)
/obj/item/mmi/digital/posibrain/digest_act(var/atom/movable/item_storage = null)
//Replace this with a VORE setting so all types of posibrains can/can't be digested on a whim
return FALSE
modular_citadel/code/modules/vore/eating/living_vr.dm
+4 -4
View File
@@ -254,8 +254,8 @@
log_attack("[attacker] attempted to feed [H.contents] to [src] ([src.type]) but it failed.")
// I just can't imagine this not being complained about
//Handle case: /obj/item/device/radio/beacon
if(/obj/item/device/radio/beacon)
//Handle case: /obj/item/radio/beacon
if(/obj/item/radio/beacon)
var/confirm = alert(user, "[src == user ? "Eat the beacon?" : "Feed the beacon to [src]?"]", "Confirmation", "Yes!", "Cancel")
if(confirm == "Yes!")
var/bellychoice = input("Which belly?","Select A Belly") in src.vore_organs
@@ -333,8 +333,8 @@
SA.update_icons()
//You're in a dogborg!
else if(istype(loc, /obj/item/device/dogborg/sleeper))
var/obj/item/device/dogborg/sleeper/belly = loc //The belly!
else if(istype(loc, /obj/item/dogborg/sleeper))
var/obj/item/dogborg/sleeper/belly = loc //The belly!
var/confirm = alert(src, "You're in a dogborg sleeper. This is for escaping from preference-breaking or if your predator disconnects/AFKs. You can also resist out naturally too.", "Confirmation", "Okay", "Cancel")
if(!confirm == "Okay" || loc != belly)