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

Merge branch 'master' into protean-rework

Browse Source
This commit is contained in:
BlackMajor
2022-12-24 08:34:13 +13:00
committed by GitHub
parent f602eb20b4 65c1331eca
commit 780d548bc3
28 changed files with 17358 additions and 431215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modular_chomp/code/game/objects/structures/loot_pile.dm Normal file
View File

@@ -0,0 +1,12 @@
/obj/structure/loot_pile/christmas_tree
name = "festive tree"
desc = "Happy Holidays!"
icon = 'modular_chomp/icons/obj/loot_piles.dmi'
icon_state = "festivetree"
plane = ABOVE_MOB_PLANE
chance_uncommon = 0
chance_rare = 0
common_loot = list(/obj/item/weapon/a_gift/advanced)
pixel_x = -32
bound_width = 96
bound_height = 64

2
modular_chomp/code/modules/client/preference_setup/loadout/loadout_xeno.dm Normal file
View File

@@ -0,0 +1,2 @@
/datum/gear/suit/dept/cloak/cap
path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/cap

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

@@ -87,7 +87,8 @@
/mob/living/carbon/human/proc/get_vore_tail_image()
if(tail_style && istaurtail(tail_style) && tail_style:vore_tail_sprite_variant)
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)
var/image/working = image(vorebelly_s)
working.pixel_x = -16
@@ -147,4 +148,8 @@ Would need to fix this proc up to work as smoothly as the above proc, though.
UpdateAppearance(Dummy.dna.UI.Copy())
icon = Dummy.icon
qdel(Dummy)
*/
*/
/mob/living/carbon/human/update_tail_showing()
. = ..()
update_vore_tail_sprite()

22
modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm
View File

@@ -1,6 +1,6 @@
/datum/sprite_accessory/tail/taur
var/vore_tail_sprite_variant = ""
var/belly_variant_when_loaf = FALSE
/datum/sprite_accessory/tail/taur/wolf
vore_tail_sprite_variant = "N"
@@ -22,6 +22,26 @@
name = "Sect Drone (Taur)"
icon_state = "sectdrone"
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
name = "Fat Sect Drone (Taur)"