From 2931c03ccbfe28837648c89c509bffbad618b31e Mon Sep 17 00:00:00 2001 From: Artur Date: Thu, 2 Jul 2020 01:48:28 +0300 Subject: [PATCH] Ghommie fixes strongDMM autofixed wildest, hopefully it didnt break anything --- _maps/RandomZLevels/away_mission/wildwest.dmm | 53 +----- code/modules/mob/dead/observer/orbit.dm | 156 +++++++++--------- 2 files changed, 87 insertions(+), 122 deletions(-) diff --git a/_maps/RandomZLevels/away_mission/wildwest.dmm b/_maps/RandomZLevels/away_mission/wildwest.dmm index a4d0580d51..5f3689e31a 100644 --- a/_maps/RandomZLevels/away_mission/wildwest.dmm +++ b/_maps/RandomZLevels/away_mission/wildwest.dmm @@ -63,50 +63,15 @@ /obj/structure/destructible/cult/pylon, /turf/open/floor/circuit/green/off, /area/awaymission/wildwest/vault) -"ar" = ( -/turf/open/floor/plating/ironsand{ - icon_state = "ironsand1" - }, -/area/awaymission/wildwest/mines) -"as" = ( -/turf/open/floor/plating/ironsand{ - icon_state = "ironsand1" - }, -/area/awaymission/wildwest/mines) -"at" = ( -/turf/open/floor/plating/ironsand{ - icon_state = "ironsand1" - }, -/area/awaymission/wildwest/mines) -"au" = ( -/turf/open/floor/plating/ironsand{ - icon_state = "ironsand1" - }, -/area/awaymission/wildwest/mines) -"av" = ( -/turf/open/floor/plating/ironsand{ - icon_state = "ironsand1" - }, -/area/awaymission/wildwest/mines) "aw" = ( /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" - }, -"ax" = ( -/turf/open/floor/plating/ironsand{ - icon_state = "ironsand1" - }, -/area/awaymission/wildwest/mines) -"ay" = ( -/turf/open/floor/plating/ironsand{ - icon_state = "ironsand1" - }, -/area/awaymission/wildwest/mines) + }) "az" = ( /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, -/area/awaymission/wildwest/mines) +/area/awaymission/wildwest/mines, /area/awaymission/wildwest/mines) "aA" = ( /obj/effect/meatgrinder, @@ -32720,9 +32685,9 @@ aT aN aN aT -ar -au -ax +aT +aT +aT aT aT aT @@ -32977,9 +32942,9 @@ aT aN aN aT -as -av -ay +aT +aT +aT aT aT aT @@ -33234,7 +33199,7 @@ aT aN aN aT -at +aT aw az aT diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index 137de92db8..eb23a5fb67 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -1,78 +1,78 @@ -/datum/orbit_menu - var/mob/dead/observer/owner - -/datum/orbit_menu/New(mob/dead/observer/new_owner) - if(!istype(new_owner)) - qdel(src) - owner = new_owner - -/datum/orbit_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state) - if (!ui) - ui = new(user, src, ui_key, "Orbit", "Orbit", 350, 700, master_ui, state) - ui.open() - -/datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) - if (..()) - return - - if (action == "orbit") - var/list/pois = getpois(skip_mindless = 1) - var/atom/movable/poi = pois[params["name"]] - if (poi != null) - owner.ManualFollow(poi) - ui.close() - -/datum/orbit_menu/ui_data(mob/user) - var/list/data = list() - - var/list/alive = list() - var/list/antagonists = list() - var/list/dead = list() - var/list/ghosts = list() - var/list/misc = list() - var/list/npcs = list() - - var/list/pois = getpois(skip_mindless = 1) - for (var/name in pois) - var/list/serialized = list() - serialized["name"] = name - - var/poi = pois[name] - - var/mob/M = poi - if (istype(M)) - if (isobserver(M)) - ghosts += list(serialized) - else if (M.stat == DEAD) - dead += list(serialized) - else if (M.mind == null) - npcs += list(serialized) - else - var/number_of_orbiters = M.orbiters?.orbiters?.len - if (number_of_orbiters) - serialized["orbiters"] = number_of_orbiters - - var/datum/mind/mind = M.mind - var/was_antagonist = FALSE - - for (var/_A in mind.antag_datums) - var/datum/antagonist/A = _A - if (A.show_to_ghosts) - was_antagonist = TRUE - serialized["antag"] = A.name - antagonists += list(serialized) - break - - if (!was_antagonist) - alive += list(serialized) - else - misc += list(serialized) - - data["alive"] = alive - data["antagonists"] = antagonists - data["dead"] = dead - data["ghosts"] = ghosts - data["misc"] = misc - data["npcs"] = npcs - - return data +/datum/orbit_menu + var/mob/dead/observer/owner + +/datum/orbit_menu/New(mob/dead/observer/new_owner) + if(!istype(new_owner)) + qdel(src) + owner = new_owner + +/datum/orbit_menu/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state) + if (!ui) + ui = new(user, src, ui_key, "Orbit", "Orbit", 350, 700, master_ui, state) + ui.open() + +/datum/orbit_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state) + if (..()) + return + + if (action == "orbit") + var/list/pois = getpois(skip_mindless = 1) + var/atom/movable/poi = pois[params["name"]] + if (poi != null) + owner.ManualFollow(poi) + ui.close() + +/datum/orbit_menu/ui_data(mob/user) + var/list/data = list() + + var/list/alive = list() + var/list/antagonists = list() + var/list/dead = list() + var/list/ghosts = list() + var/list/misc = list() + var/list/npcs = list() + + var/list/pois = getpois(skip_mindless = 1) + for (var/name in pois) + var/list/serialized = list() + serialized["name"] = name + + var/poi = pois[name] + + var/mob/M = poi + if (istype(M)) + if (isobserver(M)) + ghosts += list(serialized) + else if (M.stat == DEAD) + dead += list(serialized) + else if (M.mind == null) + npcs += list(serialized) + else + var/number_of_orbiters = M.orbiters?.orbiters?.len + if (number_of_orbiters) + serialized["orbiters"] = number_of_orbiters + + var/datum/mind/mind = M.mind + var/was_antagonist = FALSE + + for (var/_A in mind.antag_datums) + var/datum/antagonist/A = _A + if (A.show_to_ghosts) + was_antagonist = TRUE + serialized["antag"] = A.name + antagonists += list(serialized) + break + + if (!was_antagonist) + alive += list(serialized) + else + misc += list(serialized) + + data["alive"] = alive + data["antagonists"] = antagonists + data["dead"] = dead + data["ghosts"] = ghosts + data["misc"] = misc + data["npcs"] = npcs + + return data