From 451e05d6bc8e0df37469efcd596ef3857e1f775d Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Thu, 29 May 2014 12:54:12 -0400 Subject: [PATCH] Final nations fixes hopefully --- code/game/gamemodes/nations/nations.dm | 6 +++++- maps/NSS Cyberiad- WIP.dmm | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm index 4058cbb8740..7e3f3c76f6f 100644 --- a/code/game/gamemodes/nations/nations.dm +++ b/code/game/gamemodes/nations/nations.dm @@ -6,6 +6,7 @@ datum/game_mode/nations required_players_secret = 25 var/const/waittime_l = 3000 //lower bound on time before intercept arrives (in tenths of seconds) var/const/waittime_h = 6000 //upper bound on time before intercept arrives (in tenths of seconds) + var/kickoff = 0 var/victory = 0 var/list/cargonians = list("Quartermaster","Cargo Technician","Shaft Miner") @@ -16,6 +17,7 @@ datum/game_mode/nations spawn (rand(waittime_l, waittime_h)) remove_flags() spawn(50) + kickoff=1 send_intercept() split_teams() spawn_flags() @@ -291,7 +293,9 @@ datum/game_mode/nations */ /hook/latespawn/proc/give_latejoiners_nations(var/mob/living/carbon/human/H) var/datum/game_mode/nations/mode = get_nations_mode() - if (!mode) return 1 + if (!mode) return + + if(!mode.kickoff) return var/list/cargonians = list("Quartermaster","Cargo Technician","Shaft Miner") if(H.mind) diff --git a/maps/NSS Cyberiad- WIP.dmm b/maps/NSS Cyberiad- WIP.dmm index 77814d974a1..838a964c315 100644 --- a/maps/NSS Cyberiad- WIP.dmm +++ b/maps/NSS Cyberiad- WIP.dmm @@ -2596,7 +2596,7 @@ "aXV" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "bridge blast"; name = "Bridge Blast Doors"; opacity = 0},/obj/structure/sign/securearea{pixel_x = 32; pixel_y = 0},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor{icon_state = "delivery"; name = "floor"},/area/bridge) "aXW" = (/turf/simulated/floor{icon_state = "red"; dir = 8},/area/bridge) "aXX" = (/obj/item/device/radio/beacon,/turf/simulated/floor,/area/bridge) -"aXY" = (/obj/machinery/hologram/holopad,/obj/effect/landmark/nations{name = "Command"},/turf/simulated/floor,/area/bridge) +"aXY" = (/obj/machinery/hologram/holopad,/obj/effect/landmark/nations{name = "People's Republic of Commandzakstan"},/turf/simulated/floor,/area/bridge) "aXZ" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor,/area/bridge) "aYa" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor,/area/bridge) "aYb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/turf/simulated/floor,/area/bridge)