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

Converted Syndicate shuttle over to multi-shuttle setup.

Browse Source
This commit is contained in:
Zuhayr
2014-06-04 00:08:10 +09:30
parent 3bb5aa7818
commit 7a56a174dc
6 changed files with 39 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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)