cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into belly-feedable

Browse Source
This commit is contained in:
Eli
2023-04-24 21:09:20 +10:00
parent 27ca556ee3 95d6752941
commit 16c26386ce
19 changed files with 146 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
modular_chomp/code/modules/economy/vending_machines_vr.dm Normal file
View File

@@ -0,0 +1,29 @@
/obj/machinery/vending/loadout/loadout_misc
products = list(/obj/item/weapon/cane = 5,
/obj/item/weapon/pack/cardemon = 25,
/obj/item/weapon/deck/holder = 5,
/obj/item/weapon/deck/cah = 5,
/obj/item/weapon/deck/cah/black = 5,
/obj/item/weapon/deck/tarot = 5,
/obj/item/weapon/deck/cards = 5,
/obj/item/weapon/pack/spaceball = 10,
/obj/item/weapon/storage/pill_bottle/dice = 5,
/obj/item/weapon/storage/pill_bottle/dice_nerd = 5,
/obj/item/weapon/melee/umbrella/random = 10,
/obj/item/weapon/deck/schnapsen = 5,
/obj/item/weapon/deck/egy = 5,
/obj/item/capture_crystal/cheap = 5)
prices = list(/obj/item/weapon/cane = 100,
/obj/item/weapon/pack/cardemon = 100,
/obj/item/weapon/deck/holder = 100,
/obj/item/weapon/deck/cah = 100,
/obj/item/weapon/deck/cah/black = 100,
/obj/item/weapon/deck/tarot = 100,
/obj/item/weapon/deck/cards = 100,
/obj/item/weapon/pack/spaceball = 100,
/obj/item/weapon/storage/pill_bottle/dice = 100,
/obj/item/weapon/storage/pill_bottle/dice_nerd = 100,
/obj/item/weapon/melee/umbrella/random = 100,
/obj/item/weapon/deck/schnapsen = 100,
/obj/item/weapon/deck/egy = 100,
/obj/item/capture_crystal/cheap = 100)

21
modular_chomp/code/modules/mob/living/carbon/human/human.dm
View File

@@ -3,7 +3,24 @@
var/previous_taur_fullness = vore_fullness_ex["taur belly"]
//update_vore_tail_sprite()
//update_vore_belly_sprite()
. = ..()
var/list/new_fullness = ..()
. = new_fullness
for(var/datum/category_group/underwear/undergarment_class in global_underwear.categories)
if(new_fullness[undergarment_class.name] == 0)
continue
new_fullness[undergarment_class.name] = -1 * round(-1 * new_fullness[undergarment_class.name]) // Doing a ceiling the only way BYOND knows how I guess
new_fullness[undergarment_class.name] = (min(2, new_fullness[undergarment_class.name]) - 2) * -1 //Complicated stuff to get it correctly aligned with the expected TRUE/FALSE
var/datum/category_item/underwear/UWI = all_underwear[undergarment_class.name]
if(!UWI || UWI.name == "None")
//Welllll okay then. If the former then something went wrong, if None was selected then...
if(istype(undergarment_class.items_by_name[new_fullness[undergarment_class.name + "-ifnone"]], /datum/category_item/underwear))
UWI = undergarment_class.items_by_name[new_fullness[undergarment_class.name + "-ifnone"]]
all_underwear[undergarment_class.name] = UWI
if(UWI && UWI.has_color && new_fullness[undergarment_class.name + "-color"])
all_underwear_metadata[undergarment_class.name]["[gear_tweak_free_color_choice]"] = new_fullness[undergarment_class.name + "-color"]
if(UWI && UWI.name != "None" && hide_underwear[undergarment_class.name] != new_fullness[undergarment_class.name])
hide_underwear[undergarment_class.name] = new_fullness[undergarment_class.name]
update_underwear(1)
if(vore_fullness_ex["stomach"] != previous_stomach_fullness)
update_vore_belly_sprite()
if(vore_fullness_ex["taur belly"] != previous_taur_fullness)
@@ -29,4 +46,4 @@
set category = "IC"
set desc = "Toggle glasses worn icon visibility."
hide_glasses = !hide_glasses
update_inv_glasses()
update_inv_glasses()

3
modular_chomp/code/modules/vore/eating/exportpanel_ch.dm
View File

@@ -193,6 +193,9 @@
belly_data["resist_triggers_animation"] = B.resist_triggers_animation
belly_data["size_factor_for_sprite"] = B.size_factor_for_sprite
belly_data["belly_sprite_to_affect"] = B.belly_sprite_to_affect
belly_data["undergarment_chosen"] = B.undergarment_chosen
belly_data["undergarment_if_none"] = B.undergarment_if_none
belly_data["undergarment_color"] = B.undergarment_color
// Visuals (Belly Fullscreens Preview and Coloring)
belly_data["belly_fullscreen_color"] = B.belly_fullscreen_color