cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into protean-rework

Browse Source
This commit is contained in:
BlackMajor
2023-02-05 13:56:08 +13:00
committed by GitHub
parent d05b31a73c 61b96d004a
commit c72ab8fffe
68 changed files with 1658 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modular_chomp/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm Normal file
View File

@@ -0,0 +1,4 @@
/mob/living/simple_mob/slime/promethean/character_directory_species()
if (humanform)
return "[humanform.custom_species ? humanform.custom_species : (humanform.species ? humanform.species.name : "Promethean Blob")]"
return "Promethean Blob"

5
modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm
View File

@@ -437,6 +437,11 @@
return
..()
/mob/living/simple_mob/protean_blob/character_directory_species()
if (humanform)
return "[humanform.custom_species ? humanform.custom_species : (humanform.species ? humanform.species.name : "Protean")]"
return "Protean"
// Helpers - Unsafe, WILL perform change.
/mob/living/carbon/human/proc/nano_intoblob(force)
if(!force && !isturf(loc) && !loc == /obj/item/weapon/rig/protean)

3
modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm
View File

@@ -129,3 +129,6 @@
var/vs_fullness = vore_fullness_ex[belly_class]
if(vs_fullness > 0)
add_overlay("[icon_state]_[belly_class]-[vs_fullness]")
/mob/living/simple_mob/proc/character_directory_species()
return "simplemob"

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

@@ -72,6 +72,33 @@
extra_overlay = "naga_alt_markings"
suit_sprites = 'modular_chomp/icons/mob/taursuits_naga_ch.dmi'
msg_owner_help_walk = "You carefully slither around %prey."
msg_prey_help_walk = "%owner's huge tail slithers past beside you!"
msg_owner_help_run = "You carefully slither around %prey."
msg_prey_help_run = "%owner's huge tail slithers past beside you!"
msg_owner_disarm_run = "Your tail slides over %prey, pushing them down to the ground!"
msg_prey_disarm_run = "%owner's tail slides over you, forcing you down to the ground!"
msg_owner_disarm_walk = "You push down on %prey with your tail, pinning them down under you!"
msg_prey_disarm_walk = "%owner pushes down on you with their tail, pinning you down below them!"
msg_owner_harm_run = "Your heavy tail carelessly slides past %prey, crushing them!"
msg_prey_harm_run = "%owner quickly goes over your body, carelessly crushing you with their heavy tail!"
msg_owner_harm_walk = "Your heavy tail slowly and methodically slides down upon %prey, crushing against the floor below!"
msg_prey_harm_walk = "%owner's thick, heavy tail slowly and methodically slides down upon your body, mercilessly crushing you into the floor below!"
msg_owner_grab_success = "You slither over %prey with your large, thick tail, smushing them against the ground before coiling up around them, trapping them within the tight confines of your tail!"
msg_prey_grab_success = "%owner slithers over you with their large, thick tail, smushing you against the ground before coiling up around you, trapping you within the tight confines of their tail!"
msg_owner_grab_fail = "You squish %prey under your large, thick tail, forcing them onto the ground!"
msg_prey_grab_fail = "%owner pins you under their large, thick tail, forcing you onto the ground!"
msg_prey_stepunder = "You jump over %prey's thick tail."
msg_owner_stepunder = "%owner bounds over your tail."
/datum/sprite_accessory/tail/taur/ch/horse/scoli
name = "Scolipede (Taur)"
icon_state = "scoli_s"