Split corpses into corpse and mobcorpse. Corpse is still used for decorating maps, mobcorpse is used for simple animals dropping human bodies.

Committing Brotemis's updates to his Wild West map/fixes he had for the associated code.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5093 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
Kortgstation@gmail.com
2012-11-17 01:43:13 +00:00
parent 32a855049f
commit 121e8fa1d9
11 changed files with 625 additions and 451 deletions
+41
View File
@@ -0,0 +1,41 @@
/obj/effect/meatgrinder
name = "Meat Grinder"
desc = "What is that thing?"
density = 1
anchored = 1
layer = 3
icon = 'icons/obj/weapons.dmi'
icon_state = "shadow_portal"
var/triggerproc = "explode" //name of the proc thats called when the mine is triggered
var/triggered = 0
/obj/effect/meatgrinder/New()
icon_state = "shadow_portal"
/obj/effect/meatgrinder/HasEntered(AM as mob|obj)
Bumped(AM)
/obj/effect/meatgrinder/Bumped(mob/M as mob|obj)
if(triggered) return
if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))
for(var/mob/O in viewers(world.view, src.loc))
O << "<font color='red'>[M] triggered the \icon[src] [src]</font>"
triggered = 1
call(src,triggerproc)(M)
/obj/effect/meatgrinder/proc/triggerrad1(obj)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
obj:radiation += 5000
randmutb(obj)
domutcheck(obj,null)
spawn(0)
del(src)
/obj/effect/mine/meatgrinder
name = "Meat Grinder"
icon_state = "shadow_portal"
triggerproc = "triggerrad1"
-18
View File
@@ -35,16 +35,6 @@
spawn(0)
del(src)
/obj/effect/mine/proc/triggerrad1(obj)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
obj:radiation += 5000
randmutb(obj)
domutcheck(obj,null)
spawn(0)
del(src)
/obj/effect/mine/proc/triggerstun(obj)
if(ismob(obj))
var/mob/M = obj
@@ -105,19 +95,11 @@
spawn(0)
del(src)
/obj/effect/mine/dnascramble
name = "Radiation Mine"
icon_state = "uglymine"
triggerproc = "triggerrad"
/obj/effect/mine/meatgrinder
name = "Meat Grinder"
icon_state = "uglymine"
triggerproc = "triggerrad1"
/obj/effect/mine/plasma
name = "Plasma Mine"
icon_state = "uglymine"