Merge pull request #13636 from Fox-McCloud/remove-construction-site

Removes Construction Site
This commit is contained in:
variableundefined
2020-06-27 00:08:49 -04:00
committed by GitHub
14 changed files with 66805 additions and 142933 deletions
+1 -1
View File
@@ -139,7 +139,7 @@
for(var/areapath in typesof(A))
possible_areas[areapath] -= 2
//removes "bad areas" which shouldn't be on-station but are subtypes of station areas. probably should the unused ones and consider repathing the rest
var/list/bad_areas = list(subtypesof(/area/construction), /area/solar/derelict_starboard, /area/solar/derelict_aft, /area/solar/constructionsite)
var/list/bad_areas = list(subtypesof(/area/construction), /area/solar/derelict_starboard, /area/solar/derelict_aft)
for(var/A in bad_areas)
possible_areas -= A
//weight check, remove negative or zero weight areas from the list, then return the list.
@@ -32,8 +32,6 @@
jumpto_ports += list("nav_z1" = 1)
if(access_tcomms)
jumpto_ports += list("nav_z3" = 1)
if(access_construction)
jumpto_ports += list("nav_z4" = 1)
if(access_mining)
jumpto_ports += list("nav_z5" = 1)
if(access_derelict)
+2 -2
View File
@@ -863,7 +863,7 @@
desc = "Used to control the White Ship."
circuit = /obj/item/circuitboard/white_ship
shuttleId = "whiteship"
possible_destinations = "whiteship_away;whiteship_home;whiteship_z4"
possible_destinations = "whiteship_away;whiteship_home"
/obj/machinery/computer/shuttle/engineering
name = "Engineering Shuttle Console"
@@ -913,7 +913,7 @@
desc = "Used to control the Golem Ship."
circuit = /obj/item/circuitboard/shuttle/golem_ship
shuttleId = "freegolem"
possible_destinations = "freegolem_lavaland;freegolem_z5;freegolem_z4;freegolem_z6"
possible_destinations = "freegolem_lavaland;freegolem_z5;freegolem_z6"
/obj/machinery/computer/shuttle/golem_ship/attack_hand(mob/user)
if(!isgolem(user) && !isobserver(user))