diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 3a881de4b24c..b9be92165781 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -1146,7 +1146,8 @@ pixel_y = 5; pixel_x = 7; id = "cargo"; - name = "Launch Cargo" + name = "Launch Cargo"; + looping_time = 1 }, /turf/closed/wall/r_wall, /area/station/cargo/storage) @@ -9847,16 +9848,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"eZq" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - invisibility = 101 - }, -/obj/docking_port/stationary/escape_pod{ - dir = 4 - }, -/turf/open/floor/engine, -/area/station/cargo/miningoffice) "eZx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, @@ -67302,7 +67293,7 @@ iLH ont dGk hcx -eZq +hcx dGk nip qRY diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm index 8308240a0e44..a5c6761afa87 100644 --- a/code/__DEFINES/power.dm +++ b/code/__DEFINES/power.dm @@ -18,3 +18,5 @@ GLOBAL_VAR_INIT(CHARGELEVEL, 0.001) // Cap for how fast cells charge, as a perce #define KW * 1000 #define MW * 1000000 #define GW * 1000000000 +#define TW * 1000000000000 +#define PW * 1000000000000000 diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 8db31009cb73..8c154766057a 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -26,7 +26,10 @@ if(COOLDOWN_FINISHED(src, massdriver_countdown)) timing = FALSE // alarm() sleeps, so we want to end processing first and can't rely on return PROCESS_KILL - end_processing() + if(!looping_time) + end_processing() + else + COOLDOWN_START(src, massdriver_countdown, time SECONDS) alarm() /** diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index 3f680f883c34..bfafabd73b1b 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -56,6 +56,8 @@ var/manifest_can_fail = TRUE ///Boolean on whether the manifest can be cancelled through cargo consoles. var/can_be_cancelled = TRUE + ///the account we charge for this purchase + var/account_to_charge = ACCOUNT_CAR /datum/supply_order/New( datum/supply_pack/pack, @@ -70,6 +72,7 @@ manifest_can_fail = TRUE, cost_type = "cr", can_be_cancelled = TRUE, + account_to_charge = ACCOUNT_CAR, ) id = SSshuttle.order_number++ src.cost_type = cost_type @@ -84,6 +87,7 @@ src.charge_on_purchase = charge_on_purchase src.manifest_can_fail = manifest_can_fail src.can_be_cancelled = can_be_cancelled + src.account_to_charge = account_to_charge //returns the total cost of this order. Its not the total price paid by cargo but the total value of this order /datum/supply_order/proc/get_final_cost() @@ -128,6 +132,7 @@ manifest_paper.name += " - Purchased by [owner]" manifest_text += "Order[packname?"":"s"]: [id]
" manifest_text += "Destination: [station_name]
" + manifest_text += "Paid For By: [account_to_charge]
" if(packname) manifest_text += "Item: [packname]
" manifest_text += "Contents:
" diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index fbd6dc29e11d..665485ac9aed 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -39,6 +39,10 @@ /// are we currently_sending to an ocean point? var/currently_sending = FALSE + ///department specific locks + var/can_send_shuttle = TRUE + var/can_remove_orders = TRUE + /obj/machinery/computer/cargo/request name = "supply request console" desc = "Used to request supplies from cargo." @@ -248,7 +252,7 @@ applied_coupon = coupon_check break - var/datum/supply_order/SO = new(pack = pack ,orderer = name, orderer_rank = rank, orderer_ckey = ckey, reason = reason, paying_account = account, coupon = applied_coupon) + var/datum/supply_order/SO = new(pack = pack ,orderer = name, orderer_rank = rank, orderer_ckey = ckey, reason = reason, paying_account = account, coupon = applied_coupon, account_to_charge = params["account_to_charge"]) if(requestonly && !self_paid) SSshuttle.request_list += SO else @@ -271,6 +275,9 @@ for(var/datum/supply_order/order in SSshuttle.shopping_list) if(order.id != id) continue + if(!can_remove_orders && order.account_to_charge != cargo_account) + say("ERROR: This console lacks permission to remove orders not added by them!") + return if(order.department_destination) say("Only the department that ordered this item may cancel it.") return @@ -298,6 +305,9 @@ return switch(action) if("send") + if(!can_send_shuttle) + say("ERROR: This console lacks permission to call or send the Shuttle") + return if(currently_sending) say("Contents are already on their way") return @@ -341,7 +351,7 @@ else usr.investigate_log("called the supply shuttle.", INVESTIGATE_CARGO) say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.") - SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE) + SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE, cargo_account) else if(!length(GLOB.cargo_launch_points)) stack_trace("Erm, we are attempting to launch cargo crates on a map with no cargo landing points") @@ -364,7 +374,10 @@ price += 700 paying_for_this.bank_card_talk("Goody order size exceeds free shipping limit: Assessing 700 credit S&H fee.") else - paying_for_this = SSeconomy.get_dep_account(ACCOUNT_CAR) + paying_for_this = SSeconomy.get_dep_account(order.account_to_charge) + if(order.account_to_charge != ACCOUNT_CAR) + var/datum/bank_account/department/cargo = SSeconomy.get_dep_account(ACCOUNT_CAR) + cargo.adjust_money(order.pack.get_cost() * 0.1) // give some back for actually getting the crates if(paying_for_this) if(!paying_for_this.adjust_money(-price, "Cargo: [order.pack.name]")) if(order.paying_account) @@ -412,12 +425,14 @@ usr.log_message("accepted a shuttle loan event.", LOG_GAME) . = TRUE if("add") + params += "account_to_charge" + params["account_to_charge"] = cargo_account return add_item(params) if("add_by_name") var/supply_pack_id = name_to_id(params["order_name"]) if(!supply_pack_id) return - return add_item(list("id" = supply_pack_id, "amount" = 1)) + return add_item(list("id" = supply_pack_id, "amount" = 1, "account_to_charge" = cargo_account)) if("remove") var/order_name = params["order_name"] //try removing atleast one item with the specified name. An order may not be removed if it was from the department @@ -446,7 +461,7 @@ var/supply_pack_id = name_to_id(order_name) //map order name to supply pack id for adding if(!supply_pack_id) return - return add_item(list("id" = supply_pack_id, "amount" = amount)) + return add_item(list("id" = supply_pack_id, "amount" = amount, "account_to_charge" = cargo_account)) if("clear") //create copy of list else we will get runtimes when iterating & removing items on the same list SSshuttle.shopping_list var/list/shopping_cart = SSshuttle.shopping_list.Copy() diff --git a/code/modules/events/anomaly/anomaly_vortex.dm b/code/modules/events/anomaly/anomaly_vortex.dm index a9c9985534d6..d8eb0b6459ca 100644 --- a/code/modules/events/anomaly/anomaly_vortex.dm +++ b/code/modules/events/anomaly/anomaly_vortex.dm @@ -13,6 +13,7 @@ start_when = ANOMALY_START_DANGEROUS_TIME announce_when = ANOMALY_ANNOUNCE_DANGEROUS_TIME anomaly_path = /obj/effect/anomaly/bhole + oshan_blocked = TRUE /datum/round_event/anomaly/anomaly_vortex/announce(fake) priority_announce("Localized high-intensity vortex anomaly detected on [ANOMALY_ANNOUNCE_DANGEROUS_TEXT] [impact_area.name]", "Anomaly Alert") diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index df5ec005f866..fd0a21fb53bb 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( return 2 return ..() -/obj/docking_port/mobile/supply/initiate_docking() +/obj/docking_port/mobile/supply/initiate_docking(obj/docking_port/stationary/new_dock, movement_direction, force=FALSE) if(getDockedId() == "cargo_away") // Buy when we leave home. buy() create_mail() @@ -139,7 +139,10 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( price += CRATE_TAX paying_for_this.bank_card_talk("Goody order size exceeds free shipping limit: Assessing [CRATE_TAX] credit S&H fee.") else - paying_for_this = SSeconomy.get_dep_account(ACCOUNT_CAR) + paying_for_this = SSeconomy.get_dep_account(spawning_order.account_to_charge) + if(spawning_order.account_to_charge != ACCOUNT_CAR) + var/datum/bank_account/department/cargo = SSeconomy.get_dep_account(ACCOUNT_CAR) + cargo.adjust_money(spawning_order.pack.get_cost() * 0.1) // give some back for actually getting the crates if(paying_for_this) if(!paying_for_this.adjust_money(-price, "Cargo: [spawning_order.pack.name]")) if(spawning_order.paying_account) diff --git a/monkestation/code/game/machinery/power/ptl.dm b/monkestation/code/game/machinery/power/ptl.dm index bbc84625cb9c..40918f121507 100644 --- a/monkestation/code/game/machinery/power/ptl.dm +++ b/monkestation/code/game/machinery/power/ptl.dm @@ -46,11 +46,25 @@ var/list/laser_effects = list() ///list of all blocking turfs or objects var/list/blocked_objects = list() + ///our max load we can set + var/max_grid_load = 0 + ///our current grid load + var/current_grid_load = 0 + ///out power formatting multiplier used inside tgui to convert to things like mW gW to watts for ease of setting + var/power_format_multi = 1 + ///same as above but for output + var/power_format_multi_output = 1 + + ///how much we are inputing pre multiplier + var/input_number = 0 + ///how much we are outputting pre multiplier + var/output_number = 0 + ///our set input pulling + var/input_pulling = 0 /obj/machinery/power/transmission_laser/Initialize(mapload) . = ..() - register_context() range = get_dist(get_step(get_front_turf(), dir), get_edge_target_turf(get_front_turf(), dir)) var/turf/back_turf = get_step(get_back_turf(), turn(dir, 180)) terminal = locate(/obj/machinery/power/terminal) in back_turf @@ -119,41 +133,94 @@ . += "charge_[charge_level]" . += emissive_appearance(icon, "charge_[charge_level]", src) - -/obj/machinery/power/transmission_laser/add_context( - atom/source, - list/context, - obj/item/held_item, - mob/living/user, -) - . = ..() - context[SCREENTIP_CONTEXT_LMB] = "Turn [turned_on ? "Off" : "On"] the PTL." - context[SCREENTIP_CONTEXT_RMB] = "Turn [firing ? "Off" : "On"] the PTL's Firing mechanism." - return CONTEXTUAL_SCREENTIP_SET - ///returns the charge level from [0 to 6] /obj/machinery/power/transmission_laser/proc/return_charge() if(!output_level) return 0 return min(round((charge / abs(output_level)) * 6), 6) -/obj/machinery/power/transmission_laser/attack_hand(mob/living/user, list/modifiers) + +/obj/machinery/power/transmission_laser/ui_interact(mob/user, datum/tgui/ui) . = ..() - if(user.istate & ISTATE_SECONDARY) - return - turned_on = !turned_on - to_chat(user, span_notice("You turn the [src] [turned_on ? "On" : "Off"].")) - update_appearance() + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "TransmissionLaser") + ui.open() + ui.set_autoupdate(TRUE) -/obj/machinery/power/transmission_laser/attack_hand_secondary(mob/user, list/modifiers) +/obj/machinery/power/transmission_laser/ui_data(mob/user) . = ..() - firing = !firing - to_chat(user, span_notice("You turn the firing mode on the [src] to [firing ? "On" : "Off"].")) - update_appearance() - if(length(laser_effects) && !firing) - addtimer(CALLBACK(src, PROC_REF(destroy_lasers)), 5 SECONDS) + var/list/data = list() + + data["output"] = output_level + data["total_earnings"] = total_earnings + data["unsent_earnings"] = unsent_earnings + data["held_power"] = charge + data["selling_power"] = selling_power + data["max_capacity"] = capacity + data["max_grid_load"] = max_grid_load + + data["accepting_power"] = turned_on + data["sucking_power"] = inputting + data["firing"] = firing + + data["power_format"] = power_format_multi + data["input_number"] = input_number + data["avalible_input"] = input_available + data["output_number"] = output_number + data["output_multiplier"] = power_format_multi_output + data["input_total"] = input_number * power_format_multi + data["output_total"] = output_number * power_format_multi_output + + return data + +/obj/machinery/power/transmission_laser/ui_act(action, list/params) + . = ..() + if (.) + return + switch(action) + if("toggle_input") + turned_on = !turned_on + update_appearance() + if("toggle_output") + firing = !firing + update_appearance() + + if("set_input") + input_number = clamp(params["set_input"], 0, 999) //multiplies our input by if input + if("set_output") + output_number = clamp(params["set_output"], 0, 999) + + if("inputW") + power_format_multi = 1 + if("inputKW") + power_format_multi = 1 KW + if("inputMW") + power_format_multi = 1 MW + if("inputGW") + power_format_multi = 1 GW + if("inputTW") + power_format_multi = 1 TW + if("inputPW") + power_format_multi = 1 PW + + if("outputW") + power_format_multi_output = 1 + if("outputKW") + power_format_multi_output = 1 KW + if("outputMW") + power_format_multi_output = 1 MW + if("outputGW") + power_format_multi_output = 1 GW + if("outputTW") + power_format_multi_output = 1 TW + if("outputPW") + power_format_multi = 1 PW + /obj/machinery/power/transmission_laser/process() + max_grid_load = terminal.surplus() + input_available = terminal.surplus() if((machine_stat & BROKEN) || !turned_on) return @@ -162,16 +229,16 @@ var/last_fire = firing if(terminal && input_attempt) - input_available = terminal.surplus() + input_pulling = min(terminal.surplus() , input_number * power_format_multi) if(inputting) - if(input_available > 0) - terminal.add_load(input_available) - charge += input_available + if(input_pulling > 0) + terminal.add_load(input_pulling) + charge += input_pulling else inputting = FALSE else - if(input_attempt && input_available > 0) + if(input_attempt && input_pulling > 0) inputting = TRUE else inputting = FALSE @@ -182,7 +249,7 @@ destroy_lasers() if(charge > MINIMUM_POWER && firing) - output_level = max(clamp((charge * 0.2) + MINIMUM_POWER, 0, charge), MINIMUM_POWER) + output_level = min(charge, output_number * power_format_multi_output) if(!length(laser_effects)) setup_lasers() if(length(blocked_objects)) @@ -218,11 +285,14 @@ var/datum/bank_account/department/cargo = SSeconomy.get_dep_account(ACCOUNT_CAR) var/datum/bank_account/department/engineer = SSeconomy.get_dep_account(ACCOUNT_ENG) + var/datum/bank_account/department/security = SSeconomy.get_dep_account(ACCOUNT_SEC) ///the other 25% will be sent to engineers in the future but for now its stored inside var/cargo_cut = generated_cash * 0.25 var/engineering_cut = generated_cash * 0.5 + security.adjust_money(cargo_cut, "Transmission Laser Payout") + unsent_earnings -= cargo_cut engineer.adjust_money(engineering_cut, "Transmission Laser Payout") unsent_earnings -= engineering_cut cargo.adjust_money(cargo_cut, "Transmission Laser Payout") @@ -279,12 +349,16 @@ /obj/effect/transmission_beam/Initialize(mapload, obj/machinery/power/transmission_laser/creator) . = ..() - RegisterSignal(src, COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) + var/turf/source_turf = get_turf(src) + if(source_turf) + RegisterSignal(source_turf, COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) update_appearance() /obj/effect/transmission_beam/Destroy(force) . = ..() - UnregisterSignal(src, COMSIG_ATOM_ENTERED) + var/turf/source_turf = get_turf(src) + if(source_turf) + UnregisterSignal(source_turf, COMSIG_ATOM_ENTERED) /obj/effect/transmission_beam/update_overlays() . = ..() diff --git a/monkestation/code/modules/ghost_players/arena/arena_cleanser.dm b/monkestation/code/modules/ghost_players/arena/arena_cleanser.dm index 1c2712a05010..b7749c762cf0 100644 --- a/monkestation/code/modules/ghost_players/arena/arena_cleanser.dm +++ b/monkestation/code/modules/ghost_players/arena/arena_cleanser.dm @@ -10,8 +10,7 @@ mob.fully_heal() continue qdel(listed_atom) - listed_turf.ScrapeAway() - + listed_turf.baseturfs = list(/turf/open/indestructible/event/plating) var/turf/located = locate(161, 44, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1]) // this grabs the bottom corner turf new /obj/effect/spawner/random_arena_spawner(located) diff --git a/monkestation/code/modules/ghost_players/arena/fight_button.dm b/monkestation/code/modules/ghost_players/arena/fight_button.dm index bd2977d8f29d..4aa53e84e0cf 100644 --- a/monkestation/code/modules/ghost_players/arena/fight_button.dm +++ b/monkestation/code/modules/ghost_players/arena/fight_button.dm @@ -19,10 +19,9 @@ var/list/weapon_choices = list( /obj/item/storage/toolbox, /obj/item/knife/shiv, + /obj/item/grenade/clusterbuster, + /obj/item/spear/bamboospear, ) - ///player storages - var/list/player_one_storage = list() - var/list/player_two_storage = list() /obj/structure/fight_button/Initialize(mapload) . = ..() @@ -132,13 +131,11 @@ return - player_one_storage = player_one.unequip_everything_return_list() - for(var/atom/movable/atom in player_one_storage) - atom.forceMove(src) + player_one.unequip_everything() + player_one.fully_heal() - player_two_storage = player_two.unequip_everything_return_list() - for(var/atom/movable/atom in player_two_storage) - atom.forceMove(src) + player_two.unequip_everything() + player_two.fully_heal() var/obj/item/one_weapon = new weapon_of_choice(src) var/turf/one_spot = locate(161, 49, SSmapping.levels_by_trait(ZTRAIT_CENTCOM)[1]) @@ -166,35 +163,8 @@ player_one.dueling = FALSE player_two.dueling = FALSE - var/turf/player_one_turf = get_turf(player_one) - for(var/atom/movable/atom in player_one_storage) - atom.forceMove(player_one_turf) - - var/turf/player_two_turf = get_turf(player_two) - for(var/atom/movable/atom in player_two_storage) - atom.forceMove(player_two_turf) - - player_one_storage = list() - player_two_storage = list() - player_one = null player_two = null payout = 0 update_maptext() - -/mob/living/proc/unequip_everything_return_list() - var/list/items = list() - items |= get_equipped_items(TRUE) - for(var/I in items) - dropItemToGround(I) - items += drop_all_held_items_return_list() - return items - -/mob/proc/drop_all_held_items_return_list() - . = FALSE - var/list/items = list() - for(var/obj/item/I in held_items) - items += I - . |= dropItemToGround(I) - return items diff --git a/monkestation/code/modules/ghost_players/arena/maps/arcadia.dmm b/monkestation/code/modules/ghost_players/arena/maps/arcadia.dmm index fa0e2ff31cea..44f110f1ca3f 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/arcadia.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/arcadia.dmm @@ -39,11 +39,11 @@ /turf/open/floor/iron/dark/textured_large, /area/centcom/tdome/arena/actual) "iW" = ( -/obj/machinery/light/floor, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/eighties/red, /area/centcom/tdome/arena/actual) "je" = ( -/obj/machinery/light/floor, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/checker, /area/centcom/tdome/arena/actual) "jI" = ( @@ -254,7 +254,7 @@ /turf/open/floor/eighties/red, /area/centcom/tdome/arena/actual) "MS" = ( -/obj/machinery/light/floor, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/eighties, /area/centcom/tdome/arena/actual) "NR" = ( diff --git a/monkestation/code/modules/ghost_players/arena/maps/atlantis.dmm b/monkestation/code/modules/ghost_players/arena/maps/atlantis.dmm index e2923586b970..06e098ddcf56 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/atlantis.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/atlantis.dmm @@ -8,7 +8,7 @@ }, /area/centcom/tdome/arena/actual) "b" = ( -/mob/living/simple_animal/fish/greenchromis, +/mob/living/basic/aquatic/fish, /obj/effect/overlay/water, /turf/open/misc/ashplanet/rocky{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" @@ -39,6 +39,13 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/centcom/tdome/arena/actual) +"i" = ( +/obj/effect/overlay/water, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/ashplanet/rocky{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, +/area/centcom/tdome/arena/actual) "k" = ( /obj/structure/atlantis/column/broken_1, /obj/effect/overlay/water, @@ -51,6 +58,7 @@ /obj/machinery/camera/motion/thunderdome{ pixel_x = 10 }, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/ashplanet/wateryrock{ slowdown = 0 }, @@ -58,6 +66,7 @@ "p" = ( /obj/structure/atlantis/column/broken_2, /obj/effect/overlay/water, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/ashplanet/wateryrock{ slowdown = 0 }, @@ -117,6 +126,23 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/centcom/tdome/arena/actual) +"B" = ( +/obj/item/aquarium_prop/seaweed_top{ + anchored = 1 + }, +/obj/effect/overlay/water, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/ashplanet/rocky{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, +/area/centcom/tdome/arena/actual) +"D" = ( +/obj/effect/overlay/water, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/ashplanet/wateryrock{ + slowdown = 0 + }, +/area/centcom/tdome/arena/actual) "E" = ( /obj/structure/flora/bush/stalky, /obj/effect/overlay/water, @@ -133,8 +159,8 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/centcom/tdome/arena/actual) -"J" = ( -/mob/living/simple_animal/fish/angelfish, +"H" = ( +/mob/living/basic/aquatic/fish/gupper, /obj/effect/overlay/water, /turf/open/misc/ashplanet/rocky{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" @@ -149,6 +175,13 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/centcom/tdome/arena/actual) +"L" = ( +/obj/machinery/light/floor/has_bulb, +/obj/effect/overlay/water, +/turf/open/misc/ashplanet/rocky{ + initial_gas_mix = "o2=22;n2=82;TEMP=293.15" + }, +/area/centcom/tdome/arena/actual) "N" = ( /obj/item/aquarium_prop/seaweed_top{ anchored = 1 @@ -191,14 +224,14 @@ /area/centcom/tdome/arena/actual) "U" = ( /obj/structure/flora/bush/reed/style_3, -/mob/living/simple_animal/fish/guppy, +/mob/living/basic/aquatic/fish/gupper, /obj/effect/overlay/water, /turf/open/misc/ashplanet/rocky{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/centcom/tdome/arena/actual) "V" = ( -/mob/living/simple_animal/fish/plasmatetra, +/mob/living/basic/aquatic/fish/cod, /obj/effect/overlay/water, /turf/open/misc/ashplanet/rocky{ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" @@ -227,13 +260,13 @@ P (2,1,1) = {" P G -P +L P u +i P P -P -N +B P "} (3,1,1) = {" @@ -275,13 +308,13 @@ P (6,1,1) = {" X t +i P P -P -P +i P u -P +i h "} (7,1,1) = {" @@ -311,13 +344,13 @@ z (9,1,1) = {" z z -z +D z z l z z -z +D z "} (10,1,1) = {" @@ -347,13 +380,13 @@ z (12,1,1) = {" X T -P +i E P +i P P -P -P +i g "} (13,1,1) = {" @@ -365,7 +398,7 @@ P P P d -J +V P "} (14,1,1) = {" @@ -382,7 +415,7 @@ P "} (15,1,1) = {" P -P +H P P P @@ -395,13 +428,13 @@ P (16,1,1) = {" P v +i P P -P -N -P +B P P +i P "} (17,1,1) = {" diff --git a/monkestation/code/modules/ghost_players/arena/maps/bottomless_pit.dmm b/monkestation/code/modules/ghost_players/arena/maps/bottomless_pit.dmm index f33058cb9466..31dde1f0c59d 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/bottomless_pit.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/bottomless_pit.dmm @@ -8,6 +8,10 @@ }, /turf/open/floor/wood, /area/centcom/tdome/arena/actual) +"f" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/asteroid, +/area/centcom/tdome/arena/actual) "i" = ( /obj/structure/flora/bush/grassy/style_3, /turf/open/misc/asteroid, @@ -102,7 +106,7 @@ /area/centcom/tdome/arena/actual) "I" = ( /obj/effect/turf_decal/stripes/corner, -/obj/structure/railing/corner, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/asteroid, /area/centcom/tdome/arena/actual) "J" = ( @@ -113,9 +117,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, -/obj/structure/railing/corner{ - dir = 8 - }, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/asteroid, /area/centcom/tdome/arena/actual) "M" = ( @@ -164,9 +166,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/structure/railing/corner{ - dir = 1 - }, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/asteroid, /area/centcom/tdome/arena/actual) "U" = ( @@ -200,9 +200,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/structure/railing/corner{ - dir = 4 - }, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/asteroid, /area/centcom/tdome/arena/actual) @@ -234,10 +232,10 @@ a a q a +f a a -a -a +f i a a @@ -378,10 +376,10 @@ a a a a +f a a -a -a +f a a a diff --git a/monkestation/code/modules/ghost_players/arena/maps/conveyor_shards.dmm b/monkestation/code/modules/ghost_players/arena/maps/conveyor_shards.dmm index e6e85845da2a..f08cb18e9750 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/conveyor_shards.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/conveyor_shards.dmm @@ -17,6 +17,7 @@ /area/centcom/tdome/arena/actual) "bE" = ( /obj/effect/turf_decal/stripes/corner, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/small, /area/centcom/tdome/arena/actual) "dq" = ( @@ -153,6 +154,7 @@ /obj/effect/turf_decal/trimline/yellow/arrow_cw{ dir = 9 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/engine, /area/centcom/tdome/arena/actual) "uz" = ( @@ -210,6 +212,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 8 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/small, /area/centcom/tdome/arena/actual) "BT" = ( @@ -227,6 +230,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/small, /area/centcom/tdome/arena/actual) "Ed" = ( @@ -254,6 +258,7 @@ /obj/effect/turf_decal/trimline/yellow/arrow_cw{ dir = 10 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/engine, /area/centcom/tdome/arena/actual) "Hl" = ( @@ -289,6 +294,7 @@ /obj/effect/turf_decal/trimline/yellow/arrow_cw{ dir = 6 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/engine, /area/centcom/tdome/arena/actual) "MZ" = ( @@ -356,6 +362,7 @@ /obj/effect/turf_decal/trimline/yellow/arrow_cw{ dir = 5 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/engine, /area/centcom/tdome/arena/actual) "VF" = ( @@ -401,6 +408,7 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/dark/small, /area/centcom/tdome/arena/actual) "YL" = ( diff --git a/monkestation/code/modules/ghost_players/arena/maps/cult.dmm b/monkestation/code/modules/ghost_players/arena/maps/cult.dmm index 26d680260c36..d52efd511862 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/cult.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/cult.dmm @@ -8,6 +8,13 @@ /obj/effect/decal/cleanable/blood, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) +"ay" = ( +/obj/structure/railing{ + dir = 1; + color = "#8E5450" + }, +/turf/open/lava, +/area/centcom/tdome/arena/actual) "bk" = ( /obj/structure/destructible/cult/item_dispenser/altar, /obj/item/toy/plush/narplush, @@ -16,11 +23,13 @@ "bw" = ( /turf/open/floor/cult, /area/centcom/tdome/arena/actual) +"bK" = ( +/obj/structure/stone_tile/slab, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/basalt/safe, +/area/centcom/tdome/arena/actual) "bU" = ( -/obj/structure/railing/corner{ - dir = 1; - color = "#8E5450" - }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) "cx" = ( @@ -28,26 +37,7 @@ /obj/item/melee/cultblade/dagger, /turf/open/misc/basalt/safe, /area/centcom/tdome/arena/actual) -"cK" = ( -/obj/structure/railing{ - dir = 8; - color = "#8E5450" - }, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) -"cL" = ( -/obj/structure/railing{ - dir = 8; - color = "#8E5450" - }, -/obj/effect/decal/cleanable/blood, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) "df" = ( -/obj/structure/railing{ - color = "#8E5450" - }, /obj/effect/decal/cleanable/blood/drip{ icon_state = "floor5" }, @@ -58,6 +48,14 @@ /turf/open/floor/cult, /area/centcom/tdome/arena/actual) "dK" = ( +/obj/structure/railing{ + dir = 1; + color = "#8E5450" + }, +/obj/structure/railing{ + dir = 8; + color = "#8E5450" + }, /turf/open/lava, /area/centcom/tdome/arena/actual) "el" = ( @@ -71,6 +69,10 @@ /obj/structure/stone_tile/burnt{ dir = 1 }, +/obj/structure/railing{ + dir = 1; + color = "#8E5450" + }, /turf/open/lava, /area/centcom/tdome/arena/actual) "fs" = ( @@ -78,6 +80,10 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, +/obj/structure/railing{ + dir = 4; + color = "#8E5450" + }, /turf/open/lava, /area/centcom/tdome/arena/actual) "fx" = ( @@ -90,35 +96,21 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, -/turf/open/lava, -/area/centcom/tdome/arena/actual) -"jD" = ( -/obj/structure/railing/corner{ - color = "#8E5450" - }, -/turf/open/floor/cult, +/turf/open/misc/basalt/safe, /area/centcom/tdome/arena/actual) "lb" = ( /obj/structure/stone_tile/burnt{ dir = 4 }, -/turf/open/lava, +/turf/open/misc/basalt/safe, /area/centcom/tdome/arena/actual) "lo" = ( /obj/effect/rune/blood_boil, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) -"lI" = ( -/obj/structure/stone_tile/slab/cracked, -/obj/structure/statue/goliath, -/turf/open/misc/basalt/safe, -/area/centcom/tdome/arena/actual) "lY" = ( -/obj/structure/railing/corner{ - dir = 8; - color = "#8E5450" - }, /obj/effect/decal/cleanable/blood, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) "mw" = ( @@ -142,60 +134,54 @@ /obj/effect/mob_spawn/corpse/human/assistant, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) -"pi" = ( -/obj/structure/railing/corner{ - dir = 8; - color = "#8E5450" - }, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) "pP" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 1 }, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) -"rA" = ( +"qR" = ( /obj/structure/railing{ - dir = 1; + dir = 8; color = "#8E5450" }, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "floor3" +/obj/structure/railing{ + dir = 1; + color = "#8E5450" }, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) -"sO" = ( -/obj/structure/stone_tile/slab, -/obj/structure/statue/goliath, -/turf/open/misc/basalt/safe, +/turf/open/lava, /area/centcom/tdome/arena/actual) -"va" = ( +"tN" = ( /obj/structure/railing{ - dir = 8; + dir = 1; color = "#8E5450" }, -/turf/open/floor/cult, +/obj/structure/railing{ + dir = 4; + color = "#8E5450" + }, +/turf/open/lava, /area/centcom/tdome/arena/actual) "vm" = ( /obj/structure/stone_tile/block/cracked{ dir = 1 }, +/obj/structure/railing{ + dir = 1; + color = "#8E5450" + }, /turf/open/lava, /area/centcom/tdome/arena/actual) "vo" = ( /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) -"xc" = ( +"wM" = ( /obj/structure/railing{ - dir = 1; + dir = 4; color = "#8E5450" }, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 8 - }, -/turf/open/floor/cult, +/turf/open/lava, /area/centcom/tdome/arena/actual) "xd" = ( /obj/effect/rune/teleport, @@ -205,50 +191,43 @@ /obj/structure/stone_tile/block{ dir = 1 }, +/obj/structure/railing{ + dir = 1; + color = "#8E5450" + }, /turf/open/lava, /area/centcom/tdome/arena/actual) "xg" = ( /obj/structure/stone_tile/block{ dir = 4 }, -/turf/open/lava, -/area/centcom/tdome/arena/actual) -"xm" = ( /obj/structure/railing{ - dir = 1; + dir = 4; color = "#8E5450" }, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/cult, +/turf/open/lava, /area/centcom/tdome/arena/actual) "xr" = ( /obj/structure/stone_tile/block/burnt{ dir = 4 }, -/turf/open/lava, +/turf/open/misc/basalt/safe, /area/centcom/tdome/arena/actual) "xt" = ( /obj/effect/mob_spawn/corpse/human/cargo_tech, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) -"xS" = ( -/obj/structure/railing{ - color = "#8E5450" - }, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/gibs, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) "ya" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 }, -/turf/open/lava, -/area/centcom/tdome/arena/actual) -"yj" = ( /obj/structure/railing{ + dir = 8; color = "#8E5450" }, +/turf/open/lava, +/area/centcom/tdome/arena/actual) +"yj" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 6 }, @@ -261,22 +240,29 @@ /obj/structure/stone_tile/burnt{ dir = 4 }, +/obj/structure/railing{ + dir = 8; + color = "#8E5450" + }, /turf/open/lava, /area/centcom/tdome/arena/actual) -"AO" = ( +"zP" = ( +/obj/structure/stone_tile{ + dir = 8 + }, +/obj/structure/stone_tile/cracked, /obj/structure/railing{ color = "#8E5450" }, +/turf/open/lava, +/area/centcom/tdome/arena/actual) +"AO" = ( /obj/effect/decal/cleanable/blood/drip{ icon_state = "drip2" }, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) "AU" = ( -/obj/structure/railing{ - dir = 1; - color = "#8E5450" - }, /obj/effect/decal/cleanable/blood/tracks{ dir = 5 }, @@ -284,31 +270,10 @@ /area/centcom/tdome/arena/actual) "BB" = ( /obj/structure/stone_tile/block/cracked, -/turf/open/lava, -/area/centcom/tdome/arena/actual) -"Dq" = ( -/obj/structure/railing/corner{ - dir = 1; - color = "#8E5450" - }, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) -"Es" = ( -/obj/structure/railing/corner{ - color = "#8E5450" - }, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 8 - }, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) -"EC" = ( -/obj/structure/railing/corner{ - dir = 4; +/obj/structure/railing{ color = "#8E5450" }, -/turf/open/floor/cult, +/turf/open/lava, /area/centcom/tdome/arena/actual) "EG" = ( /obj/effect/rune/manifest, @@ -319,16 +284,6 @@ }, /turf/open/misc/basalt/safe, /area/centcom/tdome/arena/actual) -"FR" = ( -/obj/structure/railing{ - dir = 4; - color = "#8E5450" - }, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 5 - }, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) "Gc" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs, @@ -340,56 +295,46 @@ /obj/effect/rune/raise_dead, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) -"GM" = ( -/obj/structure/railing/corner{ - dir = 4; - color = "#8E5450" - }, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "drip2" +"HB" = ( +/obj/structure/stone_tile/block/cracked{ + dir = 8 }, -/turf/open/floor/cult, +/turf/open/misc/basalt/safe, +/area/centcom/tdome/arena/actual) +"KC" = ( +/obj/structure/fluff/drake_statue, +/obj/structure/stone_tile/slab, +/turf/open/misc/basalt/safe, /area/centcom/tdome/arena/actual) -"GW" = ( +"Ld" = ( /obj/structure/railing{ + dir = 8; color = "#8E5450" }, -/obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) -"JE" = ( /obj/structure/railing{ color = "#8E5450" }, -/obj/effect/decal/cleanable/blood/tracks{ - dir = 8 - }, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) -"KC" = ( -/obj/structure/fluff/drake_statue, -/obj/structure/stone_tile/slab, -/turf/open/misc/basalt/safe, +/turf/open/lava, /area/centcom/tdome/arena/actual) "Mn" = ( /obj/effect/mob_spawn/corpse/human/cook, /obj/effect/decal/cleanable/blood, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) -"Nd" = ( +"My" = ( /obj/structure/railing{ - dir = 1; color = "#8E5450" }, -/obj/effect/decal/cleanable/blood, -/obj/effect/decal/cleanable/blood/gibs, -/turf/open/floor/cult, +/turf/open/lava, /area/centcom/tdome/arena/actual) "NP" = ( /obj/structure/stone_tile/cracked, /obj/structure/stone_tile/burnt{ dir = 8 }, +/obj/structure/railing{ + color = "#8E5450" + }, /turf/open/lava, /area/centcom/tdome/arena/actual) "NS" = ( @@ -401,34 +346,31 @@ /turf/open/misc/basalt/safe, /area/centcom/tdome/arena/actual) "Py" = ( -/obj/structure/railing/corner{ - dir = 4; - color = "#8E5450" - }, /obj/effect/decal/cleanable/blood/tracks{ dir = 8 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) -"PY" = ( +"Rf" = ( /obj/structure/railing{ - dir = 1; + dir = 4; color = "#8E5450" }, -/obj/effect/decal/cleanable/blood/drip, -/turf/open/floor/cult, -/area/centcom/tdome/arena/actual) -"RX" = ( /obj/structure/railing{ - dir = 4; + dir = 1; color = "#8E5450" }, -/turf/open/floor/cult, +/turf/open/lava, /area/centcom/tdome/arena/actual) "Sr" = ( /obj/structure/stone_tile/block/burnt{ dir = 1 }, +/obj/structure/railing{ + dir = 1; + color = "#8E5450" + }, /turf/open/lava, /area/centcom/tdome/arena/actual) "Ss" = ( @@ -436,23 +378,17 @@ /turf/open/floor/cult, /area/centcom/tdome/arena/actual) "TH" = ( -/obj/structure/railing/corner{ - dir = 4; - color = "#8E5450" - }, /obj/effect/decal/cleanable/blood/tracks{ dir = 10 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) "TV" = ( -/obj/structure/railing{ - dir = 4; - color = "#8E5450" - }, /obj/effect/decal/cleanable/blood/drip{ icon_state = "drip4" }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/cult, /area/centcom/tdome/arena/actual) "Uc" = ( @@ -462,15 +398,24 @@ /obj/structure/stone_tile/cracked, /turf/open/lava, /area/centcom/tdome/arena/actual) +"Ui" = ( +/obj/structure/railing{ + dir = 4; + color = "#8E5450" + }, +/obj/structure/railing{ + color = "#8E5450" + }, +/turf/open/lava, +/area/centcom/tdome/arena/actual) "Vs" = ( /obj/structure/stone_tile/slab/cracked, /turf/open/misc/basalt/safe, /area/centcom/tdome/arena/actual) -"Vv" = ( -/obj/structure/railing{ - color = "#8E5450" - }, -/turf/open/floor/cult, +"Wf" = ( +/obj/structure/stone_tile/slab/cracked, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/basalt/safe, /area/centcom/tdome/arena/actual) "Wt" = ( /obj/effect/decal/cleanable/blood/drip{ @@ -495,42 +440,42 @@ (1,1,1) = {" bw bw -Vv +bw vm -lI -sO +Vs +NT Uc my ax bw "} (2,1,1) = {" -RX -EC -Vv -dK +bw +bw +bw +tN xr hG -dK +wM my -jD -RX +bw +bw "} (3,1,1) = {" -dK -my +Ld +bw lY -cK -va -va -va +Ss +bw +bw +bw bU -GW +Ss dK "} (4,1,1) = {" -dK -PY +My +vo fx oj bw @@ -538,11 +483,11 @@ YN ax bw AO -dK +ay "} (5,1,1) = {" -dK -rA +My +mw fx vo Gc @@ -550,41 +495,41 @@ bw lo Zb df -dK +ay "} (6,1,1) = {" -dK -my -Es -RX -RX -RX -RX +Ui +bw Py -Vv -dK +bw +bw +bw +bw +Py +bw +tN "} (7,1,1) = {" -va -Dq -JE +bw +Ss +fx dK yG ya -dK -xc -pi -va +Ld +fx +bw +bw "} (8,1,1) = {" XM mV -JE +fx xe -NT +bK am -Uc -xc +zP +fx bw Ss "} @@ -603,96 +548,96 @@ ax (10,1,1) = {" el NS -Vv +bw vm -Vs +Wf cx NP -xm +Ss xt vo "} (11,1,1) = {" -RX -GM -Vv -dK +bw +AO +bw +tN xg fs -dK -my -jD -RX +Ui +bw +bw +bw "} (12,1,1) = {" -dK -Nd -pi -va -va -va -cL +Ld +Gc bU -Vv -dK +bw +bw +bw +ax +bU +bw +qR "} (13,1,1) = {" -dK -my +My +bw dJ bw mw Wt bw bw -xS -dK +Gc +ay "} (14,1,1) = {" -dK -my +My +bw bw ax xd Ss Mn bw -Vv -dK +bw +ay "} (15,1,1) = {" -dK -xm -jD +Ui +Ss +bU TV -RX -RX -FR +bw +bw +AU TH -Vv -dK +bw +Rf "} (16,1,1) = {" -va -bU -Vv +bw +bw +bw dK lb -ya -dK -xc -pi -va +HB +Ld +fx +bw +bw "} (17,1,1) = {" bw ax -Vv +bw Sr -sO -lI +NT +Vs BB -xc +fx Ss bw "} diff --git a/monkestation/code/modules/ghost_players/arena/maps/diner.dmm b/monkestation/code/modules/ghost_players/arena/maps/diner.dmm index 0091661d8336..8703b0fc7578 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/diner.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/diner.dmm @@ -63,6 +63,7 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, /area/centcom/tdome/arena/actual) "jL" = ( @@ -81,6 +82,7 @@ /obj/machinery/camera/motion/thunderdome{ pixel_x = 10 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron, /area/centcom/tdome/arena/actual) "lO" = ( @@ -94,6 +96,10 @@ }, /turf/open/floor/iron/cafeteria, /area/centcom/tdome/arena/actual) +"mo" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/cafeteria, +/area/centcom/tdome/arena/actual) "mv" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -281,6 +287,7 @@ pixel_y = 30 }, /obj/effect/decal/cleanable/blood, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/cafeteria, /area/centcom/tdome/arena/actual) "Fp" = ( @@ -330,6 +337,10 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/wood, /area/centcom/tdome/arena/actual) +"Mp" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/wood, +/area/centcom/tdome/arena/actual) "NQ" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, @@ -359,6 +370,11 @@ /obj/machinery/deepfryer, /turf/open/floor/iron/cafeteria, /area/centcom/tdome/arena/actual) +"Rn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/wood, +/area/centcom/tdome/arena/actual) "RD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -385,6 +401,7 @@ /obj/structure/disposalpipe/segment{ dir = 9 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/wood/large, /area/centcom/tdome/arena/actual) "Vj" = ( @@ -401,6 +418,11 @@ }, /turf/open/floor/iron/cafeteria, /area/centcom/tdome/arena/actual) +"WK" = ( +/obj/structure/table/wood/poker, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet, +/area/centcom/tdome/arena/actual) "WQ" = ( /obj/machinery/gibber, /turf/open/floor/iron/cafeteria, @@ -434,14 +456,14 @@ GL "} (2,1,1) = {" aQ -GL +Mp NQ GL GL -GL +Mp GL JO -GL +Mp NQ "} (3,1,1) = {" @@ -470,14 +492,14 @@ GL "} (5,1,1) = {" um -ih +mo ih Ah jL Um GL GL -GL +Mp ET "} (6,1,1) = {" @@ -525,7 +547,7 @@ xl lt GL lO -vl +WK GL "} (10,1,1) = {" @@ -566,14 +588,14 @@ qB "} (13,1,1) = {" go -ih +mo ih FM jL iS NQ GL -NQ +Rn zT "} (14,1,1) = {" @@ -602,14 +624,14 @@ GL "} (16,1,1) = {" ix +Mp GL GL GL -GL -GL +Mp GL pD -GL +Mp GL "} (17,1,1) = {" diff --git a/monkestation/code/modules/ghost_players/arena/maps/flowers.dmm b/monkestation/code/modules/ghost_players/arena/maps/flowers.dmm index bc6350a37641..189199cd1e8d 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/flowers.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/flowers.dmm @@ -17,6 +17,7 @@ /obj/machinery/camera/motion/thunderdome{ pixel_x = 10 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/grass, /area/centcom/tdome/arena/actual) "o" = ( @@ -27,6 +28,11 @@ /obj/item/food/honey_roll, /turf/open/floor/grass, /area/centcom/tdome/arena/actual) +"t" = ( +/obj/structure/flora/bush/flowers_yw/style_random, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/grass, +/area/centcom/tdome/arena/actual) "u" = ( /obj/structure/flora/bush/flowers_pp/style_random, /obj/item/toy/plush/beeplushie, @@ -77,6 +83,10 @@ "V" = ( /turf/open/floor/grass, /area/centcom/tdome/arena/actual) +"X" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/grass, +/area/centcom/tdome/arena/actual) "Y" = ( /obj/structure/flora/bush/grassy/style_random, /mob/living/basic/butterfly, @@ -110,12 +120,12 @@ V (3,1,1) = {" V V -V +X V M V S -V +X V C "} @@ -158,12 +168,12 @@ C (7,1,1) = {" C V -P +t V S V V -V +X V V "} @@ -184,7 +194,7 @@ S C V V -V +X m V V @@ -206,12 +216,12 @@ f (11,1,1) = {" I V -V +X V I V S -P +t V V "} @@ -254,12 +264,12 @@ A (15,1,1) = {" V M -V +X V I V V -P +t V C "} diff --git a/monkestation/code/modules/ghost_players/arena/maps/hive.dmm b/monkestation/code/modules/ghost_players/arena/maps/hive.dmm index c0aaa10b9c22..36296e1829eb 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/hive.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/hive.dmm @@ -134,6 +134,13 @@ }, /turf/open/floor/iron/dark, /area/centcom/tdome/arena/actual) +"HZ" = ( +/obj/structure/alien/weeds{ + obj_flags = null + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/dark, +/area/centcom/tdome/arena/actual) "Is" = ( /obj/structure/alien/weeds{ obj_flags = null @@ -205,11 +212,11 @@ Fp ih ih lO -ih +HZ rX rX ih -ih +HZ ih ih "} @@ -254,9 +261,9 @@ ih ih ih lO -ih +HZ rX -ih +HZ ih ih ih @@ -278,9 +285,9 @@ sd rt ih ih -ih +HZ rX -ih +HZ gC ih ih @@ -325,11 +332,11 @@ ih ih ih lO -ih +HZ rX rX nn -ih +HZ ih ih "} diff --git a/monkestation/code/modules/ghost_players/arena/maps/jungle.dmm b/monkestation/code/modules/ghost_players/arena/maps/jungle.dmm index 67f945ff75bd..328ea4ff40ef 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/jungle.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/jungle.dmm @@ -26,10 +26,20 @@ /obj/structure/punji_sticks/spikes, /turf/open/misc/grass/jungle, /area/centcom/tdome/arena/actual) +"s" = ( +/obj/structure/flora/bush/large/style_random, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/grass/jungle, +/area/centcom/tdome/arena/actual) "u" = ( /obj/structure/flora/bush/fullgrass/style_random, /turf/open/misc/grass/jungle, /area/centcom/tdome/arena/actual) +"A" = ( +/obj/structure/flora/bush/fullgrass/style_random, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/grass/jungle, +/area/centcom/tdome/arena/actual) "B" = ( /obj/structure/flora/bush/jungle/a/style_2, /turf/open/misc/grass/jungle, @@ -42,6 +52,11 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/misc/grass/jungle, /area/centcom/tdome/arena/actual) +"H" = ( +/obj/structure/flora/bush/grassy/style_random, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/grass/jungle, +/area/centcom/tdome/arena/actual) "K" = ( /turf/open/misc/grass/jungle, /area/centcom/tdome/arena/actual) @@ -64,6 +79,10 @@ /obj/structure/punji_sticks, /turf/open/water, /area/centcom/tdome/arena/actual) +"U" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/grass/jungle, +/area/centcom/tdome/arena/actual) "Y" = ( /obj/structure/flora/bush/lavendergrass/style_3, /turf/open/misc/grass/jungle, @@ -83,14 +102,14 @@ C "} (2,1,1) = {" K -K +U K K K K l K -K +U C "} (3,1,1) = {" @@ -123,7 +142,7 @@ K K K K -h +s K q K @@ -144,12 +163,12 @@ K (7,1,1) = {" a a -F +H K K Y F -F +H a a "} @@ -192,12 +211,12 @@ a (11,1,1) = {" a a -F +H K F K Y -F +H a a "} @@ -219,7 +238,7 @@ K q K K -K +U K K K @@ -251,14 +270,14 @@ n "} (16,1,1) = {" K -K +U K K u K S Y -u +A K "} (17,1,1) = {" diff --git a/monkestation/code/modules/ghost_players/arena/maps/lockers.dmm b/monkestation/code/modules/ghost_players/arena/maps/lockers.dmm index 3c8f47dc9d08..10354898af26 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/lockers.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/lockers.dmm @@ -47,6 +47,7 @@ "p" = ( /obj/machinery/shower/directional/east, /obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/freezer, /area/centcom/tdome/arena/actual) "q" = ( @@ -62,18 +63,32 @@ "x" = ( /obj/structure/window/reinforced/spawner, /obj/machinery/shower/directional/east, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/freezer, /area/centcom/tdome/arena/actual) "z" = ( /obj/machinery/shower/directional/west, /obj/structure/window/reinforced/spawner/directional/north, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/freezer, /area/centcom/tdome/arena/actual) +"A" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/plastic, +/area/centcom/tdome/arena/actual) "C" = ( /obj/structure/window/reinforced/spawner, /obj/machinery/shower/directional/west, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/freezer, /area/centcom/tdome/arena/actual) +"E" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/plastic, +/area/centcom/tdome/arena/actual) "H" = ( /obj/structure/sign/poster/official/no_erp{ pixel_x = 32 @@ -126,12 +141,12 @@ (1,1,1) = {" l a -a +A S S o S -a +A a l "} @@ -162,12 +177,12 @@ l (4,1,1) = {" l a -a +A O j O -O -a +E +A a l "} @@ -282,12 +297,12 @@ l (14,1,1) = {" l a -a +A S S S S -a +A a l "} @@ -318,12 +333,12 @@ l (17,1,1) = {" l a -a +A O i O O -a +A a l "} diff --git a/monkestation/code/modules/ghost_players/arena/maps/monastery.dmm b/monkestation/code/modules/ghost_players/arena/maps/monastery.dmm index c7dd93ef1fb5..926a99d70851 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/monastery.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/monastery.dmm @@ -280,6 +280,10 @@ /obj/structure/flora/bush/flowers_br, /turf/open/floor/grass, /area/centcom/tdome/arena/actual) +"TW" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet, +/area/centcom/tdome/arena/actual) "Vg" = ( /obj/structure/table/wood/fancy, /turf/open/floor/iron/dark, @@ -338,7 +342,7 @@ xA rX Tw Oz -Mk +TW Mk ox ox @@ -386,7 +390,7 @@ rX Oz Kv bd -Mk +TW Mk EZ EZ @@ -425,7 +429,7 @@ VZ Mb Mk Mk -Mk +TW Mk "} (10,1,1) = {" @@ -458,7 +462,7 @@ rX Oz Wj tC -Mk +TW Mk EZ EZ @@ -506,7 +510,7 @@ rX Eb rX Oz -Mk +TW Mk wf wf diff --git a/monkestation/code/modules/ghost_players/arena/maps/museum.dmm b/monkestation/code/modules/ghost_players/arena/maps/museum.dmm index 49e9ff6411ca..f3a727c045a6 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/museum.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/museum.dmm @@ -154,6 +154,7 @@ /obj/effect/turf_decal/siding/white{ dir = 6 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/plastic, /area/centcom/tdome/arena/actual) "wZ" = ( @@ -167,6 +168,7 @@ /obj/effect/turf_decal/siding/white{ dir = 5 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/plastic, /area/centcom/tdome/arena/actual) "yn" = ( @@ -240,6 +242,23 @@ /obj/effect/turf_decal/siding/white{ dir = 10 }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/plastic, +/area/centcom/tdome/arena/actual) +"FT" = ( +/obj/effect/turf_decal/siding/white, +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 4 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/plastic, +/area/centcom/tdome/arena/actual) +"GN" = ( +/obj/effect/turf_decal/siding/thinplating/corner, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/plastic, /area/centcom/tdome/arena/actual) "Im" = ( @@ -339,6 +358,7 @@ /obj/effect/turf_decal/siding/white{ dir = 9 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/plastic, /area/centcom/tdome/arena/actual) "VF" = ( @@ -361,6 +381,16 @@ }, /turf/open/floor/plastic, /area/centcom/tdome/arena/actual) +"WW" = ( +/obj/effect/turf_decal/siding/thinplating/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/plastic, +/area/centcom/tdome/arena/actual) "YF" = ( /obj/effect/turf_decal/siding/thinplating, /obj/effect/turf_decal/siding/white{ @@ -383,10 +413,10 @@ TW AA ro -tz +FT bs bs -Wk +GN ro OV TW @@ -578,7 +608,7 @@ EW Di bs bs -Cz +WW EW Ky TW diff --git a/monkestation/code/modules/ghost_players/arena/maps/neon.dmm b/monkestation/code/modules/ghost_players/arena/maps/neon.dmm index b6876200b4ee..f6560cd9fa9a 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/neon.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/neon.dmm @@ -1,11 +1,15 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"bA" = ( +"aZ" = ( /obj/structure/railing{ - dir = 4 - }, -/obj/structure/railing/corner{ dir = 8 }, +/obj/structure/railing{ + dir = 1; + layer = 3.1 + }, +/turf/open/floor/carpet/red, +/area/centcom/tdome/arena/actual) +"bA" = ( /obj/effect/turf_decal/siding/thinplating/light/corner{ dir = 8 }, @@ -16,10 +20,32 @@ density = 1 }, /area/centcom/tdome/arena/actual) -"hX" = ( +"fy" = ( /obj/structure/railing{ - dir = 6 + dir = 1; + layer = 3.1 }, +/turf/open/floor/carpet/red, +/area/centcom/tdome/arena/actual) +"fR" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/carpet/neon/simple/blue/nodots, +/area/centcom/tdome/arena/actual) +"he" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/carpet/red, +/area/centcom/tdome/arena/actual) +"hn" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/turf/open/space/basic, +/area/centcom/tdome/arena/actual) +"hX" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 }, @@ -28,33 +54,21 @@ }, /area/centcom/tdome/arena/actual) "ih" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/thinplating/light, /turf/open/floor/fakespace{ density = 1 }, /area/centcom/tdome/arena/actual) "ip" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/light{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, -/turf/open/floor/fakespace{ - density = 1 - }, +/turf/open/space/basic, /area/centcom/tdome/arena/actual) "iB" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating/light{ dir = 1 }, @@ -63,26 +77,57 @@ }, /area/centcom/tdome/arena/actual) "jn" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/light{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, +/turf/open/space/basic, +/area/centcom/tdome/arena/actual) +"ju" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 9 + }, /turf/open/floor/fakespace{ density = 1 }, /area/centcom/tdome/arena/actual) "ki" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/carpet/red, /area/centcom/tdome/arena/actual) +"km" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 10 + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/fakespace{ + density = 1 + }, +/area/centcom/tdome/arena/actual) +"ku" = ( +/obj/structure/railing, +/turf/open/floor/carpet/red, +/area/centcom/tdome/arena/actual) +"kX" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 1; + layer = 3.1 + }, +/turf/open/floor/carpet/blue, +/area/centcom/tdome/arena/actual) "lO" = ( +/obj/structure/railing, /turf/open/floor/carpet/blue, /area/centcom/tdome/arena/actual) "mf" = ( @@ -93,9 +138,6 @@ /turf/open/floor/carpet/neon/simple/red, /area/centcom/tdome/arena/actual) "mi" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, @@ -104,20 +146,21 @@ }, /area/centcom/tdome/arena/actual) "mA" = ( -/obj/structure/railing{ - dir = 5 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 5 }, +/obj/structure/railing{ + dir = 1; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 4 + }, /turf/open/floor/fakespace{ density = 1 }, /area/centcom/tdome/arena/actual) "nk" = ( -/obj/structure/railing{ - dir = 10 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 10 }, @@ -125,19 +168,20 @@ density = 1 }, /area/centcom/tdome/arena/actual) -"nz" = ( +"nu" = ( /obj/structure/railing{ dir = 4 }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/neon/simple/red/nodots, +/area/centcom/tdome/arena/actual) +"nz" = ( /obj/effect/turf_decal/siding/thinplating/light{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, @@ -160,9 +204,6 @@ /turf/open/floor/carpet/red, /area/centcom/tdome/arena/actual) "oJ" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, @@ -170,13 +211,13 @@ density = 1 }, /area/centcom/tdome/arena/actual) -"rF" = ( +"qD" = ( /obj/structure/railing{ - dir = 10 - }, -/obj/structure/railing/corner{ dir = 4 }, +/turf/open/floor/carpet/neon/simple/red/nodots, +/area/centcom/tdome/arena/actual) +"rF" = ( /obj/effect/turf_decal/siding/thinplating/light/corner{ dir = 4 }, @@ -188,31 +229,28 @@ }, /area/centcom/tdome/arena/actual) "rN" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/thinplating/dark, /obj/machinery/camera/motion/thunderdome{ pixel_x = 10 }, +/obj/structure/railing, /turf/open/floor/fakespace{ density = 1 }, /area/centcom/tdome/arena/actual) "rX" = ( +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/carpet/neon/simple/purple/nodots, /area/centcom/tdome/arena/actual) "vc" = ( -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/light{ dir = 4 }, /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 }, -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 }, @@ -220,24 +258,21 @@ density = 1 }, /area/centcom/tdome/arena/actual) +"vh" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/blue, +/area/centcom/tdome/arena/actual) "vV" = ( -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/dark/corner, /turf/open/floor/fakespace{ density = 1 }, /area/centcom/tdome/arena/actual) "wq" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/light{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating/dark/corner, -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, @@ -245,11 +280,46 @@ density = 1 }, /area/centcom/tdome/arena/actual) -"CE" = ( +"wL" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/red, +/area/centcom/tdome/arena/actual) +"xX" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/carpet/neon/simple/blue/nodots, +/area/centcom/tdome/arena/actual) +"yC" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/centcom/tdome/arena/actual) +"AB" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/carpet/neon/simple/red/nodots, +/area/centcom/tdome/arena/actual) +"Cd" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 1; + layer = 3.1 + }, +/turf/open/floor/carpet/neon/simple/blue/nodots, +/area/centcom/tdome/arena/actual) +"CC" = ( /obj/structure/railing{ dir = 8 }, -/obj/structure/railing/corner, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/neon/simple/red/nodots, +/area/centcom/tdome/arena/actual) +"CE" = ( /obj/effect/turf_decal/siding/thinplating/light/corner, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 8 @@ -258,10 +328,21 @@ density = 1 }, /area/centcom/tdome/arena/actual) -"EZ" = ( -/obj/structure/railing/corner{ - dir = 1 +"Dp" = ( +/obj/structure/railing{ + dir = 8 }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/neon/simple/blue/nodots, +/area/centcom/tdome/arena/actual) +"Ek" = ( +/obj/structure/railing{ + dir = 1; + layer = 3.1 + }, +/turf/open/floor/carpet/blue, +/area/centcom/tdome/arena/actual) +"EZ" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 1 }, @@ -270,19 +351,44 @@ }, /area/centcom/tdome/arena/actual) "Fp" = ( -/obj/structure/railing, /obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/railing, /turf/open/floor/fakespace{ density = 1 }, /area/centcom/tdome/arena/actual) +"FI" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/neon/simple/blue/nodots, +/area/centcom/tdome/arena/actual) +"Gr" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/carpet/neon/simple/red/nodots, +/area/centcom/tdome/arena/actual) +"GH" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/carpet/neon/simple/purple/nodots, +/area/centcom/tdome/arena/actual) "HK" = ( /turf/open/floor/carpet/neon/simple/red/nodots, /area/centcom/tdome/arena/actual) -"JZ" = ( -/obj/structure/railing/corner{ - dir = 8 +"Ju" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 5 + }, +/turf/open/floor/fakespace{ + density = 1 }, +/area/centcom/tdome/arena/actual) +"JZ" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 8 }, @@ -293,28 +399,30 @@ "Kv" = ( /turf/open/floor/carpet/neon/simple/blue/nodots, /area/centcom/tdome/arena/actual) -"Mk" = ( +"KY" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/neon/simple/blue/nodots, +/area/centcom/tdome/arena/actual) +"LE" = ( /obj/structure/railing{ - dir = 6 + dir = 4 }, -/obj/structure/railing/corner{ - dir = 1 +/obj/structure/railing{ + dir = 1; + layer = 3.1 }, +/turf/open/floor/carpet/neon/simple/blue/nodots, +/area/centcom/tdome/arena/actual) +"Mk" = ( /obj/effect/turf_decal/siding/thinplating/light/corner{ dir = 1 }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 6 }, -/turf/open/floor/fakespace{ - density = 1 - }, +/turf/open/space/basic, /area/centcom/tdome/arena/actual) "Mw" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/light{ dir = 1 }, @@ -324,12 +432,13 @@ }, /area/centcom/tdome/arena/actual) "NQ" = ( -/obj/structure/railing{ - dir = 1 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 }, +/obj/structure/railing{ + dir = 1; + layer = 3.1 + }, /turf/open/floor/fakespace{ density = 1 }, @@ -341,13 +450,33 @@ }, /turf/open/floor/carpet/blue, /area/centcom/tdome/arena/actual) -"TN" = ( +"PS" = ( +/obj/structure/railing, /obj/structure/railing{ - dir = 1 - }, -/obj/structure/railing/corner{ dir = 8 }, +/turf/open/floor/carpet/neon/simple/red/nodots, +/area/centcom/tdome/arena/actual) +"Qu" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/carpet/blue, +/area/centcom/tdome/arena/actual) +"Tp" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 6 + }, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/fakespace{ + density = 1 + }, +/area/centcom/tdome/arena/actual) +"TN" = ( /obj/effect/turf_decal/siding/thinplating/light{ dir = 1 }, @@ -358,19 +487,17 @@ density = 1 }, /area/centcom/tdome/arena/actual) +"UK" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/carpet/neon/simple/red/nodots, +/area/centcom/tdome/arena/actual) "Wj" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/siding/thinplating/light{ dir = 8 }, /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 4 }, -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 4 }, @@ -391,20 +518,21 @@ }, /area/centcom/tdome/arena/actual) "XA" = ( -/obj/structure/railing{ - dir = 9 - }, /obj/effect/turf_decal/siding/thinplating/dark{ dir = 9 }, +/obj/structure/railing{ + dir = 1; + layer = 3.1 + }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/fakespace{ density = 1 }, /area/centcom/tdome/arena/actual) "Zz" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /obj/effect/turf_decal/siding/thinplating/dark/corner{ dir = 4 }, @@ -418,8 +546,8 @@ Xf Xf Xf ih -lO -lO +Ek +vh lO iB Xf @@ -430,7 +558,7 @@ mi Zz Xf ih -lO +Ek PD lO iB @@ -438,38 +566,38 @@ vV mi "} (3,1,1) = {" -HK -mA +PS +Ju Zz ih -lO -lO -lO +kX +yC +Qu Mw hX -Kv +Cd "} (4,1,1) = {" HK -HK -mA +PS +Ju bA Wj wq ip Mk -Kv +Cd Kv "} (5,1,1) = {" HK HK -HK -HK +AB +CC rX rX -Kv -Kv +Dp +xX Kv Kv "} @@ -479,7 +607,7 @@ HK HK HK XA -nk +km Kv Kv Kv @@ -512,12 +640,12 @@ Kv (9,1,1) = {" mf HK -HK +UK nB NQ rN nB -Kv +KY Kv Wl "} @@ -551,7 +679,7 @@ HK HK HK mA -hX +Tp Kv Kv Kv @@ -560,47 +688,47 @@ Kv (13,1,1) = {" HK HK -HK -HK -rX -rX -Kv -Kv +qD +nu +GH +GH +FI +fR Kv Kv "} (14,1,1) = {" HK -HK -XA +Gr +ju CE vc nz jn rF -Kv +LE Kv "} (15,1,1) = {" -HK -XA +Gr +ju EZ ih -ki -ki +aZ +he ki TN nk -Kv +LE "} (16,1,1) = {" oJ -EZ +hn Xf ih -ki +fy oG -ki +ku iB JZ oJ @@ -610,9 +738,9 @@ Xf Xf Xf ih -ki -ki -ki +fy +wL +ku iB Xf Xf diff --git a/monkestation/code/modules/ghost_players/arena/maps/snow.dmm b/monkestation/code/modules/ghost_players/arena/maps/snow.dmm index 2573b6ed741a..1bf45782f404 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/snow.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/snow.dmm @@ -23,6 +23,7 @@ pixel_y = 7; color = " #DCDCDC" }, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/dirt, /area/centcom/tdome/arena/actual) "go" = ( @@ -80,6 +81,7 @@ /area/centcom/tdome/arena/actual) "mv" = ( /obj/structure/flora/tree/dead/style_4, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/snow/actually_safe, /area/centcom/tdome/arena/actual) "mG" = ( @@ -87,6 +89,7 @@ /area/centcom/tdome/arena/actual) "oa" = ( /obj/structure/flora/tree/dead/style_5, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/snow/actually_safe, /area/centcom/tdome/arena/actual) "ol" = ( @@ -113,6 +116,10 @@ /obj/structure/fence/cut/large, /turf/open/misc/snow/actually_safe, /area/centcom/tdome/arena/actual) +"rJ" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/snow/actually_safe, +/area/centcom/tdome/arena/actual) "rX" = ( /obj/structure/loom, /turf/open/floor/wood/large, @@ -144,6 +151,7 @@ pixel_y = 7; color = " #DCDCDC" }, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/dirt, /area/centcom/tdome/arena/actual) "vl" = ( @@ -254,12 +262,21 @@ pixel_y = 7; color = " #DCDCDC" }, +/obj/machinery/light/floor/has_bulb, /turf/open/misc/dirt, /area/centcom/tdome/arena/actual) "RD" = ( /obj/structure/fluff/fokoff_sign, /turf/open/misc/snow/actually_safe, /area/centcom/tdome/arena/actual) +"SH" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/wood/large, +/area/centcom/tdome/arena/actual) +"Tr" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/plating/snowed/smoothed/icemoon, +/area/centcom/tdome/arena/actual) "Ty" = ( /obj/item/wallframe/picture{ pixel_x = -30 @@ -306,7 +323,7 @@ EZ EZ "} (2,1,1) = {" -pD +Tr By pD EZ @@ -331,15 +348,15 @@ qB "} (4,1,1) = {" zi -mi +SH Ty rX cc mG -EZ +rJ pD EZ -EZ +rJ "} (5,1,1) = {" um @@ -370,7 +387,7 @@ Pb Pb mi mi -mi +SH mG Ju EZ @@ -418,7 +435,7 @@ mi Pb mi mi -mi +SH mG FM EZ @@ -451,15 +468,15 @@ pD "} (14,1,1) = {" zl -mi +SH mi hm Ah mG -pD -EZ +Tr EZ EZ +rJ "} (15,1,1) = {" mG @@ -474,7 +491,7 @@ HK GL "} (16,1,1) = {" -pD +Tr bl pD EZ diff --git a/monkestation/code/modules/ghost_players/arena/maps/snowfort.dmm b/monkestation/code/modules/ghost_players/arena/maps/snowfort.dmm index 5943405478b7..8ff99b1717ec 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/snowfort.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/snowfort.dmm @@ -13,6 +13,7 @@ /obj/effect/turf_decal/weather/snow/corner{ dir = 6 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/fakeice/slippery, /area/centcom/tdome/arena/actual) "g" = ( @@ -56,6 +57,10 @@ /obj/structure/flora/tree/pine/style_random, /turf/open/misc/snow/actually_safe, /area/centcom/tdome/arena/actual) +"v" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/snow/actually_safe, +/area/centcom/tdome/arena/actual) "w" = ( /obj/item/toy/snowball, /obj/item/toy/snowball, @@ -64,6 +69,10 @@ /obj/item/toy/snowball, /turf/open/misc/snow/actually_safe, /area/centcom/tdome/arena/actual) +"C" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/fakeice/slippery, +/area/centcom/tdome/arena/actual) "E" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 9 @@ -99,9 +108,16 @@ /obj/structure/statue/snow/snowlegion, /turf/open/misc/snow/actually_safe, /area/centcom/tdome/arena/actual) +"R" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/fakeice/slippery, +/area/centcom/tdome/arena/actual) (1,1,1) = {" -a +v a a a @@ -110,7 +126,7 @@ a a a b -a +v "} (2,1,1) = {" b @@ -151,12 +167,12 @@ u (5,1,1) = {" a b +v a a a a -a -a +v a b "} @@ -189,9 +205,9 @@ a a a E +C c -c -n +R a a b @@ -213,7 +229,7 @@ b a a g -c +C c f a @@ -247,12 +263,12 @@ a (13,1,1) = {" a a +v a a a a -a -a +v a a "} @@ -293,7 +309,7 @@ a a "} (17,1,1) = {" -a +v a a a @@ -302,5 +318,5 @@ a a a b -a +v "} diff --git a/monkestation/code/modules/ghost_players/arena/maps/syndie.dmm b/monkestation/code/modules/ghost_players/arena/maps/syndie.dmm index 932176831464..13ea2da5ded8 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/syndie.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/syndie.dmm @@ -8,6 +8,13 @@ /obj/effect/turf_decal/trimline/dark_red/filled, /turf/open/floor/mineral/plastitanium, /area/centcom/tdome/arena/actual) +"bd" = ( +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 6 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/mineral/plastitanium, +/area/centcom/tdome/arena/actual) "bs" = ( /obj/effect/turf_decal/trimline/dark/arrow_cw{ dir = 1 @@ -38,6 +45,10 @@ }, /turf/open/floor/mineral/plastitanium, /area/centcom/tdome/arena/actual) +"eP" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/mineral/plastitanium, +/area/centcom/tdome/arena/actual) "fs" = ( /obj/effect/turf_decal/trimline/dark_red/filled/shrink_cw, /turf/open/floor/mineral/plastitanium, @@ -52,6 +63,13 @@ /obj/effect/turf_decal/trimline/dark_red/filled/shrink_ccw, /turf/open/floor/mineral/plastitanium, /area/centcom/tdome/arena/actual) +"gu" = ( +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 9 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/mineral/plastitanium, +/area/centcom/tdome/arena/actual) "hA" = ( /obj/structure/cable, /obj/structure/cable/layer3, @@ -167,6 +185,7 @@ /obj/effect/turf_decal/trimline/dark_red/filled/mid_joiner{ dir = 1 }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/mineral/plastitanium, /area/centcom/tdome/arena/actual) "BY" = ( @@ -237,6 +256,7 @@ "KT" = ( /obj/effect/turf_decal/trimline/dark_red, /obj/effect/turf_decal/trimline/dark_red/filled/mid_joiner, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/mineral/plastitanium, /area/centcom/tdome/arena/actual) "Lu" = ( @@ -247,6 +267,13 @@ /obj/effect/turf_decal/trimline/dark/arrow_ccw, /turf/open/floor/pod/dark, /area/centcom/tdome/arena/actual) +"LN" = ( +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 5 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/mineral/plastitanium, +/area/centcom/tdome/arena/actual) "Mj" = ( /obj/effect/turf_decal/trimline/dark_red/filled/warning{ dir = 4 @@ -285,6 +312,13 @@ }, /turf/open/floor/mineral/plastitanium, /area/centcom/tdome/arena/actual) +"PC" = ( +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 10 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/mineral/plastitanium, +/area/centcom/tdome/arena/actual) "PS" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/dark/arrow_ccw{ @@ -378,12 +412,12 @@ rl (2,1,1) = {" wZ Na -cj +gu YF BY nt jA -TW +PC mI hA "} @@ -461,14 +495,14 @@ hA "} (9,1,1) = {" wZ -cT +eP fE VF hL ds VF QQ -cT +eP hA "} (10,1,1) = {" @@ -546,12 +580,12 @@ YL (16,1,1) = {" wZ yt -yW +LN HN PS UD Aa -Cb +bd Cs hA "} diff --git a/monkestation/code/modules/ghost_players/arena/maps/two_forts.dmm b/monkestation/code/modules/ghost_players/arena/maps/two_forts.dmm index 88d1802990bc..ea3c06ee5cb5 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/two_forts.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/two_forts.dmm @@ -19,6 +19,11 @@ }, /turf/open/misc/sandy_dirt, /area/centcom/tdome/arena/actual) +"eJ" = ( +/obj/effect/turf_decal/siding/wood, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/wood/large, +/area/centcom/tdome/arena/actual) "hA" = ( /obj/structure/flora/bush/reed/style_3, /turf/open/water{ @@ -99,6 +104,11 @@ initial_gas_mix = "o2=22;n2=82;TEMP=293.15" }, /area/centcom/tdome/arena/actual) +"Cu" = ( +/obj/effect/turf_decal/sand/plating, +/obj/machinery/light/floor/has_bulb, +/turf/open/misc/sandy_dirt, +/area/centcom/tdome/arena/actual) "Fc" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/bush/sparsegrass, @@ -232,10 +242,10 @@ Pg Pg Fc Pg +Cu Pg Pg -Pg -Pg +Cu Pg Pg Pg @@ -258,7 +268,7 @@ Zu VF VF hL -Mj +eJ VF BT VF @@ -306,7 +316,7 @@ VF BT VF hL -Mj +eJ VF VF Zu @@ -328,10 +338,10 @@ PS Pg Pg Pg +Cu Pg Pg -Pg -Pg +Cu Pg Pg Pg diff --git a/monkestation/code/modules/ghost_players/arena/maps/upperrail.dmm b/monkestation/code/modules/ghost_players/arena/maps/upperrail.dmm index 7077fe53e23c..66bb9714fe60 100644 --- a/monkestation/code/modules/ghost_players/arena/maps/upperrail.dmm +++ b/monkestation/code/modules/ghost_players/arena/maps/upperrail.dmm @@ -52,6 +52,15 @@ "cK" = ( /turf/open/floor/iron/smooth_corner, /area/centcom/tdome/arena/actual) +"cS" = ( +/obj/structure/railing, +/obj/effect/turf_decal/stripes/line, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/smooth_edge, +/area/centcom/tdome/arena/actual) "cT" = ( /obj/structure/rack, /obj/item/wallframe/extinguisher_cabinet{ @@ -69,6 +78,10 @@ dir = 1 }, /obj/effect/decal/cleanable/glass, +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/smooth_edge{ dir = 1 }, @@ -108,9 +121,6 @@ }, /area/centcom/tdome/arena/actual) "ih" = ( -/obj/structure/railing/corner{ - dir = 1 - }, /turf/open/floor/iron/stairs/left{ dir = 1 }, @@ -152,6 +162,10 @@ dir = 1 }, /obj/effect/turf_decal/tile/dark/full, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/plating{ density = 1 }, @@ -160,12 +174,18 @@ /obj/structure/railing, /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/generic, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/smooth_edge, /area/centcom/tdome/arena/actual) +"nb" = ( +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/smooth_large, +/area/centcom/tdome/arena/actual) "nt" = ( -/obj/structure/railing/corner{ - dir = 4 - }, /turf/open/floor/iron/stairs/right{ dir = 1 }, @@ -189,7 +209,6 @@ /turf/open/floor/iron/smooth_large, /area/centcom/tdome/arena/actual) "rl" = ( -/obj/structure/railing/corner, /turf/open/floor/iron/stairs/right, /area/centcom/tdome/arena/actual) "rW" = ( @@ -206,6 +225,7 @@ icon_state = "gibarm"; random_icon_states = list("gibarm") }, +/obj/machinery/light/floor/has_bulb, /turf/open/floor/iron/smooth_large, /area/centcom/tdome/arena/actual) "xD" = ( @@ -223,6 +243,27 @@ }, /turf/open/floor/iron/smooth_large, /area/centcom/tdome/arena/actual) +"yy" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/smooth_edge{ + dir = 1 + }, +/area/centcom/tdome/arena/actual) +"zr" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/smooth_large, +/area/centcom/tdome/arena/actual) "zW" = ( /obj/effect/decal/cleanable/blood/splatter/over_window{ pixel_x = 32 @@ -254,6 +295,9 @@ /obj/structure/fluff/tram_rail/end{ dir = 8 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plating{ density = 1 }, @@ -283,9 +327,6 @@ }, /area/centcom/tdome/arena/actual) "Fc" = ( -/obj/structure/railing/corner{ - dir = 8 - }, /turf/open/floor/iron/stairs/left, /area/centcom/tdome/arena/actual) "Fp" = ( @@ -319,11 +360,13 @@ density = 1 }, /area/centcom/tdome/arena/actual) +"Jk" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/light/floor/has_bulb, +/turf/open/floor/iron/smooth_large, +/area/centcom/tdome/arena/actual) "Kf" = ( /obj/effect/turf_decal/tile/neutral/full, -/obj/structure/railing{ - dir = 8 - }, /obj/effect/turf_decal/tile/neutral/full, /obj/effect/turf_decal/tile/neutral/full, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -350,6 +393,9 @@ /obj/structure/fluff/tram_rail/end{ dir = 4 }, +/obj/structure/railing{ + dir = 8 + }, /turf/open/floor/plating{ density = 1 }, @@ -370,9 +416,6 @@ /area/centcom/tdome/arena/actual) "Mj" = ( /obj/effect/turf_decal/tile/neutral/full, -/obj/structure/railing{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral/full, /obj/effect/turf_decal/tile/neutral/full, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -489,6 +532,10 @@ }, /obj/effect/turf_decal/tile/dark/full, /obj/effect/decal/cleanable/dirt, +/obj/structure/railing{ + dir = 4; + layer = 4.1 + }, /turf/open/floor/plating{ density = 1 }, @@ -535,7 +582,7 @@ BT Cs "} (2,1,1) = {" -pQ +Jk Na BT TX @@ -544,7 +591,7 @@ KY YL Cs Cs -BT +zr "} (3,1,1) = {" Cs @@ -601,7 +648,7 @@ cK mI YF mv -YL +yy cC fP Na @@ -646,7 +693,7 @@ Cs Cs fP Fp -TX +cS BY Lu ez @@ -712,7 +759,7 @@ KY Aa Cb Cs -Cs +nb "} (17,1,1) = {" cj diff --git a/monkestation/code/modules/ocean_content/department_consoles/engineering.dm b/monkestation/code/modules/ocean_content/department_consoles/engineering.dm new file mode 100644 index 000000000000..deda9df9ab08 --- /dev/null +++ b/monkestation/code/modules/ocean_content/department_consoles/engineering.dm @@ -0,0 +1,5 @@ +/obj/machinery/computer/cargo/engineering + name = "engineering supply console" + can_send_shuttle = FALSE + can_remove_orders = FALSE + cargo_account = ACCOUNT_ENG diff --git a/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm b/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm index f7d8d11e3951..829ea9762e86 100644 --- a/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm +++ b/monkestation/code/modules/ocean_content/fluff/cargo_driver.dm @@ -1,3 +1,5 @@ +/obj/machinery/computer/pod/var/looping_time = FALSE + /obj/machinery/mass_driver/cargo_driver name = "Cargo Driver" id = MASSDRIVER_CARGO diff --git a/monkestation/code/modules/ocean_content/fluff/industrial_power_cables.dm b/monkestation/code/modules/ocean_content/fluff/industrial_power_cables.dm index 45b6699a412d..f3c6f14c7e54 100644 --- a/monkestation/code/modules/ocean_content/fluff/industrial_power_cables.dm +++ b/monkestation/code/modules/ocean_content/fluff/industrial_power_cables.dm @@ -1,13 +1,14 @@ /obj/structure/cable/industrial name = "industrial grade power cable" cable_color = CABLE_COLOR_CYAN + color = CABLE_COLOR_CYAN cable_tag = "industrial" /obj/structure/cable/industrial/deconstruct(disassembled = TRUE) if(!do_after(usr, 2 SECONDS, src)) return if(!(flags_1 & NODECONSTRUCT_1)) - var/obj/item/stack/cable_coil/cable = new(drop_location(), 1) + var/obj/item/stack/cable_coil/industrial/cable = new(drop_location(), 1) cable.set_cable_color(cable_color) qdel(src) diff --git a/tgstation.dme b/tgstation.dme index 2129974414b9..d3e2fe4efa85 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5959,6 +5959,7 @@ #include "monkestation\code\modules\mob\living\carbon\human\species_type\zombies.dm" #include "monkestation\code\modules\mob\living\simple_animal\pets\bees.dm" #include "monkestation\code\modules\mob\living\simple_animal\pets\honk_platinum.dm" +#include "monkestation\code\modules\ocean_content\department_consoles\engineering.dm" #include "monkestation\code\modules\ocean_content\fluff\barrier.dm" #include "monkestation\code\modules\ocean_content\fluff\base_turf_editor.dm" #include "monkestation\code\modules\ocean_content\fluff\breaching_charge.dm" diff --git a/tgui/packages/tgui/interfaces/TransmissionLaser.js b/tgui/packages/tgui/interfaces/TransmissionLaser.js new file mode 100644 index 000000000000..c94966e27acc --- /dev/null +++ b/tgui/packages/tgui/interfaces/TransmissionLaser.js @@ -0,0 +1,228 @@ +/** + * @file + * @copyright 2020 + * @author Sovexe (https://github.com/Sovexe) + * @license ISC + */ + +import { useBackend } from '../backend'; +import { Box, Button, Knob, LabeledList, NoticeBox, ProgressBar, Section } from '../components'; +import { formatMoney, formatSiUnit, formatPower } from '../format'; +import { Window } from '../layouts'; + +export const TransmissionLaser = (props, context) => { + const { data } = useBackend(context); + const { total_earnings, name = 'Power Transmission Laser' } = data; + return ( + + + + + + + Earned Credits : {total_earnings ? formatMoney(total_earnings) : 0} + + + + ); +}; + +const Status = (props, context) => { + const { data } = useBackend(context); + const { max_capacity, held_power, output_total, max_grid_load } = data; + + return ( +
+ + + {held_power ? formatSiUnit(held_power, 0, 'W') : '0 J'} + + + + + + + +
+ ); +}; + +const InputControls = (props, context) => { + const { act, data } = useBackend(context); + const { + input_total, + accepting_power, + sucking_power, + input_number, + power_format, + } = data; + + return ( +
+ + act('toggle_input')} + /> + }> + + {(sucking_power && 'Online') || + (accepting_power && 'Idle') || + 'Offline'} + + + + {input_total ? formatPower(input_total) : '0 W'} + + + + act('set_input', { set_input })} + /> +
+ ); +}; + +const OutputControls = (props, context) => { + const { act, data } = useBackend(context); + const { + output_total, + firing, + accepting_power, + output_number, + output_multiplier, + } = data; + + return ( +
+ + act('toggle_output')} + /> + }> + + {(firing && 'Online') || (accepting_power && 'Idle') || 'Offline'} + + + + {output_total + ? output_total < 0 + ? '-' + formatPower(Math.abs(output_total)) + : formatPower(output_total) + : '0 W'} + + + + act('set_output', { set_output })} + /> +
+ ); +};