mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-02-09 15:59:24 +00:00
* replaces "iron ass" trait with "personal space" * ass-slapping with the personalspace trait now also checks for combat mode * re-adds Iron Ass for Player ChoiceTM * minor punctuation fix + added to trait description * fixes ironass value * add checks for counterattacks * Update code/modules/mob/living/carbon/carbon_defense.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/master_files/code/datums/traits/neutral.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update code/__DEFINES/~skyrat_defines/traits.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update modular_skyrat/master_files/code/datums/traits/neutral.dm Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * reremoves Iron Ass * replaces magic numbers with defs * remove TRAIT_IRONASS * removes IRON_ASS check from carbon_defense * Let's get this over with * Of course I had to forget some of them... Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>