diff --git a/_maps/map_levels/140x140/talon/talon1.dmm b/_maps/map_levels/140x140/talon/talon1.dmm index 12f37e1a39b..f9807771827 100644 --- a/_maps/map_levels/140x140/talon/talon1.dmm +++ b/_maps/map_levels/140x140/talon/talon1.dmm @@ -1349,6 +1349,9 @@ dir = 1; pixel_y = -24 }, +/obj/effect/landmark/start{ + name = "Talon Engineer" + }, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/talon/deckone/port_eng_store) "cO" = ( @@ -2413,6 +2416,15 @@ /obj/machinery/photocopier/faxmachine/talon, /turf/simulated/floor/tiled/eris/steel/cargo, /area/talon/deckone/workroom) +"mt" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Talon Engineer" + }, +/turf/simulated/floor/tiled/eris/dark/brown_perforated, +/area/talon/deckone/port_eng) "mB" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -2666,6 +2678,9 @@ /obj/structure/bed/chair/office/light{ dir = 8 }, +/obj/effect/landmark/start{ + name = "Talon Doctor" + }, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/talon/deckone/workroom) "pC" = ( @@ -2957,6 +2972,9 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/landmark/start{ + name = "Talon Engineer" + }, /turf/simulated/floor/tiled/eris/dark/brown_platform, /area/talon/deckone/starboard_eng_store) "ta" = ( @@ -4925,6 +4943,9 @@ /obj/structure/bed/chair/bay/comfy/red{ dir = 4 }, +/obj/effect/landmark/start{ + name = "Talon Pilot" + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "Ow" = ( @@ -5087,6 +5108,12 @@ }, /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_starboard_aft_wing) +"Rn" = ( +/obj/effect/landmark/start{ + name = "Talon Doctor" + }, +/turf/simulated/floor/tiled/eris/white/bluecorner, +/area/talon/deckone/medical) "Rr" = ( /obj/machinery/alarm/talon{ dir = 1; @@ -5771,6 +5798,9 @@ /obj/structure/bed/chair/bay/comfy/brown{ dir = 1 }, +/obj/effect/landmark/start{ + name = "Talon Pilot" + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "Ym" = ( @@ -14553,7 +14583,7 @@ iA cP iX vV -lM +mt ir YI Fw @@ -16522,7 +16552,7 @@ Bn Gb FA So -Gb +Rn Gb ce Tq @@ -17515,7 +17545,7 @@ Nm dO hv xE -Gb +Rn UG UQ dO diff --git a/code/game/trader_visit.dm b/code/game/trader_visit.dm index 3d7336da216..0c54440862a 100644 --- a/code/game/trader_visit.dm +++ b/code/game/trader_visit.dm @@ -3,6 +3,9 @@ var/global/hire_nebula = 0 var/can_call_traders = 1 +//I'm disabling this for now, until Overmaps/Nebula Gas is reinstated. + +/* /client/proc/trader_ship() set name = "Hire Nebula Gas Employees" set category = "Special Verbs" @@ -60,3 +63,4 @@ proc/trigger_trader_visit() hire_nebula = 1 sleep(600 * 5) +*/ diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 603083f8815..54f30376bf1 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -88,7 +88,7 @@ var/list/admin_verbs_admin = list( /client/proc/man_up, /client/proc/global_man_up, /client/proc/response_team, // Response Teams admin verb, - /client/proc/trader_ship, // Trader ship admin verb, +// /client/proc/trader_ship, // Trader ship admin verb, // I've commented this one out for now, in conjunction with Nebula Gas being disabled. /client/proc/toggle_antagHUD_use, /client/proc/toggle_antagHUD_restrictions, /client/proc/allow_character_respawn, // Allows a ghost to respawn ,