Fixes pirates, ops, the mining base, and gives pirates and ops drills

This commit is contained in:
Detective Google
2020-05-03 00:28:28 -05:00
parent 151ed53cb7
commit bad9e76e50
5 changed files with 44 additions and 4 deletions
@@ -689,7 +689,9 @@
/obj/machinery/power/smes{
charge = 5e+006
},
/obj/structure/cable,
/obj/structure/cable{
icon_state = "0-4"
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"cT" = (
@@ -700,10 +702,16 @@
/obj/structure/sign/warning/electricshock{
pixel_y = 32
},
/obj/structure/cable{
icon_state = "4-8"
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"cU" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/obj/structure/cable{
icon_state = "2-8"
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"cV" = (
@@ -871,6 +879,9 @@
/obj/machinery/power/port_gen/pacman{
anchored = 1
},
/obj/structure/cable{
icon_state = "0-2"
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"dp" = (
@@ -878,6 +889,9 @@
dir = 6
},
/obj/machinery/meter,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"dq" = (
@@ -1016,11 +1030,15 @@
/obj/machinery/power/port_gen/pacman{
anchored = 1
},
/obj/structure/cable,
/turf/open/floor/plating,
/area/mine/living_quarters)
"dH" = (
/obj/machinery/atmospherics/components/binary/pump/on,
/obj/structure/cable,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"dI" = (
@@ -1127,6 +1145,9 @@
req_access_txt = "48"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/mine/living_quarters)
"dT" = (
@@ -1240,6 +1261,9 @@
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/structure/cable{
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"ej" = (
@@ -1336,6 +1360,9 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "1-4"
},
/turf/open/floor/plasteel,
/area/mine/living_quarters)
"ew" = (
+9 -3
View File
@@ -505,9 +505,7 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/airlock)
"bd" = (
/obj/structure/sign/warning/vacuum/external{
layer = 4
},
/obj/structure/sign/warning/vacuum/external,
/turf/closed/wall/r_wall/syndicate,
/area/shuttle/syndicate/airlock)
"be" = (
@@ -808,6 +806,10 @@
"bQ" = (
/obj/structure/closet/syndicate/personal,
/obj/effect/turf_decal/bot_white,
/obj/item/pickaxe/drill/diamonddrill,
/obj/item/pickaxe/drill/diamonddrill,
/obj/item/pickaxe/drill/diamonddrill,
/obj/item/gun/energy/plasmacutter,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/armory)
"bR" = (
@@ -848,6 +850,10 @@
"bX" = (
/obj/structure/closet/syndicate/nuclear,
/obj/effect/turf_decal/bot_white,
/obj/item/pickaxe/drill/diamonddrill,
/obj/item/pickaxe/drill/diamonddrill,
/obj/item/pickaxe/drill/diamonddrill,
/obj/item/gun/energy/plasmacutter,
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/armory)
"bY" = (
+3
View File
@@ -943,6 +943,9 @@
/obj/item/grenade/smokebomb{
pixel_x = 5
},
/obj/item/pickaxe/drill/diamonddrill,
/obj/item/pickaxe/drill/diamonddrill,
/obj/item/pickaxe/drill/diamonddrill,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"ep" = (
+3
View File
@@ -58,6 +58,9 @@
var/list/candidates = pollGhostCandidates("Do you wish to be considered for pirate crew?", ROLE_TRAITOR)
shuffle_inplace(candidates)
if(!SSmapping.empty_space)
SSmapping.empty_space = SSmapping.add_new_zlevel("Empty Area For Pirates", list(ZTRAIT_LINKAGE = SELFLOOPING))
var/datum/map_template/shuttle/pirate/default/ship = new
var/x = rand(TRANSITIONEDGE,world.maxx - TRANSITIONEDGE - ship.width)
var/y = rand(TRANSITIONEDGE,world.maxy - TRANSITIONEDGE - ship.height)
+1
View File
@@ -62,6 +62,7 @@
view_range = 13
x_offset = -7
y_offset = -1
space_turfs_only = FALSE
whitelist_turfs = list(/turf/open/space, /turf/open/floor/plating, /turf/open/lava, /turf/closed/mineral)
see_hidden = TRUE