Some more bug fixes (#26)

Some more bugfixes.
The Windoor changes from Nanakos pull might conflict.
So merge that first and I´ll resolve as needed.
This commit is contained in:
Werner
2016-11-30 17:30:06 +01:00
committed by skull132
parent f7476fa9d7
commit a1a1d6c17e
4 changed files with 24 additions and 50 deletions

View File

@@ -161,6 +161,27 @@
qdel(src)
return O
//human -> alien
/mob/living/carbon/human/proc/Alienize()
for(var/obj/item/W in src)
drop_from_inventory(W)
regenerate_icons()
canmove = 0
icon = null
invisibility = 101
for(var/t in organs)
qdel(t)
var/alien_caste = pick("Hunter","Sentinel","Drone")
var/mob/living/carbon/human/new_xeno = create_new_xenomorph(alien_caste,loc)
new_xeno.a_intent = I_HURT
new_xeno.key = key
new_xeno << "<B>You are now an alien.</B>"
qdel(src)
return
/mob/living/carbon/human/proc/slimeize(adult as num, reproduce as num)
if (transforming)
return
@@ -317,6 +338,3 @@
//Not in here? Must be untested!
return 0