Singularity can no longer eat the AI's eye mob

Cleaned up how throwing works.
This commit is contained in:
SkyMarshal
2012-02-25 16:01:00 -07:00
parent 2f719b5b81
commit f50a3215b6
6 changed files with 9 additions and 10 deletions
-1
View File
@@ -638,7 +638,6 @@
#include "code\game\objects\devices\chameleonproj.dm"
#include "code\game\objects\devices\flash.dm"
#include "code\game\objects\devices\flashlight.dm"
#include "code\game\objects\devices\geneanalyzer.dm"
#include "code\game\objects\devices\infra_sensor.dm"
#include "code\game\objects\devices\multitool.dm"
#include "code\game\objects\devices\paicard.dm"
+2 -4
View File
@@ -41,7 +41,6 @@
icon = 'policetape.dmi'
anchored = 1
density = 1
throwpass = 1
req_access = list(access_security)
/obj/structure/signpost
@@ -701,7 +700,6 @@
density = 1
anchored = 1.0
layer = 2.8
throwpass = 1
New()
..()
@@ -827,10 +825,10 @@
dir_sum = 8
if(13)
if(dir_sum == 29)
dir_sum = 6
dir_sum = 10
table_type = 6
else if(dir_sum == 141)
dir_sum = 10
dir_sum = 6
table_type = 6
else if(dir_sum == 189 || dir_sum == 221 || dir_sum == 253 || dir_sum == 157)
dir_sum = 1
+2
View File
@@ -138,6 +138,8 @@ MASS SPECTROMETER
return
if(src.loc != user)
return 0
if(istype(A,/obj/machinery/computer/forensic_scanning)) //breaks shit.
return
if(istype(A,/obj/item/weapon/f_card))
user << "Haha, nice try. Cheater. (It would break stuff anyways.)"
return
+2 -2
View File
@@ -108,7 +108,7 @@ TABLE AND RACK OBJECT INTERATIONS
/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if(air_group || (height==0)) return 1
if(istype(mover) && mover.checkpass(PASSTABLE)) //WTF do things hit tables like that? Jeez.
if(istype(mover) && (mover.checkpass(PASSTABLE) || mover.flags & TABLEPASS)) //WTF do things hit tables like that? Jeez.
return 1
else
return 0
@@ -309,7 +309,7 @@ TABLE AND RACK OBJECT INTERATIONS
if(air_group || (height==0)) return 1
if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!|
return 1
if(istype(mover) && mover.checkpass(PASSTABLE))
if(istype(mover) && (mover.checkpass(PASSTABLE) || mover.flags & TABLEPASS))
return 1
else
return 0
+1 -2
View File
@@ -96,12 +96,11 @@
src.throw_impact(A)
src.throwing = 0
if(isobj(A))
if(A.density && !A.throwpass) // **TODO: Better behaviour for windows
if(A.density) // **TODO: Better behaviour for windows
// which are dense, but shouldn't always stop movement
src.throw_impact(A)
src.throwing = 0
/atom/var/throwpass = 0
/atom/proc/throw_impact(atom/hit_atom)
if(istype(hit_atom,/mob/living))
var/mob/living/M = hit_atom
@@ -2,7 +2,8 @@ var/global/list/uneatable = list(
/turf/space,
/obj/effect,
/obj/effect/overlay,
/obj/effect/rune
/obj/effect/rune,
/mob/aiEye
)
/obj/machinery/singularity/