cyberpresidentvanellope/Hyper-Station-13
1
0
Fork 0
mirror of https://github.com/quotefox/Hyper-Station-13.git synced 2026-08-24 13:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'quotefox:master' into Silicon-Flavortext-Fix

Browse Source
This commit is contained in:
haha26
2021-12-07 02:26:33 -05:00
committed by GitHub
parent 16f79aec2a 55eaeb1d0b
commit d5a5313ce3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/pai/pai.dm
+1 -1
View File
@@ -61,7 +61,7 @@
var/dynamic_chassis
var/dynamic_chassis_sit = FALSE //whether we're sitting instead of resting spritewise
var/dynamic_chassis_bellyup = FALSE //whether we're lying down bellyup
var/list/possible_chassis = list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE, "fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "operator" = TRUE) //assoc value is whether it can be picked up.
var/list/possible_chassis = list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE, "fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE) //assoc value is whether it can be picked up.
var/list/dynamic_chassis_icons //ditto.
var/list/chassis_pixel_offsets_x //stupid dogborgs
icons/mob/pai.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

modular_citadel/code/modules/vore/eating/belly_obj_vr.dm
+4 -4
View File
@@ -202,7 +202,7 @@
continue
L.absorbed = FALSE
L.stop_sound_channel(CHANNEL_PREYLOOP)
L.cure_blind("belly_[REF(src)]")
// L.cure_blind("belly_[REF(src)]") Dont need to cure if vore doesnt cause blindness.
SEND_SIGNAL(OW, COMSIG_CLEAR_MOOD_EVENT, "fedpred", /datum/mood_event/fedpred)
SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "fedprey", /datum/mood_event/fedprey)
SEND_SIGNAL(OW, COMSIG_ADD_MOOD_EVENT, "emptypred", /datum/mood_event/emptypred)
@@ -245,7 +245,7 @@
var/mob/living/ML = M
var/mob/living/OW = owner
ML.stop_sound_channel(CHANNEL_PREYLOOP)
ML.cure_blind("belly_[REF(src)]")
// ML.cure_blind("belly_[REF(src)]") //No need to cure if vore doesnt add blindness
SEND_SIGNAL(OW, COMSIG_CLEAR_MOOD_EVENT, "fedpred", /datum/mood_event/fedpred)
SEND_SIGNAL(ML, COMSIG_CLEAR_MOOD_EVENT, "fedprey", /datum/mood_event/fedprey)
SEND_SIGNAL(OW, COMSIG_ADD_MOOD_EVENT, "emptypred", /datum/mood_event/emptypred)
@@ -293,7 +293,7 @@
for(var/mob/living/M in contents)
M.updateVRPanel()
M.become_blind("belly_[REF(src)]")
// M.become_blind("belly_[REF(src)]") //Forces people to have to use janky work arounds to see emotes, find a better way of doing this that doesnt prevent seeing /me emotes
// Setup the autotransfer checks if needed
if(transferlocation != null && autotransferchance > 0)
@@ -313,7 +313,7 @@
if(!(content in src) || !istype(target))
return
for(var/mob/living/M in contents)
M.cure_blind("belly_[REF(src)]")
// M.cure_blind("belly_[REF(src)]")
target.nom_mob(content, target.owner)
if(!silent)
var/turf/source = get_turf(owner)