mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Adds 2 new taur bellysprites, fixes 2 vorgan overlay bugs, and adds verb to toggle synth stomach reagent draining. (#7055)
This commit is contained in:
@@ -58,7 +58,7 @@
|
|||||||
|
|
||||||
acidtype = "sacid"
|
acidtype = "sacid"
|
||||||
|
|
||||||
organ_verbs = list(/mob/living/carbon/human/proc/reagent_purge) //VOREStation Add
|
organ_verbs = list(/mob/living/carbon/human/proc/reagent_purge, /mob/living/carbon/human/proc/synth_reag_toggle) //VOREStation Add + CHOMPAdd
|
||||||
|
|
||||||
/obj/item/organ/internal/stomach/machine/handle_organ_proc_special()
|
/obj/item/organ/internal/stomach/machine/handle_organ_proc_special()
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -64,7 +64,7 @@
|
|||||||
return
|
return
|
||||||
if(!affects_dead && M.stat == DEAD)
|
if(!affects_dead && M.stat == DEAD)
|
||||||
return
|
return
|
||||||
if(!affects_robots && M.isSynthetic())
|
if(!affects_robots && M.isSynthetic() && M.synth_reag_processing) //CHOMPEdit
|
||||||
return
|
return
|
||||||
if(!istype(location))
|
if(!istype(location))
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -191,20 +191,22 @@
|
|||||||
gen_interval++
|
gen_interval++
|
||||||
|
|
||||||
/obj/belly/proc/HandleBellyReagentEffects(var/list/touchable_atoms)
|
/obj/belly/proc/HandleBellyReagentEffects(var/list/touchable_atoms)
|
||||||
if(reagents.total_volume >= 5 && LAZYLEN(contents))
|
if(LAZYLEN(contents))
|
||||||
SEND_SIGNAL(src, COMSIG_BELLY_UPDATE_VORE_FX, FALSE, reagents.total_volume) // Signals vore_fx() reagents updates.
|
if(reagents.total_volume >= 5)
|
||||||
var/affecting_amt = reagents.total_volume / max(LAZYLEN(touchable_atoms), 1)
|
var/affecting_amt = reagents.total_volume / max(LAZYLEN(touchable_atoms), 1)
|
||||||
if(affecting_amt > 5)
|
if(affecting_amt > 5)
|
||||||
affecting_amt = 5
|
affecting_amt = 5
|
||||||
if(affecting_amt >= 1)
|
if(affecting_amt >= 1)
|
||||||
for(var/mob/living/L in touchable_atoms)
|
for(var/mob/living/L in touchable_atoms)
|
||||||
if(L.digestable && digest_mode == DM_DIGEST)
|
if(L.digestable && digest_mode == DM_DIGEST)
|
||||||
|
if(reagents.total_volume)
|
||||||
|
reagents.trans_to(L, affecting_amt, 1, FALSE)
|
||||||
|
for(var/obj/item/I in touchable_atoms)
|
||||||
if(reagents.total_volume)
|
if(reagents.total_volume)
|
||||||
reagents.trans_to(L, affecting_amt, 1, FALSE)
|
reagents.trans_to(I, affecting_amt, 1, FALSE)
|
||||||
vore_fx(L, FALSE, reagents.total_volume)
|
SEND_SIGNAL(src, COMSIG_BELLY_UPDATE_VORE_FX, FALSE, reagents.total_volume) // Signals vore_fx() reagents updates.
|
||||||
for(var/obj/item/I in touchable_atoms)
|
for(var/mob/living/L in contents)
|
||||||
if(reagents.total_volume)
|
vore_fx(L, FALSE, reagents.total_volume)
|
||||||
reagents.trans_to(I, affecting_amt, 1, FALSE)
|
|
||||||
if(owner.previewing_belly == src)
|
if(owner.previewing_belly == src)
|
||||||
vore_fx(owner, FALSE, reagents.total_volume)
|
vore_fx(owner, FALSE, reagents.total_volume)
|
||||||
|
|
||||||
|
|||||||
@@ -585,7 +585,7 @@
|
|||||||
I = image('modular_chomp/icons/mob/vore_fullscreens/bubbles.dmi', "mush")
|
I = image('modular_chomp/icons/mob/vore_fullscreens/bubbles.dmi', "mush")
|
||||||
I.color = extra_mush_color
|
I.color = extra_mush_color
|
||||||
I.alpha = custom_ingested_alpha
|
I.alpha = custom_ingested_alpha
|
||||||
I.pixel_y = -450 + (450 / max(max_ingested, 1) * max(min(max_ingested, ingested.total_volume), 1))
|
I.pixel_y = -450 + ((450 / max(max_ingested, 1)) * min(max_ingested, ingested.total_volume))
|
||||||
F.add_overlay(I)
|
F.add_overlay(I)
|
||||||
if(L.liquidbelly_visuals && mush_overlay && (owner.nutrition > 0 || max_mush == 0 || min_mush > 0 || (LAZYLEN(contents) * item_mush_val) > 0))
|
if(L.liquidbelly_visuals && mush_overlay && (owner.nutrition > 0 || max_mush == 0 || min_mush > 0 || (LAZYLEN(contents) * item_mush_val) > 0))
|
||||||
I = image('modular_chomp/icons/mob/vore_fullscreens/bubbles.dmi', "mush")
|
I = image('modular_chomp/icons/mob/vore_fullscreens/bubbles.dmi', "mush")
|
||||||
@@ -684,7 +684,7 @@
|
|||||||
//L.clear_fullscreen("belly3") //Chomp Disable - disable upstream's solution, use ours
|
//L.clear_fullscreen("belly3") //Chomp Disable - disable upstream's solution, use ours
|
||||||
//L.clear_fullscreen("belly4") //Chomp Disable - disable upstream's solution, use ours
|
//L.clear_fullscreen("belly4") //Chomp Disable - disable upstream's solution, use ours
|
||||||
|
|
||||||
if(disable_hud)
|
if(disable_hud && L != owner)
|
||||||
if(L?.hud_used?.hud_shown)
|
if(L?.hud_used?.hud_shown)
|
||||||
to_chat(L, "<span class='notice'>((Your pred has disabled huds in their belly. Turn off vore FX and hit F12 to get it back; or relax, and enjoy the serenity.))</span>")
|
to_chat(L, "<span class='notice'>((Your pred has disabled huds in their belly. Turn off vore FX and hit F12 to get it back; or relax, and enjoy the serenity.))</span>")
|
||||||
L.toggle_hud_vis(TRUE)
|
L.toggle_hud_vis(TRUE)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
/mob/living/carbon
|
/mob/living/carbon
|
||||||
var/datum/looping_sound/mob/cozyloop/cozyloop
|
var/datum/looping_sound/mob/cozyloop/cozyloop
|
||||||
var/slip_reflex = FALSE
|
var/slip_reflex = FALSE
|
||||||
|
var/synth_reag_processing = TRUE
|
||||||
|
|
||||||
/mob/living/carbon/Initialize()
|
/mob/living/carbon/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -60,6 +60,11 @@
|
|||||||
resting_dir = !resting_dir
|
resting_dir = !resting_dir
|
||||||
update_transform(TRUE)
|
update_transform(TRUE)
|
||||||
|
|
||||||
|
/mob/living/carbon/human/proc/synth_reag_toggle()
|
||||||
|
set name = "Toggle Reagent Processing"
|
||||||
|
set category = "Abilities"
|
||||||
|
set desc = "Toggle reagent processing as synth."
|
||||||
|
synth_reag_processing = !synth_reag_processing
|
||||||
|
|
||||||
//Formally used from a paper, gave this to everyone.
|
//Formally used from a paper, gave this to everyone.
|
||||||
/mob/living/carbon/human/verb/create_area()
|
/mob/living/carbon/human/verb/create_area()
|
||||||
|
|||||||
@@ -53,6 +53,11 @@
|
|||||||
belly_variant_when_loaf = TRUE
|
belly_variant_when_loaf = TRUE
|
||||||
fullness_icons = 1
|
fullness_icons = 1
|
||||||
|
|
||||||
|
/datum/sprite_accessory/tail/taur/skunk
|
||||||
|
vore_tail_sprite_variant = "Skunk"
|
||||||
|
belly_variant_when_loaf = TRUE
|
||||||
|
fullness_icons = 1
|
||||||
|
|
||||||
/datum/sprite_accessory/tail/taur/ch
|
/datum/sprite_accessory/tail/taur/ch
|
||||||
icon = 'icons/mob/vore/taurs_ch.dmi'//Parent which allows us to not need to set icon every time.
|
icon = 'icons/mob/vore/taurs_ch.dmi'//Parent which allows us to not need to set icon every time.
|
||||||
|
|
||||||
@@ -136,11 +141,14 @@
|
|||||||
icon_state = "sergwheat"
|
icon_state = "sergwheat"
|
||||||
icon_sprite_tag = "wolf"
|
icon_sprite_tag = "wolf"
|
||||||
vore_tail_sprite_variant = "N"
|
vore_tail_sprite_variant = "N"
|
||||||
|
fullness_icons = 3
|
||||||
|
|
||||||
/datum/sprite_accessory/tail/taur/ch/sergal/fatwheaties
|
/datum/sprite_accessory/tail/taur/ch/sergal/fatwheaties
|
||||||
name = "Fat Sergal (Taur)"
|
name = "Fat Sergal (Taur)"
|
||||||
icon_state = "fatsergal"
|
icon_state = "fatsergal"
|
||||||
icon_sprite_tag = "wolf"
|
icon_sprite_tag = "wolf"
|
||||||
|
vore_tail_sprite_variant = "N"
|
||||||
|
fullness_icons = 3
|
||||||
|
|
||||||
/datum/sprite_accessory/tail/taur/ch/sergal/wheaties_2c
|
/datum/sprite_accessory/tail/taur/ch/sergal/wheaties_2c
|
||||||
name = "Sergal (Taur, dual-color)"
|
name = "Sergal (Taur, dual-color)"
|
||||||
@@ -148,12 +156,15 @@
|
|||||||
extra_overlay = "sergwheat_markings"
|
extra_overlay = "sergwheat_markings"
|
||||||
icon_sprite_tag = "wolf"
|
icon_sprite_tag = "wolf"
|
||||||
vore_tail_sprite_variant = "N"
|
vore_tail_sprite_variant = "N"
|
||||||
|
fullness_icons = 3
|
||||||
|
|
||||||
/datum/sprite_accessory/tail/taur/ch/sergal/fatwheaties_2c
|
/datum/sprite_accessory/tail/taur/ch/sergal/fatwheaties_2c
|
||||||
name = "Fat Sergal (Taur, dual-color)"
|
name = "Fat Sergal (Taur, dual-color)"
|
||||||
icon_state = "fatsergal"
|
icon_state = "fatsergal"
|
||||||
extra_overlay = "sergwheat_markings"
|
extra_overlay = "sergwheat_markings"
|
||||||
icon_sprite_tag = "wolf"
|
icon_sprite_tag = "wolf"
|
||||||
|
vore_tail_sprite_variant = "N"
|
||||||
|
fullness_icons = 3
|
||||||
|
|
||||||
/datum/sprite_accessory/tail/taur/ch/longvirus
|
/datum/sprite_accessory/tail/taur/ch/longvirus
|
||||||
name = "Long Virus (Taur)"
|
name = "Long Virus (Taur)"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 34 KiB |
Reference in New Issue
Block a user