cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Includes the check for pickup preference in grabstep

Browse Source
This commit is contained in:
Heroman
2021-03-07 08:01:30 +10:00
parent 2937982aca
commit 96bef781bf
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/living_vr.dm
+6
View File
@@ -234,6 +234,8 @@
P.show_vore_fx = src.show_vore_fx
P.can_be_drop_prey = src.can_be_drop_prey
P.can_be_drop_pred = src.can_be_drop_pred
P.step_mechanics_pref = src.step_mechanics_pref
P.pickup_pref = src.pickup_pref
var/list/serialized = list()
for(var/belly in src.vore_organs)
@@ -266,6 +268,8 @@
show_vore_fx = P.show_vore_fx
can_be_drop_prey = P.can_be_drop_prey
can_be_drop_pred = P.can_be_drop_pred
step_mechanics_pref = P.step_mechanics_pref
pickup_pref = P.pickup_pref
if(bellies)
release_vore_contents(silent = TRUE)
@@ -847,6 +851,8 @@
dispvoreprefs += "<b>Healbelly permission:</b> [permit_healbelly ? "Allowed" : "Disallowed"]<br>"
dispvoreprefs += "<b>Spontaneous vore prey:</b> [can_be_drop_prey ? "Enabled" : "Disabled"]<br>"
dispvoreprefs += "<b>Spontaneous vore pred:</b> [can_be_drop_pred ? "Enabled" : "Disabled"]<br>"
dispvoreprefs += "<b>Can be stepped on/over:</b> [step_mechanics_pref ? "Allowed" : "Disallowed"]<br>"
dispvoreprefs += "<b>Can be picked up:</b> [pickup_pref ? "Allowed" : "Disallowed"]<br>"
user << browse("<html><head><title>Vore prefs: [src]</title></head><body><center>[dispvoreprefs]</center></body></html>", "window=[name]mvp;size=200x300;can_resize=0;can_minimize=0")
onclose(user, "[name]")
return
code/modules/vore/resizing/resize_vr.dm
+2 -2
View File
@@ -310,8 +310,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
tail = pred.tail_style
if(a_intent == I_GRAB)
// You can only grab prey if you have no shoes on.
if(pred.shoes)
// You can only grab prey if you have no shoes on. And both of you are cool with it.
if(pred.shoes || !(pickup_pref && tmob.pickup_pref))
message_pred = "You step down onto [prey], squishing them and forcing them down to the ground!"
message_prey = "[pred] steps down and squishes you with their foot, forcing you down to the ground!"
if(tail)