Merge branch 'master' into final_away_maps_additions

# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm
This commit is contained in:
alberyk
2022-04-04 19:47:58 -03:00
100 changed files with 1824 additions and 447407 deletions
@@ -134,6 +134,9 @@
var/SM = (user == target) ? "your" : (target.name + "\'s")
if(!L)
return
if(isvaurca(target))
to_chat(usr, SPAN_WARNING("\The [src] won't pierce through [P] carapace!"))
return
if(L.rescued == TRUE)
to_chat(usr, SPAN_NOTICE("[H]'s ribs are already punctured!"))
return