mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-20 19:57:28 +01:00
Merge pull request #5255 from CHOMPStation2/upstream-merge-14062
[MIRROR] Adds sect drone taurhalves and wvag versions of existing fat taurs
This commit is contained in:
Nadyr
@@ -63,8 +63,13 @@
|
||||
/datum/sprite_accessory/tail/taur/wolf/fatwolf
|
||||
name = "Fat Wolf (Taur)"
|
||||
icon_state = "fatwolf_s"
|
||||
icon_sprite_tag = "wolf" //This could be modified later.
|
||||
loaf_offset = 3
|
||||
//icon_sprite_tag = "wolf" //This could be modified later.
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/wolf/wolf_wag
|
||||
name = "Wolf (Taur, Fat vwag)"
|
||||
icon_state = "wolf_s"
|
||||
ani_state = "fatwolf_s"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/wolf/wolf_2c
|
||||
name = "Wolf 3-color (Taur)"
|
||||
@@ -73,8 +78,16 @@
|
||||
extra_overlay2 = "wolf_markings_2"
|
||||
//icon_sprite_tag = "wolf2c"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/wolf/fatwolf_2c
|
||||
name = "Fat Wolf 3-color (Taur)"
|
||||
icon_state = "fatwolf_s"
|
||||
extra_overlay = "fatwolf_markings"
|
||||
extra_overlay2 = "wolf_markings_2"
|
||||
//icon_sprite_tag = "fatwolf2c"
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/wolf/wolf_2c_wag
|
||||
name = "Wolf 3-color (Taur, vwag)"
|
||||
name = "Wolf 3-color (Taur, Fat vwag)"
|
||||
icon_state = "wolf_s"
|
||||
extra_overlay = "wolf_markings"
|
||||
extra_overlay2 = "wolf_markings_2"
|
||||
@@ -82,14 +95,6 @@
|
||||
extra_overlay_w = "fatwolf_markings"
|
||||
extra_overlay2_w = "wolf_markings_2"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/wolf/fatwolf_2c
|
||||
name = "Fat Wolf 3-color (Taur)"
|
||||
icon_state = "fatwolf_s"
|
||||
extra_overlay = "fatwolf_markings"
|
||||
extra_overlay2 = "fatwolf_markings_2"
|
||||
//icon_sprite_tag = "fatwolf2c"
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/wolf/synthwolf
|
||||
name = "SynthWolf dual-color (Taur)"
|
||||
icon_state = "synthwolf_s"
|
||||
@@ -105,6 +110,15 @@
|
||||
extra_overlay2 = "fatsynthwolf_glow"
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/wolf/fatsynthwolf_wag
|
||||
name = "SynthWolf dual-color (Taur, Fat vwag)"
|
||||
icon_state = "synthwolf_s"
|
||||
extra_overlay = "synthwolf_markings"
|
||||
extra_overlay2 = "synthwolf_glow"
|
||||
ani_state = "fatsynthwolf_s"
|
||||
extra_overlay_w = "fatsynthwolf_markings"
|
||||
extra_overlay2_w = "fatsynthwolf_glow"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/skunk
|
||||
name = "Skunk (Taur)"
|
||||
icon_state = "skunk_s"
|
||||
@@ -255,6 +269,18 @@
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 5
|
||||
|
||||
/datum/sprite_accessory/tail/taur/lizard/fatlizard
|
||||
name = "Fat Lizard (Taur)"
|
||||
icon_state = "fatlizard_s"
|
||||
can_loaf = TRUE
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/lizard/lizard_wag
|
||||
name = "Lizard (Taur, Fat vwag)"
|
||||
icon_state = "lizard_s"
|
||||
ani_state = "fatlizard_s"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/lizard/lizard_2c
|
||||
name = "Lizard dual-color (Taur)"
|
||||
icon_state = "lizard_s"
|
||||
@@ -264,20 +290,20 @@
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 5
|
||||
|
||||
/datum/sprite_accessory/tail/taur/lizard/fatlizard
|
||||
name = "Fat Lizard (Taur)"
|
||||
/datum/sprite_accessory/tail/taur/lizard/fatlizard_2c
|
||||
name = "Fat Lizard (Taur, dual-color)"
|
||||
icon_state = "fatlizard_s"
|
||||
extra_overlay = "fatlizard_markings"
|
||||
can_loaf = TRUE
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/lizard/fatlizard_2c
|
||||
name = "Fat Lizard (Taur, dual-color)"
|
||||
icon_state = "fatlizard_s"
|
||||
extra_overlay= "fatlizard_markings"
|
||||
can_loaf = TRUE
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 3
|
||||
/datum/sprite_accessory/tail/taur/lizard/lizard_2c_wag
|
||||
name = "Fat Lizard (Taur, dual-color, Fat vwag)"
|
||||
icon_state = "lizard_s"
|
||||
extra_overlay = "lizard_markings"
|
||||
ani_state = "fatlizard_s"
|
||||
extra_overlay_w = "fatlizard_markings"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/lizard/synthlizard
|
||||
name = "SynthLizard dual-color (Taur)"
|
||||
@@ -298,6 +324,15 @@
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/lizard/synthlizard_wag
|
||||
name = "SynthLizard dual-color (Taur, Fat vwag)"
|
||||
icon_state = "synthlizard_s"
|
||||
extra_overlay = "synthlizard_markings"
|
||||
extra_overlay2 = "synthlizard_glow"
|
||||
ani_state = "fatsynthlizard_s"
|
||||
extra_overlay_w = "fatsynthlizard_markings"
|
||||
extra_overlay2_w = "fatsynthlizard_glow"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/spider
|
||||
name = "Spider (Taur)"
|
||||
icon_state = "spider_s"
|
||||
@@ -364,7 +399,7 @@
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/fatfeline_wag
|
||||
name = "Fat Feline (Taur) (vwag)"
|
||||
name = "Fat Feline (Taur, Fat vwag)"
|
||||
icon_state = "fatfeline_s"
|
||||
ani_state = "fatfeline_w"
|
||||
can_loaf = TRUE
|
||||
@@ -390,6 +425,15 @@
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/feline/feline_2c_wag
|
||||
name = "Feline 3-color (Taur, Fat vwag)"
|
||||
icon_state = "feline_s"
|
||||
extra_overlay = "feline_markings"
|
||||
extra_overlay2 = "feline_markings_2"
|
||||
ani_state = "fatfeline_s"
|
||||
extra_overlay_w = "fatfeline_markings"
|
||||
extra_overlay2_w = "feline_markings_2"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/feline/synthfeline
|
||||
name = "SynthFeline dual-color (Taur)"
|
||||
icon_state = "synthfeline_s"
|
||||
@@ -409,6 +453,15 @@
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 3
|
||||
|
||||
/datum/sprite_accessory/tail/taur/feline/synthfeline_wag
|
||||
name = "SynthFeline dual-color (Taur, Fat vwag)"
|
||||
icon_state = "synthfeline_s"
|
||||
extra_overlay = "synthfeline_markings"
|
||||
extra_overlay2 = "synthfeline_glow"
|
||||
ani_state = "fatsynthfeline_s"
|
||||
extra_overlay_w = "fatsynthfeline_markings"
|
||||
extra_overlay2_w = "fatsynthfeline_glow"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/slug
|
||||
name = "Slug (Taur)"
|
||||
icon_state = "slug_s"
|
||||
@@ -485,15 +538,22 @@
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 6
|
||||
|
||||
/datum/sprite_accessory/tail/taur/ch/fatdrake
|
||||
name = "Drake (Fat Taur dual-color)"
|
||||
/datum/sprite_accessory/tail/taur/drake/fat
|
||||
name = "Fat Drake (Taur)"
|
||||
icon_state = "fatdrake_s"
|
||||
extra_overlay = "fatdrake_markings"
|
||||
icon_sprite_tag = "drake"
|
||||
can_loaf = TRUE
|
||||
icon_loaf = 'icons/mob/vore/taurs_vr_loaf.dmi'
|
||||
loaf_offset = 6
|
||||
|
||||
/datum/sprite_accessory/tail/taur/drake/drake_vwag
|
||||
name = "Drake (Taur, Fat vwag)"
|
||||
icon_state = "drake_s"
|
||||
extra_overlay = "drake_markings"
|
||||
ani_state = "fatdrake_s"
|
||||
extra_overlay_w = "fatdrake_markings"
|
||||
can_loaf = FALSE
|
||||
|
||||
/datum/sprite_accessory/tail/taur/otie
|
||||
name = "Otie (Taur)"
|
||||
icon_state = "otie_s"
|
||||
@@ -674,7 +734,7 @@
|
||||
msg_prey_grab_fail = "%owner steps down onto you with one of their vines, squishing you and forcing you onto the ground!"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/rat
|
||||
name = "Rat (dual color)"
|
||||
name = "Rat (Taur)"
|
||||
icon_state = "rat_s"
|
||||
extra_overlay = "rat_markings"
|
||||
clip_mask_state = "taur_clip_mask_rat"
|
||||
@@ -688,3 +748,36 @@
|
||||
suit_sprites = 'icons/mob/taursuits_noodle_vr.dmi'
|
||||
clip_mask_state = "taur_clip_mask_noodle"
|
||||
icon_sprite_tag = "noodle"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/sect_drone
|
||||
name = "Sect Drone (Taur)"
|
||||
icon_state = "sect_drone"
|
||||
extra_overlay = "sect_drone_markings"
|
||||
icon_sprite_tag = "sect_drone"
|
||||
|
||||
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/sect_drone/fat
|
||||
name = "Fat Sect Drone (Taur)"
|
||||
icon_state = "fat_sect_drone"
|
||||
extra_overlay = "fat_sect_drone_markings"
|
||||
|
||||
/datum/sprite_accessory/tail/taur/sect_drone/drone_wag
|
||||
name = "Sect Drone (Taur, Fat vwag)"
|
||||
icon_state = "sect_drone"
|
||||
extra_overlay = "sect_drone_markings"
|
||||
ani_state = "fat_sect_drone"
|
||||
extra_overlay_w = "fat_sect_drone_markings"
|
||||
|
||||
Reference in New Issue
Block a user