Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right)

This commit is contained in:
Zuhayr
2014-12-23 17:37:33 +10:30
parent 2483f6fecc
commit bbfc6db0a3
60 changed files with 1213 additions and 1443 deletions

View File

@@ -332,10 +332,9 @@ datum
if(!M) M = holder.my_atom
if(ishuman(M))
var/mob/living/carbon/human/human = M
if(human.dna.mutantrace == null)
M << "\red Your flesh rapidly mutates!"
human.dna.mutantrace = "slime"
human.update_mutantrace()
if(human.species.name != "Slime")
M << "<span class='danger'>Your flesh rapidly mutates!</span>"
human.set_species("Slime")
..()
return

View File

@@ -428,16 +428,9 @@
return
/obj/item/weapon/reagent_containers/food/snacks/grown/bluetomato/Crossed(AM as mob|obj)
if (istype(AM, /mob/living/carbon))
var/mob/M = AM
if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP) || M.buckled)
return
M.stop_pulling()
M << "\blue You slipped on the [name]!"
playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
M.Stun(8)
M.Weaken(5)
if (istype(AM, /mob/living))
var/mob/living/M = AM
M.slip("the [src]!")
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat
name = "wheat"

View File

@@ -23,12 +23,10 @@
name = "synthetic meat"
desc = "A synthetic slab of flesh."
// Seperate definitions because some food likes to know if it's human.
// TODO: rewrite kitchen code to check a var on the meat item so we can remove
// all these sybtypes.
/obj/item/weapon/reagent_containers/food/snacks/meat/human
name = "-meat"
var/subjectname = ""
var/subjectjob = null
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey
//same as plain meat