WIP commit

still working on the camera thing..
This commit is contained in:
Aurorablade
2015-11-01 01:19:35 -04:00
parent 570cfbe566
commit f9d96ffbf1
3 changed files with 25 additions and 3 deletions
@@ -185,6 +185,7 @@ var/global/list/image/splatter_cache=list()
/obj/effect/decal/cleanable/blood/gibs/New()
..()
noclear = 1
reagents.add_reagent("liquidgibs", 5)
+7 -2
View File
@@ -35,8 +35,13 @@
user << "<span class='notice'>You 'clean' \the [target.name].</span>"
if(istype(target, /turf/simulated))
new /obj/effect/decal/cleanable/blood/gibs(target)
else if (istype(target,/mob/living/))
add_blood(target)
else if (istype(target,/mob/living/carbon))
for(var/obj/item/carried_item in target.contents)
if(!istype(carried_item, /obj/item/weapon/implant))//If it's not an implant.
carried_item.add_blood(target)//Oh yes, there will be blood...
var/mob/living/carbon/human/H = target
H.bloody_hands(target,0)
H.bloody_body(target)
return
+17 -1
View File
@@ -153,7 +153,7 @@
var/see_ghosts = 0 //for the spoop of it
/obj/item/device/camera/CheckParts()
/obj/item/device/camera/spooky/CheckParts()
var/obj/item/device/camera/C = locate(/obj/item/device/camera) in contents
if(C)
pictures_max = C.pictures_max
@@ -166,6 +166,16 @@
name = "camera obscura"
desc = "A polaroid camera, some say it can see ghosts!"
see_ghosts = 1
/////spooky helpers!/////
/obj/effect/spookyghost
name = "Spooky Ghost"
desc = "It's a g-g-g-g-ghooooost!" //jinkies!
icon = 'icons/mob/mob.dmi'
icon_state = "ghost"
layer = 4
density = 0
anchored = 1 // don't get pushed around
invisibility = INVISIBILITY_OBSERVER
/obj/item/device/camera/verb/change_size()
set name = "Set Photo Focus"
@@ -215,14 +225,20 @@
atoms.Add(the_turf);
// As well as anything that isn't invisible.
for(var/atom/A in the_turf)
var/obj/effect/spookyghost/SPOOK
if(A.invisibility )
if(see_ghosts && istype(A,/mob/dead/observer))
var/mob/dead/observer/O = A
if(O.following) //so you dont see ghosts following people like antags, etc.
continue
else
SPOOK = new(A.loc)
A = SPOOK
else
continue
atoms.Add(A)
if(SPOOK)
qdel(SPOOK)
// Sort the atoms into their layers
var/list/sorted = sort_atoms_by_layer(atoms)