Merge pull request #5405 from Seris02/sectdroneloaf

sect drone l o a f + sect drone icon improvements (in my opinion)
This commit is contained in:
Nadyr
2022-12-19 19:06:42 -05:00
committed by GitHub
7 changed files with 31 additions and 4 deletions

View File

@@ -752,7 +752,7 @@
suit_sprites = 'icons/mob/taursuits_noodle_vr.dmi' suit_sprites = 'icons/mob/taursuits_noodle_vr.dmi'
clip_mask_state = "taur_clip_mask_noodle" clip_mask_state = "taur_clip_mask_noodle"
icon_sprite_tag = "noodle" icon_sprite_tag = "noodle"
/* CHOMPEdit - removed as a sprite accessory of the same name already exists for us, and having this here stops it from registering as a sprite accessory.
/datum/sprite_accessory/tail/taur/sect_drone /datum/sprite_accessory/tail/taur/sect_drone
name = "Sect Drone (Taur)" name = "Sect Drone (Taur)"
icon_state = "sect_drone" icon_state = "sect_drone"
@@ -773,11 +773,12 @@
msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!" msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!"
msg_prey_grab_fail = "%owner steps down and squishes you with their leg, forcing you down to the ground!" msg_prey_grab_fail = "%owner steps down and squishes you with their leg, forcing you down to the ground!"
*/
/datum/sprite_accessory/tail/taur/sect_drone/fat /datum/sprite_accessory/tail/taur/sect_drone/fat
name = "Fat Sect Drone (Taur)" name = "Fat Sect Drone (Taur)"
icon_state = "fat_sect_drone" icon_state = "fat_sect_drone"
extra_overlay = "fat_sect_drone_markings" extra_overlay = "fat_sect_drone_markings"
icon_sprite_tag = "sect_drone" //CHOMPEdit addition
/datum/sprite_accessory/tail/taur/sect_drone/drone_wag /datum/sprite_accessory/tail/taur/sect_drone/drone_wag
name = "Sect Drone (Taur, Fat vwag)" name = "Sect Drone (Taur, Fat vwag)"
@@ -785,6 +786,7 @@
extra_overlay = "sect_drone_markings" extra_overlay = "sect_drone_markings"
ani_state = "fat_sect_drone" ani_state = "fat_sect_drone"
extra_overlay_w = "fat_sect_drone_markings" extra_overlay_w = "fat_sect_drone_markings"
icon_sprite_tag = "sect_drone" //CHOMPEdit addition
/datum/sprite_accessory/tail/taur/giantspider_colorable//these are honestly better fit for vass icontypes whoops /datum/sprite_accessory/tail/taur/giantspider_colorable//these are honestly better fit for vass icontypes whoops
name = "Giant Spider dual-color (Taur)" name = "Giant Spider dual-color (Taur)"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 118 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 733 B

View File

@@ -87,7 +87,8 @@
/mob/living/carbon/human/proc/get_vore_tail_image() /mob/living/carbon/human/proc/get_vore_tail_image()
if(tail_style && istaurtail(tail_style) && tail_style:vore_tail_sprite_variant) if(tail_style && istaurtail(tail_style) && tail_style:vore_tail_sprite_variant)
var/vs_fullness = vore_fullness_ex["taur belly"] var/vs_fullness = vore_fullness_ex["taur belly"]
var/icon/vorebelly_s = new/icon(icon = 'icons/mob/vore/Taur_Bellies.dmi', icon_state = "Taur[tail_style:vore_tail_sprite_variant]-Belly-[vs_fullness][struggle_anim_taur ? "" : " idle"]") var/loaf_alt = lying && tail_style:belly_variant_when_loaf
var/icon/vorebelly_s = new/icon(icon = 'icons/mob/vore/Taur_Bellies.dmi', icon_state = "Taur[tail_style:vore_tail_sprite_variant]-Belly-[vs_fullness][loaf_alt ? " loaf" : (struggle_anim_taur ? "" : " idle")]")
vorebelly_s.Blend(vore_sprite_color["taur belly"], vore_sprite_multiply["taur belly"] ? ICON_MULTIPLY : ICON_ADD) vorebelly_s.Blend(vore_sprite_color["taur belly"], vore_sprite_multiply["taur belly"] ? ICON_MULTIPLY : ICON_ADD)
var/image/working = image(vorebelly_s) var/image/working = image(vorebelly_s)
working.pixel_x = -16 working.pixel_x = -16
@@ -103,3 +104,7 @@
spawn(12) spawn(12)
struggle_anim_taur = FALSE struggle_anim_taur = FALSE
update_vore_tail_sprite() update_vore_tail_sprite()
/mob/living/carbon/human/update_tail_showing()
. = ..()
update_vore_tail_sprite()

View File

@@ -1,6 +1,6 @@
/datum/sprite_accessory/tail/taur /datum/sprite_accessory/tail/taur
var/vore_tail_sprite_variant = "" var/vore_tail_sprite_variant = ""
var/belly_variant_when_loaf = FALSE
/datum/sprite_accessory/tail/taur/wolf /datum/sprite_accessory/tail/taur/wolf
vore_tail_sprite_variant = "N" vore_tail_sprite_variant = "N"
@@ -22,6 +22,26 @@
name = "Sect Drone (Taur)" name = "Sect Drone (Taur)"
icon_state = "sectdrone" icon_state = "sectdrone"
extra_overlay = "sectdrone_markings" extra_overlay = "sectdrone_markings"
can_loaf = TRUE
icon_loaf = 'icons/mob/vore/taurs_ch_loaf.dmi'
vore_tail_sprite_variant = "SectDrone"
belly_variant_when_loaf = TRUE
loaf_offset = 3
msg_owner_disarm_run = "You quickly push %prey to the ground with your leg!"
msg_prey_disarm_run = "%owner pushes you down to the ground with their leg!"
msg_owner_disarm_walk = "You firmly push your leg down on %prey, painfully but harmlessly pinning them to the ground!"
msg_prey_disarm_walk = "%owner firmly pushes their leg down on you, quite painfully but harmlessly pinning you to the ground!"
msg_owner_harm_walk = "You methodically place your leg down upon %prey's body, slowly applying pressure, crushing them against the floor!"
msg_prey_harm_walk = "%owner methodically places their leg upon your body, slowly applying pressure, crushing you against the floor!"
msg_owner_grab_success = "You pin %prey down on the ground with your front leg before using your other leg to pick them up, trapping them between two of your front legs!"
msg_prey_grab_success = "%owner pins you down on the ground with their front leg before using their other leg to pick you up, trapping you between two of their front legs!"
msg_owner_grab_fail = "You step down onto %prey, squishing them and forcing them down to the ground!"
msg_prey_grab_fail = "%owner steps down and squishes you with their leg, forcing you down to the ground!"
/datum/sprite_accessory/tail/taur/ch/fatsectdrone /datum/sprite_accessory/tail/taur/ch/fatsectdrone
name = "Fat Sect Drone (Taur)" name = "Fat Sect Drone (Taur)"