cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-25 04:56:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into aro-bellies

Browse Source
This commit is contained in:
Aronai Sieyes
2018-02-27 21:39:53 -05:00
committed by GitHub
parent f04c58f202 d0fbc58100
commit 0f4185ceec
43 changed files with 222 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/living_vr.dm
-6
View File
@@ -15,8 +15,6 @@
var/vore_taste = null // What the character tastes like
var/no_vore = 0 // If the character/mob can vore.
var/openpanel = 0 // Is the vore panel open?
var/conceal_nif = 0 // Do they wish to conceal their NIF from examine?
var/nif_examine = "There's a certain spark to their eyes" //The examine text of their NIF. This is the default placeholder.
var/noisy = 0 // Toggle audible hunger.
var/absorbing_prey = 0 // Determines if the person is using the succubus drain or not. See station_special_abilities_vr.
var/drain_finalized = 0 // Determines if the succubus drain will be KO'd/absorbed. Can be toggled on at any time.
@@ -188,8 +186,6 @@
P.allowmobvore = src.allowmobvore
P.belly_prefs = src.vore_organs
P.vore_taste = src.vore_taste
P.nif_examine = src.nif_examine
P.conceal_nif = src.conceal_nif
P.can_be_drop_prey = src.can_be_drop_prey
P.can_be_drop_pred = src.can_be_drop_pred
@@ -209,8 +205,6 @@
digestable = P.digestable
allowmobvore = P.allowmobvore
vore_taste = P.vore_taste
nif_examine = P.nif_examine
conceal_nif = P.conceal_nif
can_be_drop_prey = P.can_be_drop_prey
can_be_drop_pred = P.can_be_drop_pred
code/modules/vore/eating/vore_vr.dm
-6
View File
@@ -45,8 +45,6 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
var/allowmobvore = 1
var/list/belly_prefs = list()
var/vore_taste
var/conceal_nif
var/nif_examine
var/can_be_drop_prey
var/can_be_drop_pred
@@ -103,8 +101,6 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
S["allowmobvore"] >> allowmobvore
S["belly_prefs"] >> belly_prefs
S["vore_taste"] >> vore_taste
S["conceal_nif"] >> conceal_nif
S["nif_examine"] >> nif_examine
S["can_be_drop_prey"] >> can_be_drop_prey
S["can_be_drop_pred"] >> can_be_drop_pred
@@ -128,8 +124,6 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE
S["allowmobvore"] << allowmobvore
S["belly_prefs"] << belly_prefs
S["vore_taste"] << vore_taste
S["conceal_nif"] << conceal_nif
S["nif_examine"] << nif_examine
S["can_be_drop_prey"] << can_be_drop_prey
S["can_be_drop_pred"] << can_be_drop_pred