Traitorstation Fixes + SyndieCat

Fixes some things with traitorstation and adds SyndieCat.
This commit is contained in:
melandor0
2014-09-02 13:53:11 +02:00
parent 65df3b8ba3
commit 59f73acfd3
7 changed files with 8678 additions and 8650 deletions
+16 -2
View File
@@ -113,8 +113,11 @@
var/turf/T = get_turf(R)
if (!T)
continue
if(T.z == 2 || T.z > 7)
continue
if(T.z == 2 || T.z > 6)
if (T.z == 7 & src.emagged == 1)
// This should be empty, allows for it to continue if the z-level is 7 and the machine.
else
continue
var/tmpname = T.loc.name
if(areaindex[tmpname])
tmpname = "[tmpname] ([++areaindex[tmpname]])"
@@ -401,3 +404,14 @@
/atom/proc/laserhit(L as obj)
return 1
/obj/machinery/computer/teleporter/attackby(I as obj, user as mob) //Emagging.
if(istype(I,/obj/item/weapon/card/emag))
if (src.emagged == 0)
user << "\blue You scramble the Teleporter's circuits. You should be able to teleport to more places now!"
src.emagged = 1
else
user << "\red The machine seems unaffected by the card swipe..."
else
return attack_hand(user)
@@ -137,7 +137,7 @@ Frequency:
/obj/item/weapon/hand_tele/attack_self(mob/user as mob)
var/turf/current_location = get_turf(user)//What turf is the user on?
if(!current_location||current_location.z==2||current_location.z>=7)//If turf was not found or they're on z level 2 or >7 which does not currently exist.
if(!current_location||current_location.z==2||current_location.z>=8)//If turf was not found or they're on z level 2 or >8 which does not currently exist.
user << "<span class='notice'>\The [src] is malfunctioning.</span>"
return
var/list/L = list( )
+1 -1
View File
@@ -81,7 +81,7 @@
// Okay, so let's make it so that people can travel z levels but not nuke disks!
// if(ticker.mode.name == "nuclear emergency") return
if(A.z > 6) return
if(A.z > MAX_Z) return // For "Unenterable" z levels, they have their own entrance/exit code, eg: Away missions
if (A.x <= TRANSITIONEDGE || A.x >= (world.maxx - TRANSITIONEDGE - 1) || A.y <= TRANSITIONEDGE || A.y >= (world.maxy - TRANSITIONEDGE - 1))
if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust))
del(A)
@@ -76,3 +76,13 @@
icon_living = "kitten"
icon_dead = "kitten_dead"
gender = NEUTER
/mob/living/simple_animal/cat/Syndi
name = "SyndiCat"
desc = "It's a SyndiCat droid."
icon_state = "Syndicat"
icon_living = "Syndicat"
icon_dead = "Syndicat_dead"
gender = FEMALE
var/turns_since_scan = 0
var/mob/living/simple_animal/mouse/movement_target
+2 -2
View File
@@ -450,8 +450,8 @@ var/MAX_EXPLOSION_RANGE = 14
#define GAS_CO2 (1 << 3)
#define GAS_N2O (1 << 4)
var/list/accessable_z_levels = list("1" = 5, "3" = 10, "4" = 15, "5" = 10, "6" = 60, "7" = 0)
#define MAX_Z 7 // Used in space.dm to defince which Z-levels cannot be exited via space.
var/list/accessable_z_levels = list("1" = 5, "3" = 10, "4" = 15, "5" = 10, "6" = 60)
//This list contains the z-level numbers which can be accessed via space travel and the percentile chances to get there.
//(Exceptions: extended, sandbox and nuke) -Errorage
//Was list("3" = 30, "4" = 70).