mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 21:48:39 +01:00
[SPEED MERGE NEEDED] removes cat (#47999)
This commit is contained in:
committed by
Rob Bailey
parent
ff444890a3
commit
345d2bf607
@@ -134,7 +134,7 @@
|
||||
|
||||
//catpeople
|
||||
for(var/mob/living/carbon/human/H in view(1,targloc))
|
||||
if(!isfelinid(H) || H.incapacitated() || H.eye_blind )
|
||||
if( H.incapacitated() || H.eye_blind )
|
||||
continue
|
||||
if(user.mobility_flags & MOBILITY_STAND)
|
||||
H.setDir(get_dir(H,targloc)) // kitty always looks at the light
|
||||
|
||||
@@ -166,7 +166,6 @@
|
||||
if(!istype(H))
|
||||
return 0
|
||||
H.set_species(/datum/species/human, 1)//lizards go home
|
||||
purrbation_remove(H)//remove cats
|
||||
H.dna.remove_all_mutations()//hulks out
|
||||
return 1
|
||||
|
||||
|
||||
@@ -88,11 +88,7 @@
|
||||
return
|
||||
if(target.mob_size > max_occupant_weight)
|
||||
if(ishuman(target))
|
||||
var/mob/living/carbon/human/H = target
|
||||
if(isfelinid(H))
|
||||
to_chat(user, "<span class='warning'>You'd need a lot of catnip and treats, plus maybe a laser pointer, for that to work.</span>")
|
||||
else
|
||||
to_chat(user, "<span class='warning'>Humans, generally, do not fit into pet carriers.</span>")
|
||||
to_chat(user, "<span class='warning'>Humans, generally, do not fit into pet carriers.</span>")
|
||||
else
|
||||
to_chat(user, "<span class='warning'>You get the feeling [target] isn't meant for a [name].</span>")
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user