Merge branch 'SPLURT-Station:master' into STOMPSHIELDING

This commit is contained in:
Zatarra
2023-08-11 19:56:20 -07:00
committed by GitHub
63 changed files with 563 additions and 328 deletions
@@ -25,7 +25,7 @@
if(!owner)
return
/obj/item/organ/genital/belly/modify_size(modifier, min = -INFINITY, max = INFINITY)
/obj/item/organ/genital/belly/modify_size(modifier, min = -INFINITY, max = BELLY_SIZE_MAX)
var/new_value = clamp(size_cached + modifier, max(min, min_size ? min_size : -INFINITY), min(max_size ? max_size : INFINITY, max))
if(new_value == size_cached)
return
@@ -109,7 +109,7 @@
icon_state = "runner_engi"
/obj/item/clothing/suit/jacket/runner/syndicate
name = "Sydnicate Runner Jacket"
name = "Syndicate Runner Jacket"
icon_state = "runner_syndi"
/obj/item/clothing/suit/jacket/runner/winter
@@ -211,7 +211,8 @@
"Junior Scientist",
"Rack Researcher",
"Nanite Programmer",
"Tetromino Researcher"
"Tetromino Researcher",
"Xenoarchaeologist"
)
LAZYADD(alt_titles, extra_titles)
. = ..()
@@ -0,0 +1,3 @@
// Simply changes the icon to a proper one instead of it using the EAL's (which confuses people).
/datum/language/signlanguage
icon = 'modular_splurt/icons/misc/language.dmi'
@@ -231,7 +231,7 @@
message = "speeeeens!"
message_mime = "speeeeens silently!"
restraint_check = TRUE
mob_type_allowed_typecache = list(/mob/living, /mob/dead/observer)
mob_type_allowed_typecache = list(/mob/living)
mob_type_ignore_stat_typecache = list(/mob/dead/observer)
emote_sound = 'modular_splurt/sound/voice/speen.ogg'
// No cooldown var required
@@ -0,0 +1,4 @@
/mob/living/simple_animal/hostile/megafauna/hierophant
name = "Hierophant"
icon = 'modular_splurt/icons/mob/lavaland/hierophant.dmi'
desc = "A penguin-like entity, he's holding what appears to be a scepter of some sort..."