cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'shuttlecontroller' of https://github.com/Zuhayr/Baystation12 into dev

Browse Source
This commit is contained in:
Zuhayr
2014-06-04 19:14:00 +09:30
parent da2ae4d507 99ffd06285
commit dfa6d8ef15
20 changed files with 1386 additions and 1653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/heist/heist.dm
+3 -2
View File
@@ -272,8 +272,9 @@ datum/game_mode/proc/auto_declare_completion_heist()
return 1
/datum/game_mode/heist/check_finished()
if (!(is_raider_crew_alive()) || (vox_shuttle_location && (vox_shuttle_location == "start")))
return 1
// DO NOT FORGET TO FIX THIS.
//if (!(is_raider_crew_alive()) || (vox_shuttle_location && (vox_shuttle_location == "start")))
// return 1
return ..()
/datum/game_mode/heist/cleanup()
code/game/gamemodes/nuclear/nuclearbomb.dm
+1 -1
View File
@@ -404,7 +404,7 @@ obj/machinery/nuclearbomb/proc/nukehack_win(mob/user as mob)
if(ticker)
if(ticker.mode && ticker.mode.name == "nuclear emergency")
var/obj/machinery/computer/syndicate_station/syndie_location = locate(/obj/machinery/computer/syndicate_station)
var/obj/machinery/computer/shuttle_control/multi/syndicate/syndie_location = locate(/obj/machinery/computer/shuttle_control/multi/syndicate)
if(syndie_location)
ticker.mode:syndies_didnt_escape = (syndie_location.z > 1 ? 0 : 1) //muskets will make me change this, but it will do for now
ticker.mode:nuke_off_station = off_station
code/game/gamemodes/nuclear/pinpointer.dm
+1 -2
View File
@@ -179,8 +179,7 @@
/obj/item/weapon/pinpointer/nukeop
var/mode = 0 //Mode 0 locates disk, mode 1 locates the shuttle
var/obj/machinery/computer/syndicate_station/home = null
var/obj/machinery/computer/shuttle_control/multi/syndicate/home = null
/obj/item/weapon/pinpointer/nukeop/attack_self(mob/user as mob)
if(!active)