cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Hawk_v3
2019-12-21 21:57:49 +00:00
parent 06a47d15d5 8b9806c8c4
commit 6b935d64ec
192 changed files with 7436 additions and 5475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/vore/eating/belly_obj_vr.dm
View File

@@ -638,14 +638,16 @@
I.decontaminate()
I.gurgle_contaminate(target.contents, target.contamination_flavor, target.contamination_color)
items_preserved -= content
/* Disabling this part due to redundancy. Entered() on target belly will make the sound anyway.
if(!silent && target.vore_sound && !recent_sound)
var/soundfile
if(!fancy_vore)
if(!target.fancy_vore)
soundfile = classic_vore_sounds[target.vore_sound]
else
soundfile = fancy_vore_sounds[target.vore_sound]
if(soundfile)
playsound(src, soundfile, vol = 100, vary = 1, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/digestion_noises)
*/
owner.updateVRPanel()
for(var/mob/living/M in contents)
M.updateVRPanel()

6
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -1905,15 +1905,15 @@ Departamental Swimsuits, for general use
//Bacon12366:Elly Brown
/obj/item/clothing/accessory/sweater/fluff/star
name = "Star Sweater"
desc = "It's a white long sweater with a big yellow star at the chest. It seems like it's made of a soft material."
desc = "It's a black long sweater with a big blue star at the chest area. It was made to show person's left shoulder."
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "star_sweater"
icon_override = 'icons/vore/custom_clothes_vr.dmi'
item_state = "star_sweater"
slot_flags = SLOT_OCLOTHING | SLOT_TIE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
w_class = ITEMSIZE_NORMAL
slot = ACCESSORY_SLOT_OVER
slot = ACCESSORY_SLOT_OVER