cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 04:57:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-adds insect welfare (#49542)

Browse Source 
* cleans pacifist consciences

* Update code/modules/mob/living/simple_animal/hostile/cockroach.dm

Co-Authored-By: cacogen <25089914+cacogen@users.noreply.github.com>

* other mobs can be pacifists too

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
This commit is contained in:
Yenwodyah
2020-02-25 08:19:38 -06:00
committed by GitHub
parent f55ac271ee
commit f44765d510
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/cockroach.dm
+3
View File
@@ -66,6 +66,9 @@
if(isliving(AM))
var/mob/living/A = AM
if(A.mob_size > MOB_SIZE_SMALL && !(A.movement_type & FLYING))
if(HAS_TRAIT(A, TRAIT_PACIFISM))
A.visible_message("<span class='notice'>[A] carefully steps over [src].</span>", "<span class='notice'>You carefully step over [src] to avoid hurting it.</span>")
return
if(prob(squish_chance))
A.visible_message("<span class='notice'>[A] squashed [src].</span>", "<span class='notice'>You squashed [src].</span>")
adjustBruteLoss(1) //kills a normal cockroach