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

Redo Of Last PR With No Conflicts This Time (#10134)

Browse Source 
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Hunter-Dovetail
2025-02-21 08:40:32 +00:00
committed by GitHub
parent ad636f511d
commit 2a0d9eca32
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
icons/mob/human_races/markings_ch.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 58 KiB

3
modular_chomp/code/modules/mob/new_player/sprite_accessories_extra.dm
View File

@@ -220,6 +220,8 @@
hide_body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_L_LEG,BP_R_LEG,BP_GROIN) hide_body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_L_LEG,BP_R_LEG,BP_GROIN)
body_parts = list(BP_TORSO) body_parts = list(BP_TORSO)
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY
digitigrade_acceptance = MARKING_ALL_LEGS
digitigrade_icon = 'icons/mob/human_races/markings_ch.dmi'
/datum/sprite_accessory/marking/ch/trex_upperjaw /datum/sprite_accessory/marking/ch/trex_upperjaw
@@ -292,7 +294,6 @@
/datum/sprite_accessory/marking/ch/smallchubbybelly /datum/sprite_accessory/marking/ch/smallchubbybelly
name = "Chubby Belly, Small" name = "Chubby Belly, Small"
icon_state = "smallchubbybelly" icon_state = "smallchubbybelly"
hide_body_parts = list(BP_L_LEG,BP_R_LEG,BP_L_HAND,BP_R_HAND,BP_L_LEG,BP_R_LEG,BP_GROIN)
body_parts = list(BP_TORSO,BP_GROIN,BP_L_HAND,BP_R_HAND) body_parts = list(BP_TORSO,BP_GROIN,BP_L_HAND,BP_R_HAND)
color_blend_mode = ICON_MULTIPLY color_blend_mode = ICON_MULTIPLY

5
tools/ci/compile_and_run.sh
View File

@@ -25,10 +25,9 @@ if [ $exitVal -gt 0 ]; then
fi fi
# If we're running, run # If we're running, run
# YW Edit removes "|| exit 1" until we can fix our submaps
if [ $RUN -eq 1 ]; if [ $RUN -eq 1 ];
then then
DreamDaemon $BASENAME.dmb -close -trusted -invisible -verbose -core 2>&1 | tee log.txt; DreamDaemon $BASENAME.dmb -close -trusted -invisible -verbose -core 2>&1 | tee log.txt;
grep "All Unit Tests Passed" log.txt grep "All Unit Tests Passed" log.txt || exit 1
grep "Caught 0 Runtimes" log.txt grep "Caught 0 Runtimes" log.txt || exit 1
fi fi