cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

The syndicate shuttle can no longer leave unless the bomb is deployed.

Browse Source 
Teleport can no longer teleport to the syndicate shuttle.

Main solar walkways are no longer blocked.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@623 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
crazyclonetheninja
2010-12-15 07:10:50 +00:00
parent 843e5e9da9
commit dfb189a398
4 changed files with 2155 additions and 2153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/game/gamemodes/nuclear/nuclearbomb.dm
View File

@@ -38,6 +38,7 @@
flick("nuclearbombc", src) flick("nuclearbombc", src)
src.icon_state = "nuclearbomb1" src.icon_state = "nuclearbomb1"
src.extended = 1 src.extended = 1
bomb_set = 1
return return
/obj/machinery/nuclearbomb/verb/make_deployable() /obj/machinery/nuclearbomb/verb/make_deployable()
@@ -149,8 +150,6 @@
derp = 1 derp = 1
if (A.name == "Wizard's Den") if (A.name == "Wizard's Den")
derp = 1 derp = 1
if (syndicate_station_at_station)
herp = 1
if (!derp) if (!derp)
for(var/direction in cardinal) for(var/direction in cardinal)
for(var/area/target in get_step(src,direction)) for(var/area/target in get_step(src,direction))
@@ -160,6 +159,8 @@
derp = 1 derp = 1
if (target.name == "Wizard's Den") if (target.name == "Wizard's Den")
derp = 1 derp = 1
if (syndicate_station_at_station)
herp = 1
for(var/mob/M in world) for(var/mob/M in world)
if(M.client) if(M.client)
spawn(0) spawn(0)

4
code/game/gamemodes/wizard/spell12.dm
View File

@@ -10,7 +10,7 @@
var/list/theareas = new/list() var/list/theareas = new/list()
for(var/area/AR in world) for(var/area/AR in world)
if(istype(AR, /area/shuttle)) continue if(istype(AR, /area/shuttle) || istype(AR, /area/syndicate_station)) continue
if(theareas.Find(AR.name)) continue if(theareas.Find(AR.name)) continue
var/turf/picked = pick(get_area_turfs(AR.type)) var/turf/picked = pick(get_area_turfs(AR.type))
if (picked.z == src.z) if (picked.z == src.z)
@@ -51,7 +51,7 @@
var/list/theareas = new/list() var/list/theareas = new/list()
for(var/area/AR in world) for(var/area/AR in world)
if(istype(AR, /area/shuttle)) continue if(istype(AR, /area/shuttle) || istype(AR, /area/syndicate_station)) continue
if(theareas.Find(AR.name)) continue if(theareas.Find(AR.name)) continue
var/turf/picked = pick(get_area_turfs(AR.type)) var/turf/picked = pick(get_area_turfs(AR.type))
if (picked.z == src.z) if (picked.z == src.z)

3
code/game/syndicate_shuttle.dm
View File

@@ -13,6 +13,7 @@ var/syndicate_station_time = 0
var/syndicate_station_timeleft = 0 var/syndicate_station_timeleft = 0
var/area/syndicate_loc = null var/area/syndicate_loc = null
var/syndicate_out_of_moves = 0 var/syndicate_out_of_moves = 0
var/bomb_set = 1
/obj/machinery/computer/syndicate_station /obj/machinery/computer/syndicate_station
name = "Syndicate Station Terminal" name = "Syndicate Station Terminal"
@@ -79,6 +80,7 @@ var/syndicate_out_of_moves = 0
del(T) del(T)
start_location.move_contents_to(end_location) start_location.move_contents_to(end_location)
bomb_set = 0
@@ -117,6 +119,7 @@ var/syndicate_out_of_moves = 0
/proc/syndicate_can_move() /proc/syndicate_can_move()
if(syndicate_station_moving_to_station || syndicate_station_moving_to_space) return 0 if(syndicate_station_moving_to_station || syndicate_station_moving_to_space) return 0
if(syndicate_out_of_moves) return 0 if(syndicate_out_of_moves) return 0
if(!bomb_set) return 0
else return 1 else return 1
/obj/machinery/computer/syndicate_station/attackby(I as obj, user as mob) /obj/machinery/computer/syndicate_station/attackby(I as obj, user as mob)

4296
maps/tgstation.2.0.0.dmm
View File

File diff suppressed because it is too large Load Diff