cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-31 07:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Singularity can no longer eat the AI's eye mob

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/devices/scanners.dm
+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
code/game/objects/tables_racks.dm
+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