Makes Xenobiology Simpler. Removes Slimes (#12398)

This commit is contained in:
Fox McCloud
2019-09-24 19:17:33 -04:00
committed by variableundefined
parent 69e3a08a06
commit cb8529cdb8
81 changed files with 1774 additions and 1903 deletions
@@ -105,7 +105,7 @@
continue
if(istype(M, /mob/living/simple_animal/bot/mulebot))
continue
if(M.buckled || M.anchored)
if(M.buckled || M.anchored || M.has_buckled_mobs())
continue
M.forceMove(src)
+1 -1
View File
@@ -90,7 +90,7 @@
attack_generic(M, M.melee_damage_upper)
/obj/structure/inflatable/attack_slime(mob/user as mob)
var/mob/living/carbon/slime/S = user
var/mob/living/simple_animal/slime/S = user
if(!S.is_adult)
return
attack_generic(user, rand(10, 15))
+3 -3
View File
@@ -108,7 +108,7 @@
/obj/structure/mirror/attack_slime(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
var/mob/living/carbon/slime/S = user
var/mob/living/simple_animal/slime/S = user
if(!S.is_adult)
return
user.do_attack_animation(src)
@@ -153,7 +153,7 @@
H.dna.real_name = newname
if(H.mind)
H.mind.name = newname
if(newname)
curse(user)
@@ -197,7 +197,7 @@
if(voice_choice)
curse(user)
/obj/structure/mirror/magic/on_ui_close(mob/user)
curse(user)