Committed for Sieve:

Reverted dismemberment
- This is the majority of the files

Reverted the gun change
- You wont shoot yourself putting your gun away
- You don't have to fire off all of your shots before hitting someone with your gun

Reverted Tarajans
- As requested

Hotfix for the Holodeck.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3574 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-05-11 02:21:00 +00:00
parent 98eca2a4a6
commit 6951ec37ed
31 changed files with 206 additions and 1237 deletions
-12
View File
@@ -71,18 +71,6 @@
if(B != src)
del(B)
/obj/effect/decal/cleanable/blood/drip
name = "drips of blood"
desc = "It's red."
gender = PLURAL
density = 0
anchored = 1
layer = 2
icon = 'drip.dmi'
icon_state = "1"
// track_amt = 0
/obj/effect/decal/cleanable/blood/splatter
random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")
+3 -2
View File
@@ -244,7 +244,7 @@ proc/isInSight(var/atom/A, var/atom/B)
return 0
proc/doafterattack(obj/target , obj/source)
/*proc/doafterattack(obj/target , obj/source)
if (istype(target, /obj/item/weapon/storage/ ))
return 0
@@ -256,4 +256,5 @@ proc/doafterattack(obj/target , obj/source)
return 0
else
return 1
return 1
{R}*/