From e4e192c3a31cd3e25d3bdce08e63786234502c4f Mon Sep 17 00:00:00 2001 From: coiax Date: Sun, 12 Feb 2017 01:13:44 +0000 Subject: [PATCH] BYOS shuttle restrictions (Shuttle changes #1) (#23904) * BYOS shuttle restrictions (Shuttle changes #1) :cl: coiax add: The Build your own shuttle kit can only be bought in the first five minutes of the shift. /:cl: - BYOS restriction is to avoid grief. * Moves the defines * Ten minutes --- code/__DEFINES/misc.dm | 2 +- code/datums/shuttles.dm | 4 ++++ code/game/objects/items/charter.dm | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 4424f05436b..d4acb7f4b49 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -408,4 +408,4 @@ var/global/list/ghost_others_options = list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE #define TURF_DECAL_PAINT "paint" #define TURF_DECAL_DAMAGE "damage" -#define TURF_DECAL_DIRT "dirt" \ No newline at end of file +#define TURF_DECAL_DIRT "dirt" diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 213a5f07e60..517fa11d20b 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -45,6 +45,10 @@ admin_notes = "No brig, no medical facilities, no air." credit_cost = -7500 +/datum/map_template/shuttle/emergency/airless/prerequisites_met() + // first 10 minutes only + return world.time - round_start_time < 6000 + /datum/map_template/shuttle/emergency/asteroid suffix = "asteroid" name = "Asteroid Station Emergency Shuttle" diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index bfe699ad33f..ead1f9e820f 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -1,3 +1,5 @@ +#define STATION_RENAME_TIME_LIMIT 3000 + /obj/item/station_charter name = "station charter" icon = 'icons/obj/wizard.dmi' @@ -33,7 +35,7 @@ if(used) user << "This charter has already been used to name the station." return - if(!ignores_timeout && (world.time-round_start_time > CHALLENGE_TIME_LIMIT)) //5 minutes + if(!ignores_timeout && (world.time-round_start_time > STATION_RENAME_TIME_LIMIT)) //5 minutes user << "The crew has already settled into the shift. \ It probably wouldn't be good to rename the station right now." return @@ -93,3 +95,5 @@ if(!unlimited_uses) used = TRUE + +#undef STATION_RENAME_TIME_LIMIT