diff --git a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm index 1301895facd..0e64cefc7aa 100644 --- a/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm +++ b/_maps/map_files/MetaStation/MetaStation.v41A.II.dmm @@ -11703,7 +11703,7 @@ }) "auD" = ( /obj/machinery/light_construct/small, -/obj/item/toolbox_tiles_sensor, +/obj/item/toolbox_tiles/sensor, /turf/simulated/floor/plating, /area/maintenance/fpmaint2{ name = "Port Maintenance" diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 606fabcc4b5..15154bd85d3 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -9787,6 +9787,7 @@ pixel_y = 2 }, /obj/item/stamp/law, +/obj/item/pen/multi, /turf/simulated/floor/plasteel{ tag = "icon-cult"; icon_state = "cult"; diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index b138d19b513..8171efa7825 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -28,6 +28,46 @@ Thus, the two variables affect pump operation are set in New(): var/id = null var/datum/radio_frequency/radio_connection +/obj/machinery/atmospherics/binary/pump/CtrlClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + toggle() + return ..() + +/obj/machinery/atmospherics/binary/pump/AICtrlClick() + toggle() + return ..() + +/obj/machinery/atmospherics/binary/pump/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + set_max() + return + +/obj/machinery/atmospherics/binary/pump/AIAltClick() + set_max() + return ..() + +/obj/machinery/atmospherics/binary/pump/proc/toggle() + if(powered()) + on = !on + update_icon() + +/obj/machinery/atmospherics/binary/pump/proc/set_max() + if(powered()) + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + /obj/machinery/atmospherics/binary/pump/Destroy() if(SSradio) SSradio.remove_object(src, frequency) @@ -203,7 +243,15 @@ Thus, the two variables affect pump operation are set in New(): update_icon() /obj/machinery/atmospherics/binary/pump/attackby(obj/item/W, mob/user, params) - if(!istype(W, /obj/item/wrench)) + if(istype(W, /obj/item/pen)) + var/t = copytext(stripped_input(user, "Enter the name for the pump.", "Rename", name), 1, MAX_NAME_LEN) + if(!t) + return + if(!in_range(src, usr) && loc != usr) + return + name = t + return + else if(!istype(W, /obj/item/wrench)) return ..() if(!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 11874172340..6633c1ac10d 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -28,6 +28,46 @@ Thus, the two variables affect pump operation are set in New(): var/id = null var/datum/radio_frequency/radio_connection +/obj/machinery/atmospherics/binary/volume_pump/CtrlClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + toggle() + return ..() + +/obj/machinery/atmospherics/binary/volume_pump/AICtrlClick() + toggle() + return ..() + +/obj/machinery/atmospherics/binary/volume_pump/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + set_max() + return + +/obj/machinery/atmospherics/binary/volume_pump/AIAltClick() + set_max() + return ..() + +/obj/machinery/atmospherics/binary/volume_pump/proc/toggle() + if(powered()) + on = !on + update_icon() + +/obj/machinery/atmospherics/binary/volume_pump/proc/set_max() + if(powered()) + transfer_rate = MAX_TRANSFER_RATE + update_icon() + /obj/machinery/atmospherics/binary/volume_pump/Destroy() if(SSradio) SSradio.remove_object(src, frequency) @@ -199,7 +239,15 @@ Thus, the two variables affect pump operation are set in New(): update_icon() /obj/machinery/atmospherics/binary/volume_pump/attackby(obj/item/W, mob/user, params) - if(!istype(W, /obj/item/wrench)) + if(istype(W, /obj/item/pen)) + var/t = copytext(stripped_input(user, "Enter the name for the volume pump.", "Rename", name), 1, MAX_NAME_LEN) + if(!t) + return + if(!in_range(src, usr) && loc != usr) + return + name = t + return + else if(!istype(W, /obj/item/wrench)) return ..() if(!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index c6720e45f6e..a778b01ea86 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -22,6 +22,45 @@ Filter types: var/frequency = 0 var/datum/radio_frequency/radio_connection +/obj/machinery/atmospherics/trinary/filter/CtrlClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + toggle() + return ..() + +/obj/machinery/atmospherics/trinary/filter/AICtrlClick() + toggle() + return ..() + +/obj/machinery/atmospherics/trinary/filter/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + set_max() + return + +/obj/machinery/atmospherics/trinary/filter/AIAltClick() + set_max() + return ..() + +/obj/machinery/atmospherics/trinary/filter/proc/toggle() + if(powered()) + on = !on + update_icon() + +/obj/machinery/atmospherics/trinary/filter/proc/set_max() + if(powered()) + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() /obj/machinery/atmospherics/trinary/filter/Destroy() if(SSradio) @@ -211,4 +250,16 @@ Filter types: . = TRUE update_icon() - SSnanoui.update_uis(src) \ No newline at end of file + SSnanoui.update_uis(src) + +/obj/machinery/atmospherics/trinary/filter/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/pen)) + var/t = copytext(stripped_input(user, "Enter the name for the filter.", "Rename", name), 1, MAX_NAME_LEN) + if(!t) + return + if(!in_range(src, usr) && loc != usr) + return + name = t + return + else + return ..() \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 0c64804b6da..e7c91172e3b 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -12,10 +12,50 @@ //node 3 is the outlet, nodes 1 & 2 are intakes +/obj/machinery/atmospherics/trinary/mixer/CtrlClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + toggle() + return ..() + +/obj/machinery/atmospherics/trinary/mixer/AICtrlClick() + toggle() + return ..() + +/obj/machinery/atmospherics/trinary/mixer/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user) && !issilicon(usr)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + set_max() + return + +/obj/machinery/atmospherics/trinary/mixer/AIAltClick() + set_max() + return ..() + /obj/machinery/atmospherics/trinary/mixer/flipped icon_state = "mmap" flipped = 1 +/obj/machinery/atmospherics/trinary/mixer/proc/toggle() + if(powered()) + on = !on + update_icon() + +/obj/machinery/atmospherics/trinary/mixer/proc/set_max() + if(powered()) + target_pressure = MAX_OUTPUT_PRESSURE + update_icon() + /obj/machinery/atmospherics/trinary/mixer/update_icon(safety = 0) if(flipped) icon_state = "m" @@ -176,4 +216,16 @@ . = TRUE update_icon() - SSnanoui.update_uis(src) \ No newline at end of file + SSnanoui.update_uis(src) + +/obj/machinery/atmospherics/trinary/mixer/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/pen)) + var/t = copytext(stripped_input(user, "Enter the name for the mixer.", "Rename", name), 1, MAX_NAME_LEN) + if(!t) + return + if(!in_range(src, usr) && loc != usr) + return + name = t + return + else + return ..() \ No newline at end of file diff --git a/code/ATMOSPHERICS/datum_pipeline.dm b/code/ATMOSPHERICS/datum_pipeline.dm index b4a0cd9ba7b..43082c38ded 100644 --- a/code/ATMOSPHERICS/datum_pipeline.dm +++ b/code/ATMOSPHERICS/datum_pipeline.dm @@ -22,7 +22,7 @@ A.nullifyPipenet(src) return ..() -/datum/pipeline/proc/process()//This use to be called called from the pipe networks +/datum/pipeline/process()//This use to be called called from the pipe networks if(update) update = 0 reconcile_air() diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index 1c4c12c243d..cbcf2c1dd90 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -21,7 +21,6 @@ #define START_PROCESSING(Processor, Datum) if (!Datum.isprocessing) {Datum.isprocessing = TRUE;Processor.processing += Datum} #define STOP_PROCESSING(Processor, Datum) Datum.isprocessing = FALSE;Processor.processing -= Datum -#define START_DEFERRED_PROCESSING(Processor, Datum) if (!Datum.isprocessing) {Datum.isprocessing = TRUE;Processor.processing.Insert(1,Datum)} //SubSystem flags (Please design any new flags so that the default is off, to make adding flags to subsystems easier) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 5ee80535780..ba0d1858616 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -13,6 +13,8 @@ //Objects #define isitem(A) (istype(A, /obj/item)) +#define ismachinery(A) (istype(A, /obj/machinery)) + #define ismecha(A) (istype(A, /obj/mecha)) #define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 5ade3b0baef..29a93ae94f9 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -61,6 +61,8 @@ #define INIT_ORDER_LANGUAGE 6 #define INIT_ORDER_MACHINES 5 #define INIT_ORDER_CIRCUIT 4 +#define INIT_ORDER_HOLIDAY 3 +#define INIT_ORDER_ALARMS 2 #define INIT_ORDER_TIMER 1 #define INIT_ORDER_DEFAULT 0 #define INIT_ORDER_AIR -1 diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index fd5fd510e40..c567ba7adb2 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -491,7 +491,7 @@ GLOBAL_LIST_INIT(do_after_once_tracker, list()) to_chat(user, "Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];") to_chat(user, "Location = [location_description];") to_chat(user, "[special_role_description]") - to_chat(user, "(PM) ([ADMIN_PP(M,"PP")]) ([ADMIN_VV(M,"VV")]) ([ADMIN_SM(M,"SM")]) ([ADMIN_FLW(M,"FLW")]) (CA)") + to_chat(user, "(PM) ([ADMIN_PP(M,"PP")]) ([ADMIN_VV(M,"VV")]) ([ADMIN_SM(M,"SM")]) ([ADMIN_FLW(M,"FLW")]) (CA)") // Gets the first mob contained in an atom, and warns the user if there's not exactly one /proc/get_mob_in_atom_with_warning(atom/A, mob/user = usr) diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 930a8ee9de5..5b90cda376e 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -49,10 +49,10 @@ var/religion_name = null name = "" // Prefix - for(var/holiday_name in holiday_master.holidays) + for(var/holiday_name in SSholiday.holidays) if(holiday_name == "Friday the 13th") random = 13 - var/datum/holiday/holiday = holiday_master.holidays[holiday_name] + var/datum/holiday/holiday = SSholiday.holidays[holiday_name] name = holiday.getStationPrefix() //get normal name if(!name) diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 5b639cc80f8..b90f7502e65 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -113,9 +113,14 @@ /proc/typing_input(mob/user, message = "", title = "", default = "") if(user.client.checkTyping()) // Prevent double windows return null - user.client.typing = TRUE + var/client/C = user.client // Save it in a var in case the client disconnects from the mob + C.typing = TRUE var/msg = input(user, message, title, default) as text|null - user.client.typing = FALSE + if(!C) + return null + C.typing = FALSE + if(!user || C != user.client) // User got out of the mob for some reason or the mob is gone + return null return msg //Filters out undesirable characters from names diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 436970567a0..968a2f4d577 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -27,7 +27,5 @@ Due to BYOND features used in this codebase, you must update to version 510 or l This may require updating to a beta release. #endif -var/global/list/processing_objects = list() //This has to be initialized BEFORE world - // Macros that must exist before world.dm -#define to_chat to_chat_filename=__FILE__;to_chat_line=__LINE__;to_chat_src=src;__to_chat +#define to_chat to_chat_filename=__FILE__;to_chat_line=__LINE__;to_chat_src=src;__to_chat \ No newline at end of file diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm index 1e35e150a25..6dc18d4fdff 100644 --- a/code/_globalvars/configuration.dm +++ b/code/_globalvars/configuration.dm @@ -3,7 +3,7 @@ var/datum/configuration/config = null var/host = null var/join_motd = null GLOBAL_VAR(join_tos) -var/game_version = "Custom ParaCode" +var/game_version = "ParaCode" var/changelog_hash = md5('html/changelog.html') //used to check if the CL changed var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544) diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index c7217221585..e6f463d6f23 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -19,8 +19,6 @@ GLOBAL_LIST_INIT(navigation_computers, list()) GLOBAL_LIST_INIT(all_areas, list()) GLOBAL_LIST_INIT(machines, list()) -GLOBAL_LIST_INIT(fast_processing, list()) -GLOBAL_LIST_INIT(processing_power_items, list()) //items that ask to be called every cycle GLOBAL_LIST_INIT(rcd_list, list()) //list of Rapid Construction Devices. GLOBAL_LIST_INIT(apcs, list()) diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index f0bb813a336..77443fb4ab2 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -1,8 +1,9 @@ var/global/obj/effect/overlay/plmaster = null var/global/obj/effect/overlay/slmaster = null -// Event Manager, the manager for events. -var/datum/event_manager/event_manager = new() +GLOBAL_VAR_INIT(CELLRATE, 0.002) // conversion ratio between a watt-tick and kilojoule +GLOBAL_VAR_INIT(CHARGELEVEL, 0.001) // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second) + // Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it. var/global/obj/item/radio/intercom/global_announcer = create_global_announcer() var/global/obj/item/radio/intercom/command/command_announcer = create_command_announcer() diff --git a/code/_globalvars/station.dm b/code/_globalvars/station.dm index 2d635996b30..e997a672e1f 100644 --- a/code/_globalvars/station.dm +++ b/code/_globalvars/station.dm @@ -1,6 +1,3 @@ var/global/datum/datacore/data_core = null -var/CELLRATE = 0.002 // multiplier for watts per tick <> cell storage (eg: .002 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) -var/CHARGELEVEL = 0.001 // Cap for how fast cells charge, as a percentage-per-tick (.001 means cellcharge is capped to 1% per second) - var/map_name = "Unknown" //The name of the map that is loaded. Assigned in world/New() \ No newline at end of file diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index c84a64722c5..22921f5228d 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -49,7 +49,7 @@ if(!can_see(A)) if(isturf(A)) //On unmodified clients clicking the static overlay clicks the turf underneath return // So there's no point messaging admins - message_admins("[key_name_admin(src)] might be running a modified client! (failed can_see on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))") + add_attack_logs(src, src, "[key_name_admin(src)] might be running a modified client! (failed can_see on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))", ATKLOG_ALL) var/message = "[key_name(src)] might be running a modified client! (failed can_see on AI click of [A]([COORD(pixel_turf)]))" log_admin(message) send2irc_adminless_only("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))") @@ -64,7 +64,7 @@ else if(pixel_turf.obscured) log_admin("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)])") - message_admins("[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))") + add_attack_logs(src, src, "[key_name_admin(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([ADMIN_COORDJMP(pixel_turf)]))", ATKLOG_ALL) send2irc_adminless_only("NOCHEAT", "[key_name(src)] might be running a modified client! (failed checkTurfVis on AI click of [A]([COORD(pixel_turf)]))") return diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 24e58b502ad..286f8ce7095 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -122,6 +122,10 @@ throw_item(A) return + if(isLivingSSD(A)) + if(client && client.send_ssd_warning(A)) + return + var/obj/item/W = get_active_hand() if(W == A) diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 24a2442faeb..e3d423130e5 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -154,6 +154,12 @@ #define ui_bot_radio "EAST-1:28,SOUTH:7" #define ui_bot_pull "EAST-2:26,SOUTH:7" +//Ghosts +#define ui_ghost_jumptomob "SOUTH:6,CENTER-2:24" +#define ui_ghost_orbit "SOUTH:6,CENTER-1:24" +#define ui_ghost_reenter_corpse "SOUTH:6,CENTER:24" +#define ui_ghost_teleport "SOUTH:6,CENTER+1:24" + //HUD styles. Please ensure HUD_VERSIONS is the same as the maximum index. Index order defines how they are cycled in F12. #define HUD_STYLE_STANDARD 1 #define HUD_STYLE_REDUCED 2 diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index 32a9d7cf46d..5780e86a298 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -17,6 +17,7 @@ //Hide/Show Action Buttons ... Button /obj/screen/movable/action_button/hide_toggle name = "Hide Buttons" + desc = "Shift-click any button to reset its position. Alt-click to reset all buttons to their default positions." icon = 'icons/mob/actions/actions.dmi' icon_state = "bg_default" var/hidden = 0 @@ -24,8 +25,18 @@ /obj/screen/movable/action_button/hide_toggle/Click(location,control,params) var/list/modifiers = params2list(params) if(modifiers["shift"]) - moved = 0 - return 1 + moved = FALSE + usr.update_action_buttons(TRUE) + return TRUE + if(modifiers["alt"]) + for(var/V in usr.actions) + var/datum/action/A = V + var/obj/screen/movable/action_button/B = A.button + B.moved = FALSE + moved = FALSE + usr.update_action_buttons(TRUE) + to_chat(usr, "Action button positions have been reset.") + return TRUE usr.hud_used.action_buttons_hidden = !usr.hud_used.action_buttons_hidden hidden = usr.hud_used.action_buttons_hidden @@ -36,6 +47,15 @@ UpdateIcon() usr.update_action_buttons() +/obj/screen/movable/action_button/hide_toggle/AltClick(mob/user) + for(var/V in user.actions) + var/datum/action/A = V + var/obj/screen/movable/action_button/B = A.button + B.moved = FALSE + if(moved) + moved = FALSE + user.update_action_buttons(TRUE) + to_chat(user, "Action button positions have been reset.") /obj/screen/movable/action_button/hide_toggle/proc/InitialiseIcon(mob/living/user) if(isalien(user)) diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm new file mode 100644 index 00000000000..4e92395f4cc --- /dev/null +++ b/code/_onclick/hud/ghost.dm @@ -0,0 +1,61 @@ +/mob/dead/observer/create_mob_hud() + if(client && !hud_used) + hud_used = new /datum/hud/ghost(src) + +/obj/screen/ghost + icon = 'icons/mob/screen_ghost.dmi' + +/obj/screen/ghost/MouseEntered() + flick(icon_state + "_anim", src) + +/obj/screen/ghost/jumptomob + name = "Jump to mob" + icon_state = "jumptomob" + +/obj/screen/ghost/jumptomob/Click() + var/mob/dead/observer/G = usr + G.jumptomob() + +/obj/screen/ghost/orbit + name = "Orbit" + icon_state = "orbit" + +/obj/screen/ghost/orbit/Click() + var/mob/dead/observer/G = usr + G.follow() + +/obj/screen/ghost/reenter_corpse + name = "Re-enter corpse" + icon_state = "reenter_corpse" + +/obj/screen/ghost/reenter_corpse/Click() + var/mob/dead/observer/G = usr + G.reenter_corpse() + +/obj/screen/ghost/teleport + name = "Teleport" + icon_state = "teleport" + +/obj/screen/ghost/teleport/Click() + var/mob/dead/observer/G = usr + G.dead_tele() + +/datum/hud/ghost/New(mob/owner) + ..() + var/obj/screen/using + + using = new /obj/screen/ghost/jumptomob() + using.screen_loc = ui_ghost_jumptomob + static_inventory += using + + using = new /obj/screen/ghost/orbit() + using.screen_loc = ui_ghost_orbit + static_inventory += using + + using = new /obj/screen/ghost/reenter_corpse() + using.screen_loc = ui_ghost_reenter_corpse + static_inventory += using + + using = new /obj/screen/ghost/teleport() + using.screen_loc = ui_ghost_teleport + static_inventory += using diff --git a/code/controllers/ProcessScheduler/core/process.dm b/code/controllers/ProcessScheduler/core/process.dm index 134eaec96a6..f997109f90b 100644 --- a/code/controllers/ProcessScheduler/core/process.dm +++ b/code/controllers/ProcessScheduler/core/process.dm @@ -158,7 +158,7 @@ /datum/controller/process/proc/setup() -/datum/controller/process/proc/process() +/datum/controller/process/proc/process_decrepit() started() doWork() finished() diff --git a/code/controllers/ProcessScheduler/core/processScheduler.dm b/code/controllers/ProcessScheduler/core/processScheduler.dm index 9fcf6d13759..66d101d178e 100644 --- a/code/controllers/ProcessScheduler/core/processScheduler.dm +++ b/code/controllers/ProcessScheduler/core/processScheduler.dm @@ -72,9 +72,9 @@ var/global/datum/controller/processScheduler/processScheduler scheduler_sleep_interval = world.tick_lag updateStartDelays() spawn(0) - process() + process_decrepit() -/datum/controller/processScheduler/proc/process() +/datum/controller/processScheduler/proc/process_decrepit() while(isRunning) checkRunningProcesses() queueProcesses() @@ -154,7 +154,7 @@ var/global/datum/controller/processScheduler/processScheduler /datum/controller/processScheduler/proc/runProcess(var/datum/controller/process/process) spawn(0) - process.process() + process.process_decrepit() /datum/controller/processScheduler/proc/processStarted(var/datum/controller/process/process) setRunningProcessState(process) diff --git a/code/controllers/Processes/alarm.dm b/code/controllers/Processes/alarm.dm deleted file mode 100644 index 068ef0c1213..00000000000 --- a/code/controllers/Processes/alarm.dm +++ /dev/null @@ -1,37 +0,0 @@ -// We manually initialize the alarm handlers instead of looping over all existing types -// to make it possible to write: camera.triggerAlarm() rather than alarm_manager.managers[datum/alarm_handler/camera].triggerAlarm() or a variant thereof. -/var/global/datum/alarm_handler/atmosphere/atmosphere_alarm = new() -/var/global/datum/alarm_handler/burglar/burglar_alarm = new() -/var/global/datum/alarm_handler/camera/camera_alarm = new() -/var/global/datum/alarm_handler/fire/fire_alarm = new() -/var/global/datum/alarm_handler/motion/motion_alarm = new() -/var/global/datum/alarm_handler/power/power_alarm = new() - -// Alarm Manager, the manager for alarms. -var/datum/controller/process/alarm/alarm_manager - -/datum/controller/process/alarm - var/list/datum/alarm/all_handlers - -/datum/controller/process/alarm/setup() - name = "alarm" - schedule_interval = 20 // every 2 seconds - all_handlers = list(atmosphere_alarm, burglar_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm) - -/datum/controller/process/alarm/doWork() - for(var/datum/alarm_handler/AH in all_handlers) - AH.process() - -DECLARE_GLOBAL_CONTROLLER(alarm, alarm_manager) - -/datum/controller/process/alarm/proc/active_alarms() - var/list/all_alarms = new - for(var/datum/alarm_handler/AH in all_handlers) - var/list/alarms = AH.alarms - all_alarms += alarms - - return all_alarms - -/datum/controller/process/alarm/proc/number_of_active_alarms() - var/list/alarms = active_alarms() - return alarms.len diff --git a/code/controllers/Processes/event.dm b/code/controllers/Processes/event.dm deleted file mode 100644 index 42e8c4bcc1d..00000000000 --- a/code/controllers/Processes/event.dm +++ /dev/null @@ -1,48 +0,0 @@ -/datum/controller/process/event/setup() - name = "event" - schedule_interval = 20 // every 2 seconds - if(!holiday_master) - holiday_master = new - holiday_master.Setup() - -/datum/controller/process/event/doWork() - event_manager.process() - holiday_master.process() - -///////// -//Holiday controller -///////// - -var/global/datum/controller/holiday/holiday_master //This has to be defined before world. - -/datum/controller/holiday - var/list/holidays - -/datum/controller/holiday/proc/Setup() - getHoliday() - -/datum/controller/holiday/proc/process() - if(holiday_master.holidays) - for(var/datum/holiday/H in holiday_master.holidays) - if(H.eventChance) - if(prob(H.eventChance)) - H.handle_event() - -/datum/controller/holiday/proc/getHoliday() - if(!config.allow_holidays) return //Holiday stuff was not enabled in the config! - - var/YY = text2num(time2text(world.timeofday, "YY")) // get the current year - var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month - var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day - - for(var/H in subtypesof(/datum/holiday)) - var/datum/holiday/holiday = new H() - if(holiday.shouldCelebrate(DD, MM, YY)) - holiday.celebrate() - if(!holidays) - holidays = list() - holidays[holiday.name] = holiday - - if(holidays) - holidays = shuffle(holidays) - world.update_status() diff --git a/code/controllers/Processes/fast_process.dm b/code/controllers/Processes/fast_process.dm deleted file mode 100644 index c27a749f526..00000000000 --- a/code/controllers/Processes/fast_process.dm +++ /dev/null @@ -1,17 +0,0 @@ -/datum/controller/process/fast_process/setup() - name = "fast processing" - schedule_interval = 2 //every 0.2 seconds - start_delay = 9 - log_startup_progress("Fast Processing starting up.") - -/datum/controller/process/fast_process/statProcess() - ..() - stat(null, "[GLOB.fast_processing.len] fast processes") - -/datum/controller/process/fast_process/doWork() - for(last_object in GLOB.fast_processing) - var/obj/O = last_object - try - O.process() - catch(var/exception/e) - catchException(e, O) \ No newline at end of file diff --git a/code/controllers/Processes/obj.dm b/code/controllers/Processes/obj.dm deleted file mode 100644 index 454709b6194..00000000000 --- a/code/controllers/Processes/obj.dm +++ /dev/null @@ -1,28 +0,0 @@ -/datum/controller/process/obj/setup() - name = "obj" - schedule_interval = 20 // every 2 seconds - start_delay = 8 - -/datum/controller/process/obj/started() - ..() - if(!processing_objects) - processing_objects = list() - -/datum/controller/process/obj/statProcess() - ..() - stat(null, "[processing_objects.len] objects") - -/datum/controller/process/obj/doWork() - for(last_object in processing_objects) - var/datum/O = last_object - if(istype(O) && !QDELETED(O)) - try - // Reagent datums get shoved in here, but the process proc isn't on the - // base datum type, so we just call it blindly. - O:process() - catch(var/exception/e) - catchException(e, O) - SCHECK - else - catchBadType(O) - processing_objects -= O diff --git a/code/controllers/Processes/ticker.dm b/code/controllers/Processes/ticker.dm index 8fc476116e5..578c2725710 100644 --- a/code/controllers/Processes/ticker.dm +++ b/code/controllers/Processes/ticker.dm @@ -30,7 +30,7 @@ DECLARE_GLOBAL_CONTROLLER(ticker, tickerProcess) lastTickerTime = currentTime - ticker.process() + ticker.process_decrepit() /datum/controller/process/ticker/proc/getLastTickerTimeDuration() return lastTickerTimeDuration diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index ad9cb166970..a424fb1ac55 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -1,5 +1,7 @@ /datum/configuration var/server_name = null // server name (for world name / status) + var/server_tag_line = null // server tagline (for showing on hub entry) + var/server_extra_features = null // server-specific extra features (for hub entry) var/server_suffix = 0 // generate numeric suffix based on server port var/minimum_client_build = 1421 // Build 1421 due to the middle mouse button exploit @@ -53,7 +55,6 @@ var/humans_need_surnames = 0 var/allow_random_events = 0 // enables random events mid-round when set to 1 var/allow_ai = 1 // allow ai job - var/hostedby = null var/respawn = 0 var/guest_jobban = 1 var/usewhitelist = 0 @@ -69,6 +70,9 @@ var/assistantlimit = 0 //enables assistant limiting var/assistantratio = 2 //how many assistants to security members + var/auto_cryo_ssd_mins = 0 + var/ssd_warning = 0 + var/prob_free_golems = 75 //chance for free golems spawners to appear roundstart var/unrestricted_free_golems = FALSE //if true, free golems can appear on all roundtypes @@ -301,6 +305,11 @@ if("shadowling_max_age") config.shadowling_max_age = text2num(value) + if("auto_cryo_ssd_mins") + config.auto_cryo_ssd_mins = text2num(value) + if("ssd_warning") + config.ssd_warning = 1 + if("ipintel_email") if(value != "ch@nge.me") config.ipintel_email = value @@ -408,6 +417,12 @@ if("servername") config.server_name = value + if("server_tag_line") + config.server_tag_line = value + + if("server_extra_features") + config.server_extra_features = value + if("serversuffix") config.server_suffix = 1 @@ -417,9 +432,6 @@ if("nudge_script_path") config.nudge_script_path = value - if("hostedby") - config.hostedby = value - if("server") config.server = value diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 8fbed1f0b0f..79de45c3248 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -67,7 +67,7 @@ SUBSYSTEM_DEF(air) setup_allturfs() setup_atmos_machinery(GLOB.machines) setup_pipenets(GLOB.machines) - ..() + return ..() /datum/controller/subsystem/air/fire(resumed = 0) diff --git a/code/controllers/subsystem/alarm.dm b/code/controllers/subsystem/alarm.dm new file mode 100644 index 00000000000..90e3ff960f1 --- /dev/null +++ b/code/controllers/subsystem/alarm.dm @@ -0,0 +1,30 @@ +SUBSYSTEM_DEF(alarms) + name = "Alarms" + init_order = INIT_ORDER_ALARMS // 2 + var/datum/alarm_handler/atmosphere/atmosphere_alarm = new() + var/datum/alarm_handler/burglar/burglar_alarm = new() + var/datum/alarm_handler/camera/camera_alarm = new() + var/datum/alarm_handler/fire/fire_alarm = new() + var/datum/alarm_handler/motion/motion_alarm = new() + var/datum/alarm_handler/power/power_alarm = new() + var/list/datum/alarm/all_handlers + +/datum/controller/subsystem/alarms/Initialize(start_timeofday) + all_handlers = list(SSalarms.atmosphere_alarm, SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.fire_alarm, SSalarms.motion_alarm, SSalarms.power_alarm) + return ..() + +/datum/controller/subsystem/alarms/fire() + for(var/datum/alarm_handler/AH in all_handlers) + AH.process() + +/datum/controller/subsystem/alarms/proc/active_alarms() + var/list/all_alarms = new () + for(var/datum/alarm_handler/AH in all_handlers) + var/list/alarms = AH.alarms + all_alarms += alarms + + return all_alarms + +/datum/controller/subsystem/alarms/proc/number_of_active_alarms() + var/list/alarms = active_alarms() + return alarms.len diff --git a/code/controllers/subsystem/assets.dm b/code/controllers/subsystem/assets.dm index 1423c6cf9bd..cd531db614a 100644 --- a/code/controllers/subsystem/assets.dm +++ b/code/controllers/subsystem/assets.dm @@ -14,4 +14,4 @@ SUBSYSTEM_DEF(assets) for(var/client/C in GLOB.clients) addtimer(CALLBACK(GLOBAL_PROC, .proc/getFilesSlow, C, preload, FALSE), 10) - ..() \ No newline at end of file + return ..() \ No newline at end of file diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index a0b2d49d958..cbe8806fc15 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -19,6 +19,7 @@ SUBSYSTEM_DEF(atoms) setupgenetics() initialized = INITIALIZATION_INNEW_MAPLOAD InitializeAtoms() + return ..() diff --git a/code/modules/events/event_manager.dm b/code/controllers/subsystem/events.dm similarity index 73% rename from code/modules/events/event_manager.dm rename to code/controllers/subsystem/events.dm index 1545ddbbdf0..95553ab0d7e 100644 --- a/code/modules/events/event_manager.dm +++ b/code/controllers/subsystem/events.dm @@ -1,19 +1,25 @@ -/datum/event_manager +SUBSYSTEM_DEF(events) + name = "Events" + init_order = INIT_ORDER_EVENTS + runlevels = RUNLEVEL_GAME + // Report events at the end of the rouund + var/report_at_round_end = 0 + + // UI vars var/window_x = 700 var/window_y = 600 - var/report_at_round_end = 0 var/table_options = " align='center'" var/head_options = " style='font-weight:bold;'" var/row_options1 = " width='85px'" var/row_options2 = " width='260px'" var/row_options3 = " width='150px'" + + // Event vars var/datum/event_container/selected_event_container = null - - var/list/datum/event/active_events = list() - var/list/datum/event/finished_events = list() - - var/list/datum/event/allEvents - var/list/datum/event_container/event_containers = list( + var/list/active_events = list() + var/list/finished_events = list() + var/list/allEvents + var/list/event_containers = list( EVENT_LEVEL_MUNDANE = new/datum/event_container/mundane, EVENT_LEVEL_MODERATE = new/datum/event_container/moderate, EVENT_LEVEL_MAJOR = new/datum/event_container/major @@ -21,18 +27,19 @@ var/datum/event_meta/new_event = new -/datum/event_manager/New() +/datum/controller/subsystem/events/Initialize() allEvents = subtypesof(/datum/event) + return ..() -/datum/event_manager/proc/process() - for(var/datum/event/E in event_manager.active_events) +/datum/controller/subsystem/events/fire() + for(var/datum/event/E in active_events) E.process() for(var/i = EVENT_LEVEL_MUNDANE to EVENT_LEVEL_MAJOR) var/list/datum/event_container/EC = event_containers[i] EC.process() -/datum/event_manager/proc/event_complete(var/datum/event/E) +/datum/controller/subsystem/events/proc/event_complete(var/datum/event/E) if(!E.event_meta) // datum/event is used here and there for random reasons, maintaining "backwards compatibility" log_debug("Event of '[E.type]' with missing meta-data has completed.") return @@ -57,11 +64,11 @@ log_debug("Event '[EM.name]' has completed at [station_time_timestamp()].") -/datum/event_manager/proc/delay_events(var/severity, var/delay) +/datum/controller/subsystem/events/proc/delay_events(var/severity, var/delay) var/list/datum/event_container/EC = event_containers[severity] EC.next_event_time += delay -/datum/event_manager/proc/Interact(var/mob/living/user) +/datum/controller/subsystem/events/proc/Interact(var/mob/living/user) var/html = GetInteractWindow() @@ -69,7 +76,7 @@ popup.set_content(html) popup.open() -/datum/event_manager/proc/RoundEnd() +/datum/controller/subsystem/events/proc/RoundEnd() if(!report_at_round_end) return @@ -89,7 +96,7 @@ to_chat(world, message) -/datum/event_manager/proc/GetInteractWindow() +/datum/controller/subsystem/events/proc/GetInteractWindow() var/html = "Refresh" if(selected_event_container) @@ -197,7 +204,7 @@ return html -/datum/event_manager/Topic(href, href_list) +/datum/controller/subsystem/events/Topic(href, href_list) if(..()) return @@ -290,123 +297,3 @@ EC.next_event = null Interact(usr) - -/client/proc/forceEvent(var/type in event_manager.allEvents) - set name = "Trigger Event (Debug Only)" - set category = "Debug" - - if(!holder) - return - - if(ispath(type)) - new type(new /datum/event_meta(EVENT_LEVEL_MAJOR)) - message_admins("[key_name_admin(usr)] has triggered an event. ([type])", 1) - -/client/proc/event_manager_panel() - set name = "Event Manager Panel" - set category = "Event" - if(event_manager) - event_manager.Interact(usr) - feedback_add_details("admin_verb","EMP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - -/proc/findEventArea() //Here's a nice proc to use to find an area for your event to land in! - var/area/candidate = null - - var/list/safe_areas = list( - /area/turret_protected/ai, - /area/turret_protected/ai_upload, - /area/engine, - /area/solar, - /area/holodeck, - /area/shuttle/arrival, - /area/shuttle/escape, - /area/shuttle/escape_pod1/station, - /area/shuttle/escape_pod2/station, - /area/shuttle/escape_pod3/station, - /area/shuttle/escape_pod5/station, - /area/shuttle/specops/station, - /area/shuttle/prison/station, - /area/shuttle/administration/station - ) - - //These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up. - var/list/danger_areas = list( - /area/engine/break_room, - /area/engine/chiefs_office) - - var/list/event_areas = list() - - for(var/areapath in the_station_areas) - event_areas += typesof(areapath) - for(var/areapath in safe_areas) - event_areas -= typesof(areapath) - for(var/areapath in danger_areas) - event_areas += typesof(areapath) - - while(event_areas.len > 0) - var/list/event_turfs = null - candidate = locate(pick_n_take(event_areas)) - event_turfs = get_area_turfs(candidate) - if(event_turfs.len > 0) - break - - return candidate - -/datum/event/proc/num_players() - var/players = 0 - for(var/mob/living/carbon/human/P in GLOB.player_list) - if(P.client) - players++ - return players - -// Returns how many characters are currently active(not logged out, not AFK for more than 10 minutes) -// with a specific role. -// Note that this isn't sorted by department, because e.g. having a roboticist shouldn't make meteors spawn. -/proc/number_active_with_role() - var/list/active_with_role = list() - active_with_role["Engineer"] = 0 - active_with_role["Medical"] = 0 - active_with_role["Security"] = 0 - active_with_role["Scientist"] = 0 - active_with_role["AI"] = 0 - active_with_role["Cyborg"] = 0 - active_with_role["Janitor"] = 0 - active_with_role["Botanist"] = 0 - active_with_role["Any"] = GLOB.player_list.len - - for(var/mob/M in GLOB.player_list) - if(!M.mind || !M.client || M.client.inactivity > 10 * 10 * 60) // longer than 10 minutes AFK counts them as inactive - continue - - if(istype(M, /mob/living/silicon/robot) && M:module && M:module.name == "engineering robot module") - active_with_role["Engineer"]++ - if(M.mind.assigned_role in list("Chief Engineer", "Station Engineer")) - active_with_role["Engineer"]++ - - if(istype(M, /mob/living/silicon/robot) && M:module && M:module.name == "medical robot module") - active_with_role["Medical"]++ - if(M.mind.assigned_role in list("Chief Medical Officer", "Medical Doctor")) - active_with_role["Medical"]++ - - if(istype(M, /mob/living/silicon/robot) && M:module && M:module.name == "security robot module") - active_with_role["Security"]++ - if(M.mind.assigned_role in security_positions) - active_with_role["Security"]++ - - if(M.mind.assigned_role in list("Research Director", "Scientist")) - active_with_role["Scientist"]++ - - if(M.mind.assigned_role == "AI") - active_with_role["AI"]++ - - if(M.mind.assigned_role == "Cyborg") - active_with_role["Cyborg"]++ - - if(M.mind.assigned_role == "Janitor") - active_with_role["Janitor"]++ - - if(M.mind.assigned_role == "Botanist") - active_with_role["Botanist"]++ - - return active_with_role diff --git a/code/controllers/subsystem/holiday.dm b/code/controllers/subsystem/holiday.dm new file mode 100644 index 00000000000..be9d6d4fc7d --- /dev/null +++ b/code/controllers/subsystem/holiday.dm @@ -0,0 +1,31 @@ +SUBSYSTEM_DEF(holiday) + name = "Holiday" + init_order = INIT_ORDER_HOLIDAY // 3 + flags = SS_NO_FIRE + var/list/holidays + +/datum/controller/subsystem/holiday/Initialize(start_timeofday) + if(!config.allow_holidays) + return ..() //Holiday stuff was not enabled in the config! + + var/YY = text2num(time2text(world.timeofday, "YY")) // get the current year + var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month + var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day + + for(var/H in subtypesof(/datum/holiday)) + var/datum/holiday/holiday = new H() + if(holiday.shouldCelebrate(DD, MM, YY)) + holiday.celebrate() + if(!holidays) + holidays = list() + holidays[holiday.name] = holiday + + if(holidays) + holidays = shuffle(holidays) + world.update_status() + for(var/datum/holiday/H in holidays) + if(H.eventChance) + if(prob(H.eventChance)) + H.handle_event() + + return ..() \ No newline at end of file diff --git a/code/controllers/subsystem/icon_smooth.dm b/code/controllers/subsystem/icon_smooth.dm index 65260e5af55..531b6af2e78 100644 --- a/code/controllers/subsystem/icon_smooth.dm +++ b/code/controllers/subsystem/icon_smooth.dm @@ -29,4 +29,4 @@ SUBSYSTEM_DEF(icon_smooth) smooth_icon(A) CHECK_TICK - ..() + return ..() diff --git a/code/controllers/subsystem/jobs.dm b/code/controllers/subsystem/jobs.dm index 3639db6bbd2..02f2681b22d 100644 --- a/code/controllers/subsystem/jobs.dm +++ b/code/controllers/subsystem/jobs.dm @@ -8,6 +8,8 @@ SUBSYSTEM_DEF(jobs) var/list/name_occupations = list() //Dict of all jobs, keys are titles var/list/type_occupations = list() //Dict of all jobs, keys are types var/list/prioritized_jobs = list() // List of jobs set to priority by HoP/Captain + var/list/id_change_records = list() // List of all job transfer records + var/list/id_change_counter = 1 //Players who need jobs var/list/unassigned = list() //Debug info @@ -17,7 +19,7 @@ SUBSYSTEM_DEF(jobs) if(!occupations.len) SetupOccupations() LoadJobs("config/jobs.txt") - ..() + return ..() /datum/controller/subsystem/jobs/proc/SetupOccupations(var/list/faction = list("Station")) occupations = list() @@ -601,3 +603,84 @@ SUBSYSTEM_DEF(jobs) spawn(0) to_chat(H, "Your account number is: [M.account_number], your account pin is: [M.remote_access_pin]") + +/datum/controller/subsystem/jobs/proc/format_jobs_for_id_computer(obj/item/card/id/tgtcard) + var/list/jobs_to_formats = list() + if(tgtcard) + var/mob/M = tgtcard.getPlayer() + for(var/datum/job/job in occupations) + if(tgtcard.assignment && tgtcard.assignment == job.title) + jobs_to_formats[job.title] = "disabled" // the job they already have is pre-selected + else if(!job.would_accept_job_transfer_from_player(M)) + jobs_to_formats[job.title] = "linkDiscourage" // karma jobs they don't have available are discouraged + else if(job.total_positions && !job.current_positions && job.title != "Civilian") + jobs_to_formats[job.title] = "linkEncourage" // jobs with nobody doing them at all are encouraged + else if(job.total_positions >= 0 && job.current_positions >= job.total_positions) + jobs_to_formats[job.title] = "linkDiscourage" // jobs that are full (no free positions) are discouraged + return jobs_to_formats + + +/datum/controller/subsystem/jobs/proc/log_job_transfer(transferee, oldvalue, newvalue, whodidit) + id_change_records["[id_change_counter]"] = list("transferee" = transferee, "oldvalue" = oldvalue, "newvalue" = newvalue, "whodidit" = whodidit, "timestamp" = station_time_timestamp()) + id_change_counter++ + +/datum/controller/subsystem/jobs/proc/slot_job_transfer(oldtitle, newtitle) + var/datum/job/oldjobdatum = SSjobs.GetJob(oldtitle) + var/datum/job/newjobdatum = SSjobs.GetJob(newtitle) + if(istype(oldjobdatum) && oldjobdatum.current_positions > 0 && istype(newjobdatum)) + if(!(oldjobdatum.title in command_positions) && !(newjobdatum.title in command_positions)) + oldjobdatum.current_positions-- + newjobdatum.current_positions++ + + +/datum/controller/subsystem/jobs/proc/fetch_transfer_record_html(var/centcom) + var/record_html = "" + + var/table_headers = list("Crewman", "Old Rank", "New Rank", "Authorized By", "Time") + var/hidden_fields = list("deletedby") + if(centcom) + table_headers += "Deleted By" + record_html += "" + for(var/thisheader in table_headers) + record_html += "" + record_html += "" + + var/visible_record_count = 0 + for(var/thisid in id_change_records) + var/thisrecord = id_change_records[thisid] + + if(thisrecord["deletedby"] && !centcom) + continue + + record_html += "" + for(var/lkey in thisrecord) + if(lkey in hidden_fields) + if(centcom) + record_html += "" + else + continue + else + record_html += "" + record_html += "" + visible_record_count++ + + record_html += "
[thisheader]
[thisrecord[lkey]][thisrecord[lkey]]
" + + if(!visible_record_count) + return "No records on file yet." + return record_html + +/datum/controller/subsystem/jobs/proc/delete_log_records(sourceuser, delete_all) + . = 0 + if(!sourceuser) + return + var/list/new_id_change_records = list() + for(var/thisid in id_change_records) + var/thisrecord = id_change_records[thisid] + if(!thisrecord["deletedby"]) + if(delete_all || thisrecord["whodidit"] == sourceuser) + thisrecord["deletedby"] = sourceuser + .++ + new_id_change_records["[id_change_counter]"] = thisrecord + id_change_counter++ + id_change_records = new_id_change_records \ No newline at end of file diff --git a/code/controllers/subsystem/machinery.dm b/code/controllers/subsystem/machinery.dm index af6898c39bd..9a73c1dbabb 100644 --- a/code/controllers/subsystem/machinery.dm +++ b/code/controllers/subsystem/machinery.dm @@ -17,7 +17,7 @@ SUBSYSTEM_DEF(machines) /datum/controller/subsystem/machines/Initialize() makepowernets() fire() - ..() + return ..() /datum/controller/subsystem/machines/proc/makepowernets() for(var/datum/powernet/PN in powernets) @@ -64,23 +64,6 @@ SUBSYSTEM_DEF(machines) if(MC_TICK_CHECK) return -/datum/controller/subsystem/machines/proc/process_premachines(resumed = 0) - /* Literally exists as snowflake for fucking powersinks goddamnit */ - if(!resumed) - src.currentrun = GLOB.processing_power_items.Copy() - //cache for sanid speed (lists are references anyways) - var/list/currentrun = src.currentrun - while(currentrun.len) - var/obj/item/I = currentrun[currentrun.len] - currentrun.len-- - if(!QDELETED(I)) - if(!I.pwr_drain()) - GLOB.processing_power_items.Remove(I) - else - GLOB.processing_power_items.Remove(I) - if(MC_TICK_CHECK) - return - /datum/controller/subsystem/machines/proc/process_machines(resumed = 0) var/seconds = wait * 0.1 if(!resumed) @@ -113,13 +96,6 @@ SUBSYSTEM_DEF(machines) if(state != SS_RUNNING) return resumed = 0 - currentpart = SSMACHINES_PREMACHINERY - - if(currentpart == SSMACHINES_PREMACHINERY || !resumed) - process_premachines(resumed) - if(state != SS_RUNNING) - return - resumed = 0 currentpart = SSMACHINES_MACHINERY if(currentpart == SSMACHINES_MACHINERY || !resumed) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 43c2f406365..d08fba5ff4f 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -28,7 +28,7 @@ SUBSYSTEM_DEF(mapping) // Populate mining Z-level hidden rooms for(var/i=0, i= max_spores) - return 0 + return if(spore_delay > world.time) - return 0 + return + flick("blob_factory_glow", src) spore_delay = world.time + 100 // 10 seconds var/mob/living/simple_animal/hostile/blob/blobspore/BS = new/mob/living/simple_animal/hostile/blob/blobspore(src.loc, src) BS.color = overmind.blob_reagent_datum.complementary_color BS.overmind = overmind overmind.blob_mobs.Add(BS) - return 0 - diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index e1a08555a10..4a2699802c1 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -9,7 +9,7 @@ /obj/structure/blob/node/New(loc, var/h = 100) blob_nodes += src - processing_objects.Add(src) + START_PROCESSING(SSobj, src) ..(loc, h) /obj/structure/blob/node/adjustcolors(var/a_color) @@ -26,7 +26,7 @@ /obj/structure/blob/node/Destroy() blob_nodes -= src - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/structure/blob/node/Life(seconds, times_fired) diff --git a/code/game/gamemodes/blob/blobs/resource.dm b/code/game/gamemodes/blob/blobs/resource.dm index 7198d3ef081..14c240f681b 100644 --- a/code/game/gamemodes/blob/blobs/resource.dm +++ b/code/game/gamemodes/blob/blobs/resource.dm @@ -13,13 +13,9 @@ qdel(src) /obj/structure/blob/resource/run_action() - if(resource_delay > world.time) - return 0 - + return + flick("blob_resource_glow", src) resource_delay = world.time + 40 // 4 seconds - if(overmind) overmind.add_points(1) - return 0 - diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index ca1dffbfa74..7ec1ec3b3f0 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -98,7 +98,7 @@ if(isovermind(M) || isobserver(M)) M.show_message(rendered, 2) -/mob/camera/blob/emote(var/act,var/m_type=1,var/message = null) +/mob/camera/blob/emote(act, m_type = 1, message = null, force) return /mob/camera/blob/blob_act() diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 748823829b5..61196c9862f 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -331,17 +331,13 @@ /mob/camera/blob/verb/rally_spores_power() set category = "Blob" - set name = "Rally Spores (5)" + set name = "Rally Spores" set desc = "Rally the spores to move to your location." var/turf/T = get_turf(src) rally_spores(T) /mob/camera/blob/proc/rally_spores(var/turf/T) - - if(!can_buy(5)) - return - to_chat(src, "You rally your spores.") var/list/surrounding_turfs = block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + 1, T.y + 1, T.z)) @@ -373,12 +369,12 @@ if(!N) to_chat(src, "A node is required to birth your offspring...") return - + if(!can_buy(100)) return split_used = TRUE - + new /obj/structure/blob/core/ (get_turf(N), 200, null, blob_core.point_rate, "offspring") qdel(N) @@ -399,7 +395,8 @@ else to_chat(usr, "You broadcast with your minions, [speak_text]") for(var/mob/living/simple_animal/hostile/blob_minion in blob_mobs) - blob_minion.say(speak_text) + if(blob_minion.stat == CONSCIOUS) + blob_minion.say(speak_text) return /mob/camera/blob/verb/create_storage() @@ -478,4 +475,4 @@ to_chat(src, "Node Blobs are blobs which grow, like the core. Like the core it can activate resource and factory blobs.") to_chat(src, "In addition to the buttons on your HUD, there are a few click shortcuts to speed up expansion and defense.") to_chat(src, "Shortcuts: Click = Expand Blob | CTRL Click = Create Shield Blob | Middle Mouse Click = Rally Spores | Alt Click = Remove Blob") - to_chat(src, "Attempting to talk will send a message to all other overminds, allowing you to coordinate with them.") \ No newline at end of file + to_chat(src, "Attempting to talk will send a message to all other overminds, allowing you to coordinate with them.") diff --git a/code/game/gamemodes/changeling/powers/fleshmend.dm b/code/game/gamemodes/changeling/powers/fleshmend.dm index 21d97863105..f6f7c16fd21 100644 --- a/code/game/gamemodes/changeling/powers/fleshmend.dm +++ b/code/game/gamemodes/changeling/powers/fleshmend.dm @@ -13,10 +13,10 @@ /obj/effect/proc_holder/changeling/fleshmend/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/effect/proc_holder/changeling/fleshmend/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/effect/proc_holder/changeling/fleshmend/process() diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 6288bed2964..4b5560fe333 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -433,7 +433,7 @@ ..() if(ismob(loc)) loc.visible_message("[loc.name]\'s flesh rapidly inflates, forming a bloated mass around [loc.p_their()] body!", "We inflate our flesh, creating a spaceproof suit!", "You hear organic matter ripping and tearing!") - processing_objects += src + START_PROCESSING(SSobj, src) /obj/item/clothing/suit/space/changeling/process() if(ishuman(loc)) diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index 2fbbcdc413d..e93556ca843 100644 --- a/code/game/gamemodes/cult/cult_comms.dm +++ b/code/game/gamemodes/cult/cult_comms.dm @@ -39,7 +39,7 @@ my_message = "Harbringer of the Slaughter: [message]" else my_message = "[(ishuman(user) ? "Acolyte" : "Construct")] [user]: [message]" - for(var/mob/M in GLOB.mob_list) + for(var/mob/M in GLOB.player_list) if(iscultist(M)) to_chat(M, my_message) else if(M in GLOB.dead_mob_list) diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 63e0626f481..60f878257db 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -193,11 +193,11 @@ var/list/blacklisted_pylon_turfs = typecacheof(list( return /obj/structure/cult/functional/pylon/New() - processing_objects |= src + START_PROCESSING(SSobj, src) ..() /obj/structure/cult/functional/pylon/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/structure/cult/functional/pylon/process() diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 535823ebfee..5f3ed489107 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -88,7 +88,7 @@ ///process() ///Called by the gameticker -/datum/game_mode/proc/process() +/datum/game_mode/process() return 0 //Called by the gameticker diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index c2268063822..972075ceece 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -172,10 +172,10 @@ var/round_start_time = 0 to_chat(world, "Enjoy the game!") world << sound('sound/AI/welcome.ogg')// Skie - if(holiday_master.holidays) + if(SSholiday.holidays) to_chat(world, "and...") - for(var/holidayname in holiday_master.holidays) - var/datum/holiday/holiday = holiday_master.holidays[holidayname] + for(var/holidayname in SSholiday.holidays) + var/datum/holiday/holiday = SSholiday.holidays[holidayname] to_chat(world, "

[holiday.greet()]

") spawn(0) // Forking dynamic room selection @@ -400,7 +400,7 @@ var/round_start_time = 0 if(m) to_chat(world, "Tip of the round: [html_encode(m)]") -/datum/controller/gameticker/proc/process() +/datum/controller/gameticker/proc/process_decrepit() if(current_state != GAME_STATE_PLAYING) return 0 @@ -506,7 +506,13 @@ var/round_start_time = 0 mode.declare_station_goal_completion() //Ask the event manager to print round end information - event_manager.RoundEnd() + SSevents.RoundEnd() + + // Add AntagHUD to everyone, see who was really evil the whole time! + for(var/datum/atom_hud/antag/H in huds) + for(var/m in GLOB.player_list) + var/mob/M = m + H.add_hud_to(M) return 1 diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 830ae26f3c1..bfde102ca35 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -56,7 +56,7 @@ var/announced = 0 /obj/machinery/doomsday_device/Destroy() - GLOB.fast_processing -= src + STOP_PROCESSING(SSfastprocess, src) SSshuttle.emergencyNoEscape = 0 if(SSshuttle.emergency.mode == SHUTTLE_STRANDED) SSshuttle.emergency.mode = SHUTTLE_DOCKED @@ -67,7 +67,7 @@ /obj/machinery/doomsday_device/proc/start() detonation_timer = world.time + default_timer timing = 1 - GLOB.fast_processing += src + START_PROCESSING(SSfastprocess, src) SSshuttle.emergencyNoEscape = 1 /obj/machinery/doomsday_device/proc/seconds_remaining() @@ -84,7 +84,7 @@ priority_announcement.Announce("Hostile environment resolved. You have 3 minutes to board the Emergency Shuttle.", "Priority Announcement", 'sound/AI/shuttledock.ogg') qdel(src) if(!timing) - GLOB.fast_processing -= src + STOP_PROCESSING(SSfastprocess, src) return var/sec_left = seconds_remaining() if(sec_left <= 0) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 92ac300cc00..827eefb569d 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -110,15 +110,15 @@ M.SetStunned(0) M.SetWeakened(0) combat_cooldown = 0 - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/clothing/suit/armor/abductor/vest/process() combat_cooldown++ if(combat_cooldown==initial(combat_cooldown)) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /obj/item/clothing/suit/armor/abductor/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) for(var/obj/machinery/abductor/console/C in GLOB.machines) if(C.vest == src) C.vest = null diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 8f058a872e6..fbe1774525f 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -373,11 +373,11 @@ /obj/effect/cocoon/abductor/proc/Start() hatch_time = world.time + 600 - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/effect/cocoon/abductor/process() if(world.time > hatch_time) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) for(var/mob/M in contents) src.visible_message("[src] hatches!") M.forceMove(get_turf(src)) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 34d1f64f0d0..fa797ac929b 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -32,7 +32,7 @@ return FALSE return B.host.say_understands(other, speaking) -/mob/living/captive_brain/emote(var/message) +/mob/living/captive_brain/emote(act, m_type = 1, message = null, force) return /mob/living/captive_brain/resist() @@ -157,7 +157,7 @@ if(!istype(S.speaking, /datum/language/corticalborer) && loc == host && !talk_inside_host) to_chat(src, "You've disabled audible speech while inside a host! Re-enable it under the borer tab, or stick to borer communications.") return - + . = ..() /mob/living/simple_animal/borer/verb/Communicate() @@ -475,7 +475,7 @@ set category = "Borer" set name = "Dominate Victim" set desc = "Freeze the limbs of a potential host with supernatural fear." - + if(world.time - used_dominate < 150) to_chat(src, "You cannot use that ability again so soon.") return @@ -487,22 +487,22 @@ if(stat) to_chat(src, "You cannot do that in your current state.") return - + if(attempting_to_dominate) to_chat(src, "You're already targeting someone!") return - + var/list/choices = list() for(var/mob/living/carbon/C in view(3,src)) if(C.stat != DEAD) choices += C - + if(world.time - used_dominate < 300) to_chat(src, "You cannot use that ability again so soon.") return - + attempting_to_dominate = TRUE - + var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices if(!M) @@ -519,8 +519,8 @@ if(incapacitated()) attempting_to_dominate = FALSE - return - + return + if(get_dist(src, M) > 7) //to avoid people remotely doing from across the map etc, 7 is the default view range to_chat(src, "You're too far away!") attempting_to_dominate = FALSE @@ -760,10 +760,9 @@ to_chat(src, "Your host twitches and quivers as you rapdly excrete several larvae from your sluglike body.") visible_message("[src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") B.chemicals -= 100 - - new /obj/effect/decal/cleanable/vomit(get_turf(src)) - playsound(loc, 'sound/effects/splat.ogg', 50, 1) - new /mob/living/simple_animal/borer(get_turf(src),B.generation + 1) + var/turf/T = get_turf(src) + T.add_vomit_floor() + new /mob/living/simple_animal/borer(T, B.generation + 1) else to_chat(src, "You need 100 chemicals to reproduce!") diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index bde3f7ee8e9..54b01ff38ce 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -2,7 +2,9 @@ //"Ghosts" that are invisible and move like ghosts, cannot take damage while invsible //Don't hear deadchat and are NOT normal ghosts //Admin-spawn or random event + #define INVISIBILITY_REVENANT 50 +#define REVENANT_NAME_FILE "revenant_names.json" /mob/living/simple_animal/revenant name = "revenant" @@ -124,9 +126,17 @@ ghost_darkness_images |= ghostimage updateallghostimages() remove_from_all_data_huds() + random_revenant_name() addtimer(CALLBACK(src, .proc/firstSetupAttempt), 15 SECONDS) // Give admin 15 seconds to put in a ghost (Or wait 15 seconds before giving it objectives) +/mob/living/simple_animal/revenant/proc/random_revenant_name() + var/built_name = "" + built_name += pick(strings(REVENANT_NAME_FILE, "spirit_type")) + built_name += " of " + built_name += pick(strings(REVENANT_NAME_FILE, "adjective")) + built_name += pick(strings(REVENANT_NAME_FILE, "theme")) + name = built_name /mob/living/simple_animal/revenant/proc/firstSetupAttempt() if(mind) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 94190149848..2e36488cc8a 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -407,7 +407,7 @@ var/bomb_set /obj/item/disk/nuclear/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) GLOB.poi_list |= src /obj/item/disk/nuclear/process() @@ -437,7 +437,7 @@ var/bomb_set message_admins("[src] has been !!force deleted!! in ([diskturf ? "[diskturf.x], [diskturf.y] ,[diskturf.z] - JMP":"nonexistent location"]).") log_game("[src] has been !!force deleted!! in ([diskturf ? "[diskturf.x], [diskturf.y] ,[diskturf.z]":"nonexistent location"]).") GLOB.poi_list.Remove(src) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() if(blobstart.len > 0) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 30c79798b2f..ea95f62af57 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -335,7 +335,7 @@ include_user = 1 var/blind_smoke_acquired var/screech_acquired - var/drainLifeAcquired + var/nullChargeAcquired var/reviveThrallAcquired action_icon_state = "collective_mind" @@ -370,10 +370,11 @@ It will create a choking cloud that will blind any non-thralls who enter.") target.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/blindness_smoke(null)) - if(thralls >= CEILING(7 * ticker.mode.thrall_ratio, 1) && !drainLifeAcquired) - drainLifeAcquired = 1 - to_chat(target, "The power of your thralls has granted you the Drain Life ability. You can now drain the health of nearby humans to heal yourself.") - target.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/drainLife(null)) + if(thralls >= CEILING(7 * ticker.mode.thrall_ratio, 1) && !nullChargeAcquired) + nullChargeAcquired = 1 + to_chat(user, "The power of your thralls has granted you the Null Charge ability. This ability will drain an APC's contents to the void, preventing it from recharging \ + or sending power until repaired.") + target.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/null_charge(null)) if(thralls >= CEILING(9 * ticker.mode.thrall_ratio, 1) && !reviveThrallAcquired) reviveThrallAcquired = 1 @@ -491,45 +492,57 @@ for(var/obj/structure/window/W in T.contents) W.take_damage(rand(80, 100)) -/obj/effect/proc_holder/spell/aoe_turf/drainLife - name = "Drain Life" - desc = "Damages nearby humans, draining their life and healing your own wounds." +/obj/effect/proc_holder/spell/aoe_turf/null_charge + name = "Null Charge" + desc = "Empties an APC, preventing it from recharging until fixed." panel = "Shadowling Abilities" - range = 3 - charge_max = 100 - clothes_req = 0 - var/targetsDrained - var/list/nearbyTargets - action_icon_state = "drain_life" + charge_max = 600 + clothes_req = FALSE + action_icon_state = "null_charge" -/obj/effect/proc_holder/spell/aoe_turf/drainLife/cast(list/targets, mob/user = usr) +/obj/effect/proc_holder/spell/aoe_turf/null_charge/cast(mob/user = usr) if(!shadowling_check(user)) charge_counter = charge_max return - var/mob/living/carbon/human/U = usr - targetsDrained = 0 - nearbyTargets = list() - for(var/turf/T in targets) - for(var/mob/living/carbon/M in T.contents) - if(M == src) - continue - targetsDrained++ - nearbyTargets.Add(M) - if(!targetsDrained) + + var/list/local_objs = view(1, user) + var/obj/machinery/power/apc/target_apc + for(var/object in local_objs) + if(istype(object, /obj/machinery/power/apc)) + target_apc = object + break + + if(!target_apc) + to_chat(user, "You must stand next to an APC to drain it!") charge_counter = charge_max - to_chat(U, "There were no nearby humans for you to drain.") return - for(var/mob/living/carbon/M in nearbyTargets) - U.heal_organ_damage(10, 10) - U.adjustToxLoss(-10) - U.adjustOxyLoss(-10) - U.adjustStaminaLoss(-20) - U.AdjustWeakened(-1) - U.AdjustStunned(-1) - M.adjustOxyLoss(20) - M.adjustStaminaLoss(20) - to_chat(M, "You feel a wave of exhaustion and a curious draining sensation directed towards [U]!") - to_chat(U, "You draw life from those around you to heal your wounds.") + + if(target_apc.cell?.charge == 0) + to_chat(user, "APC must have a power to drain!") + charge_counter = charge_max + return + + target_apc.operating = 0 + target_apc.update() + target_apc.update_icon() + target_apc.visible_message("The [target_apc] flickers and begins to grow dark.") + + to_chat(user, "You dim the APC's screen and carefully begin siphoning its power into the void.") + if(!do_after(user, 200, target=target_apc)) + //Whoops! The APC's powers back on + to_chat(user, "Your concentration breaks and the APC suddenly repowers!") + target_apc.operating = 1 + target_apc.update() + target_apc.update_icon() + target_apc.visible_message("The [target_apc] begins glowing brightly!") + else + //We did it! + to_chat(user, "You sent the APC's power to the void while overloading all it's lights!") + target_apc.cell?.charge = 0 //Sent to the shadow realm + target_apc.chargemode = 0 //Won't recharge either until an someone hits the button + target_apc.charging = 0 + target_apc.null_charge() + target_apc.update_icon() diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index f78520ac7eb..5e7b8f9a237 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -226,6 +226,7 @@ target.Weaken(5) target.stuttering = 20 to_chat(target, "You are blinded by [user]'s glare.") + add_attack_logs(user, target, "(Vampire) Glared at") /obj/effect/proc_holder/spell/vampire/self/shapeshift name = "Shapeshift (50)" diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index dbe3146dd7f..243f4e3a3fa 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -153,9 +153,13 @@ src.spawn_amt_left = spawn_amt src.desc = desc - processing_objects.Add(src) + START_PROCESSING(SSobj, src) //return +/obj/effect/rend/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + /obj/effect/rend/process() for(var/mob/M in loc) return diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 66cdff69b3f..0a1340d885b 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -469,6 +469,24 @@ dat += "Already cast!
" return dat +/datum/spellbook_entry/summon/ghosts + name = "Summon Ghosts" + desc = "Spook the crew out by making them see dead people. Be warned, ghosts are capricious and occasionally vindicative, and some will use their incredibly minor abilities to frustrate you." + cost = 0 + +/datum/spellbook_entry/summon/ghosts/IsAvailible() + if(!ticker.mode) + return FALSE + else + return TRUE + +/datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book) + new /datum/event/wizard/ghost() + active = TRUE + to_chat(user, "You have cast summon ghosts!") + playsound(get_turf(user), 'sound/effects/ghost2.ogg', 50, 1) + return TRUE + /datum/spellbook_entry/summon/guns name = "Summon Guns" category = "Rituals" diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 9e06d662053..eebe4f2e9e4 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -256,6 +256,8 @@ if(H.mind && H.mind.initial_account) C.associated_account_number = H.mind.initial_account.account_number + C.owner_uid = H.UID() + C.owner_ckey = H.ckey /datum/outfit/job/proc/imprint_pda(mob/living/carbon/human/H) var/obj/item/pda/PDA = H.wear_pda @@ -265,3 +267,10 @@ PDA.ownjob = C.assignment PDA.ownrank = C.rank PDA.name = "PDA-[H.real_name] ([PDA.ownjob])" + +/datum/job/proc/would_accept_job_transfer_from_player(mob/player) + if(!guest_jobbans(title)) // actually checks if job is a whitelisted position + return TRUE + if(!istype(player)) + return FALSE + return is_job_whitelisted(player, title) diff --git a/code/game/jobs/job_exp.dm b/code/game/jobs/job_exp.dm index 6f5be69280a..7c228ba554f 100644 --- a/code/game/jobs/job_exp.dm +++ b/code/game/jobs/job_exp.dm @@ -257,13 +257,14 @@ var/global/list/role_playtime_requirements = list( play_records[rtype] = text2num(read_records[rtype]) else play_records[rtype] = 0 - if(mob.stat == CONSCIOUS && mob.mind.assigned_role) + var/myrole = mob.mind.playtime_role ? mob.mind.playtime_role : mob.mind.assigned_role + if(mob.stat == CONSCIOUS && myrole) play_records[EXP_TYPE_LIVING] += minutes if(announce_changes) to_chat(mob,"You got: [minutes] Living EXP!") for(var/category in exp_jobsmap) if(exp_jobsmap[category]["titles"]) - if(mob.mind.assigned_role in exp_jobsmap[category]["titles"]) + if(myrole in exp_jobsmap[category]["titles"]) play_records[category] += minutes if(announce_changes) to_chat(mob,"You got: [minutes] [category] EXP!") diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 95e609ee524..e392b468557 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -371,7 +371,15 @@ update_flag SSnanoui.update_uis(src) // Update all NanoUIs attached to src - +/obj/machinery/portable_atmospherics/canister/replace_tank(mob/living/user, close_valve) + . = ..() + if(.) + if(close_valve) + valve_open = FALSE + update_icon() + investigate_log("Valve was closed by [key_name(user)].
", "atmos") + else if(valve_open && holding) + investigate_log("[key_name(user)] started a transfer into [holding].
", "atmos") /obj/machinery/portable_atmospherics/canister/attack_ai(var/mob/user as mob) src.add_hiddenprint(user) diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index dfecc3a4409..71e1310f96b 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -82,16 +82,49 @@ /obj/machinery/portable_atmospherics/portableConnectorReturnAir() return air_contents -/obj/machinery/portable_atmospherics/attackby(var/obj/item/W as obj, var/mob/user as mob, params) - if((istype(W, /obj/item/tank) && !( src.destroyed ))) - if(src.holding) - return - var/obj/item/tank/T = W - user.drop_item() - T.loc = src - src.holding = T - update_icon() +/obj/machinery/portable_atmospherics/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") return + if(!in_range(src, user)) + return + if(!ishuman(usr) && !issilicon(usr)) + return + if(holding) + to_chat(user, "You remove [holding] from [src].") + replace_tank(user, TRUE) + +/obj/machinery/portable_atmospherics/examine(mob/user) + ..() + if(holding) + to_chat(user, "\The [src] contains [holding]. Alt-click [src] to remove it.") + +/obj/machinery/portable_atmospherics/proc/replace_tank(mob/living/user, close_valve, obj/item/tank/new_tank) + if(holding) + holding.forceMove(drop_location()) + if(Adjacent(user) && !issilicon(user)) + user.put_in_hands(holding) + if(new_tank) + holding = new_tank + else + holding = null + update_icon() + return TRUE + +/obj/machinery/portable_atmospherics/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/tank)) + if(!(stat & BROKEN)) + if(!user.drop_item()) + return + var/obj/item/tank/T = W + user.drop_item() + if(src.holding) + to_chat(user, "[holding ? "In one smooth motion you pop [holding] out of [src]'s connector and replace it with [T]" : "You insert [T] into [src]"].") + replace_tank(user, FALSE) + T.loc = src + src.holding = T + update_icon() + return else if(istype(W, /obj/item/wrench)) if(connected_port) diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index a7680e815ff..5bd441f6748 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -95,6 +95,16 @@ /obj/machinery/portable_atmospherics/pump/return_air() return air_contents +/obj/machinery/portable_atmospherics/pump/replace_tank(mob/living/user, close_valve) + . = ..() + if(.) + if(close_valve) + if(on) + on = FALSE + update_icon() + else if(on && holding && direction_out) + investigate_log("[key_name(user)] started a transfer into [holding].
", "atmos") + /obj/machinery/portable_atmospherics/pump/attack_ai(var/mob/user as mob) src.add_hiddenprint(user) return src.attack_hand(user) @@ -139,10 +149,14 @@ if(href_list["power"]) on = !on + if(on && direction_out) + investigate_log("[key_name(usr)] started a transfer into [holding].
", "atmos") update_icon() if(href_list["direction"]) direction_out = !direction_out + if(on && holding) + investigate_log("[key_name(usr)] started a transfer into [holding].
", "atmos") if(href_list["remove_tank"]) if(holding) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 7535381197a..0eb627d1e62 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -295,10 +295,10 @@ to_chat(O, "The screen bursts into static.") /obj/machinery/camera/proc/triggerCameraAlarm() - camera_alarm.triggerAlarm(loc, src) + SSalarms.camera_alarm.triggerAlarm(loc, src) /obj/machinery/camera/proc/cancelCameraAlarm() - camera_alarm.clearAlarm(loc, src) + SSalarms.camera_alarm.clearAlarm(loc, src) /obj/machinery/camera/proc/can_use() if(!status) diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index eeb9eeb60d3..17f64c07cb8 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -45,7 +45,7 @@ if(!status || (stat & NOPOWER)) return 0 if(detectTime == -1) - motion_alarm.clearAlarm(loc, src) + SSalarms.motion_alarm.clearAlarm(loc, src) detectTime = 0 return 1 @@ -53,7 +53,7 @@ if(!status || (stat & NOPOWER)) return 0 if(!detectTime) return 0 - motion_alarm.triggerAlarm(loc, src) + SSalarms.motion_alarm.triggerAlarm(loc, src) detectTime = -1 return 1 diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 6d360a2ddb3..54841a78a08 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -470,7 +470,7 @@ M.nutrition -= 50 //lose a lot of food var/turf/location = usr.loc if(istype(location, /turf/simulated)) - location.add_vomit_floor(src, 1) + location.add_vomit_floor(TRUE) if(ORION_TRAIL_FLUX) if(prob(75)) M.Weaken(3) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index f2137d2ee8f..f8c2979e043 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -12,10 +12,10 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert/New() ..() - atmosphere_alarm.register(src, /obj/machinery/computer/station_alert/update_icon) + SSalarms.atmosphere_alarm.register(src, /obj/machinery/computer/station_alert/update_icon) /obj/machinery/computer/atmos_alert/Destroy() - atmosphere_alarm.unregister(src) + SSalarms.atmosphere_alarm.unregister(src) return ..() /obj/machinery/computer/atmos_alert/attack_hand(mob/user) @@ -33,10 +33,10 @@ var/global/list/minor_air_alarms = list() var/major_alarms[0] var/minor_alarms[0] - for(var/datum/alarm/alarm in atmosphere_alarm.major_alarms()) + for(var/datum/alarm/alarm in SSalarms.atmosphere_alarm.major_alarms()) major_alarms[++major_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "\ref[alarm]") - for(var/datum/alarm/alarm in atmosphere_alarm.minor_alarms()) + for(var/datum/alarm/alarm in SSalarms.atmosphere_alarm.minor_alarms()) minor_alarms[++minor_alarms.len] = list("name" = sanitize(alarm.alarm_name()), "ref" = "\ref[alarm]") data["priority_alarms"] = major_alarms @@ -45,11 +45,11 @@ var/global/list/minor_air_alarms = list() return data /obj/machinery/computer/atmos_alert/update_icon() - var/list/alarms = atmosphere_alarm.major_alarms() + var/list/alarms = SSalarms.atmosphere_alarm.major_alarms() if(alarms.len) icon_screen = "alert:2" else - alarms = atmosphere_alarm.minor_alarms() + alarms = SSalarms.atmosphere_alarm.minor_alarms() if(alarms.len) icon_screen = "alert:1" else @@ -61,7 +61,7 @@ var/global/list/minor_air_alarms = list() return 1 if(href_list["clear_alarm"]) - var/datum/alarm/alarm = locate(href_list["clear_alarm"]) in atmosphere_alarm.alarms + var/datum/alarm/alarm = locate(href_list["clear_alarm"]) in SSalarms.atmosphere_alarm.alarms if(alarm) for(var/datum/alarm_source/alarm_source in alarm.sources) var/obj/machinery/alarm/air_alarm = alarm_source.source diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 2b294db78c9..c9e5e8ba676 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -56,6 +56,17 @@ /obj/item/circuitboard/machine board_type = "machine" +/obj/item/circuitboard/examine(mob/user) + ..() + if(LAZYLEN(req_components)) + var/list/nice_list = list() + for(var/B in req_components) + var/atom/A = B + if(!ispath(A)) + continue + nice_list += list("[req_components[A]] [initial(A.name)]") + to_chat(user,"Required components: [english_list(nice_list)].") + /obj/item/circuitboard/message_monitor name = "Circuit board (Message Monitor)" build_path = /obj/machinery/computer/message_monitor diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 5cb19358358..f4d21cbd125 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -66,14 +66,15 @@ var/time_last_changed_position = 0 /obj/machinery/computer/card/proc/get_target_rank() return modify && modify.assignment ? modify.assignment : "Unassigned" -/obj/machinery/computer/card/proc/format_jobs(list/jobs) +/obj/machinery/computer/card/proc/format_jobs(list/jobs, targetrank, list/jobformats) var/list/formatted = list() for(var/job in jobs) if(job_in_department(SSjobs.GetJob(job))) formatted.Add(list(list( "display_name" = replacetext(job, " ", " "), - "target_rank" = get_target_rank(), - "job" = job))) + "target_rank" = targetrank, + "job" = job, + "jlinkformat" = jobformats[job] ? jobformats[job] : null))) return formatted @@ -117,12 +118,14 @@ var/time_last_changed_position = 0 if(!usr.get_active_hand() && Adjacent(usr)) usr.put_in_hands(scan) scan = null + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else if(modify) to_chat(usr, "You remove \the [modify] from \the [src].") modify.forceMove(get_turf(src)) if(!usr.get_active_hand() && Adjacent(usr)) usr.put_in_hands(modify) modify = null + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else to_chat(usr, "There is nothing to remove from the console.") @@ -134,10 +137,12 @@ var/time_last_changed_position = 0 user.drop_item() id_card.loc = src scan = id_card + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else if(!modify) user.drop_item() id_card.loc = src modify = id_card + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) SSnanoui.update_uis(src) attack_hand(user) @@ -242,6 +247,7 @@ var/time_last_changed_position = 0 data["target_owner"] = modify && modify.registered_name ? modify.registered_name : "-----" data["target_rank"] = get_target_rank() data["scan_name"] = scan ? scan.name : "-----" + data["scan_owner"] = scan && scan.registered_name ? scan.registered_name : null data["authenticated"] = is_authenticated(user) data["has_modify"] = !!modify data["account_number"] = modify ? modify.associated_account_number : null @@ -249,15 +255,19 @@ var/time_last_changed_position = 0 data["all_centcom_access"] = null data["regions"] = null data["target_dept"] = target_dept + data["card_is_owned"] = modify && modify.owner_ckey - data["engineering_jobs"] = format_jobs(engineering_positions) - data["medical_jobs"] = format_jobs(medical_positions) - data["science_jobs"] = format_jobs(science_positions) - data["security_jobs"] = format_jobs(security_positions) - data["support_jobs"] = format_jobs(support_positions) - data["civilian_jobs"] = format_jobs(civilian_positions) - data["special_jobs"] = format_jobs(whitelisted_positions) - data["centcom_jobs"] = format_jobs(get_all_centcom_jobs()) + var/list/job_formats = SSjobs.format_jobs_for_id_computer(modify) + + data["top_jobs"] = format_jobs(list("Captain", "Custom"), data["target_rank"], job_formats) + data["engineering_jobs"] = format_jobs(engineering_positions, data["target_rank"], job_formats) + data["medical_jobs"] = format_jobs(medical_positions, data["target_rank"], job_formats) + data["science_jobs"] = format_jobs(science_positions, data["target_rank"], job_formats) + data["security_jobs"] = format_jobs(security_positions, data["target_rank"], job_formats) + data["support_jobs"] = format_jobs(support_positions, data["target_rank"], job_formats) + data["civilian_jobs"] = format_jobs(civilian_positions, data["target_rank"], job_formats) + data["special_jobs"] = format_jobs(whitelisted_positions, data["target_rank"], job_formats) + data["centcom_jobs"] = format_jobs(get_all_centcom_jobs(), data["target_rank"], job_formats) data["card_skins"] = format_card_skins(get_station_card_skins()) data["job_slots"] = format_job_slots() @@ -268,6 +278,9 @@ var/time_last_changed_position = 0 data["cooldown_mins"] = mins data["cooldown_secs"] = (seconds < 10) ? "0[seconds]" : seconds + if(mode == 3 && is_authenticated(user)) + data["id_change_html"] = SSjobs.fetch_transfer_record_html(is_centcom()) + if(modify) data["current_skin"] = modify.icon_state @@ -315,15 +328,18 @@ var/time_last_changed_position = 0 if(!usr.get_active_hand() && Adjacent(usr)) usr.put_in_hands(modify) modify = null + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else modify.forceMove(get_turf(src)) modify = null + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else if(Adjacent(usr)) var/obj/item/I = usr.get_active_hand() if(istype(I, /obj/item/card/id)) usr.drop_item() I.forceMove(src) modify = I + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) if("scan") if(scan) @@ -332,15 +348,18 @@ var/time_last_changed_position = 0 if(!usr.get_active_hand() && Adjacent(usr)) usr.put_in_hands(scan) scan = null + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else scan.forceMove(get_turf(src)) scan = null + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) else if(Adjacent(usr)) var/obj/item/I = usr.get_active_hand() if(istype(I, /obj/item/card/id)) usr.drop_item() I.forceMove(src) scan = I + playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) if("access") if(href_list["allowed"] && !target_dept) @@ -361,7 +380,7 @@ var/time_last_changed_position = 0 if("assign") if(is_authenticated(usr) && modify) var/t1 = href_list["assign_target"] - if(target_dept && modify.assignment == "Unassigned") + if(target_dept && modify.assignment == "Demoted") visible_message("[src]: Demoted individuals must see the HoP for a new job.") return 0 if(!job_in_department(SSjobs.GetJob(modify.rank), FALSE)) @@ -373,11 +392,12 @@ var/time_last_changed_position = 0 var/temp_t = sanitize(copytext(input("Enter a custom job assignment.","Assignment"),1,MAX_MESSAGE_LEN)) //let custom jobs function as an impromptu alt title, mainly for sechuds if(temp_t && modify) + SSjobs.log_job_transfer(modify.registered_name, modify.getRankAndAssignment(), temp_t, scan.registered_name) modify.assignment = temp_t log_game("[key_name(usr)] has given \"[modify.registered_name]\" the custom job title \"[temp_t]\".") else var/list/access = list() - if(is_centcom()) + if(is_centcom() && islist(get_centcom_access(t1))) access = get_centcom_access(t1) else var/datum/job/jobdatum @@ -397,6 +417,16 @@ var/time_last_changed_position = 0 if(t1 == "Civilian") message_admins("[key_name_admin(usr)] has reassigned \"[modify.registered_name]\" from \"[jobnamedata]\" to \"[t1]\".") + SSjobs.log_job_transfer(modify.registered_name, jobnamedata, t1, scan.registered_name) + SSjobs.slot_job_transfer(modify.rank, t1) + + var/mob/living/carbon/human/H = modify.getPlayer() + if(istype(H)) + if(jobban_isbanned(H, t1)) + message_admins("[ADMIN_FULLMONTY(H)] has been assigned the job [t1], in possible violation of their job ban.") + if(H.mind) + H.mind.playtime_role = t1 + modify.access = access modify.rank = t1 modify.assignment = t1 @@ -426,6 +456,20 @@ var/time_last_changed_position = 0 if("mode") mode = text2num(href_list["mode_target"]) + if("wipe_my_logs") + if(is_authenticated(usr) && is_centcom()) + var/delcount = SSjobs.delete_log_records(scan.registered_name, FALSE) + if(delcount) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + SSnanoui.update_uis(src) + + if("wipe_all_logs") + if(is_authenticated(usr) && !target_dept) + var/delcount = SSjobs.delete_log_records(scan.registered_name, TRUE) + if(delcount) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + SSnanoui.update_uis(src) + if("print") if(!printing && !target_dept) printing = 1 @@ -464,14 +508,15 @@ var/time_last_changed_position = 0 var/jobnamedata = modify.getRankAndAssignment() log_game("[key_name(usr)] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\".") message_admins("[key_name_admin(usr)] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\".") + SSjobs.log_job_transfer(modify.registered_name, jobnamedata, "Terminated", scan.registered_name) modify.assignment = "Terminated" modify.access = list() callHook("terminate_employee", list(modify)) if("demote") if(is_authenticated(usr)) - if(modify.assignment == "Unassigned") - visible_message("[src]: Unassigned crew cannot be demoted any further. If further action is warranted, ask the Captain about Termination.") + if(modify.assignment == "Demoted") + visible_message("[src]: Demoted crew cannot be demoted any further. If further action is warranted, ask the Captain about Termination.") return 0 if(!job_in_department(SSjobs.GetJob(modify.rank), FALSE)) visible_message("[src]: Heads may only demote members of their own department.") @@ -482,12 +527,13 @@ var/time_last_changed_position = 0 access = jobdatum.get_access() var/jobnamedata = modify.getRankAndAssignment() - log_game("[key_name(usr)] has demoted \"[modify.registered_name]\" the \"[jobnamedata]\" to \"Civilian (Unassigned)\".") - message_admins("[key_name_admin(usr)] has demoted \"[modify.registered_name]\" the \"[jobnamedata]\" to \"Civilian (Unassigned)\".") + log_game("[key_name(usr)] has demoted \"[modify.registered_name]\" the \"[jobnamedata]\" to \"Civilian (Demoted)\".") + message_admins("[key_name_admin(usr)] has demoted \"[modify.registered_name]\" the \"[jobnamedata]\" to \"Civilian (Demoted)\".") + SSjobs.log_job_transfer(modify.registered_name, jobnamedata, "Demoted", scan.registered_name) modify.access = access modify.rank = "Civilian" - modify.assignment = "Unassigned" + modify.assignment = "Demoted" modify.icon_state = "id" if("make_job_available") diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index a5198da6e56..b39c005855c 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -38,7 +38,7 @@ if(isturf(T)) attached = locate() in T if(attached) - return attached.get_powernet() + return attached.powernet /obj/machinery/computer/monitor/attack_ai(mob/user) attack_hand(user) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 8fefabbf877..75c4e466a79 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -54,6 +54,7 @@ /obj/machinery/disco/Destroy() dance_over() selection = null + STOP_PROCESSING(SSobj, src) return ..() /obj/machinery/disco/attackby(obj/item/O, mob/user, params) @@ -128,7 +129,7 @@ active = TRUE update_icon() dance_setup() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) lights_spin() updateUsrDialog() else if(active) @@ -472,7 +473,7 @@ L.stop_sound_channel(CHANNEL_JUKEBOX) else if(active) active = FALSE - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) dance_over() playsound(src,'sound/machines/terminal_off.ogg',50,1) icon_state = "disco0" diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 496d8942bcc..5a53381ef07 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -39,8 +39,7 @@ if(command_completed(cur_command)) cur_command = null else - if(!isprocessing) - START_PROCESSING(SSmachines, src) + START_PROCESSING(SSmachines, src) /obj/machinery/door/airlock/proc/do_command(command) switch(command) diff --git a/code/game/machinery/embedded_controller/embedded_program_base.dm b/code/game/machinery/embedded_controller/embedded_program_base.dm index 1fe527df13b..5bd46b2f3e0 100644 --- a/code/game/machinery/embedded_controller/embedded_program_base.dm +++ b/code/game/machinery/embedded_controller/embedded_program_base.dm @@ -17,8 +17,8 @@ /datum/computer/file/embedded_program/proc/receive_signal(datum/signal/signal, receive_method, receive_param) return -/datum/computer/file/embedded_program/proc/process() - return +/datum/computer/file/embedded_program/process() + return FALSE /datum/computer/file/embedded_program/proc/post_signal(datum/signal/signal, comm_line) if(master) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index f1651d5bb99..835b0264229 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -143,7 +143,7 @@ FIRE ALARM alarm() time = 0 timing = 0 - processing_objects -= src + STOP_PROCESSING(SSobj, src) updateDialog() last_process = world.timeofday @@ -206,9 +206,9 @@ FIRE ALARM last_process = world.timeofday if(oldTiming != timing) if(timing) - processing_objects += src + START_PROCESSING(SSobj, src) else - processing_objects -= src + STOP_PROCESSING(SSobj, src) else if(href_list["tp"]) var/tp = text2num(href_list["tp"]) time += tp @@ -220,7 +220,7 @@ FIRE ALARM var/area/A = get_area(src) A.fire_reset() for(var/obj/machinery/firealarm/FA in A) - fire_alarm.clearAlarm(loc, FA) + SSalarms.fire_alarm.clearAlarm(loc, FA) return /obj/machinery/firealarm/proc/alarm(var/duration = 0) @@ -228,7 +228,7 @@ FIRE ALARM return var/area/A = get_area(src) for(var/obj/machinery/firealarm/FA in A) - fire_alarm.triggerAlarm(loc, FA, duration) + SSalarms.fire_alarm.triggerAlarm(loc, FA, duration) update_icon() //playsound(loc, 'sound/ambience/signal.ogg', 75, 0) return diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index c74ee23d25c..91dcb43ab57 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -118,25 +118,22 @@ Class Procs: var/use_log = list() var/list/settagwhitelist = list()//WHITELIST OF VARIABLES THAT THE set_tag HREF CAN MODIFY, DON'T PUT SHIT YOU DON'T NEED ON HERE, AND IF YOU'RE GONNA USE set_tag (format_tag() proc), ADD TO THIS LIST. atom_say_verb = "beeps" - var/defer_process = 0 var/siemens_strength = 0.7 // how badly will it shock you? -/obj/machinery/Initialize() - addAtProcessing() +/obj/machinery/Initialize(mapload) + if(!armor) + armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) . = ..() - power_change() + GLOB.machines += src -/obj/machinery/proc/addAtProcessing() if(use_power) myArea = get_area(src) if(!speed_process) - if(!defer_process) - START_PROCESSING(SSmachines, src) - else - START_DEFERRED_PROCESSING(SSmachines, src) + START_PROCESSING(SSmachines, src) else - GLOB.fast_processing += src - isprocessing = TRUE // all of these isprocessing = TRUE can be removed when the PS is dead + START_PROCESSING(SSfastprocess, src) + + power_change() // gotta go fast /obj/machinery/makeSpeedProcess() @@ -144,7 +141,7 @@ Class Procs: return speed_process = TRUE STOP_PROCESSING(SSmachines, src) - GLOB.fast_processing += src + START_PROCESSING(SSfastprocess, src) // gotta go slow /obj/machinery/makeNormalProcess() @@ -152,20 +149,16 @@ Class Procs: return speed_process = FALSE START_PROCESSING(SSmachines, src) - GLOB.fast_processing -= src - -/obj/machinery/New() //new - if(!armor) - armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0) - GLOB.machines += src - ..() + STOP_PROCESSING(SSfastprocess, src) /obj/machinery/Destroy() if(myArea) myArea = null - GLOB.fast_processing -= src - STOP_PROCESSING(SSmachines, src) - GLOB.machines -= src + GLOB.machines.Remove(src) + if(!speed_process) + STOP_PROCESSING(SSmachines, src) + else + STOP_PROCESSING(SSfastprocess, src) return ..() /obj/machinery/proc/locate_machinery() diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 1b3dfe19001..bb5847fc6fb 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -2,8 +2,8 @@ name = "Pipe Dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" - density = 1 - anchored = 1 + density = TRUE + anchored = TRUE var/unwrenched = 0 var/wait = 0 @@ -75,29 +75,25 @@ /obj/machinery/pipedispenser/Topic(href, href_list) if(..() || unwrenched) - return 1 + return usr.set_machine(src) add_fingerprint(usr) + if(world.time < wait + 4) + return + wait = world.time if(href_list["make"]) - if(!wait) - var/p_type = text2num(href_list["make"]) - var/p_dir = text2num(href_list["dir"]) - var/obj/item/pipe/P = new (loc, pipe_type=p_type, dir=p_dir) - P.update() - P.add_fingerprint(usr) - wait = world.time + 10 + var/p_type = text2num(href_list["make"]) + var/p_dir = text2num(href_list["dir"]) + var/obj/item/pipe/P = new (loc, pipe_type=p_type, dir=p_dir) + P.update() + P.add_fingerprint(usr) if(href_list["makemeter"]) - if(wait < world.time) - new /obj/item/pipe_meter(loc) - wait = world.time + 15 + new /obj/item/pipe_meter(loc) if(href_list["makegsensor"]) - if(!wait) - new /obj/item/pipe_gsensor(loc) - wait = 1 - spawn(15) - wait = 0 + new /obj/item/pipe_gsensor(loc) + return TRUE /obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob, params) add_fingerprint(usr) @@ -140,8 +136,6 @@ name = "Disposal Pipe Dispenser" icon = 'icons/obj/stationobjs.dmi' icon_state = "pipe_d" - density = 1 - anchored = 1.0 //Allow you to drag-drop disposal pipes into it /obj/machinery/pipedispenser/disposal/MouseDrop_T(var/obj/structure/disposalconstruct/pipe, mob/usr) @@ -182,16 +176,10 @@ popup.open() /obj/machinery/pipedispenser/disposal/Topic(href, href_list) - if(..() || unwrenched) - return 1 - - usr.set_machine(src) - add_fingerprint(usr) - - if(wait < world.time) + if(!..()) + return + if(href_list["dmake"]) var/p_type = text2num(href_list["dmake"]) var/obj/structure/disposalconstruct/C = new(loc, p_type) if(p_type in list(PIPE_DISPOSALS_BIN, PIPE_DISPOSALS_OUTLET, PIPE_DISPOSALS_CHUTE)) C.density = TRUE - C.add_fingerprint(usr) - wait = world.time + 15 diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 304dc7dc639..6422e94dc74 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -188,11 +188,11 @@ /obj/machinery/power/singularity_beacon/process() if(!active) return PROCESS_KILL + + if(surplus() >= 1500) + add_load(1500) else - if(surplus() > 1500) - draw_power(1500) - else - Deactivate() + Deactivate() /obj/machinery/power/singularity_beacon/syndicate icontype = "beaconsynd" diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index f02b8411e38..9f664eaad76 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -39,7 +39,7 @@ /obj/machinery/syndicatebomb/process() if(!active) - GLOB.fast_processing -= src + STOP_PROCESSING(SSfastprocess, src) detonation_timer = null next_beep = null countdown.stop() @@ -73,7 +73,7 @@ if(defused && payload in src) payload.defuse() countdown.stop() - GLOB.fast_processing -= src + STOP_PROCESSING(SSfastprocess, src) /obj/machinery/syndicatebomb/New() wires = new(src) @@ -86,7 +86,7 @@ /obj/machinery/syndicatebomb/Destroy() QDEL_NULL(wires) QDEL_NULL(countdown) - GLOB.fast_processing -= src + STOP_PROCESSING(SSfastprocess, src) return ..() /obj/machinery/syndicatebomb/examine(mob/user) @@ -205,7 +205,7 @@ /obj/machinery/syndicatebomb/proc/activate() active = TRUE - GLOB.fast_processing += src + START_PROCESSING(SSfastprocess, src) countdown.start() next_beep = world.time + 10 detonation_timer = world.time + (timer_set * 10) diff --git a/code/game/machinery/telecomms/ntsl2.dm b/code/game/machinery/telecomms/ntsl2.dm index f01f173ebb3..604fcdfbe7e 100644 --- a/code/game/machinery/telecomms/ntsl2.dm +++ b/code/game/machinery/telecomms/ntsl2.dm @@ -10,109 +10,109 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) */ /datum/nttc_configuration // ALL OF THE JOB CRAP - // Dict of all jobs and their colors + // Dict of all jobs and their department color classes var/all_jobs = list( // AI - "AI" = "#FF00FF", - "Android" = "#FF00FF", - "Cyborg" = "#FF00FF", - "Personal AI" = "#FF00FF", - "Robot" = "#FF00FF", + "AI" = "airadio", + "Android" = "airadio", + "Cyborg" = "airadio", + "Personal AI" = "airadio", + "Robot" = "airadio", // Civilian + Varients - "Assistant" = "#408010", - "Businessman" = "#408010", - "Civilian" = "#408010", - "Tourist" = "#408010", - "Trader" = "#408010", + "Assistant" = "radio", + "Businessman" = "radio", + "Civilian" = "radio", + "Tourist" = "radio", + "Trader" = "radio", // Command (Solo command, not department heads) - "Blueshield" = "#204090", - "Captain" = "#204090", - "Head of Personnel" = "#204090", - "Nanotrasen Representative" = "#204090", + "Blueshield" = "comradio", + "Captain" = "comradio", + "Head of Personnel" = "comradio", + "Nanotrasen Representative" = "comradio", // Engineeering - "Atmospheric Technician" = "#A66300", - "Chief Engineer" = "#A66300", - "Electrician" = "#A66300", - "Engine Technician" = "#A66300", - "Life Support Specialist" = "#A66300", - "Maintenance Technician" = "#A66300", - "Mechanic" = "#A66300", - "Station Engineer" = "#A66300", + "Atmospheric Technician" = "engradio", + "Chief Engineer" = "engradio", + "Electrician" = "engradio", + "Engine Technician" = "engradio", + "Life Support Specialist" = "engradio", + "Maintenance Technician" = "engradio", + "Mechanic" = "engradio", + "Station Engineer" = "engradio", // ERT - "Emergency Response Team Engineer" = "#5C5C7C", - "Emergency Response Team Leader" = "#5C5C7C", - "Emergency Response Team Medic" = "#5C5C7C", - "Emergency Response Team Member" = "#5C5C7C", - "Emergency Response Team Officer" = "#5C5C7C", + "Emergency Response Team Engineer" = "dsquadradio", // I know this says deathsquad but the class for responseteam is neon green. No. + "Emergency Response Team Leader" = "dsquadradio", + "Emergency Response Team Medic" = "dsquadradio", + "Emergency Response Team Member" = "dsquadradio", + "Emergency Response Team Officer" = "dsquadradio", // Medical - "Chemist" = "#009190", - "Chief Medical Officer" = "#009190", - "Coroner" = "#009190", - "Medical Doctor" = "#009190", - "Microbiologist" = "#009190", - "Nurse" = "#009190", - "Paramedic" = "#009190", - "Pharmacologist" = "#009190", - "Pharmacist" = "#009190", - "Psychiatrist" = "#009190", - "Psychologist" = "#009190", - "Surgeon" = "#009190", - "Therapist" = "#009190", - "Virologist" = "#009190", + "Chemist" = "medradio", + "Chief Medical Officer" = "medradio", + "Coroner" = "medradio", + "Medical Doctor" = "medradio", + "Microbiologist" = "medradio", + "Nurse" = "medradio", + "Paramedic" = "medradio", + "Pharmacologist" = "medradio", + "Pharmacist" = "medradio", + "Psychiatrist" = "medradio", + "Psychologist" = "medradio", + "Surgeon" = "medradio", + "Therapist" = "medradio", + "Virologist" = "medradio", // Science - "Anomalist" = "#993399", - "Biomechanical Engineer" = "#993399", - "Chemical Researcher" = "#993399", - "Geneticist" = "#993399", - "Mechatronic Engineer" = "#993399", - "Plasma Researcher" = "#993399", - "Research Director" = "#993399", - "Roboticist" = "#993399", - "Scientist" = "#993399", - "Xenoarcheologist" = "#993399", - "Xenobiologist" = "#993399", + "Anomalist" = "sciradio", + "Biomechanical Engineer" = "sciradio", + "Chemical Researcher" = "sciradio", + "Geneticist" = "sciradio", + "Mechatronic Engineer" = "sciradio", + "Plasma Researcher" = "sciradio", + "Research Director" = "sciradio", + "Roboticist" = "sciradio", + "Scientist" = "sciradio", + "Xenoarcheologist" = "sciradio", + "Xenobiologist" = "sciradio", // Security - "Brig Physician" = "#A30000", - "Detective" = "#A30000", - "Forensic Technician" = "#A30000", - "Head of Security" = "#A30000", - "Human Resources Agent" = "#A30000", - "Internal Affairs Agent" = "#A30000", - "Magistrate" = "#A30000", - "Security Officer" = "#A30000", - "Security Pod Pilot" = "#A30000", - "Warden" = "#A30000", + "Brig Physician" = "secradio", + "Detective" = "secradio", + "Forensic Technician" = "secradio", + "Head of Security" = "secradio", + "Human Resources Agent" = "secradio", + "Internal Affairs Agent" = "secradio", + "Magistrate" = "secradio", + "Security Officer" = "secradio", + "Security Pod Pilot" = "secradio", + "Warden" = "secradio", // Supply - "Quartermaster" = "#7F6539", - "Cargo Technician" = "#7F6539", - "Shaft Miner" = "#7F6539", - "Spelunker" = "#7F6539", + "Quartermaster" = "supradio", + "Cargo Technician" = "supradio", + "Shaft Miner" = "supradio", + "Spelunker" = "supradio", // Service - "Barber" = "#80A000", - "Bartender" = "#80A000", - "Beautician" = "#80A000", - "Botanical Researcher" = "#80A000", - "Botanist" = "#80A000", - "Butcher" = "#80A000", - "Chaplain" = "#80A000", - "Chef" = "#80A000", - "Clown" = "#80A000", - "Cook" = "#80A000", - "Culinary Artist" = "#80A000", - "Custodial Technician" = "#80A000", - "Hair Stylist" = "#80A000", - "Hydroponicist" = "#80A000", - "Janitor" = "#80A000", - "Journalist" = "#80A000", - "Librarian" = "#80A000", - "Mime" = "#80A000", + "Barber" = "srvradio", + "Bartender" = "srvradio", + "Beautician" = "srvradio", + "Botanical Researcher" = "srvradio", + "Botanist" = "srvradio", + "Butcher" = "srvradio", + "Chaplain" = "srvradio", + "Chef" = "srvradio", + "Clown" = "srvradio", + "Cook" = "srvradio", + "Culinary Artist" = "srvradio", + "Custodial Technician" = "srvradio", + "Hair Stylist" = "srvradio", + "Hydroponicist" = "srvradio", + "Janitor" = "srvradio", + "Journalist" = "srvradio", + "Librarian" = "srvradio", + "Mime" = "srvradio", ) // Just command members var/heads = list("Captain", "Head of Personnel", "Nanotrasen Representative", "Blueshield", "Chief Engineer", "Chief Medical Officer", "Research Director", "Head of Security") // Just ERT var/ert_jobs = list("Emergency Response Team Officer", "Emergency Response Team Engineer", "Emergency Response Team Medic", "Emergency Response Team Leader", "Emergency Response Team Member") // Defined so code compiles and incase someone has a non-standard job - var/job_color = "#000000" + var/job_class = "radio" // NOW FOR ACTUAL TOGGLES /* Simple Toggles */ var/toggle_activated = TRUE @@ -274,10 +274,10 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) // All job and coloring shit if(toggle_job_color || toggle_name_color) var/job = signal.data["job"] - job_color = all_jobs[job] + job_class = all_jobs[job] if(toggle_name_color) - var/new_name = "" + signal.data["name"] + "" + var/new_name = "" + signal.data["name"] + "" signal.data["name"] = new_name signal.data["realname"] = new_name // this is required because the broadcaster uses this directly if the speaker doesn't have a voice changer on @@ -289,13 +289,13 @@ GLOBAL_DATUM_INIT(nttc_config, /datum/nttc_configuration, new()) if(toggle_job_color) switch(job_indicator_type) if(JOB_STYLE_1) - new_name = signal.data["name"] + " ([job]) " + new_name = signal.data["name"] + " ([job]) " if(JOB_STYLE_2) - new_name = signal.data["name"] + " - [job] " + new_name = signal.data["name"] + " - [job] " if(JOB_STYLE_3) - new_name = "\[[job]\] " + signal.data["name"] + " " + new_name = "\[[job]\] " + signal.data["name"] + " " if(JOB_STYLE_4) - new_name = "([job]) " + signal.data["name"] + " " + new_name = "([job]) " + signal.data["name"] + " " else switch(job_indicator_type) if(JOB_STYLE_1) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 8014a149cf4..54bd17920bd 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -166,10 +166,10 @@ name = "Automatic X-Ray 5000" desc = "A large metalic machine with an entrance and an exit. A sign on the side reads, 'backpack go in, backpack come out', 'human go in, irradiated human come out'." -/obj/machinery/transformer/xray/New() +/obj/machinery/transformer/xray/Initialize(mapload) + . = ..() // On us new /obj/machinery/conveyor/auto(loc, EAST) - addAtProcessing() /obj/machinery/transformer/xray/conveyor/New() ..() diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index f1ad010ea93..8a910670201 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -4,7 +4,7 @@ /obj/item/mecha_parts/mecha_equipment/medical/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/mecha_parts/mecha_equipment/medical/can_attach(obj/mecha/medical/M) @@ -13,19 +13,19 @@ /obj/item/mecha_parts/mecha_equipment/medical/attach(obj/mecha/M) ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/mecha_parts/mecha_equipment/medical/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/mecha_parts/mecha_equipment/medical/process() if(!chassis) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return 1 /obj/item/mecha_parts/mecha_equipment/medical/detach() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/mecha_parts/mecha_equipment/medical/sleeper @@ -66,7 +66,7 @@ return target.forceMove(src) patient = target - processing_objects.Add(src) + START_PROCESSING(SSobj, src) update_equip_info() occupant_message("[target] successfully loaded into [src]. Life support functions engaged.") chassis.visible_message("[chassis] loads [target] into [src].") @@ -90,7 +90,7 @@ patient.forceMove(get_turf(src)) occupant_message("[patient] ejected. Life support functions disabled.") log_message("[patient] ejected. Life support functions disabled.") - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) patient = null update_equip_info() @@ -98,7 +98,7 @@ if(patient) occupant_message("Unable to detach [src] - equipment occupied!") return - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/mecha_parts/mecha_equipment/medical/sleeper/get_equip_info() @@ -221,7 +221,7 @@ set_ready_state(1) log_message("Deactivated.") occupant_message("[src] deactivated - no power.") - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return var/mob/living/carbon/M = patient if(!M) @@ -263,11 +263,11 @@ processed_reagents = new /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/detach() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/critfail() @@ -374,7 +374,7 @@ m++ if(processed_reagents.len) message += " added to production" - processing_objects.Add(src) + START_PROCESSING(SSobj, src) occupant_message(message) occupant_message("Reagent processing started.") log_message("Reagent processing started.") @@ -513,7 +513,7 @@ if(!processed_reagents.len || reagents.total_volume >= reagents.maximum_volume || !chassis.has_charge(energy_drain)) occupant_message("Reagent processing stopped.") log_message("Reagent processing stopped.") - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return var/amount = synth_speed / processed_reagents.len for(var/reagent in processed_reagents) diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index b1a110813e8..edeb2424711 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -116,14 +116,14 @@ /obj/item/mecha_parts/mecha_equipment/mining_scanner/attach(obj/mecha/M) . = ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) M.occupant_sight_flags |= SEE_TURFS if(M.occupant) M.occupant.update_sight() /obj/item/mecha_parts/mecha_equipment/mining_scanner/detach() chassis.occupant_sight_flags &= ~SEE_TURFS - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) if(chassis.occupant) chassis.occupant.update_sight() return ..() diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index a42e76015c1..4cfbc5c8143 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -193,7 +193,7 @@ selectable = 0 /obj/item/mecha_parts/mecha_equipment/repair_droid/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) if(chassis) chassis.overlays -= droid_overlay return ..() @@ -205,7 +205,7 @@ /obj/item/mecha_parts/mecha_equipment/repair_droid/detach() chassis.overlays -= droid_overlay - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /obj/item/mecha_parts/mecha_equipment/repair_droid/get_equip_info() if(!chassis) return @@ -217,12 +217,12 @@ if(href_list["toggle_repairs"]) chassis.overlays -= droid_overlay if(equip_ready) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) droid_overlay = new(icon, icon_state = "repair_droid_a") log_message("Activated.") set_ready_state(0) else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) droid_overlay = new(icon, icon_state = "repair_droid") log_message("Deactivated.") set_ready_state(1) @@ -232,7 +232,7 @@ /obj/item/mecha_parts/mecha_equipment/repair_droid/process() if(!chassis) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) set_ready_state(1) return var/h_boost = health_boost @@ -250,10 +250,10 @@ repaired = 1 if(repaired) if(!chassis.use_power(energy_drain)) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) set_ready_state(1) else //no repair needed, we turn off - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) set_ready_state(1) chassis.overlays -= droid_overlay droid_overlay = new(icon, icon_state = "repair_droid") @@ -273,11 +273,11 @@ selectable = 0 /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/detach() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) ..() /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_charge() @@ -302,11 +302,11 @@ ..() if(href_list["toggle_relay"]) if(equip_ready) //inactive - processing_objects.Add(src) + START_PROCESSING(SSobj, src) set_ready_state(0) log_message("Activated.") else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) set_ready_state(1) log_message("Deactivated.") @@ -317,12 +317,12 @@ /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/process() if(!chassis || chassis.internal_damage & MECHA_INT_SHORT_CIRCUIT) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) set_ready_state(1) return var/cur_charge = chassis.get_charge() if(isnull(cur_charge) || !chassis.cell) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) set_ready_state(1) occupant_message("No powercell detected.") return @@ -358,11 +358,11 @@ /obj/item/mecha_parts/mecha_equipment/generator/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/mecha_parts/mecha_equipment/generator/detach() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) ..() /obj/item/mecha_parts/mecha_equipment/generator/Topic(href, href_list) @@ -370,11 +370,11 @@ if(href_list["toggle"]) if(equip_ready) //inactive set_ready_state(0) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) log_message("Activated.") else set_ready_state(1) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) log_message("Deactivated.") /obj/item/mecha_parts/mecha_equipment/generator/get_equip_info() @@ -447,11 +447,11 @@ /obj/item/mecha_parts/mecha_equipment/generator/process() if(!chassis) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) set_ready_state(1) return if(fuel_amount<=0) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) log_message("Deactivated - no fuel.") set_ready_state(1) return @@ -460,7 +460,7 @@ set_ready_state(1) occupant_message("No powercell detected.") log_message("Deactivated.") - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return var/use_fuel = fuel_per_cycle_idle if(cur_charge < chassis.cell.maxcharge) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 6cfd1d63942..35b94e2eed2 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -118,7 +118,7 @@ smoke_system.attach(src) add_cell() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) GLOB.poi_list |= src log_message("[src] created.") GLOB.mechas_list += src //global mech list @@ -670,7 +670,7 @@ QDEL_NULL(cell) QDEL_NULL(internal_tank) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) GLOB.poi_list.Remove(src) equipment.Cut() cell = null diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 59533b338a4..b44c4e3dd1b 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -24,7 +24,7 @@ spawn(3 + metal*3) process() spawn(120) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) sleep(30) if(metal) diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 405a0ec46f7..ddce32f68fa 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -30,15 +30,15 @@ /obj/effect/particle_effect/smoke/New() ..() - processing_objects |= src + START_PROCESSING(SSobj, src) lifetime += rand(-1,1) /obj/effect/particle_effect/smoke/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/effect/particle_effect/smoke/proc/kill_smoke() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) INVOKE_ASYNC(src, .proc/fade_out) QDEL_IN(src, 10) diff --git a/code/game/objects/effects/snowcloud.dm b/code/game/objects/effects/snowcloud.dm index 08a64d62f17..5723b66bc04 100644 --- a/code/game/objects/effects/snowcloud.dm +++ b/code/game/objects/effects/snowcloud.dm @@ -9,12 +9,12 @@ /obj/effect/snowcloud/New(turf, obj/machinery/snow_machine/SM) ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) if(SM && istype(SM)) parent_machine = SM /obj/effect/snowcloud/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/effect/snowcloud/process() @@ -73,12 +73,12 @@ anchored = TRUE /obj/effect/snow/New() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) icon_state = "snow[rand(1,6)]" ..() /obj/effect/snow/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/effect/snow/process() diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index f0233bb0f9e..d4336aa6cf3 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -107,7 +107,7 @@ ..() pixel_x = rand(3,-3) pixel_y = rand(3,-3) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/structure/spider/eggcluster/process() amount_grown += rand(0,2) @@ -140,10 +140,10 @@ ..() pixel_x = rand(6,-6) pixel_y = rand(6,-6) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/structure/spider/spiderling/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) entry_vent = null return ..() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 77b263fb8f2..9d199a404d0 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -100,6 +100,10 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d var/trip_walksafe = TRUE var/trip_tiles = 0 + //Tooltip vars + var/in_inventory = FALSE //is this item equipped into an inventory slot or hand of a mob? + var/tip_timer = 0 + /obj/item/New() ..() for(var/path in actions_types) @@ -340,11 +344,13 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d A.Remove(user) if(flags & DROPDEL) qdel(src) + in_inventory = FALSE SEND_SIGNAL(src, COMSIG_ITEM_DROPPED,user) // called just as an item is picked up (loc is not yet changed) /obj/item/proc/pickup(mob/user) SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user) + in_inventory = TRUE return TRUE // called when this item is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called. @@ -374,6 +380,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d var/datum/action/A = X if(item_action_slot_check(slot, user)) //some items only give their actions buttons when in a specific slot. A.Grant(user) + in_inventory = TRUE /obj/item/proc/item_action_slot_check(slot, mob/user) return 1 @@ -532,6 +539,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d if(callback) //call the original callback . = callback.Invoke() throw_speed = initial(throw_speed) //explosions change this. + in_inventory = FALSE /obj/item/proc/pwr_drain() return 0 // Process Kill @@ -578,4 +586,17 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d return TRUE /obj/item/attack_hulk(mob/living/carbon/human/user) - return FALSE \ No newline at end of file + return FALSE + +/obj/item/proc/openTip(location, control, params, user) + openToolTip(user, src, params, title = name, content = "[desc]", theme = "") + +/obj/item/MouseEntered(location, control, params) + if(in_inventory) + var/timedelay = 5 + var/user = usr + tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, user), timedelay, TIMER_STOPPABLE) + +/obj/item/MouseExited() + deltimer(tip_timer) //delete any in-progress timer if the mouse is moved off the item before it finishes + closeToolTip(usr) diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm index b32176cb155..8e85709ef97 100644 --- a/code/game/objects/items/ashtray.dm +++ b/code/game/objects/items/ashtray.dm @@ -28,7 +28,6 @@ var/obj/item/clothing/mask/cigarette/cig = W if(cig.lit == 1) src.visible_message("[user] crushes [cig] in [src], putting it out.") - processing_objects.Remove(cig) var/obj/item/butt = new cig.type_butt(src) cig.transfer_fingerprints_to(butt) qdel(cig) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 85780484264..5ea13308de5 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -18,7 +18,7 @@ light(show_message = 0) /obj/item/candle/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/candle/update_icon() @@ -62,7 +62,7 @@ if(show_message) usr.visible_message(show_message) set_light(CANDLE_LUM) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) update_icon() diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 575ce0cb6d6..7bf80244072 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -32,7 +32,7 @@ /obj/item/camera_bug/New() ..() - processing_objects += src + START_PROCESSING(SSobj, src) /obj/item/camera_bug/Destroy() get_cameras() diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 27132b75346..5fa2bd692e0 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -227,7 +227,7 @@ return PROCESS_KILL /obj/item/borg_chameleon/proc/activate(mob/living/silicon/robot/syndicate/saboteur/user) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) S = user user.base_icon = disguise user.icon_state = disguise @@ -236,7 +236,7 @@ user.update_icons() /obj/item/borg_chameleon/proc/deactivate(mob/living/silicon/robot/syndicate/saboteur/user) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) S = user user.base_icon = initial(user.base_icon) user.icon_state = initial(user.icon_state) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index d0b8637b280..2fb1aae8ff0 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -207,10 +207,10 @@ /obj/item/flash/cameraflash/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/flash/cameraflash/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/flash/cameraflash/process() //this and the two parts above are part of the charge system. diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 24c8cbcd3b7..e65c9a683a7 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -183,10 +183,10 @@ turn_off() if(!fuel) src.icon_state = "[initial(icon_state)]-empty" - processing_objects -= src + STOP_PROCESSING(SSobj, src) /obj/item/flashlight/flare/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/flashlight/flare/proc/turn_off() @@ -222,7 +222,7 @@ user.visible_message("[user] activates [src].", "You activate [src].") src.force = on_damage src.damtype = "fire" - processing_objects += src + START_PROCESSING(SSobj, src) // GLOWSTICKS @@ -307,6 +307,9 @@ brightness_on = 7 icon_state = "torch" item_state = "torch" + lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' + righthand_file = 'icons/mob/inhands/items_righthand.dmi' + light_color = LIGHT_COLOR_ORANGE on_damage = 10 /obj/item/flashlight/slime @@ -344,10 +347,10 @@ /obj/item/flashlight/emp/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/flashlight/emp/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/flashlight/emp/process() diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 32b548c38aa..43b22eb4979 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -167,7 +167,7 @@ if(energy <= max_energy) if(!recharging) recharging = 1 - processing_objects.Add(src) + START_PROCESSING(SSobj, src) if(energy <= 0) to_chat(user, "You've overused the battery of [src], now it needs time to recharge!") recharge_locked = 1 diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index d142136ed23..62fc36863fc 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -47,10 +47,10 @@ /obj/item/multitool/ai_detect/New() ..() - processing_objects += src + START_PROCESSING(SSobj, src) /obj/item/multitool/ai_detect/Destroy() - processing_objects -= src + STOP_PROCESSING(SSobj, src) return ..() /obj/item/multitool/ai_detect/process() diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 0d0475df8ee..562800c2ce0 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -1,3 +1,7 @@ +#define DISCONNECTED 0 +#define CLAMPED_OFF 1 +#define OPERATING 2 + // Powersink - used to drain station power /obj/item/powersink @@ -13,28 +17,55 @@ throw_range = 2 materials = list(MAT_METAL=750) origin_tech = "powerstorage=5;syndicate=5" - var/drain_rate = 1600000 // amount of power to drain per tick - var/apc_drain_rate = 50 // Max. amount drained from single APC. In Watts. - var/dissipation_rate = 20000 // Passive dissipation of drained power. In Watts. - var/power_drained = 0 // Amount of power drained. - var/max_power = 1e10 // Detonation point. - var/mode = 0 // 0 = off, 1=clamped (off), 2=operating - var/drained_this_tick = 0 // This is unfortunately necessary to ensure we process powersinks BEFORE other machinery such as APCs. - var/admins_warned = 0 // stop spam, only warn the admins once that we are about to go boom + var/drain_rate = 2000000 // amount of power to drain per tick + var/power_drained = 0 // has drained this much power + var/max_power = 6e8 // maximum power that can be drained before exploding + var/mode = 0 // 0 = off, 1=clamped (off), 2=operating + var/admins_warned = FALSE // stop spam, only warn the admins once that we are about to boom - var/datum/powernet/PN // Our powernet var/obj/structure/cable/attached // the attached cable /obj/item/powersink/Destroy() - processing_objects.Remove(src) - GLOB.processing_power_items.Remove(src) - PN = null + STOP_PROCESSING(SSobj, src) attached = null return ..() -/obj/item/powersink/attackby(var/obj/item/I, var/mob/user) - if(istype(I, /obj/item/screwdriver)) - if(mode == 0) +/obj/item/powersink/update_icon() + icon_state = "powersink[mode == OPERATING]" + +/obj/item/powersink/proc/set_mode(value) + if(value == mode) + return + switch(value) + if(DISCONNECTED) + attached = null + if(mode == OPERATING) + STOP_PROCESSING(SSobj, src) + anchored = FALSE + density = FALSE + + if(CLAMPED_OFF) + if(!attached) + return + if(mode == OPERATING) + STOP_PROCESSING(SSobj, src) + anchored = TRUE + density = TRUE + + if(OPERATING) + if(!attached) + return + START_PROCESSING(SSobj, src) + anchored = TRUE + density = TRUE + + mode = value + update_icon() + set_light(0) + +/obj/item/powersink/attackby(obj/item/I, mob/user) + if(isscrewdriver(I)) + if(mode == DISCONNECTED) var/turf/T = loc if(isturf(T) && !T.intact) attached = locate() in T @@ -42,98 +73,81 @@ to_chat(user, "No exposed cable here to attach to.") return else - anchored = 1 - mode = 1 - src.visible_message("[user] attaches [src] to the cable!") + set_mode(CLAMPED_OFF) + visible_message("[user] attaches [src] to the cable!") message_admins("Power sink activated by [key_name_admin(user)] at ([x],[y],[z] - JMP)") log_game("Power sink activated by [key_name(user)] at ([x],[y],[z])") - return else to_chat(user, "Device must be placed over an exposed cable to attach to it.") - return else - if(mode == 2) - processing_objects.Remove(src) // Now the power sink actually stops draining the station's power if you unhook it. --NeoFite - GLOB.processing_power_items.Remove(src) - anchored = 0 - mode = 0 + set_mode(DISCONNECTED) src.visible_message("[user] detaches [src] from the cable!") - set_light(0) - icon_state = "powersink0" - - return else - ..() + return ..() /obj/item/powersink/attack_ai() return /obj/item/powersink/attack_hand(var/mob/user) switch(mode) - if(0) + if(DISCONNECTED) ..() - if(1) - src.visible_message("[user] activates [src]!") - mode = 2 - icon_state = "powersink1" - processing_objects.Add(src) - GLOB.processing_power_items.Add(src) - if(2) //This switch option wasn't originally included. It exists now. --NeoFite - src.visible_message("[user] deactivates [src]!") - mode = 1 - set_light(0) - icon_state = "powersink0" - processing_objects.Remove(src) - GLOB.processing_power_items.Remove(src) - -/obj/item/powersink/pwr_drain() - if(!attached) - return 0 - - if(drained_this_tick) - return 1 - drained_this_tick = 1 - - var/drained = 0 - - if(!PN) - return 1 - - set_light(12) - PN.trigger_warning() - // found a powernet, so drain up to max power from it - drained = PN.draw_power(drain_rate) - // if tried to drain more than available on powernet - // now look for APCs and drain their cells - if(drained < drain_rate) - for(var/obj/machinery/power/terminal/T in PN.nodes) - // Enough power drained this tick, no need to torture more APCs - if(drained >= drain_rate) - break - if(istype(T.master, /obj/machinery/power/apc)) - var/obj/machinery/power/apc/A = T.master - if(A.operating && A.cell) - A.cell.charge = max(0, A.cell.charge - apc_drain_rate) - drained += apc_drain_rate - if(A.charging == 2) // If the cell was full - A.charging = 1 // It's no longer full - power_drained += drained - return 1 + if(CLAMPED_OFF) + user.visible_message( \ + "[user] activates \the [src]!", \ + "You activate \the [src].", + "You hear a click.") + message_admins("Power sink activated by [ADMIN_LOOKUPFLW(user)] at [ADMIN_VERBOSEJMP(src)]") + log_game("Power sink activated by [key_name(user)] at [AREACOORD(src)]") + set_mode(OPERATING) + if(OPERATING) + user.visible_message( \ + "[user] deactivates \the [src]!", \ + "You deactivate \the [src].", + "You hear a click.") + set_mode(CLAMPED_OFF) /obj/item/powersink/process() - drained_this_tick = 0 - power_drained -= min(dissipation_rate, power_drained) + if(!attached) + set_mode(DISCONNECTED) + return + + var/datum/powernet/PN = attached.powernet + if(PN) + set_light(5) + + // found a powernet, so drain up to max power from it + + var/drained = min (drain_rate, attached.newavail()) + attached.add_delayedload(drained) + power_drained += drained + + // if tried to drain more than available on powernet + // now look for APCs and drain their cells + if(drained < drain_rate) + for(var/obj/machinery/power/terminal/T in PN.nodes) + if(istype(T.master, /obj/machinery/power/apc)) + var/obj/machinery/power/apc/A = T.master + if(A.operating && A.cell) + A.cell.charge = max(0, A.cell.charge - 50) + power_drained += 50 + if(A.charging == 2) // If the cell was full + A.charging = 1 // It's no longer full + if(drained >= drain_rate) + break + if(power_drained > max_power * 0.98) - if(!admins_warned) - admins_warned = 1 + if (!admins_warned) + admins_warned = TRUE message_admins("Power sink at ([x],[y],[z] - JMP) is 95% full. Explosion imminent.") playsound(src, 'sound/effects/screech.ogg', 100, 1, 1) + if(power_drained >= max_power) + STOP_PROCESSING(SSobj, src) explosion(src.loc, 4,8,16,32) qdel(src) - return - if(attached && attached.powernet) - PN = attached.powernet - else - PN = null + +#undef DISCONNECTED +#undef CLAMPED_OFF +#undef OPERATING \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 62057880b9b..3064b0ae3c8 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -49,7 +49,7 @@ ..() buildstage = building if(buildstage) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else if(ndir) pixel_x = (ndir & EAST|WEST) ? (ndir == EAST ? 28 : -28) : 0 @@ -105,7 +105,7 @@ ) /obj/item/radio/intercom/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) GLOB.global_intercoms.Remove(src) return ..() @@ -150,7 +150,7 @@ b_stat = 1 buildstage = 1 update_icon() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return 1 else return ..() if(2) @@ -163,7 +163,7 @@ buildstage = 3 to_chat(user, "You secure the electronics!") update_icon() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) for(var/i, i<= 5, i++) wires.UpdateCut(i,1) return 1 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 4a20a52fa04..9bb036c4d05 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -34,7 +34,7 @@ REAGENT SCANNER /obj/item/t_scanner/Destroy() if(on) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/t_scanner/attack_self(mob/user) @@ -43,12 +43,12 @@ REAGENT SCANNER icon_state = copytext(icon_state, 1, length(icon_state))+"[on]" if(on) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/t_scanner/process() if(!on) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return null scan() diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 064b66b78f4..0b9f6c3aca9 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -256,7 +256,7 @@ /obj/item/borg/upgrade/selfrepair/Destroy() cyborg = null - processing_objects -= src + STOP_PROCESSING(SSobj, src) on = 0 return ..() @@ -264,10 +264,10 @@ on = !on if(on) to_chat(cyborg, "You activate the self-repair module.") - processing_objects |= src + START_PROCESSING(SSobj, src) else to_chat(cyborg, "You deactivate the self-repair module.") - processing_objects -= src + STOP_PROCESSING(SSobj, src) update_icon() /obj/item/borg/upgrade/selfrepair/update_icon() @@ -280,7 +280,7 @@ icon_state = "cyborg_upgrade5" /obj/item/borg/upgrade/selfrepair/proc/deactivate() - processing_objects -= src + STOP_PROCESSING(SSobj, src) on = 0 update_icon() diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 5cab26e062b..b0a1286d3b2 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -54,7 +54,7 @@ to_chat(user, "There are [amount] [singular_name]\s in the stack.") else to_chat(user, "There are [amount] [name]\s in the stack.") - to_chat(user,"Ctrl-Shift-click to take a custom amount.") + to_chat(user,"Alt-click to take a custom amount.") /obj/item/stack/proc/add(newamount) amount += newamount @@ -263,7 +263,7 @@ else ..() -/obj/item/stack/CtrlShiftClick(mob/living/user) +/obj/item/stack/AltClick(mob/living/user) if(!istype(user) || user.incapacitated()) to_chat(user, "You can't do that right now!") return @@ -276,7 +276,7 @@ //get amount from user var/min = 0 var/max = get_amount() - var/stackmaterial = round(input(user, "How many sheets do you wish to take out of this stack? (Maximum: [max])") as num) + var/stackmaterial = round(input(user, "How many sheets do you wish to take out of this stack? (Maximum: [max])") as null|num) if(stackmaterial == null || stackmaterial <= min || stackmaterial > get_amount()) return change_stack(user,stackmaterial) diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 150b21692f2..74318bfa16d 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -98,6 +98,8 @@ //alt titles are handled a bit weirdly in order to unobtrusively integrate into existing ID system var/assignment = null //can be alt title or the actual job var/rank = null //actual job + var/owner_uid + var/owner_ckey var/dorm = 0 // determines if this ID has claimed a dorm already var/sex @@ -195,6 +197,19 @@ jobnamedata += " (" + assignment + ")" return jobnamedata +/obj/item/card/id/proc/getPlayer() + if(owner_uid) + var/mob/living/carbon/human/H = locateUID(owner_uid) + if(istype(H) && H.ckey == owner_ckey) + return H + owner_uid = null + if(owner_ckey) + for(var/mob/M in GLOB.player_list) + if(M.ckey && M.ckey == owner_ckey) + owner_uid = M.UID() + return M + owner_ckey = null + /obj/item/card/id/proc/is_untrackable() return untrackable diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm index a4599a2e79f..b1b573f77ad 100644 --- a/code/game/objects/items/weapons/caution.dm +++ b/code/game/objects/items/weapons/caution.dm @@ -26,7 +26,7 @@ return timing = !timing if(timing) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else armed = 0 timepassed = 0 @@ -34,7 +34,7 @@ /obj/item/caution/proximity_sign/process() if(!timing) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) timepassed++ if(timepassed >= 15 && !armed) armed = 1 diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 58c2dd2594f..7e7f1642e3a 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -177,7 +177,7 @@ update_icon() desc = initial(desc) + "
It appears to contain [target.name]." - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/effect/chrono_field/Destroy() if(gun && gun.field_check(src)) diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 1378b5c004d..ce9f5d916a2 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -48,7 +48,7 @@ LIGHTERS ARE IN LIGHTERS.DM /obj/item/clothing/mask/cigarette/Destroy() QDEL_NULL(reagents) - processing_objects -= src + STOP_PROCESSING(SSobj, src) return ..() /obj/item/clothing/mask/cigarette/attack(mob/living/M, mob/living/user, def_zone) @@ -161,7 +161,7 @@ LIGHTERS ARE IN LIGHTERS.DM var/turf/T = get_turf(src) T.visible_message(flavor_text) set_light(2, 0.25, "#E38F46") - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/clothing/mask/cigarette/process() @@ -213,7 +213,7 @@ LIGHTERS ARE IN LIGHTERS.DM var/mob/living/M = loc to_chat(M, "Your [name] goes out.") M.unEquip(src, 1) //Force the un-equip so the overlays update - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) qdel(src) @@ -341,7 +341,7 @@ LIGHTERS ARE IN LIGHTERS.DM if(flavor_text) var/turf/T = get_turf(src) T.visible_message(flavor_text) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/clothing/mask/cigarette/pipe/process() var/turf/location = get_turf(src) @@ -355,7 +355,7 @@ LIGHTERS ARE IN LIGHTERS.DM icon_state = icon_off item_state = icon_off M.update_inv_wear_mask(0) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return smoke() return @@ -366,7 +366,7 @@ LIGHTERS ARE IN LIGHTERS.DM lit = 0 icon_state = icon_off item_state = icon_off - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return if(smoketime <= 0) to_chat(user, "You refill the pipe with tobacco.") diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 666c14801d8..40fc1bf7d56 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -112,10 +112,9 @@ /obj/item/dice/attack_self(mob/user as mob) diceroll(user) -/obj/item/dice/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) - if(!..()) - return - diceroll(thrower) +/obj/item/dice/throw_impact(atom/target) + diceroll(thrownby) + . = ..() /obj/item/dice/proc/diceroll(mob/user) result = rand(1, sides) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 75d29c7c6be..dd67d7c67a4 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -33,7 +33,7 @@ /obj/item/flamethrower/process() if(!lit) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return null var/turf/location = loc if(istype(location, /mob/)) @@ -141,7 +141,7 @@ if(!status) return lit = !lit if(lit) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) if(href_list["remove"]) if(!ptank) return usr.put_in_hands(ptank) diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index dd65df1ea3f..4bddaf551ea 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -44,7 +44,7 @@ strangling = null update_icon() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) else ..() @@ -97,7 +97,7 @@ M.AdjustSilence(1) garrote_time = world.time + 10 - processing_objects.Add(src) + START_PROCESSING(SSobj, src) strangling = M update_icon() @@ -113,14 +113,14 @@ if(!strangling) // Our mark got gibbed or similar update_icon() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return if(!istype(loc, /mob/living/carbon/human)) strangling = null update_icon() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return var/mob/living/carbon/human/user = loc @@ -138,7 +138,7 @@ strangling = null update_icon() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return @@ -148,7 +148,7 @@ strangling = null update_icon() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 9e471583d3b..a20dd86c897 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -402,10 +402,10 @@ /obj/item/nullrod/tribal_knife/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/nullrod/tribal_knife/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/nullrod/tribal_knife/process() @@ -432,10 +432,10 @@ /obj/item/nullrod/rosary/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/nullrod/rosary/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/nullrod/rosary/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 9a7c3f0e27c..88dc4ed6542 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -14,7 +14,7 @@ flags = DROPDEL -/obj/item/implant/proc/trigger(emote, mob/source) +/obj/item/implant/proc/trigger(emote, mob/source, force) return /obj/item/implant/proc/activate() diff --git a/code/game/objects/items/weapons/implants/implant_abductor.dm b/code/game/objects/items/weapons/implants/implant_abductor.dm index a86545f8722..64bb7345f7a 100644 --- a/code/game/objects/items/weapons/implants/implant_abductor.dm +++ b/code/game/objects/items/weapons/implants/implant_abductor.dm @@ -13,7 +13,7 @@ if(cooldown == total_cooldown) home.Retrieve(imp_in,1) cooldown = 0 - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else to_chat(imp_in, "You must wait [(total_cooldown - cooldown)*2] seconds to use [src] again!") @@ -21,7 +21,7 @@ if(cooldown < total_cooldown) cooldown++ if(cooldown == total_cooldown) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /obj/item/implant/abductor/implant(mob/source, mob/user) if(..()) diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm index 5f0fea79da9..f1c4dd4126b 100644 --- a/code/game/objects/items/weapons/implants/implant_chem.dm +++ b/code/game/objects/items/weapons/implants/implant_chem.dm @@ -33,8 +33,8 @@ -/obj/item/implant/chem/trigger(emote, mob/source) - if(emote == "deathgasp") +/obj/item/implant/chem/trigger(emote, mob/source, force) + if(force && emote == "deathgasp") activate(reagents.total_volume) /obj/item/implant/chem/activate(cause) diff --git a/code/game/objects/items/weapons/implants/implant_death_alarm.dm b/code/game/objects/items/weapons/implants/implant_death_alarm.dm index dea34b2ba91..68c8e111520 100644 --- a/code/game/objects/items/weapons/implants/implant_death_alarm.dm +++ b/code/game/objects/items/weapons/implants/implant_death_alarm.dm @@ -18,7 +18,7 @@ return dat /obj/item/implant/death_alarm/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/implant/death_alarm/process() @@ -61,12 +61,12 @@ /obj/item/implant/death_alarm/implant(mob/target) if(..()) mobname = target.real_name - processing_objects.Add(src) + START_PROCESSING(SSobj, src) return 1 return 0 /obj/item/implant/death_alarm/removed(mob/target) if(..()) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return 1 return 0 diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm index 30113ea4e96..f37e148bee6 100644 --- a/code/game/objects/items/weapons/implants/implant_explosive.dm +++ b/code/game/objects/items/weapons/implants/implant_explosive.dm @@ -20,8 +20,8 @@ "} return dat -/obj/item/implant/explosive/trigger(emote, mob/source) - if(emote == "deathgasp") +/obj/item/implant/explosive/trigger(emote, mob/source, force) + if(force && emote == "deathgasp") activate("death") /obj/item/implant/explosive/activate(cause) @@ -148,8 +148,8 @@ "} return dat -/obj/item/implant/dust/trigger(emote, mob/source) - if(emote == "deathgasp") +/obj/item/implant/dust/trigger(emote, mob/source, force) + if(force && emote == "deathgasp") activate("death") /obj/item/implant/dust/activate(cause) diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 297966525f0..66e0ba6b110 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -152,8 +152,14 @@ breakouttime = 35//easy to apply, easy to break out of gender = NEUTER origin_tech = "engineering=3;combat=1" + hitsound = 'sound/effects/snap.ogg' var/weaken = 0 +/obj/item/restraints/legcuffs/bola/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback) + playsound(loc,'sound/weapons/bolathrow.ogg', 50, TRUE) + if(!..()) + return + /obj/item/restraints/legcuffs/bola/throw_impact(atom/hit_atom) if(..() || !iscarbon(hit_atom))//if it gets caught or the target can't be cuffed, return//abort @@ -166,6 +172,7 @@ feedback_add_details("handcuffs","B") to_chat(C, "[src] ensnares you!") C.Weaken(weaken) + playsound(loc, hitsound, 50, TRUE) /obj/item/restraints/legcuffs/bola/tactical //traitor variant name = "reinforced bola" diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index a2d8b03da84..ab946de5f0f 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -58,7 +58,7 @@ user.visible_message("After a few attempts, [user] manages to light the [src], [user.p_they()] however burn[user.p_s()] [user.p_their()] finger in the process.") set_light(2) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else lit = 0 w_class = WEIGHT_CLASS_TINY @@ -74,7 +74,7 @@ user.visible_message("[user] quietly shuts off the [src].") set_light(0) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) else return ..() return @@ -181,7 +181,7 @@ name = "lit match" desc = "A match. This one is lit." attack_verb = list("burnt","singed") - processing_objects.Add(src) + START_PROCESSING(SSobj, src) update_icon() return TRUE @@ -196,7 +196,7 @@ name = "burnt match" desc = "A match. This one has seen better days." attack_verb = list("flicked") - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return TRUE /obj/item/match/dropped(mob/user) diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index e642e3b994a..7c5c6f9421f 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -89,14 +89,14 @@ /obj/item/mop/advanced/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/mop/advanced/attack_self(mob/user) refill_enabled = !refill_enabled if(refill_enabled) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) to_chat(user, "You set the condenser switch to the '[refill_enabled ? "ON" : "OFF"]' position.") playsound(user, 'sound/machines/click.ogg', 30, 1) @@ -111,7 +111,7 @@ /obj/item/mop/advanced/Destroy() if(refill_enabled) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 03cf28b25ed..e8a181a197b 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -107,7 +107,7 @@ /obj/item/storage/bag/plasticbag/equipped(var/mob/user, var/slot) if(slot==slot_head) storage_slots = 0 - processing_objects.Add(src) + START_PROCESSING(SSobj, src) return /obj/item/storage/bag/plasticbag/process() @@ -120,7 +120,7 @@ H.AdjustLoseBreath(1) else storage_slots = 7 - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return // ----------------------------- diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index abf68deb765..e406b097bee 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -642,9 +642,13 @@ new /obj/item/grenade/smokebomb(src) new /obj/item/restraints/legcuffs/bola(src) new /obj/item/restraints/legcuffs/bola(src) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) cooldown = world.time +/obj/item/storage/belt/bluespace/owlman/Destroy() + STOP_PROCESSING(SSobj, src) + return ..() + /obj/item/storage/belt/bluespace/owlman/process() if(cooldown < world.time - 600) smokecount = 0 diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index d533a7e595b..c44264c6529 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -27,13 +27,13 @@ air_contents.volume = volume //liters air_contents.temperature = T20C - processing_objects.Add(src) + START_PROCESSING(SSobj, src) return /obj/item/tank/Destroy() QDEL_NULL(air_contents) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 98f97b66f53..7afb1885ea2 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -377,7 +377,7 @@ damtype = "brute" update_icon() if(!can_off_process) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return //Welders left on now use up fuel, but lets not have them run out quite that fast if(1) @@ -539,7 +539,7 @@ damtype = "fire" hitsound = 'sound/items/welder.ogg' update_icon() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else to_chat(user, "You need more fuel!") switched_off(user) diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 29f2c2dd488..4053f747af5 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -557,10 +557,10 @@ /obj/item/twohanded/singularityhammer/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/twohanded/singularityhammer/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/twohanded/singularityhammer/process() @@ -664,10 +664,10 @@ /obj/item/twohanded/knighthammer/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/twohanded/knighthammer/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/twohanded/knighthammer/process() diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 6506a5fdf2e..c2428dd8d97 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -66,17 +66,14 @@ // Nada /obj/Destroy() - GLOB.machines -= src - processing_objects -= src - GLOB.fast_processing -= src + if(!ismachinery(src)) + if(!speed_process) + STOP_PROCESSING(SSobj, src) // TODO: Have a processing bitflag to reduce on unnecessary loops through the processing lists + else + STOP_PROCESSING(SSfastprocess, src) SSnanoui.close_uis(src) return ..() -/obj/proc/process() - set waitfor = 0 - processing_objects.Remove(src) - return 0 - //user: The mob that is suiciding //damagetype: The type of damage the item will inflict on the user //BRUTELOSS = 1 @@ -300,15 +297,15 @@ a { if(speed_process) return speed_process = TRUE - processing_objects.Remove(src) - GLOB.fast_processing.Add(src) + STOP_PROCESSING(SSobj, src) + START_PROCESSING(SSfastprocess, src) /obj/proc/makeNormalProcess() if(!speed_process) return speed_process = FALSE - processing_objects.Add(src) - GLOB.fast_processing.Remove(src) + START_PROCESSING(SSobj, src) + STOP_PROCESSING(SSfastprocess, src) /obj/vv_get_dropdown() . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 0692c90ec6d..909ee79e1ab 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -41,7 +41,7 @@ qdel(src) return - processing_objects.Add(src) + START_PROCESSING(SSobj, src) ..() /obj/structure/closet/statue/process() @@ -53,7 +53,7 @@ M.setOxyLoss(intialOxy) if(timer <= 0) dump_contents() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) qdel(src) /obj/structure/closet/statue/dump_contents() diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm index b286749f908..a3dc4ac7007 100644 --- a/code/game/objects/structures/depot.dm +++ b/code/game/objects/structures/depot.dm @@ -87,7 +87,7 @@ /obj/effect/overload/New() . = ..() // Do not attempt to put the code below into Initialize() or even LateInitialize() with a "return INITIALIZE_HINT_LATELOAD". It won't work! - processing_objects.Add(src) + START_PROCESSING(SSobj, src) depotarea = areaMaster if(istype(depotarea)) if(!depotarea.used_self_destruct) @@ -122,6 +122,6 @@ for(var/obj/mecha/E in range(30, T)) E.Destroy() explosion(get_turf(src), 25, 35, 45, 55, 1, 1, 60, 0, 0) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) qdel(src) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 568fb0ededc..303862ff66f 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -28,6 +28,22 @@ else has_extinguisher = new/obj/item/extinguisher +/obj/structure/extinguisher_cabinet/examine(mob/user) + ..() + to_chat(user, "Alt-click to [opened ? "close":"open"] it.") + +/obj/structure/extinguisher_cabinet/AltClick(mob/living/user) + if(!istype(user) || user.incapacitated()) + to_chat(user, "You can't do that right now!") + return + if(!in_range(src, user)) + return + if(!iscarbon(usr)) + return + playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) + opened = !opened + update_icon() + /obj/structure/extinguisher_cabinet/Destroy() QDEL_NULL(has_extinguisher) return ..() @@ -37,11 +53,16 @@ return if(istype(O, /obj/item/extinguisher)) if(!has_extinguisher && opened) + if(!user.drop_item()) + return user.drop_item(O) contents += O has_extinguisher = O + update_icon() to_chat(user, "You place [O] in [src].") + return TRUE else + playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened else if(istype(O, /obj/item/weldingtool)) if(has_extinguisher) @@ -65,6 +86,7 @@ new material_drop(T) qdel(src) else + playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened update_icon() @@ -81,21 +103,27 @@ to_chat(user, "You try to move your [temp.name], but cannot!") return if(has_extinguisher) + if(icon_state == "extinguisher_closed") + playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) user.put_in_hands(has_extinguisher) to_chat(user, "You take [has_extinguisher] from [src].") has_extinguisher = null opened = 1 else + playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened update_icon() /obj/structure/extinguisher_cabinet/attack_tk(mob/user) if(has_extinguisher) + if(icon_state == "extinguisher_closed") + playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) has_extinguisher.loc = loc to_chat(user, "You telekinetically remove [has_extinguisher] from [src].") has_extinguisher = null opened = 1 else + playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3) opened = !opened update_icon() diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 154d4438530..1e3cb331cd1 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -273,8 +273,8 @@ var/obj/structure/cable/C = T.get_cable_node() if(C) playsound(loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5) - tesla_zap(src, 3, C.powernet.avail * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. - C.powernet.load += C.powernet.avail * 0.0375 // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock. + tesla_zap(src, 3, C.newavail() * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot. + C.add_delayedload(C.newavail() * 0.0375) // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock. return ..() /obj/structure/grille/broken // Pre-broken grilles for map placement diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index 6be7bf072d8..01fab63dd57 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -92,11 +92,11 @@ last_ghost_alert = world.time attack_atom = src if(active) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/structure/ghost_beacon/Destroy() if(active) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) attack_atom = null return ..() @@ -111,9 +111,9 @@ return to_chat(user, "You [active ? "disable" : "enable"] \the [src].") if(active) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) else - processing_objects.Add(src) + START_PROCESSING(SSobj, src) active = !active /obj/structure/ghost_beacon/process() diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index f0a0c89880f..1bb19a81bd2 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(safes) desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads \"Scarborough Arms tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant.\"" icon = 'icons/obj/structures.dmi' icon_state = "safe" - + anchored = TRUE density = TRUE resistance_flags = LAVA_PROOF | FIRE_PROOF @@ -159,14 +159,14 @@ GLOBAL_LIST_EMPTY(safes) drill_start_time = world.time drill.soundloop.start() update_icon() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) if("Turn Off") if(do_after(user, 2 SECONDS, target = src)) deltimer(drill_timer) drill_timer = null drill.soundloop.stop() update_icon() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) if("Remove Drill") if(drill_timer) to_chat(user, "You cant remove the drill while it's running!") @@ -208,7 +208,7 @@ GLOBAL_LIST_EMPTY(safes) if(current_tick == 2) to_chat(user, "The sounds from [src] are too fast and blend together.") - + if(total_ticks == 1 || prob(10)) to_chat(user, "You hear a [pick(sounds)] from [src].") @@ -252,7 +252,7 @@ GLOBAL_LIST_EMPTY(safes) var/invalid_turn = current_tumbler_index % 2 == 0 || current_tumbler_index > number_of_tumblers if(invalid_turn) // The moment you turn the wrong way or go too far, the tumblers reset current_tumbler_index = 1 - + if(!invalid_turn && dial == tumblers[current_tumbler_index]) notify_user(user, canhear, list("tink", "krink", "plink"), ticks, i) current_tumbler_index++ @@ -308,7 +308,7 @@ GLOBAL_LIST_EMPTY(safes) drill_timer = null drill.soundloop.stop() update_icon() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /obj/structure/safe/attackby(obj/item/I, mob/user, params) if(open) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 810659d81bb..04271015f4c 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -19,10 +19,10 @@ /obj/structure/transit_tube/station/New() ..() - processing_objects += src + START_PROCESSING(SSobj, src) /obj/structure/transit_tube/station/Destroy() - processing_objects -= src + STOP_PROCESSING(SSobj, src) return ..() // Stations which will send the tube in the opposite direction after their stop. diff --git a/code/game/world.dm b/code/game/world.dm index 4681f46498a..86ca6d883bd 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -374,26 +374,28 @@ var/world_topic_spam_protect_time = world.timeofday // apply some settings from config.. /world/proc/update_status() + status = get_status_text() + +/proc/get_world_status_text() + return world.get_status_text() + +/world/proc/get_status_text() var/s = "" if(config && config.server_name) s += "[config.server_name] — " + s += "[station_name()] " + if(config && config.githuburl) + s+= "([game_version])" - s += "[station_name()]"; - s += " (" - s += "" //Change this to wherever you want the hub to link to. - s += "[game_version]" - s += "" - s += ")" - s += "
The Perfect Mix of RP & Action
" - - - + if(config && config.server_tag_line) + s += "
[config.server_tag_line]" + s += "
" var/list/features = list() if(ticker) - if(master_mode) + if(master_mode && master_mode != "secret") features += master_mode else features += "STARTING" @@ -401,39 +403,22 @@ var/world_topic_spam_protect_time = world.timeofday if(!enter_allowed) features += "closed" - features += abandon_allowed ? "respawn" : "no respawn" + if(config && config.server_extra_features) + features += config.server_extra_features if(config && config.allow_vote_mode) features += "vote" - if(config && config.allow_ai) - features += "AI allowed" + if(config && config.wikiurl) + features += "Wiki" - var/n = 0 - for(var/mob/M in GLOB.player_list) - if(M.client) - n++ - - if(n > 1) - features += "~[n] players" - else if(n > 0) - features += "~[n] player" - - /* - is there a reason for this? the byond site shows 'hosted by X' when there is a proper host already. - if(host) - features += "hosted by [host]" - */ - -// if(!host && config && config.hostedby) -// features += "hosted by [config.hostedby]" + if(abandon_allowed) + features += "respawn" if(features) - s += ": [jointext(features, ", ")]" + s += "[jointext(features, ", ")]" - /* does this help? I do not know */ - if(src.status != s) - src.status = s + return s #define FAILED_DB_CONNECTION_CUTOFF 5 var/failed_db_connections = 0 diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index c15600f7bb6..4fcf95dbfd2 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -78,7 +78,7 @@ var/global/nologevent = 0 body += "VV - " body += "[ADMIN_TP(M,"TP")] - " if(M.client) - body += "PM - " + body += "PM - " body += "[ADMIN_SM(M,"SM")] - " if(ishuman(M) && M.mind) body += "HM -" @@ -950,9 +950,6 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space for(var/obj/machinery/mech_bay_recharge_port/P in toArea) P.update_recharge_turf() - for(var/obj/machinery/power/apc/A in toArea) - A.init() - if(gamma_ship_location) gamma_ship_location = 0 else @@ -1096,7 +1093,7 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space dat += "" + id + "" dat += "" + ckey + "" dat += "Unlink" - + dat += "" usr << browse(dat, "window=duplicates;size=500x480") \ No newline at end of file diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index e7078cb6877..6b4072a800b 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -224,6 +224,8 @@ var/list/admin_verbs_snpc = list( var/list/admin_verbs_ticket = list( /client/proc/openAdminTicketUI, /client/proc/toggleticketlogs, + /client/proc/openMentorTicketUI, + /client/proc/toggleMentorTicketLogs, /client/proc/resolveAllAdminTickets, /client/proc/resolveAllMentorTickets ) @@ -926,10 +928,10 @@ var/list/admin_verbs_ticket = list( to_chat(usr, "You now will get admin log messages.") /client/proc/toggleMentorTicketLogs() - set name = "Toggle Mentor Ticket Messgaes" + set name = "Toggle Mentor Ticket Messages" set category = "Preferences" - if(!check_rights(R_MENTOR)) + if(!check_rights(R_MENTOR|R_ADMIN)) return prefs.toggles ^= CHAT_NO_MENTORTICKETLOGS diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index f50bae146c3..36c0e5cf90d 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -61,7 +61,7 @@ } - function expand(id,job,name,real_name,image,key,ip,antagonist,UID,eyeUID){ + function expand(id,job,name,real_name,image,key,ip,antagonist,mobUID,clientUID,eyeUID){ clearAll(); @@ -75,13 +75,13 @@ body += ""; - body += "PP - " + body += "PP - " body += "N - " - body += "VV - " - body += "TP - " - body += "PM - " - body += "SM - " - body += "FLW" + body += "VV - " + body += "TP - " + body += "PM - " + body += "SM - " + body += "FLW" if(eyeUID) body += "|EYE" body += "
" @@ -293,6 +293,7 @@ var/mob/living/silicon/ai/A = M if(A.client && A.eyeobj) // No point following clientless AI eyes M_eyeUID = "[A.eyeobj.UID()]" + var/clientUID = M.client ? M.client.UID() : null //output for each mob dat += {" @@ -300,7 +301,7 @@ [M_name] - [M_rname] - [M_key] ([M_job]) @@ -371,7 +372,7 @@ dat += {"[(M.client ? "[M.client]" : "No client")] X - PM + PM "} switch(is_special_character(M)) if(0) @@ -398,7 +399,7 @@ dname = M return {"[dname][caption][logout_status][M.stat == 2 ? " (DEAD)" : ""] - PM[close ? "" : ""]"} + PM[close ? "" : ""]"} /datum/admins/proc/check_antagonists() if(!check_rights(R_ADMIN)) return @@ -473,7 +474,7 @@ var/mob/M = blob.current if(M) dat += "[ADMIN_PP(M,"[M.real_name]")][M.client ? "" : " (ghost)"][M.stat == 2 ? " (DEAD)" : ""]" - dat += "PM" + dat += "PM" else dat += "Blob not found!" dat += "" diff --git a/code/modules/admin/tickets/mentorticketsverbs.dm b/code/modules/admin/tickets/mentorticketsverbs.dm index 765a1afb9da..1122b770107 100644 --- a/code/modules/admin/tickets/mentorticketsverbs.dm +++ b/code/modules/admin/tickets/mentorticketsverbs.dm @@ -5,7 +5,7 @@ set name = "Open Mentor Ticket Interface" set category = "Admin" - if(!holder || !check_rights(R_MENTOR)) + if(!holder || !check_rights(R_MENTOR|R_ADMIN)) return SSmentor_tickets.showUI(usr) diff --git a/code/modules/alarm/alarm.dm b/code/modules/alarm/alarm.dm index 1d4a570999a..798c5176770 100644 --- a/code/modules/alarm/alarm.dm +++ b/code/modules/alarm/alarm.dm @@ -29,7 +29,7 @@ cameras() // Sets up both cameras and last alarm area. set_source_data(source, duration, severity) -/datum/alarm/proc/process() +/datum/alarm/process() // Has origin gone missing? if(!origin && !end_time) end_time = world.time + ALARM_RESET_DELAY diff --git a/code/modules/alarm/alarm_handler.dm b/code/modules/alarm/alarm_handler.dm index cd09ebe4427..56a673bb5b4 100644 --- a/code/modules/alarm/alarm_handler.dm +++ b/code/modules/alarm/alarm_handler.dm @@ -7,7 +7,7 @@ var/list/datum/alarm/alarms_assoc = new // Associative list of alarms, to efficiently acquire them based on origin. var/list/listeners = new // A list of all objects interested in alarm changes. -/datum/alarm_handler/proc/process() +/datum/alarm_handler/process() for(var/datum/alarm/A in alarms) A.process() check_alarm_cleared(A) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index a5dfb44aae2..5e0b463af30 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -125,7 +125,7 @@ ..() /obj/item/assembly/process() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /obj/item/assembly/examine(mob/user) ..() diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm index 853733784fa..3a543e38f72 100644 --- a/code/modules/assembly/health.dm +++ b/code/modules/assembly/health.dm @@ -21,10 +21,10 @@ /obj/item/assembly/health/toggle_secure() secured = !secured if(secured && scanning) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else scanning = FALSE - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) update_icon() return secured @@ -66,9 +66,9 @@ return FALSE scanning = !scanning if(scanning) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return /obj/item/assembly/health/interact(mob/user)//TODO: Change this to the wires thingy diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 91f8da7cc4b..d6da1fb4d0e 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -42,12 +42,12 @@ /obj/item/assembly/infra/toggle_secure() secured = !secured if(secured) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else on = FALSE if(first) qdel(first) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) update_icon() return secured diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 80e486170c2..e6ae3ec7bc4 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -28,11 +28,11 @@ /obj/item/assembly/prox_sensor/toggle_secure() secured = !secured if(secured) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else scanning = 0 timing = 0 - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) update_icon() return secured diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 5b7eb6ca50a..2c2216fa9d0 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -29,10 +29,10 @@ /obj/item/assembly/timer/toggle_secure() secured = !secured if(secured) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else timing = FALSE - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) update_icon() return secured diff --git a/code/modules/atmos_automation/statements.dm b/code/modules/atmos_automation/statements.dm index 31ee71b7a7d..72937e18eae 100644 --- a/code/modules/atmos_automation/statements.dm +++ b/code/modules/atmos_automation/statements.dm @@ -29,7 +29,7 @@ var/global/automation_types = subtypesof(/datum/automation) /datum/automation/proc/OnRemove() return -/datum/automation/proc/process() +/datum/automation/process() return /datum/automation/proc/Evaluate() diff --git a/code/modules/awaymissions/snpc.dm b/code/modules/awaymissions/snpc.dm index 04e3bf19b8e..8d65aa44a92 100644 --- a/code/modules/awaymissions/snpc.dm +++ b/code/modules/awaymissions/snpc.dm @@ -47,7 +47,7 @@ var/list/squad /obj/effect/spawner/snpc_squad/New() - processing_objects += src + START_PROCESSING(SSobj, src) squad = squads[squad_type] if(!squad) @@ -57,7 +57,7 @@ /obj/effect/spawner/snpc_squad/Destroy() squad = null - processing_objects -= src + STOP_PROCESSING(SSobj, src) return ..() /obj/effect/spawner/snpc_squad/process() diff --git a/code/modules/awaymissions/zvis.dm b/code/modules/awaymissions/zvis.dm index 03adaeda629..3697a4678df 100644 --- a/code/modules/awaymissions/zvis.dm +++ b/code/modules/awaymissions/zvis.dm @@ -58,11 +58,11 @@ owner = o if(args.len >= 3) params = args.Copy(3) - processing_objects += src + START_PROCESSING(SSobj, src) trigger() /obj/effect/portal_sensor/Destroy() - processing_objects -= src + STOP_PROCESSING(SSobj, src) return ..() /obj/effect/portal_sensor/Crossed(A) diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm index de0b37ed3c3..b5cbf8e6fda 100644 --- a/code/modules/busy_space/air_traffic.dm +++ b/code/modules/busy_space/air_traffic.dm @@ -17,7 +17,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller next_message = world.time + rand(delay_min, delay_max) process() -/datum/lore/atc_controller/proc/process() +/datum/lore/atc_controller/process() if(world.time >= next_message) if(squelched) next_message = world.time + backoff_delay diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index b9a6df2be00..8f57b49092e 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -46,7 +46,7 @@ var/received_irc_pm = -99999 var/irc_admin //IRC admin that spoke with them last. var/mute_irc = 0 - + var/ssd_warning_acknowledged = FALSE //////////////////////////////////// //things that require the database// diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index a597d0f0e3a..aa6a95f8328 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -9,6 +9,7 @@ #define MIN_CLIENT_VERSION 0 //Just an ambiguously low version for now, I don't want to suddenly stop people playing. //I would just like the code ready should it ever need to be used. #define SUGGESTED_CLIENT_VERSION 511 // only integers (e.g: 510, 511) useful here. Does not properly handle minor versions (e.g: 510.58, 511.848) +#define SSD_WARNING_TIMER 30 // cycles, not seconds, so 30=60s /* When somebody clicks a link in game, this Topic is called first. @@ -73,9 +74,7 @@ //Admin PM if(href_list["priv_msg"]) var/client/C = locate(href_list["priv_msg"]) - if(ismob(C)) //Old stuff can feed-in mobs instead of clients - var/mob/M = C - C = M.client + if(!C) // Might be a stealthmin ID, so pass it in straight C = href_list["priv_msg"] else if(C.UID() != href_list["priv_msg"]) @@ -227,6 +226,9 @@ vote_on_poll(pollid, optionid, 1) src << browse(null, "window=playerpoll") handle_player_polling() + if(href_list["ssdwarning"]) + ssd_warning_acknowledged = TRUE + to_chat(src, "SSD warning acknowledged.") switch(href_list["action"]) if("openLink") @@ -785,3 +787,16 @@ winset(src, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") else winset(src, "rpane.changelog", "background-color=none;text-color=#000000") + + +/client/proc/send_ssd_warning(mob/M) + if(!config.ssd_warning) + return FALSE + if(ssd_warning_acknowledged) + return FALSE + if(M && M.player_logged < SSD_WARNING_TIMER) + return FALSE + to_chat(src, "Interacting with SSD players is against server rules unless you've ahelped first for permission. If you have, confirm that and proceed.") + return TRUE + +#undef SSD_WARNING_TIMER \ No newline at end of file diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 484151de797..9613ce173af 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -627,38 +627,6 @@ BLIND // can't see anything ..() -/obj/item/clothing/under/attack_hand(mob/user as mob) - //only forward to the attached accessory if the clothing is equipped (not in a storage) - if(accessories.len && src.loc == user) - for(var/obj/item/clothing/accessory/A in accessories) - A.attack_hand(user) - return - - if(ishuman(usr) && src.loc == user) //make it harder to accidentally undress yourself - return - - ..() - -/obj/item/clothing/under/MouseDrop(obj/over_object as obj) - if(ishuman(usr)) - //makes sure that the clothing is equipped so that we can't drag it into our hand from miles away. - if(!(src.loc == usr)) - return - if(!( usr.restrained() ) && !( usr.stat ) && ( over_object )) - if(!usr.canUnEquip(src)) - to_chat(usr, "[src] appears stuck on you!") - return - switch(over_object.name) - if("r_hand") - usr.unEquip(src) - usr.put_in_r_hand(src) - if("l_hand") - usr.unEquip(src) - usr.put_in_l_hand(src) - src.add_fingerprint(usr) - return - return - /obj/item/clothing/under/examine(mob/user) ..(user) switch(src.sensor_mode) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index ba1b74aad66..ab0dffee5dc 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -94,7 +94,7 @@ /obj/item/clothing/head/cakehat/process() if(!onfire) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return var/turf/location = src.loc @@ -113,7 +113,7 @@ src.force = 3 src.damtype = "fire" src.icon_state = "cake1" - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else src.force = null src.damtype = "brute" diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 88f94e5b50a..fdd871a3448 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -122,7 +122,7 @@ else new_camera(user) else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /obj/item/clothing/suit/space/chronos/proc/activate() if(!activating && !activated && !teleporting) @@ -143,7 +143,7 @@ to_chat(user, "\[ ok \] Starting ui display driver") to_chat(user, "\[ ok \] Initializing chronowalk4-view") new_camera(user) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) activated = 1 else to_chat(user, "\[ fail \] Mounting /dev/helmet") diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 382ff910277..9a0354b6b0f 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -633,7 +633,7 @@ owner.visible_message("[owner]'s shields deflect [attack_text] in a shower of sparks!") current_charges-- recharge_cooldown = world.time + recharge_delay - processing_objects |= src + START_PROCESSING(SSobj, src) if(current_charges <= 0) owner.visible_message("[owner]'s shield overloads!") shield_state = "broken" @@ -643,7 +643,7 @@ /obj/item/clothing/suit/space/hardsuit/shielded/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/clothing/suit/space/hardsuit/shielded/process() @@ -652,7 +652,7 @@ playsound(loc, 'sound/magic/charge.ogg', 50, 1) if(current_charges == max_charges) playsound(loc, 'sound/machines/ding.ogg', 50, 1) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) shield_state = "[shield_on]" if(istype(loc, /mob/living/carbon/human)) var/mob/living/carbon/human/C = loc diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index c65ea335c4d..913e65af734 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -110,7 +110,7 @@ spark_system.set_up(5, 0, src) spark_system.attach(src) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) if(initial_modules && initial_modules.len) for(var/path in initial_modules) @@ -166,7 +166,7 @@ if(istype(M)) M.unEquip(piece) qdel(piece) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) QDEL_NULL(wires) QDEL_NULL(spark_system) return ..() diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 3499bce8e49..13ef3e074da 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -186,10 +186,10 @@ /obj/item/clothing/suit/corgisuit/super_hero/en/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/clothing/suit/corgisuit/super_hero/en/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/clothing/suit/corgisuit/super_hero/en/process() @@ -883,7 +883,7 @@ /obj/item/clothing/suit/advanced_protective_suit/Destroy() if(on) on = 0 - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/clothing/suit/advanced_protective_suit/ui_action_click() @@ -893,7 +893,7 @@ else on = 1 to_chat(usr, "You turn the suit's special processes on.") - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/clothing/suit/advanced_protective_suit/IsReflect() @@ -912,7 +912,7 @@ if(user.reagents.get_reagent_amount("syndicate_nanites") < 15) user.reagents.add_reagent("syndicate_nanites", 15) else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) //Syndicate Chaplain Robe (WOLOLO!) /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe @@ -924,22 +924,22 @@ if(linked_staff) //delink on destruction linked_staff.robes = null linked_staff = null - processing_objects -= src //probably is cleared in a parent call already, but just in case we're gonna do it here + STOP_PROCESSING(SSobj, src) //probably is cleared in a parent call already, but just in case we're gonna do it here return ..() /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/equipped(mob/living/carbon/human/H, slot) if(!istype(H) || slot != slot_wear_suit) - processing_objects -= src + STOP_PROCESSING(SSobj, src) return else - processing_objects |= src + START_PROCESSING(SSobj, src) /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/process() if(!linked_staff) //if we don't have a linked staff, the rest of this is useless return if(!ishuman(loc)) //if we somehow try to process while not on a human, remove ourselves from processing and return - processing_objects -= src + STOP_PROCESSING(SSobj, src) return var/mob/living/carbon/human/H = loc diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 6b08e2e4e49..b1da17677de 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -574,7 +574,7 @@ /obj/item/clothing/accessory/petcollar/Destroy() QDEL_NULL(access_id) - processing_objects -= src + STOP_PROCESSING(SSobj, src) return ..() /obj/item/clothing/accessory/petcollar/attack_self(mob/user as mob) @@ -617,10 +617,10 @@ /obj/item/clothing/accessory/petcollar/equipped(mob/living/simple_animal/user) if(istype(user)) - processing_objects |= src + START_PROCESSING(SSobj, src) /obj/item/clothing/accessory/petcollar/dropped(mob/living/simple_animal/user) - processing_objects -= src + STOP_PROCESSING(SSobj, src) /obj/item/clothing/accessory/petcollar/process() var/mob/living/simple_animal/M = loc @@ -636,7 +636,7 @@ else a.autosay("[M] has been vandalized in [t.name]!", "[M]'s Death Alarm") qdel(a) - processing_objects -= src + STOP_PROCESSING(SSobj, src) /proc/english_accessory_list(obj/item/clothing/under/U) if(!istype(U) || !U.accessories.len) diff --git a/code/modules/countdown/countdown.dm b/code/modules/countdown/countdown.dm index d860ba9c4cd..8769e5e321a 100644 --- a/code/modules/countdown/countdown.dm +++ b/code/modules/countdown/countdown.dm @@ -28,13 +28,13 @@ /obj/effect/countdown/proc/start() if(!started) - GLOB.fast_processing += src + START_PROCESSING(SSfastprocess, src) started = TRUE /obj/effect/countdown/proc/stop() if(started) maptext = null - GLOB.fast_processing -= src + STOP_PROCESSING(SSfastprocess, src) started = FALSE /obj/effect/countdown/proc/get_value() @@ -57,7 +57,7 @@ /obj/effect/countdown/Destroy() attached_to = null - GLOB.fast_processing -= src + STOP_PROCESSING(SSfastprocess, src) return ..() /obj/effect/countdown/ex_act(severity) //immune to explosions diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 5116abf32e6..bc99aa07b0e 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -117,8 +117,8 @@ /datum/crafting_recipe/floorbot name = "Floorbot" result = /mob/living/simple_animal/bot/floorbot - reqs = list(/obj/item/storage/toolbox/mechanical = 1, - /obj/item/stack/tile/plasteel = 1, + reqs = list(/obj/item/storage/toolbox = 1, + /obj/item/stack/tile/plasteel = 10, /obj/item/assembly/prox_sensor = 1, /obj/item/robot_parts/r_arm = 1) time = 40 diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 23206e8b9b3..d2b32f720cf 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -760,10 +760,10 @@ /obj/item/clothing/head/pirate/fluff/stumpy/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/clothing/head/pirate/fluff/stumpy/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/clothing/head/pirate/fluff/stumpy/process() @@ -1773,4 +1773,16 @@ /obj/item/clothing/gloves/ring/fluff/benjaminfallout //Benjaminfallout: Pretzel Brassheart name = "Pretzel's Ring" desc = "A small platinum ring with a large light blue diamond. Engraved inside the band are the words: 'To my lovely Pristine Princess. Forever yours, Savinien.'" - icon_state = "benjaminfallout_ring" \ No newline at end of file + icon_state = "benjaminfallout_ring" + +/obj/item/clothing/under/fluff/voxbodysuit //Gangelwaefre: Kikeri + name = "Vox Bodysuit" + desc = "A shimmering bodysuit custom-fit to a vox. Has shorts sewn in." + lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi' + righthand_file = 'icons/mob/inhands/fluff_righthand.dmi' + icon = 'icons/mob/inhands/fluff_righthand.dmi' + icon_state = "voxbodysuit" + item_state = "voxbodysuit" + item_color = "voxbodysuit" + body_parts_covered = HEAD|UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + species_fit = list("Vox") \ No newline at end of file diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 6f23bbc5fcd..2c2fdfbab84 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -6,6 +6,7 @@ event_announcement.Announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/AI/outbreak5.ogg') /datum/event/blob/start() + processing = FALSE //so it won't fire again in next tick var/turf/T = pick(blobstart) if(!T) return kill() @@ -23,4 +24,5 @@ B.key = M.key to_chat(B, "You are now a mouse, infected with blob spores. Find somewhere isolated... before you burst and become the blob! Use ventcrawl (alt-click on vents) to move around.") var/image/alert_overlay = image('icons/mob/blob.dmi', "blank_blob") - notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B, alert_overlay = alert_overlay) \ No newline at end of file + notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B, alert_overlay = alert_overlay) + processing = TRUE // Let it naturally end, if it runs successfully \ No newline at end of file diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm index 0f5c43059e8..1186da902f0 100644 --- a/code/modules/events/event.dm +++ b/code/modules/events/event.dm @@ -105,7 +105,7 @@ //Do not override this proc, instead use the appropiate procs. //This proc will handle the calls to the appropiate procs. -/datum/event/proc/process() +/datum/event/process() if(!processing) return @@ -137,12 +137,12 @@ end() endedAt = world.time - event_manager.active_events -= src - event_manager.event_complete(src) + SSevents.active_events -= src + SSevents.event_complete(src) /datum/event/New(var/datum/event_meta/EM) // event needs to be responsible for this, as stuff like APLUs currently make their own events for curious reasons - event_manager.active_events += src + SSevents.active_events += src if(!EM) EM = new /datum/event_meta(EVENT_LEVEL_MAJOR, "Unknown, Most likely admin called", src.type) diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 6cc12faf1b4..3f86b88924c 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -22,7 +22,7 @@ var/list/event_last_fired = list() var/last_world_time = 0 -/datum/event_container/proc/process() +/datum/event_container/process() if(!next_event_time) set_event_delay() diff --git a/code/modules/events/event_procs.dm b/code/modules/events/event_procs.dm new file mode 100644 index 00000000000..02ae1454597 --- /dev/null +++ b/code/modules/events/event_procs.dm @@ -0,0 +1,120 @@ + +/client/proc/forceEvent(var/type in SSevents.allEvents) + set name = "Trigger Event (Debug Only)" + set category = "Debug" + + if(!holder) + return + + if(ispath(type)) + new type(new /datum/event_meta(EVENT_LEVEL_MAJOR)) + message_admins("[key_name_admin(usr)] has triggered an event. ([type])", 1) + +/client/proc/event_manager_panel() + set name = "Event Manager Panel" + set category = "Event" + if(SSevents) + SSevents.Interact(usr) + feedback_add_details("admin_verb","EMP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + return + +/proc/findEventArea() //Here's a nice proc to use to find an area for your event to land in! + var/area/candidate = null + + var/list/safe_areas = list( + /area/turret_protected/ai, + /area/turret_protected/ai_upload, + /area/engine, + /area/solar, + /area/holodeck, + /area/shuttle/arrival, + /area/shuttle/escape, + /area/shuttle/escape_pod1/station, + /area/shuttle/escape_pod2/station, + /area/shuttle/escape_pod3/station, + /area/shuttle/escape_pod5/station, + /area/shuttle/specops/station, + /area/shuttle/prison/station, + /area/shuttle/administration/station + ) + + //These are needed because /area/engine has to be removed from the list, but we still want these areas to get fucked up. + var/list/danger_areas = list( + /area/engine/break_room, + /area/engine/chiefs_office) + + var/list/event_areas = list() + + for(var/areapath in the_station_areas) + event_areas += typesof(areapath) + for(var/areapath in safe_areas) + event_areas -= typesof(areapath) + for(var/areapath in danger_areas) + event_areas += typesof(areapath) + + while(event_areas.len > 0) + var/list/event_turfs = null + candidate = locate(pick_n_take(event_areas)) + event_turfs = get_area_turfs(candidate) + if(event_turfs.len > 0) + break + + return candidate + +// Returns how many characters are currently active(not logged out, not AFK for more than 10 minutes) +// with a specific role. +// Note that this isn't sorted by department, because e.g. having a roboticist shouldn't make meteors spawn. +/proc/number_active_with_role() + var/list/active_with_role = list() + active_with_role["Engineer"] = 0 + active_with_role["Medical"] = 0 + active_with_role["Security"] = 0 + active_with_role["Scientist"] = 0 + active_with_role["AI"] = 0 + active_with_role["Cyborg"] = 0 + active_with_role["Janitor"] = 0 + active_with_role["Botanist"] = 0 + active_with_role["Any"] = GLOB.player_list.len + + for(var/mob/M in GLOB.player_list) + if(!M.mind || !M.client || M.client.inactivity > 10 * 10 * 60) // longer than 10 minutes AFK counts them as inactive + continue + + if(istype(M, /mob/living/silicon/robot) && M:module && M:module.name == "engineering robot module") + active_with_role["Engineer"]++ + if(M.mind.assigned_role in list("Chief Engineer", "Station Engineer")) + active_with_role["Engineer"]++ + + if(istype(M, /mob/living/silicon/robot) && M:module && M:module.name == "medical robot module") + active_with_role["Medical"]++ + if(M.mind.assigned_role in list("Chief Medical Officer", "Medical Doctor")) + active_with_role["Medical"]++ + + if(istype(M, /mob/living/silicon/robot) && M:module && M:module.name == "security robot module") + active_with_role["Security"]++ + if(M.mind.assigned_role in security_positions) + active_with_role["Security"]++ + + if(M.mind.assigned_role in list("Research Director", "Scientist")) + active_with_role["Scientist"]++ + + if(M.mind.assigned_role == "AI") + active_with_role["AI"]++ + + if(M.mind.assigned_role == "Cyborg") + active_with_role["Cyborg"]++ + + if(M.mind.assigned_role == "Janitor") + active_with_role["Janitor"]++ + + if(M.mind.assigned_role == "Botanist") + active_with_role["Botanist"]++ + + return active_with_role + +/datum/event/proc/num_players() + var/players = 0 + for(var/mob/living/carbon/human/P in GLOB.player_list) + if(P.client) + players++ + return players diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index e63805d6a1d..a0aa17596fd 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -4,7 +4,7 @@ /datum/event/falsealarm/announce() var/weight = pickweight(list(EVENT_LEVEL_MUNDANE = 60, EVENT_LEVEL_MODERATE = 30, EVENT_LEVEL_MAJOR = 10)) - var/datum/event_container/container = event_manager.event_containers[weight] + var/datum/event_container/container = SSevents.event_containers[weight] var/datum/event/E = container.acquire_event() var/datum/event/Event = new E message_admins("False Alarm: [Event]") diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 7d52d7cd969..ced084f05a3 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -539,7 +539,7 @@ /obj/structure/spacevine_controller/New(loc, list/muts, potency, production) color = "#ffffff" spawn_spacevine_piece(loc, , muts) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) init_subtypes(/datum/spacevine_mutation/, mutations_list) if(potency != null && potency > 0) // 1 mutativeness at 10 potency @@ -567,7 +567,7 @@ return /obj/structure/spacevine_controller/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/structure/spacevine_controller/proc/spawn_spacevine_piece(turf/location, obj/structure/spacevine/parent, list/muts) diff --git a/code/modules/events/wizard/ghost.dm b/code/modules/events/wizard/ghost.dm new file mode 100644 index 00000000000..11529e3080d --- /dev/null +++ b/code/modules/events/wizard/ghost.dm @@ -0,0 +1,5 @@ +/datum/event/wizard/ghost //The spook is real + +/datum/event/wizard/ghost/start() + var/msg = "You suddenly feel extremely obvious..." + set_observer_default_invisibility(0, msg) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 855ac60666b..e937ec25ef9 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -138,7 +138,7 @@ Gunshots/explosions/opening doors/less rare audio (done) if(target.client) target.client.images |= flood_images next_expand = world.time + FAKE_FLOOD_EXPAND_TIME - processing_objects += src + START_PROCESSING(SSobj, src) /obj/effect/hallucination/fake_flood/process() if(next_expand <= world.time) @@ -162,7 +162,7 @@ Gunshots/explosions/opening doors/less rare audio (done) target.client.images |= flood_images /obj/effect/hallucination/fake_flood/Destroy() - processing_objects -= src + STOP_PROCESSING(SSobj, src) flood_turfs.Cut() if(target.client) target.client.images.Remove(flood_images) diff --git a/code/modules/holiday/holiday.dm b/code/modules/holiday/holiday.dm index 414df7f7589..f87422e2ad1 100644 --- a/code/modules/holiday/holiday.dm +++ b/code/modules/holiday/holiday.dm @@ -345,9 +345,9 @@ if(!istype(H)) return H.celebrate() - if(!holiday_master.holidays) - holiday_master.holidays = list() - holiday_master.holidays[H.name] = H + if(!SSholiday.holidays) + SSholiday.holidays = list() + SSholiday.holidays[H.name] = H //update our hub status world.update_status() diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index 371822643a1..21ba7cb89e2 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -47,11 +47,11 @@ /obj/structure/beebox/Initialize(mapload) . = ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/structure/beebox/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) for(var/mob/living/simple_animal/hostile/poison/bees/B in bees) B.beehome = null bees.Cut() diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 67979b61dd7..cc6c6115097 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -15,8 +15,8 @@ var/productivity = 0 var/max_items = 40 var/datum/research/files - var/list/show_categories = list("Food", "Botany Chemicals", "Leather and Cloth") - var/list/timesFiveCategories = list("Food", "Botany Chemicals") + var/list/show_categories = list("Food", "Botany Chemicals", "Organic Materials", "Leather and Cloth") + var/list/timesFiveCategories = list("Food", "Botany Chemicals", "Organic Materials") /obj/machinery/biogenerator/New() ..() diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index 4ed9d963274..90725f8e46e 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -151,7 +151,7 @@ burning = 1 set_light(6, l_color = "#ED9200") Burn() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/structure/bonfire/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE) ..() @@ -186,7 +186,7 @@ icon_state = "bonfire" burning = 0 set_light(0) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /obj/structure/bonfire/buckle_mob(mob/living/M, force = 0) if(..()) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index b0eafcbc8bb..38d5436ecfb 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -701,8 +701,7 @@ H.nutrition -= 20 H.adjustToxLoss(-3) var/turf/T = get_turf(H) - T.add_vomit_floor(H) - playsound(H, 'sound/effects/splat.ogg', 50, 1) + T.add_vomit_floor() else visible_message("[src] flickers and fails, due to bluespace interference!") qdel(src) diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm index f657fa6ec5f..fd8b8dfa4ef 100644 --- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm +++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm @@ -35,14 +35,14 @@ /obj/item/melee/ghost_sword/New() ..() spirits = list() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) GLOB.poi_list |= src /obj/item/melee/ghost_sword/Destroy() for(var/mob/dead/observer/G in spirits) G.invisibility = initial(G.invisibility) spirits.Cut() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) GLOB.poi_list -= src . = ..() diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm index c3887fe4660..d7c6232121f 100644 --- a/code/modules/mining/lavaland/loot/colossus_loot.dm +++ b/code/modules/mining/lavaland/loot/colossus_loot.dm @@ -436,7 +436,7 @@ ..() if(isanimal(loc)) holder_animal = loc - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/structure/closet/stasis/Entered(atom/A) if(isliving(A) && holder_animal) @@ -450,7 +450,7 @@ holder_animal.verbs -= /mob/living/verb/pulled /obj/structure/closet/stasis/dump_contents(var/kill = 1) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) for(var/mob/living/L in src) L.disabilities &= ~MUTE L.status_flags &= ~GODMODE diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index dfd4e1e3332..b7c301f7387 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -3,6 +3,8 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for things ghosts should still be able to see when they toggle darkness +GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) + /mob/dead/observer name = "ghost" desc = "It's a g-g-g-g-ghooooost!" //jinkies! @@ -29,6 +31,8 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi var/ghost_orbit = GHOST_ORBIT_CIRCLE /mob/dead/observer/New(var/mob/body=null, var/flags=1) + set_invisibility(GLOB.observer_default_invisibility) + sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF see_invisible = SEE_INVISIBLE_OBSERVER_AI_EYE see_in_dark = 100 @@ -384,7 +388,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(usr, "AntagHud Toggled OFF") M.antagHUD = 0 -/mob/dead/observer/proc/dead_tele(A in ghostteleportlocs) +/mob/dead/observer/proc/dead_tele() set category = "Ghost" set name = "Teleport" set desc= "Teleport to a location" @@ -393,12 +397,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(usr, "Not when you're not dead!") return - usr.verbs -= /mob/dead/observer/proc/dead_tele - spawn(30) - usr.verbs += /mob/dead/observer/proc/dead_tele - + var/area/A = input("Area to jump to", "BOOYEA") as null|anything in ghostteleportlocs var/area/thearea = ghostteleportlocs[A] - if(!thearea) return + + if(!thearea) + return var/list/L = list() for(var/turf/T in get_area_turfs(thearea.type)) @@ -406,17 +409,19 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!L || !L.len) to_chat(usr, "No area available.") + return usr.forceMove(pick(L)) following = null -/mob/dead/observer/verb/follow(input in getmobs()) +/mob/dead/observer/verb/follow() set category = "Ghost" set name = "Orbit" // "Haunt" set desc = "Follow and orbit a mob." - var/target = getmobs()[input] - if(!target) return + var/list/mobs = getpois(skip_mindless=1) + var/input = input("Please, select a mob!", "Haunt", null, null) as null|anything in mobs + var/mob/target = mobs[input] ManualFollow(target) // This is the ghost's follow verb with an argument @@ -484,24 +489,29 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp update_following() return ..() -/mob/dead/observer/verb/jumptomob(target in getmobs()) //Moves the ghost instead of just changing the ghosts's eye -Nodrak +/mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak set category = "Ghost" set name = "Jump to Mob" set desc = "Teleport to a mob" - if(istype(usr, /mob/dead/observer)) //Make sure they're an observer! + if(isobserver(usr)) //Make sure they're an observer! + var/list/dest = list() //List of possible destinations (mobs) + var/target = null //Chosen target. - if(!target)//Make sure we actually have a target + dest += getpois(mobs_only=1) //Fill list, prompt user with list + target = input("Please, select a mob!", "Jump to Mob", null, null) as null|anything in dest + + if(!target) //Make sure we actually have a target return else - var/mob/M = getmobs()[target] //Destination mob + var/mob/M = dest[target] //Destination mob + var/mob/A = src //Source mob var/turf/T = get_turf(M) //Turf of the destination mob if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination. - forceMove(T) - following = null + A.forceMove(T) else - to_chat(src, "This mob is not located in the game world.") + to_chat(A, "This mob is not located in the game world.") /* Now a spell. See spells.dm @@ -742,6 +752,26 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/is_literate() return TRUE + +/mob/dead/observer/proc/set_invisibility(value) + invisibility = value + if(!value) + set_light(1, 2) + else + set_light(0, 0) + +/mob/dead/observer/vv_edit_var(var_name, var_value) + . = ..() + if(var_name == "invisibility") + set_invisibility(invisibility) // updates light + +/proc/set_observer_default_invisibility(amount, message=null) + for(var/mob/dead/observer/G in GLOB.player_list) + G.set_invisibility(amount) + if(message) + to_chat(G, message) + GLOB.observer_default_invisibility = amount + /mob/dead/observer/proc/open_spawners_menu() set name = "Mob spawners menu" set desc = "See all currently available ghost spawners" diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index ab47a84ee76..41c1d89f603 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -17,7 +17,7 @@ . = src.say_dead(message) -/mob/dead/observer/emote(var/act, var/type, var/message) +/mob/dead/observer/emote(act, type, message, force) message = sanitize(copytext(message, 1, MAX_MESSAGE_LEN)) if(!message) diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 0ec193c69e8..989decdb395 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -2,15 +2,20 @@ //Emote Cooldown System (it's so simple!) /mob/proc/handle_emote_CD(cooldown = EMOTE_COOLDOWN) - if(emote_cd == 2) return 1 // Cooldown emotes were disabled by an admin, prevent use - if(src.emote_cd == 1) return 1 // Already on CD, prevent use + if(emote_cd == 3) //Spam those emotes + return FALSE + if(emote_cd == 2) // Cooldown emotes were disabled by an admin, prevent use + return TRUE + if(emote_cd == 1) // Already on CD, prevent use + return TRUE - src.emote_cd = 1 // Starting cooldown + emote_cd = TRUE // Starting cooldown spawn(cooldown) - if(emote_cd == 2) return 1 // Don't reset if cooldown emotes were disabled by an admin during the cooldown - src.emote_cd = 0 // Cooldown complete, ready for more! + if(emote_cd == 2) + return TRUE // Don't reset if cooldown emotes were disabled by an admin during the cooldown + emote_cd = FALSE // Cooldown complete, ready for more! + return FALSE // Proceed with emote - return 0 // Proceed with emote //--FalseIncarnate /mob/proc/handle_emote_param(var/target, var/not_self, var/vicinity, var/return_mob) //Only returns not null if the target param is valid. diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 3a6c4d22a67..ee9a3c3cca2 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -7,10 +7,10 @@ /obj/item/holder/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/holder/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/holder/process() diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index f159abebbe4..7412120cff0 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/alien/humanoid/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/alien/humanoid/emote(act, m_type = 1, message = null, force) var/param = null if(findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) @@ -25,7 +25,7 @@ if("flip") on_CD = handle_emote_CD() - if(on_CD) + if(!force && on_CD == 1) return switch(act) @@ -138,4 +138,4 @@ playsound(src.loc, 'sound/voice/hiss1.ogg', 30, 1, 1) if(act == "gnarl") playsound(src.loc, 'sound/voice/hiss4.ogg', 30, 1, 1) - ..(act, m_type, message) \ No newline at end of file + ..() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm index 82ebcf943f6..3b18889176b 100644 --- a/code/modules/mob/living/carbon/alien/larva/emote.dm +++ b/code/modules/mob/living/carbon/alien/larva/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/alien/larva/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/alien/larva/emote(act, m_type = 1, message = null, force) var/param = null if(findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 087ca959902..04f5cd53d00 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -107,7 +107,7 @@ /obj/item/organ/internal/brain/necrotize(update_sprite = TRUE) //Brain also has special handling for when it necrotizes damage = max_damage status |= ORGAN_DEAD - processing_objects -= src + STOP_PROCESSING(SSobj, src) if(dead_icon && !is_robotic()) icon_state = dead_icon if(owner && vital) diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index bf7962464da..dd1876e223f 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/brain/emote(var/act,var/m_type=1,var/message = null) +/mob/living/carbon/brain/emote(act,m_type = 1, message = null, force) if(!(container && istype(container, /obj/item/mmi)))//No MMI, no emotes return @@ -48,4 +48,4 @@ to_chat(src, "alarm, alert, notice, flash,blink, whistle, beep, boop") if(message && !stat) - ..(act, m_type, message) \ No newline at end of file + ..() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 277bbbd8789..77373021727 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -109,7 +109,7 @@ adjustBruteLoss(3) else if(T) - T.add_vomit_floor(src) + T.add_vomit_floor() nutrition -= lost_nutrition if(stun) adjustToxLoss(-3) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 7259a455154..6d245674fd1 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -93,7 +93,7 @@ /mob/living/carbon/human/death(gibbed) if(can_die() && !gibbed && deathgasp_on_death) - emote("deathgasp") //let the world KNOW WE ARE DEAD + emote("deathgasp", force = TRUE) //let the world KNOW WE ARE DEAD // Only execute the below if we successfully died . = ..(gibbed) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 442d7aaf044..416fd911777 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null,var/force) +/mob/living/carbon/human/emote(act, m_type = 1, message = null, force) if((stat == DEAD) || (status_flags & FAKEDEATH)) return // No screaming bodies @@ -13,22 +13,22 @@ if(muzzled) var/obj/item/clothing/mask/muzzle/M = wear_mask if(M.mute == MUZZLE_MUTE_NONE) - muzzled = 0 //Not all muzzles block sound + muzzled = FALSE //Not all muzzles block sound if(!can_speak()) - muzzled = 1 + muzzled = TRUE //var/m_type = 1 for(var/obj/item/implant/I in src) if(I.implanted) - I.trigger(act, src) + I.trigger(act, src, force) - var/miming = 0 + var/miming = FALSE if(mind) miming = mind.miming //Emote Cooldown System (it's so simple!) - // proc/handle_emote_CD() located in [code\modules\mob\emote.dm] - var/on_CD = 0 + //handle_emote_CD() located in [code\modules\mob\emote.dm] + var/on_CD = FALSE act = lowertext(act) switch(act) //Cooldown-inducing emotes @@ -61,16 +61,16 @@ else return if("squish", "squishes") - var/found_slime_bodypart = 0 + var/found_slime_bodypart = FALSE if(isslimeperson(src)) //Only Slime People can squish on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm' - found_slime_bodypart = 1 + found_slime_bodypart = TRUE else for(var/obj/item/organ/external/L in bodyparts) // if your limbs are squishy you can squish too! if(istype(L.dna.species, /datum/species/slime)) on_CD = handle_emote_CD() - found_slime_bodypart = 1 + found_slime_bodypart = TRUE break if(!found_slime_bodypart) //Everyone else fails, skip the emote attempt @@ -118,9 +118,9 @@ on_CD = handle_emote_CD() //Everything else, including typos of the above emotes else - on_CD = 0 //If it doesn't induce the cooldown, we won't check for the cooldown + on_CD = FALSE //If it doesn't induce the cooldown, we won't check for the cooldown - if(on_CD == 1) // Check if we need to suppress the emote attempt. + if(!force && on_CD == 1) // Check if we need to suppress the emote attempt. return // Suppress emote, you're still cooling off. switch(act) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 903c8ef80d3..d6c667b1b74 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -38,6 +38,7 @@ regenerate_icons() // Make sure the inventory updates handle_ghosted() + handle_ssd() /mob/living/carbon/human/proc/handle_ghosted() if(player_ghosted > 0 && stat == CONSCIOUS && job && !restrained()) @@ -48,6 +49,22 @@ if(player_ghosted % 150 == 0) force_cryo_human(src) +/mob/living/carbon/human/proc/handle_ssd() + if(player_logged > 0 && stat != DEAD && job) + player_logged++ + if(istype(loc, /obj/machinery/cryopod)) + return + if(config.auto_cryo_ssd_mins && (player_logged >= (config.auto_cryo_ssd_mins * 30)) && player_logged % 30 == 0) + var/turf/T = get_turf(src) + if(!is_station_level(T.z)) + return + var/area/A = get_area(src) + if(cryo_ssd(src)) + var/obj/effect/portal/P = new /obj/effect/portal(T, null, null, 40) + P.name = "NT SSD Teleportation Portal" + if(A.fast_despawn) + force_cryo_human(src) + /mob/living/carbon/human/calculate_affecting_pressure(var/pressure) ..() var/pressure_difference = abs( pressure - ONE_ATMOSPHERE ) diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm index a07f1ba3b2e..c938ac17214 100644 --- a/code/modules/mob/living/carbon/slime/emote.dm +++ b/code/modules/mob/living/carbon/slime/emote.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/slime/emote(act, m_type = 1, message = null) +/mob/living/carbon/slime/emote(act, m_type = 1, message = null, force) if(findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) //param = copytext(act, t1 + 1, length(act) + 1) diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 003b5c3d4fe..37077881350 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -57,7 +57,7 @@ SetLoseBreath(0) if(!gibbed && deathgasp_on_death) - emote("deathgasp") + emote("deathgasp", force = TRUE) if(mind && suiciding) mind.suicided = TRUE diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index cf5fff66caa..95b44b15862 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -275,7 +275,7 @@ proc/get_radio_key_from_channel(var/channel) /mob/living/proc/GetVoice() return name -/mob/living/emote(var/act, var/type, var/message) //emote code is terrible, this is so that anything that isn't already snowflaked to shit can call the parent and handle emoting sanely +/mob/living/emote(act, type, message, force) //emote code is terrible, this is so that anything that isn't already snowflaked to shit can call the parent and handle emoting sanely if(client) if(client.prefs.muted & MUTE_IC) to_chat(src, "You cannot speak in IC (Muted).") @@ -284,7 +284,7 @@ proc/get_radio_key_from_channel(var/channel) if(stat) return 0 - if(..(act, type, message)) + if(..()) return 1 if(act && type && message) //parent call @@ -306,7 +306,8 @@ proc/get_radio_key_from_channel(var/channel) return 1 else //everything else failed, emote is probably invalid - if(act == "help") return //except help, because help is handled individually + if(act == "help") + return //except help, because help is handled individually to_chat(src, "Unusable emote '[act]'. Say *help for a list.") /mob/living/whisper(message as text) diff --git a/code/modules/mob/living/silicon/death.dm b/code/modules/mob/living/silicon/death.dm index 2f662169551..63b206debba 100644 --- a/code/modules/mob/living/silicon/death.dm +++ b/code/modules/mob/living/silicon/death.dm @@ -42,3 +42,9 @@ animation.icon = 'icons/mob/mob.dmi' animation.master = src QDEL_IN(animation, 15) + +/mob/living/silicon/death(gibbed) + . = ..() + if(!gibbed) + if(death_sound) + playsound(get_turf(src), death_sound, 200, 1) diff --git a/code/modules/mob/living/silicon/emote.dm b/code/modules/mob/living/silicon/emote.dm index 3385c4ce622..1b1ee4f7f48 100644 --- a/code/modules/mob/living/silicon/emote.dm +++ b/code/modules/mob/living/silicon/emote.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/emote(var/act, var/m_type=1, var/message = null) +/mob/living/silicon/emote(act, m_type=1, message = null, force) var/param = null if(findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) @@ -6,7 +6,7 @@ act = copytext(act, 1, t1) //Emote Cooldown System (it's so simple!) - // proc/handle_emote_CD() located in [code\modules\mob\emote.dm] + //handle_emote_CD() located in [code\modules\mob\emote.dm] var/on_CD = 0 act = lowertext(act) switch(act) @@ -20,7 +20,7 @@ else on_CD = 0 //If it doesn't induce the cooldown, we won't check for the cooldown - if(on_CD == 1) // Check if we need to suppress the emote attempt. + if(!force && on_CD == 1) // Check if we need to suppress the emote attempt. return // Suppress emote, you're still cooling off. //--FalseIncarnate @@ -78,4 +78,4 @@ if("help") to_chat(src, "yes, no, beep, ping, buzz, scream, buzz2") - ..(act, m_type, message) + ..() diff --git a/code/modules/mob/living/silicon/pai/emote.dm b/code/modules/mob/living/silicon/pai/emote.dm deleted file mode 100644 index a418c0972d5..00000000000 --- a/code/modules/mob/living/silicon/pai/emote.dm +++ /dev/null @@ -1,2 +0,0 @@ -/mob/living/silicon/pai/emote(var/act, var/m_type=1, var/message = null) - ..(act, m_type, message) diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index fec27db5df8..ff859853ea5 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -28,7 +28,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates if(candidate) if(!istype(candidate)) - message_admins("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate is not a pAI)") + message_admins("Warning: possible href exploit by [key_name_admin(usr)] (paiController/Topic, candidate is not a pAI)") log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate is not a pAI)") return @@ -55,13 +55,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates pai_candidates -= candidate usr << browse(null, "window=findPai") - - - if(candidate) - if(candidate.key && usr.key && candidate.key != usr.key) - message_admins("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)") - log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr are different mobs)") - return + return if("signup" in href_list) var/mob/dead/observer/O = locate(href_list["signup"]) @@ -75,6 +69,11 @@ var/datum/paiController/paiController // Global handler for pAI candidates recruitWindow(O) return + if(candidate) + if(candidate.key && usr.key && candidate.key != usr.key) + message_admins("Warning: possible href exploit by [key_name_admin(usr)] (paiController/Topic, candidate and usr have different keys)") + log_debug("Warning: possible href exploit by [key_name(usr)] (paiController/Topic, candidate and usr have different keys)") + return if(href_list["new"]) var/option = href_list["option"] diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index 21a09eed8a8..7402c4a65c9 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -50,7 +50,7 @@ /mob/living/silicon/robot/death(gibbed) if(can_die()) if(!gibbed && deathgasp_on_death) - emote("deathgasp") + emote("deathgasp", force = TRUE) if(module) module.handle_death(gibbed) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 80014c44f8b..e94f9e072b4 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -248,9 +248,9 @@ death() /mob/living/silicon/robot/drone/proc/full_law_reset() - clear_supplied_laws() - clear_inherent_laws() - clear_ion_laws() + clear_supplied_laws(TRUE) + clear_inherent_laws(TRUE) + clear_ion_laws(TRUE) laws = new /datum/ai_laws/drone //Reboot procs. diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 9c130780d81..bec1e1ae668 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/robot/emote(var/act, var/m_type=1, var/message = null) +/mob/living/silicon/robot/emote(act, m_type=1, message = null, force) var/param = null if(findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) @@ -6,7 +6,7 @@ act = copytext(act, 1, t1) //Emote Cooldown System (it's so simple!) - //proc/handle_emote_CD() located in [code\modules\mob\emote.dm] + //handle_emote_CD() located in [code\modules\mob\emote.dm] var/on_CD = 0 act = lowertext(act) switch(act) @@ -17,7 +17,7 @@ else on_CD = 0 //If it doesn't induce the cooldown, we won't check for the cooldown - if(on_CD == 1) // Check if we need to suppress the emote attempt. + if(!force && on_CD == 1) // Check if we need to suppress the emote attempt. return // Suppress emote, you're still cooling off. //--FalseIncarnate @@ -160,7 +160,7 @@ if("help") to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitches, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look,\n law, halt") - ..(act, m_type, message) + ..() /mob/living/silicon/robot/verb/powerwarn() set category = "Robot Commands" diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 17a7e67adf7..8092947919f 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -103,7 +103,7 @@ return return 1 -/mob/living/silicon/ai/emote(var/act, var/type, var/message) +/mob/living/silicon/ai/emote(act, type, message, force) var/obj/machinery/hologram/holopad/T = current if(istype(T) && T.masters[src])//Is the AI using a holopad? src.holopad_emote(message) diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 5c19dcb0d7a..1c82e9e8779 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -19,6 +19,7 @@ var/speak_exclamation = "declares" var/speak_query = "queries" var/pose //Yes, now AIs can pose too. + var/death_sound = 'sound/voice/borg_deathsound.ogg' //var/sensor_mode = 0 //Determines the current HUD. diff --git a/code/modules/mob/living/silicon/subsystems.dm b/code/modules/mob/living/silicon/subsystems.dm index fa3dcfd2cfa..8f7c2316768 100644 --- a/code/modules/mob/living/silicon/subsystems.dm +++ b/code/modules/mob/living/silicon/subsystems.dm @@ -41,7 +41,7 @@ if(!register_alarms) return - var/list/register_to = list(atmosphere_alarm, burglar_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm) + var/list/register_to = list(SSalarms.atmosphere_alarm, SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.fire_alarm, SSalarms.motion_alarm, SSalarms.power_alarm) for(var/datum/alarm_handler/AH in register_to) AH.register(src, /mob/living/silicon/proc/receive_alarm) queued_alarms[AH] = list() // Makes sure alarms remain listed in consistent order diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 2737781bd08..77eb74e5696 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -210,23 +210,29 @@ var/robot_arm = /obj/item/robot_parts/l_arm throw_range = 5 w_class = WEIGHT_CLASS_NORMAL var/created_name = "Floorbot" + var/toolbox = /obj/item/storage/toolbox/mechanical + var/toolbox_color = "" //Blank for blue, r for red, y for yellow, etc. -/obj/item/toolbox_tiles_sensor +/obj/item/toolbox_tiles/sensor desc = "It's a toolbox with tiles sticking out the top and a sensor attached" name = "tiles, toolbox and sensor arrangement" - icon = 'icons/obj/aibots.dmi' icon_state = "toolbox_tiles_sensor" - force = 3 - throwforce = 10 - throw_speed = 2 - throw_range = 5 - w_class = WEIGHT_CLASS_NORMAL - var/created_name = "Floorbot" -/obj/item/storage/toolbox/mechanical/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) +/obj/item/storage/toolbox/attackby(obj/item/stack/tile/plasteel/T, mob/user, params) + var/list/allowed_toolbox = list(/obj/item/storage/toolbox/emergency, //which toolboxes can be made into floorbots + /obj/item/storage/toolbox/electrical, + /obj/item/storage/toolbox/mechanical, + /obj/item/storage/toolbox/green, + /obj/item/storage/toolbox/syndicate, + /obj/item/storage/toolbox/fakesyndi) + if(!istype(T, /obj/item/stack/tile/plasteel)) ..() return + if(!is_type_in_list(src, allowed_toolbox)) + return + if(type == /obj/item/storage/toolbox/green/memetic) + return if(contents.len >= 1) to_chat(user, "They won't fit in, as there is already stuff inside.") return @@ -234,6 +240,23 @@ var/robot_arm = /obj/item/robot_parts/l_arm if(user.s_active) user.s_active.close(user) var/obj/item/toolbox_tiles/B = new /obj/item/toolbox_tiles + B.toolbox = type + switch(B.toolbox) + if(/obj/item/storage/toolbox/mechanical/old) + B.toolbox_color = "ob" + if(/obj/item/storage/toolbox/emergency) + B.toolbox_color = "r" + if(/obj/item/storage/toolbox/emergency/old) + B.toolbox_color = "or" + if(/obj/item/storage/toolbox/electrical) + B.toolbox_color = "y" + if(/obj/item/storage/toolbox/green) + B.toolbox_color = "g" + if(/obj/item/storage/toolbox/syndicate) + B.toolbox_color = "s" + if(/obj/item/storage/toolbox/fakesyndi) + B.toolbox_color = "s" + B.icon_state = "[B.toolbox_color]toolbox_tiles" user.put_in_hands(B) to_chat(user, "You add the tiles into the empty toolbox. They protrude from the top.") user.unEquip(src, 1) @@ -246,8 +269,10 @@ var/robot_arm = /obj/item/robot_parts/l_arm ..() if(isprox(W)) qdel(W) - var/obj/item/toolbox_tiles_sensor/B = new /obj/item/toolbox_tiles_sensor() + var/obj/item/toolbox_tiles/sensor/B = new /obj/item/toolbox_tiles/sensor() B.created_name = created_name + B.toolbox_color = src.toolbox_color + B.icon_state = "[B.toolbox_color]toolbox_tiles_sensor" user.put_in_hands(B) to_chat(user, "You add the sensor to the toolbox and tiles.") user.unEquip(src, 1) @@ -263,12 +288,11 @@ var/robot_arm = /obj/item/robot_parts/l_arm created_name = t log_game("[key_name(user)] has renamed a robot to [t]") -/obj/item/toolbox_tiles_sensor/attackby(obj/item/W, mob/user, params) +/obj/item/toolbox_tiles/sensor/attackby(obj/item/W, mob/user, params) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) qdel(W) - var/turf/T = get_turf(user.loc) - var/mob/living/simple_animal/bot/floorbot/A = new /mob/living/simple_animal/bot/floorbot(T) + var/mob/living/simple_animal/bot/floorbot/A = new(drop_location(), toolbox_color) A.name = created_name A.robot_arm = W.type to_chat(user, "You add the robot arm to the odd looking toolbox assembly. Boop beep!") @@ -287,10 +311,9 @@ var/robot_arm = /obj/item/robot_parts/l_arm //Medbot Assembly /obj/item/storage/firstaid/attackby(obj/item/I, mob/user, params) if(!istype(I, /obj/item/robot_parts/l_arm) && !istype(I, /obj/item/robot_parts/r_arm)) - return ..() + return ..() else robot_arm = I.type - //Making a medibot! if(contents.len) @@ -298,7 +321,7 @@ var/robot_arm = /obj/item/robot_parts/l_arm return var/obj/item/firstaid_arm_assembly/A = new /obj/item/firstaid_arm_assembly(loc, med_bot_skin) - + A.req_one_access = req_one_access A.syndicate_aligned = syndicate_aligned A.treatment_oxy = treatment_oxy @@ -492,7 +515,7 @@ var/robot_arm = /obj/item/robot_parts/l_arm //General Griefsky - else if((istype(I, /obj/item/wrench)) && (build_step == 3)) + else if((istype(I, /obj/item/wrench)) && (build_step == 3)) var/obj/item/griefsky_assembly/A = new /obj/item/griefsky_assembly user.put_in_hands(A) to_chat(user, "You adjust the arm slots for extra weapons!.") @@ -516,12 +539,12 @@ var/robot_arm = /obj/item/robot_parts/l_arm build_step++ to_chat(user, "You add an energy sword to [src]!.") qdel(I) - + else if((istype(I, /obj/item/melee/energy/sword)) && (build_step == 3)) if(!user.unEquip(I)) return to_chat(user, "You complete General Griefsky!.") - var/mob/living/simple_animal/bot/secbot/griefsky/S = new /mob/living/simple_animal/bot/secbot/griefsky + var/mob/living/simple_animal/bot/secbot/griefsky/S = new /mob/living/simple_animal/bot/secbot/griefsky S.forceMove(get_turf(src)) qdel(I) qdel(src) @@ -537,7 +560,7 @@ var/robot_arm = /obj/item/robot_parts/l_arm if(!user.unEquip(I)) return to_chat(user, "You complete Genewul Giftskee!.") - var/mob/living/simple_animal/bot/secbot/griefsky/toy/S = new /mob/living/simple_animal/bot/secbot/griefsky/toy + var/mob/living/simple_animal/bot/secbot/griefsky/toy/S = new /mob/living/simple_animal/bot/secbot/griefsky/toy S.forceMove(get_turf(src)) qdel(I) qdel(src) diff --git a/code/modules/mob/living/simple_animal/bot/emote.dm b/code/modules/mob/living/simple_animal/bot/emote.dm index eb6a18e8657..c59e044cc67 100644 --- a/code/modules/mob/living/simple_animal/bot/emote.dm +++ b/code/modules/mob/living/simple_animal/bot/emote.dm @@ -1,4 +1,4 @@ -/mob/living/simple_animal/bot/emote(act, m_type=1, message = null) +/mob/living/simple_animal/bot/emote(act, m_type = 1, message = null, force) var/param = null if(findtext(act, "-", 1, null)) var/t1 = findtext(act, "-", 1, null) @@ -9,7 +9,7 @@ act = copytext(act,1,length(act)) //Emote Cooldown System (it's so simple!) - //proc/handle_emote_CD() located in [code\modules\mob\emote.dm] + //handle_emote_CD() located in [code\modules\mob\emote.dm] var/on_CD = 0 act = lowertext(act) switch(act) @@ -22,7 +22,7 @@ else on_CD = 0 //If it doesn't induce the cooldown, we won't check for the cooldown - if(on_CD == 1) // Check if we need to suppress the emote attempt. + if(!force && on_CD == 1) // Check if we need to suppress the emote attempt. return // Suppress emote, you're still cooling off. //--FalseIncarnate @@ -71,4 +71,4 @@ if("help") to_chat(src, "scream(s), yes, no, beep, buzz, ping") - ..(act, m_type, message) + ..() diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index c22d37eed19..21967bd202b 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -5,7 +5,7 @@ icon = 'icons/obj/aibots.dmi' icon_state = "floorbot0" density = 0 - anchored = 0 + anchored = FALSE health = 25 maxHealth = 25 @@ -32,6 +32,7 @@ var/max_targets = 50 var/turf/target var/oldloc = null + var/toolbox_color = "" #define HULL_BREACH 1 #define BRIDGE_MODE 2 @@ -40,12 +41,16 @@ #define REPLACE_TILE 5 #define TILE_EMAG 6 -/mob/living/simple_animal/bot/floorbot/New() +/mob/living/simple_animal/bot/floorbot/New(mapload, new_toolbox_color) ..() + toolbox_color = new_toolbox_color update_icon() var/datum/job/engineer/J = new/datum/job/engineer access_card.access += J.get_access() prev_access = access_card.access + if(toolbox_color == "s") + health = 50 + maxHealth = 50 /mob/living/simple_animal/bot/floorbot/bot_reset() ..() @@ -53,7 +58,7 @@ oldloc = null ignore_list = list() nagged = 0 - anchored = 0 + anchored = FALSE update_icon() /mob/living/simple_animal/bot/floorbot/set_custom_texts() @@ -235,7 +240,7 @@ repair(target) else if(emagged == 2 && istype(target,/turf/simulated/floor)) var/turf/simulated/floor/F = target - anchored = 1 + anchored = TRUE mode = BOT_REPAIRING if(prob(90)) F.break_tile_to_plating() @@ -244,7 +249,7 @@ audible_message("[src] makes an excited booping sound.") spawn(50) amount ++ - anchored = 0 + anchored = FALSE mode = BOT_IDLE target = null path = list() @@ -272,11 +277,11 @@ if(HULL_BREACH) //The most common job, patching breaches in the station's hull. if(is_hull_breach(scan_target)) //Ensure that the targeted space turf is actually part of the station, and not random space. result = scan_target - anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach. + anchored = TRUE //Prevent the floorbot being blown off-course while trying to reach a hull breach. if(BRIDGE_MODE) //Only space turfs in our chosen direction are considered. if(get_dir(src, scan_target) == targetdirection) result = scan_target - anchored = 1 + anchored = TRUE if(REPLACE_TILE) F = scan_target if(istype(F, /turf/simulated/floor/plating)) //The floor must not already have a tile. @@ -306,9 +311,10 @@ mode = BOT_IDLE target = null return - anchored = 1 - icon_state = "floorbot-c" + anchored = TRUE + icon_state = "[toolbox_color]floorbot-c" if(istype(target_turf, /turf/space/)) //If we are fixing an area not part of pure space, it is + icon_state = "[toolbox_color]floorbot-c" visible_message("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] ") mode = BOT_REPAIRING spawn(50) @@ -320,11 +326,12 @@ mode = BOT_IDLE amount -= 1 update_icon() - anchored = 0 + anchored = FALSE target = null else var/turf/simulated/floor/F = target_turf mode = BOT_REPAIRING + icon_state = "[toolbox_color]floorbot-c" visible_message("[src] begins repairing the floor.") spawn(50) if(mode == BOT_REPAIRING) @@ -334,7 +341,7 @@ mode = BOT_IDLE amount -= 1 update_icon() - anchored = 0 + anchored = FALSE target = null /mob/living/simple_animal/bot/floorbot/proc/eattile(obj/item/stack/tile/plasteel/T) @@ -380,9 +387,9 @@ /mob/living/simple_animal/bot/floorbot/update_icon() if(amount > 0) - icon_state = "floorbot[on]" + icon_state = "[toolbox_color]floorbot[on]" else - icon_state = "floorbot[on]e" + icon_state = "[toolbox_color]floorbot[on]e" /mob/living/simple_animal/bot/floorbot/explode() on = 0 diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 9532daabab8..38787198a5f 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -147,7 +147,7 @@ stop_automated_movement = 1 walk_to(src,movement_target,0,3) -/mob/living/simple_animal/pet/cat/emote(act, m_type=1, message = null) +/mob/living/simple_animal/pet/cat/emote(act, m_type = 1, message = null, force) if(stat != CONSCIOUS) return @@ -163,9 +163,9 @@ else on_CD = 0 - if(on_CD == 1) + if(!force && on_CD == 1) return - + switch(act) if("meow") message = "[src] [pick(emote_hear)]!" @@ -225,9 +225,9 @@ maxHealth = 50 harm_intent_damage = 10 butcher_results = list( - /obj/item/organ/internal/brain = 1, - /obj/item/organ/internal/heart = 1, - /obj/item/reagent_containers/food/snacks/birthdaycakeslice = 3, + /obj/item/organ/internal/brain = 1, + /obj/item/organ/internal/heart = 1, + /obj/item/reagent_containers/food/snacks/birthdaycakeslice = 3, /obj/item/reagent_containers/food/snacks/meat/slab = 2 ) response_harm = "takes a bite out of" diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 832d92c9d8f..3ff26f7850c 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -368,7 +368,7 @@ name = "Definitely Not [real_name]" desc = "That's Definitely Not [real_name]" valid = 1 - + if(/obj/item/clothing/head/beret/centcom/officer, /obj/item/clothing/head/beret/centcom/officer/navy) name = "Blueshield [real_name]" desc = "Will stand by you until the bitter end." @@ -407,7 +407,7 @@ playsound(src, yelp_sound, 75, 1) ..() -/mob/living/simple_animal/pet/corgi/emote(act, m_type=1, message = null) +/mob/living/simple_animal/pet/corgi/emote(act, m_type = 1, message = null, force) if(stat != CONSCIOUS) return @@ -421,9 +421,9 @@ else on_CD = 0 - if(on_CD == 1) + if(!force && on_CD == 1) return - + switch(act) if("bark") message = "[src] [pick(src.speak_emote)]!" diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm index 07a5fcf0131..355d756288b 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona.dm @@ -60,7 +60,7 @@ /datum/action/innate/diona/merge/Activate() var/mob/living/simple_animal/diona/user = owner user.merge() - + /datum/action/innate/diona/evolve name = "Evolve" icon_icon = 'icons/obj/cloning.dmi' @@ -109,7 +109,7 @@ forceMove(M) else get_scooped(M) - else + else ..() /mob/living/simple_animal/diona/proc/merge() @@ -151,7 +151,7 @@ to_chat(loc, "You feel a pang of loss as [src] splits away from your biomass.") to_chat(src, "You wiggle out of the depths of [loc]'s biomass and plop to the ground.") forceMove(T) - + var/hasMobs = FALSE for(var/atom/A in D.contents) if(istype(A, /mob/) || istype(A, /obj/item/holder)) @@ -163,9 +163,9 @@ return TRUE /mob/living/simple_animal/diona/proc/evolve() - if(stat != CONSCIOUS) + if(stat != CONSCIOUS) return FALSE - + if(donors.len < evolve_donors) to_chat(src, "You need more blood in order to ascend to a new state of consciousness...") return FALSE @@ -176,7 +176,7 @@ if(isdiona(loc) && !split()) //if it's merged with diona, needs to able to split before evolving return FALSE - + visible_message("[src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.","You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.") var/mob/living/carbon/human/diona/adult = new(get_turf(loc)) @@ -202,14 +202,14 @@ qdel(src) return TRUE -/mob/living/simple_animal/diona/proc/steal_blood() - if(stat != CONSCIOUS) +/mob/living/simple_animal/diona/proc/steal_blood() + if(stat != CONSCIOUS) return FALSE - + var/list/choices = list() for(var/mob/living/carbon/human/H in oview(1,src)) if(Adjacent(H) && H.dna && !(NO_BLOOD in H.dna.species.species_traits)) - choices += H + choices += H if(!choices.len) to_chat(src, "No suitable blood donors nearby.") @@ -260,7 +260,7 @@ to_chat(src, "You don't have any hands!") return -/mob/living/simple_animal/diona/emote(act, m_type=1, message = null) +/mob/living/simple_animal/diona/emote(act, m_type = 1, message = null, force) if(stat != CONSCIOUS) return @@ -272,7 +272,7 @@ else on_CD = 0 - if(on_CD == 1) + if(!force && on_CD == 1) return switch(act) //IMPORTANT: Emotes MUST NOT CONFLICT anywhere along the chain. @@ -283,4 +283,4 @@ if("help") to_chat(src, "scream, chirp") - ..(act, m_type, message) \ No newline at end of file + ..() \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index dd0c5b9f72a..85e48c9a4d3 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -299,7 +299,7 @@ var/global/chicken_count = 0 E.pixel_y = rand(-6,6) if(eggsFertile) if(chicken_count < MAX_CHICKENS && prob(25)) - processing_objects.Add(E) + START_PROCESSING(SSobj, E) /obj/item/reagent_containers/food/snacks/egg/var/amount_grown = 0 /obj/item/reagent_containers/food/snacks/egg/process() @@ -308,10 +308,10 @@ var/global/chicken_count = 0 if(amount_grown >= 100) visible_message("[src] hatches with a quiet cracking sound.") new /mob/living/simple_animal/chick(get_turf(src)) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) qdel(src) else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /mob/living/simple_animal/pig diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index c84947c7363..ae19106e1af 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -109,7 +109,7 @@ if(client) client.time_died_as_mouse = world.time -/mob/living/simple_animal/mouse/emote(act, m_type=1, message = null) +/mob/living/simple_animal/mouse/emote(act, m_type = 1, message = null, force) if(stat != CONSCIOUS) return @@ -121,7 +121,7 @@ else on_CD = 0 - if(on_CD == 1) + if(!force && on_CD == 1) return switch(act) diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 02f15a59709..b4019cff988 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -258,7 +258,7 @@ adjustBruteLoss(20) return -/mob/living/simple_animal/emote(var/act, var/m_type=1, var/message = null) +/mob/living/simple_animal/emote(act, m_type = 1, message = null, force) if(stat) return act = lowertext(act) @@ -269,7 +269,7 @@ if("help") to_chat(src, "scream") - ..(act, m_type, message) + ..() /mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj) if(!Proj) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index fc265722f4a..0a1346fd0ed 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -19,10 +19,10 @@ spawn() alert("You have logged in already with another key this round, please log out of this one NOW or risk being banned!") if(matches) if(M.client) - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) + message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)].", 1) log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)].") else - message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) + message_admins("Notice: [key_name_admin(src)] has the same [matches] as [key_name_admin(M)] (no longer logged in). ", 1) log_adminwarn("Notice: [key_name(src)] has the same [matches] as [key_name(M)] (no longer logged in).") /mob/Login() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index ee04e624f02..482bf85491d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -901,13 +901,18 @@ var/list/slot_equipment_priority = list( \ /mob/MouseDrop(mob/M as mob) ..() if(M != usr) return - if(isliving(M)) // Ewww + if(isliving(M)) var/mob/living/L = M if(L.mob_size <= MOB_SIZE_SMALL) return // Stops pAI drones and small mobs (borers, parrots, crabs) from stripping people. --DZD - if(!M.can_strip) return - if(usr == src) return - if(!Adjacent(usr)) return + if(!M.can_strip) + return + if(usr == src) + return + if(!Adjacent(usr)) + return + if(isLivingSSD(src) && M.client && M.client.send_ssd_warning(src)) + return show_inv(usr) /mob/proc/can_use_hands() @@ -1176,12 +1181,11 @@ var/list/slot_equipment_priority = list( \ if(green) if(!no_text) visible_message("[src] vomits up some green goo!","You vomit up some green goo!") - new /obj/effect/decal/cleanable/vomit/green(location) + location.add_vomit_floor(FALSE, TRUE) else if(!no_text) visible_message("[src] pukes all over [p_them()]self!","You puke all over yourself!") - location.add_vomit_floor(src, 1) - playsound(location, 'sound/effects/splat.ogg', 50, 1) + location.add_vomit_floor(TRUE) /mob/proc/AddSpell(obj/effect/proc_holder/spell/S) mob_spell_list += S @@ -1299,6 +1303,7 @@ var/list/slot_equipment_priority = list( \ .["Show player panel"] = "?_src_=vars;mob_player_panel=[UID()]" .["Give Spell"] = "?_src_=vars;give_spell=[UID()]" + .["Give Martial Art"] = "?_src_=vars;givemartialart=[UID()]" .["Give Disease"] = "?_src_=vars;give_disease=[UID()]" .["Toggle Godmode"] = "?_src_=vars;godmode=[UID()]" .["Toggle Build Mode"] = "?_src_=vars;build_mode=[UID()]" diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index aeb6d8f14bf..93eb035b187 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -98,7 +98,7 @@ return verb -/mob/proc/emote(var/act, var/type, var/message) +/mob/proc/emote(act, type, message, force) if(act == "me") return custom_emote(type, message) @@ -184,7 +184,7 @@ var/current = prefix_locations[i] // ["Common", keypos] // There are a few things that will make us want to ignore all other languages in - namely, HIVEMIND languages. - var/datum/language/L = current[1] + var/datum/language/L = current[1] if(L && L.flags & HIVEMIND) . = new /datum/multilingual_say_piece(L, trim(strip_prefixes(message))) break diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index e978a2b4798..75aa563dd86 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -50,7 +50,7 @@ if(!physical) physical = src ..() - processing_objects += src + START_PROCESSING(SSobj, src) all_components = list() idle_threads = list() @@ -64,7 +64,7 @@ all_components.Remove(CH.device_type) qdel(CH) physical = null - processing_objects -= src + STOP_PROCESSING(SSobj, src) return ..() diff --git a/code/modules/modular_computers/computers/item/computer_power.dm b/code/modules/modular_computers/computers/item/computer_power.dm index d43a5f6d00c..0a7955cfe52 100644 --- a/code/modules/modular_computers/computers/item/computer_power.dm +++ b/code/modules/modular_computers/computers/item/computer_power.dm @@ -13,10 +13,10 @@ if(battery_module && battery_module.battery && battery_module.battery.charge) var/obj/item/stock_parts/cell/cell = battery_module.battery - if(cell.use(amount * CELLRATE)) + if(cell.use(amount * GLOB.CELLRATE)) return TRUE else // Discharge the cell anyway. - cell.use(min(amount*CELLRATE, cell.charge)) + cell.use(min(amount*GLOB.CELLRATE, cell.charge)) return FALSE return FALSE diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 38a42222c63..81d5fb03823 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -137,18 +137,17 @@ return 1 return -1 -/datum/computer_file/program/card_mod/proc/format_jobs(list/jobs) +/datum/computer_file/program/card_mod/proc/format_jobs(list/jobs, targetrank, list/jobformats) var/obj/item/computer_hardware/card_slot/card_slot = computer.all_components[MC_CARD] if(!card_slot || !card_slot.stored_card) return null - var/obj/item/card/id/id_card = card_slot.stored_card var/list/formatted = list() for(var/job in jobs) formatted.Add(list(list( "display_name" = replacetext(job, " ", " "), - "target_rank" = id_card && id_card.assignment ? id_card.assignment : "Unassigned", - "job" = job))) - + "target_rank" = targetrank, + "job" = job, + "jlinkformat" = jobformats[job] ? jobformats[job] : null))) return formatted @@ -225,11 +224,12 @@ var/temp_t = sanitize(copytext(input("Enter a custom job assignment.","Assignment"),1,MAX_MESSAGE_LEN)) //let custom jobs function as an impromptu alt title, mainly for sechuds if(temp_t && modify) + SSjobs.log_job_transfer(modify.registered_name, modify.getRankAndAssignment(), temp_t, scan.registered_name) modify.assignment = temp_t log_game("[key_name(usr)] has given \"[modify.registered_name]\" the custom job title \"[temp_t]\".") else var/list/access = list() - if(is_centcom) + if(is_centcom && islist(get_centcom_access(t1))) access = get_centcom_access(t1) else var/datum/job/jobdatum @@ -249,6 +249,16 @@ if(t1 == "Civilian") message_admins("[key_name_admin(usr)] has reassigned \"[modify.registered_name]\" from \"[jobnamedata]\" to \"[t1]\".") + SSjobs.log_job_transfer(modify.registered_name, jobnamedata, t1, scan.registered_name) + SSjobs.slot_job_transfer(modify.rank, t1) + + var/mob/living/carbon/human/H = modify.getPlayer() + if(istype(H)) + if(jobban_isbanned(H, t1)) + message_admins("[ADMIN_FULLMONTY(H)] has been assigned the job [t1], in possible violation of their job ban.") + if(H.mind) + H.mind.playtime_role = t1 + modify.access = access modify.assignment = t1 modify.rank = t1 @@ -271,6 +281,18 @@ if("PRG_mode") mode = text2num(href_list["mode_target"]) + if("PRG_wipe_my_logs") + if(is_authenticated(usr) && is_centcom) + var/delcount = SSjobs.delete_log_records(scan.registered_name, FALSE) + if(delcount) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + + if("PRG_wipe_all_logs") + if(is_authenticated(usr)) + var/delcount = SSjobs.delete_log_records(scan.registered_name, TRUE) + if(delcount) + playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0) + if("PRG_print") if(!printing && computer) printing = 1 @@ -312,6 +334,7 @@ var/jobnamedata = modify.getRankAndAssignment() log_game("[key_name(usr)] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\".") message_admins("[key_name_admin(usr)] has terminated the employment of \"[modify.registered_name]\" the \"[jobnamedata]\".") + SSjobs.log_job_transfer(modify.registered_name, jobnamedata, "Terminated", scan.registered_name) modify.assignment = "Terminated" modify.access = list() callHook("terminate_employee", list(modify)) @@ -398,6 +421,7 @@ data["target_owner"] = modify && modify.registered_name ? modify.registered_name : "-----" data["target_rank"] = get_target_rank() data["scan_name"] = scan ? scan.name : "-----" + data["scan_owner"] = scan && scan.registered_name ? scan.registered_name : null data["authenticated"] = is_authenticated(user) data["has_modify"] = !!modify data["account_number"] = modify ? modify.associated_account_number : null @@ -405,14 +429,17 @@ data["all_centcom_access"] = null data["regions"] = null - data["engineering_jobs"] = format_jobs(engineering_positions) - data["medical_jobs"] = format_jobs(medical_positions) - data["science_jobs"] = format_jobs(science_positions) - data["security_jobs"] = format_jobs(security_positions) - data["support_jobs"] = format_jobs(support_positions) - data["civilian_jobs"] = format_jobs(civilian_positions) - data["special_jobs"] = format_jobs(whitelisted_positions) - data["centcom_jobs"] = format_jobs(get_all_centcom_jobs()) + var/list/job_formats = SSjobs.format_jobs_for_id_computer(modify) + + data["top_jobs"] = format_jobs(list("Captain", "Custom"), data["target_rank"], job_formats) + data["engineering_jobs"] = format_jobs(engineering_positions, data["target_rank"], job_formats) + data["medical_jobs"] = format_jobs(medical_positions, data["target_rank"], job_formats) + data["science_jobs"] = format_jobs(science_positions, data["target_rank"], job_formats) + data["security_jobs"] = format_jobs(security_positions, data["target_rank"], job_formats) + data["support_jobs"] = format_jobs(support_positions, data["target_rank"], job_formats) + data["civilian_jobs"] = format_jobs(civilian_positions, data["target_rank"], job_formats) + data["special_jobs"] = format_jobs(whitelisted_positions, data["target_rank"], job_formats) + data["centcom_jobs"] = format_jobs(get_all_centcom_jobs(), data["target_rank"], job_formats) data["card_skins"] = format_card_skins(get_station_card_skins()) data["job_slots"] = format_job_slots() @@ -423,6 +450,9 @@ data["cooldown_mins"] = mins data["cooldown_secs"] = (seconds < 10) ? "0[seconds]" : seconds + if(mode == 3 && is_authenticated(user)) + data["id_change_html"] = SSjobs.fetch_transfer_record_html(is_centcom) + if(modify) data["current_skin"] = modify.icon_state diff --git a/code/modules/modular_computers/file_system/programs/engineering/alarm.dm b/code/modules/modular_computers/file_system/programs/engineering/alarm.dm index 5fcaf9b03fd..226511e2c09 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/alarm.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/alarm.dm @@ -11,7 +11,7 @@ /datum/computer_file/program/alarm_monitor/New() ..() - alarm_handlers = list(atmosphere_alarm, fire_alarm, power_alarm) + alarm_handlers = list(SSalarms.atmosphere_alarm, SSalarms.fire_alarm, SSalarms.power_alarm) for(var/datum/alarm_handler/AH in alarm_handlers) AH.register(src, /datum/computer_file/program/alarm_monitor/proc/update_icon) diff --git a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm index 2efe872a7f5..783ae9fa947 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm @@ -39,7 +39,7 @@ data["powermonitor"] = attached ? TRUE : FALSE if(attached) - var/datum/powernet/powernet = attached.get_powernet() + var/datum/powernet/powernet = attached.powernet data["poweravail"] = powernet.avail data["powerload"] = powernet.viewload data["powerdemand"] = powernet.load diff --git a/code/modules/modular_computers/hardware/recharger.dm b/code/modules/modular_computers/hardware/recharger.dm index 688d689cf67..418a9736528 100644 --- a/code/modules/modular_computers/hardware/recharger.dm +++ b/code/modules/modular_computers/hardware/recharger.dm @@ -20,7 +20,7 @@ return if(use_power(charge_rate, charging=1)) - holder.give_power(charge_rate * CELLRATE) + holder.give_power(charge_rate * GLOB.CELLRATE) /obj/item/computer_hardware/recharger/APC diff --git a/code/modules/nano/modules/alarm_monitor.dm b/code/modules/nano/modules/alarm_monitor.dm index e4dd848dac6..dc52841a367 100644 --- a/code/modules/nano/modules/alarm_monitor.dm +++ b/code/modules/nano/modules/alarm_monitor.dm @@ -5,15 +5,15 @@ /datum/nano_module/alarm_monitor/all/New() ..() - alarm_handlers = list(atmosphere_alarm, burglar_alarm, camera_alarm, fire_alarm, motion_alarm, power_alarm) + alarm_handlers = list(SSalarms.atmosphere_alarm, SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.fire_alarm, SSalarms.motion_alarm, SSalarms.power_alarm) /datum/nano_module/alarm_monitor/engineering/New() ..() - alarm_handlers = list(atmosphere_alarm, fire_alarm, power_alarm) + alarm_handlers = list(SSalarms.atmosphere_alarm, SSalarms.fire_alarm, SSalarms.power_alarm) /datum/nano_module/alarm_monitor/security/New() ..() - alarm_handlers = list(burglar_alarm, camera_alarm, motion_alarm) + alarm_handlers = list(SSalarms.burglar_alarm, SSalarms.camera_alarm, SSalarms.motion_alarm) /datum/nano_module/alarm_monitor/proc/register(var/object, var/procName) for(var/datum/alarm_handler/AH in alarm_handlers) diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 87649f97512..1dbdcc05b92 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -506,7 +506,7 @@ nanoui is used to open and update nano browser uis * * @return nothing */ -/datum/nanoui/proc/process(update = 0) +/datum/nanoui/process(update = 0) if(!src_object || !user) close() return diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index e1ae7da26f5..dc16101eac7 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -131,13 +131,13 @@ obj/item/clipboard/proc/penPlacement(mob/user, obj/item/pen/P, placing) else penPlacement(usr, containedpen, FALSE) else if(href_list["remove"]) - var/obj/item/P = locate(href_list["remove"]) + var/obj/item/P = locate(href_list["remove"]) in src if(isPaperwork(P)) usr.put_in_hands(P) to_chat(usr, "You remove [P] from [src].") checkTopPaper() //So we don't accidentally make the top sheet not be on the clipboard else if(href_list["viewOrWrite"]) - var/obj/item/P = locate(href_list["viewOrWrite"]) + var/obj/item/P = locate(href_list["viewOrWrite"]) in src if(!isPaperwork(P)) return if(is_pen(I) && isPaperwork(P) != PHOTO) //Because you can't write on photos that aren't in your hand @@ -148,7 +148,7 @@ obj/item/clipboard/proc/penPlacement(mob/user, obj/item/pen/P, placing) var/obj/item/photo/Ph = P Ph.show(usr) else if(href_list["topPaper"]) - var/obj/item/P = locate(href_list["topPaper"]) + var/obj/item/P = locate(href_list["topPaper"]) in src if(P == toppaper) return to_chat(usr, "You flick the pages so that [P] is on top.") diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index d5ca6b0b0f8..c40cb1667ad 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -108,7 +108,7 @@ /obj/item/paper/attack_self(mob/living/user as mob) user.examinate(src) - if(rigged && (holiday_master.holidays && holiday_master.holidays[APRIL_FOOLS])) + if(rigged && (SSholiday.holidays && SSholiday.holidays[APRIL_FOOLS])) if(spam_flag == 0) spam_flag = 1 playsound(loc, 'sound/items/bikehorn.ogg', 50, 1) @@ -621,11 +621,11 @@ /obj/item/paper/evilfax/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/paper/evilfax/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) if(mytarget && !used) var/mob/living/carbon/target = mytarget target.ForceContractDisease(new /datum/disease/transformation/corgi(0)) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index e8643c97cff..c9169a09757 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -72,7 +72,7 @@ papers.Remove(P) else P = new /obj/item/paper - if(holiday_master.holidays && holiday_master.holidays[APRIL_FOOLS]) + if(SSholiday.holidays && SSholiday.holidays[APRIL_FOOLS]) if(prob(30)) P.info = "HONK HONK HONK HONK HONK HONK HONK
HOOOOOOOOOOOOOOOOOOOOOONK
APRIL FOOLS" P.rigged = 1 diff --git a/code/modules/pda/mob_hunt_game_app.dm b/code/modules/pda/mob_hunt_game_app.dm index c08e64b7ae3..2bb28ba0264 100644 --- a/code/modules/pda/mob_hunt_game_app.dm +++ b/code/modules/pda/mob_hunt_game_app.dm @@ -21,12 +21,12 @@ /datum/data/pda/app/mob_hunter_game/start() ..() - processing_objects.Add(pda) + START_PROCESSING(SSobj, pda) /datum/data/pda/app/mob_hunter_game/stop() ..() disconnect("Program Terminated") - processing_objects.Remove(pda) + STOP_PROCESSING(SSobj, pda) /datum/data/pda/app/mob_hunter_game/proc/scan_nearby() if(!SSmob_hunt || !connected) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e8aab46dbbe..a3186b115a4 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -46,7 +46,6 @@ name = "area power controller" desc = "A control terminal for the area electrical systems." icon_state = "apc0" - anchored = 1 use_power = NO_POWER_USE req_access = list(access_engine_equip) siemens_strength = 1 @@ -55,7 +54,7 @@ var/areastring = null var/obj/item/stock_parts/cell/cell var/start_charge = 90 // initial cell charge % - var/cell_type = 2500 + var/cell_type = 2500 //Base cell has 2500 capacity. Enter the path of a different cell you want to use. cell determines charge rates, max capacity, ect. These can also be changed with other APC vars, but isn't recommended to minimize the risk of accidental usage of dirty editted APCs var/opened = 0 //0=closed, 1=opened, 2=cover removed var/shorted = 0 var/lighting = 3 @@ -137,40 +136,35 @@ /obj/machinery/power/apc/connect_to_network() //Override because the APC does not directly connect to the network; it goes through a terminal. //The terminal is what the power computer looks for anyway. - if(!terminal) - make_terminal() if(terminal) terminal.connect_to_network() -/obj/machinery/power/apc/New(turf/loc, var/ndir, var/building=0) +/obj/machinery/power/apc/New(turf/loc, ndir, building = 0) if(!armor) armor = list(melee = 20, bullet = 20, laser = 10, energy = 100, bomb = 30, bio = 100, rad = 100) ..() GLOB.apcs += src GLOB.apcs = sortAtom(GLOB.apcs) - wires = new(src) + wires = new(src) // offset 24 pixels in direction of dir // this allows the APC to be embedded in a wall, yet still inside an area if(building) - dir = ndir - src.tdir = dir // to fix Vars bug - dir = SOUTH + setDir(ndir) + tdir = dir // to fix Vars bug + setDir(SOUTH) pixel_x = (src.tdir & 3)? 0 : (src.tdir == 4 ? 24 : -24) pixel_y = (src.tdir & 3)? (src.tdir ==1 ? 24 : -24) : 0 - if(building==0) - init() - else + if(building) area = get_area(src) area.apc |= src opened = 1 operating = 0 name = "[area.name] APC" stat |= MAINT - src.update_icon() - spawn(5) - src.update() + update_icon() + addtimer(CALLBACK(src, .proc/update), 5) /obj/machinery/power/apc/Destroy() GLOB.apcs -= src @@ -193,14 +187,17 @@ // create a terminal object at the same position as original turf loc // wires will attach to this terminal = new/obj/machinery/power/terminal(src.loc) - terminal.dir = tdir + terminal.setDir(tdir) terminal.master = src -/obj/machinery/power/apc/proc/init() +/obj/machinery/power/apc/Initialize(mapload) + . = ..() + if(!mapload) + return has_electronics = 2 //installed and secured // is starting with a power cell installed, create it and set its charge level if(cell_type) - src.cell = new/obj/item/stock_parts/cell(src) + cell = new/obj/item/stock_parts/cell(src) cell.maxcharge = cell_type // cell_type is maximum charge (old default was 1000 or 2500 (values one and two respectively) cell.charge = start_charge * cell.maxcharge / 100 // (convert percentage to actual value) @@ -219,12 +216,12 @@ area = get_area_name(areastring) name = "\improper [area.name] APC" area.apc |= src + update_icon() make_terminal() - spawn(5) - src.update() + addtimer(CALLBACK(src, .proc/update), 5) /obj/machinery/power/apc/examine(mob/user) if(..(user, 1)) @@ -1084,14 +1081,9 @@ else return 0 -//Returns 1 if the APC should attempt to charge -/obj/machinery/power/apc/proc/attempt_charging() - return (chargemode && charging == 1 && operating) - -/obj/machinery/power/apc/draw_power(var/amount) +/obj/machinery/power/apc/add_load(amount) if(terminal && terminal.powernet) - return terminal.powernet.draw_power(amount) - return 0 + terminal.add_load(amount) /obj/machinery/power/apc/avail() if(terminal) @@ -1100,7 +1092,6 @@ return 0 /obj/machinery/power/apc/process() - if(stat & (BROKEN|MAINT)) return if(!area.requires_power) @@ -1136,18 +1127,21 @@ if(cell && !shorted) // draw power from cell as before to power the area - var/cellused = min(cell.charge, CELLRATE * lastused_total) // clamp deduction to a max, amount left in cell + var/cellused = min(cell.charge, GLOB.CELLRATE * lastused_total) // clamp deduction to a max, amount left in cell cell.use(cellused) if(excess > lastused_total) // if power excess recharge the cell // by the same amount just used - var/draw = draw_power(cellused/CELLRATE) // draw the power needed to charge this cell - cell.give(draw * CELLRATE) + cell.give(cellused) + add_load(cellused/GLOB.CELLRATE) // add the load used to recharge the cell + + else // no excess, and not enough per-apc - if( (cell.charge/CELLRATE + excess) >= lastused_total) // can we draw enough from cell+grid to cover last usage? - var/draw = draw_power(excess) - cell.charge = min(cell.maxcharge, cell.charge + CELLRATE * draw) //recharge with what we can + if((cell.charge/GLOB.CELLRATE + excess) >= lastused_total) // can we draw enough from cell+grid to cover last usage? + cell.charge = min(cell.maxcharge, cell.charge + GLOB.CELLRATE * excess) //recharge with what we can + add_load(excess) // so draw what we can from the grid charging = 0 + else // not enough power available to run the last tick! charging = 0 chargecount = 0 @@ -1173,14 +1167,14 @@ environ = autoset(environ, 1) autoflag = 3 if(report_power_alarm) - power_alarm.clearAlarm(loc, src) + SSalarms.power_alarm.clearAlarm(loc, src) else if(cell.charge < 1250 && cell.charge > 750 && longtermpower < 0) // <30%, turn off equipment if(autoflag != 2) equipment = autoset(equipment, 2) lighting = autoset(lighting, 1) environ = autoset(environ, 1) if(report_power_alarm) - power_alarm.triggerAlarm(loc, src) + SSalarms.power_alarm.triggerAlarm(loc, src) autoflag = 2 else if(cell.charge < 750 && cell.charge > 10) // <15%, turn off lighting & equipment if((autoflag > 1 && longtermpower < 0) || (autoflag > 1 && longtermpower >= 0)) @@ -1188,7 +1182,7 @@ lighting = autoset(lighting, 2) environ = autoset(environ, 1) if(report_power_alarm) - power_alarm.triggerAlarm(loc, src) + SSalarms.power_alarm.triggerAlarm(loc, src) autoflag = 1 else if(cell.charge <= 0) // zero charge, turn all off if(autoflag != 0) @@ -1196,18 +1190,16 @@ lighting = autoset(lighting, 0) environ = autoset(environ, 0) if(report_power_alarm) - power_alarm.triggerAlarm(loc, src) + SSalarms.power_alarm.triggerAlarm(loc, src) autoflag = 0 // now trickle-charge the cell - - if(src.attempt_charging()) + if(chargemode && charging == 1 && operating) if(excess > 0) // check to make sure we have enough to charge // Max charge is capped to % per second constant - var/ch = min(excess*CELLRATE, cell.maxcharge*CHARGELEVEL) - - ch = draw_power(ch/CELLRATE) // Removes the power we're taking from the grid - cell.give(ch*CELLRATE) // actually recharge the cell + var/ch = min(excess*GLOB.CELLRATE, cell.maxcharge*GLOB.CHARGELEVEL) + add_load(ch/GLOB.CELLRATE) // Removes the power we're taking from the grid + cell.give(ch) // actually recharge the cell else charging = 0 // stop charging @@ -1220,12 +1212,12 @@ if(chargemode) if(!charging) - if(excess > cell.maxcharge*CHARGELEVEL) + if(excess > cell.maxcharge*GLOB.CHARGELEVEL) chargecount++ else chargecount = 0 - if(chargecount >= 10) + if(chargecount == 10) chargecount = 0 charging = 1 @@ -1254,7 +1246,7 @@ lighting = autoset(lighting, 0) environ = autoset(environ, 0) if(report_power_alarm) - power_alarm.triggerAlarm(loc, src) + SSalarms.power_alarm.triggerAlarm(loc, src) autoflag = 0 // update icon & area power if anything changed @@ -1292,9 +1284,13 @@ lighting = 0 equipment = 0 environ = 0 + update_icon() + update() spawn(600) equipment = 3 environ = 3 + update_icon() + update() ..() /obj/machinery/power/apc/ex_act(severity) @@ -1353,6 +1349,11 @@ L.broken(0, 1) stoplag() +/obj/machinery/power/apc/proc/null_charge() + for(var/obj/machinery/light/L in area) + L.broken(0, 1) + stoplag() + /obj/machinery/power/apc/proc/setsubsystem(val) if(cell && cell.charge > 0) return (val==1) ? 0 : val diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index c71bc3e7c8c..5cf1d5efbe3 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -59,21 +59,18 @@ By design, d1 is the smallest direction and d2 is the highest /obj/structure/cable/white color = COLOR_WHITE -/obj/structure/cable/New() - ..() - +/obj/structure/cable/Initialize(mapload) + . = ..() // ensure d1 & d2 reflect the icon_state for entering and exiting cable var/dash = findtext(icon_state, "-") + d1 = text2num(copytext( icon_state, 1, dash )) + d2 = text2num(copytext( icon_state, dash+1 )) - d1 = text2num( copytext( icon_state, 1, dash ) ) - - d2 = text2num( copytext( icon_state, dash+1 ) ) - - var/turf/T = src.loc // hide if turf is not intact - - if(level==1) hide(T.intact) + var/turf/T = get_turf(src) // hide if turf is not intact + if(level == 1) + hide(T.intact) LAZYADD(GLOB.cable_list, src) //add it to the global cable list @@ -83,14 +80,23 @@ By design, d1 is the smallest direction and d2 is the highest LAZYREMOVE(GLOB.cable_list, src) //remove it from global cable list return ..() // then go ahead and delete the cable + +/obj/structure/cable/deconstruct(disassembled = TRUE) + var/turf/T = get_turf(src) + if(d1) // 0-X cables are 1 unit, X-X cables are 2 units long + new/obj/item/stack/cable_coil(T, 2, paramcolor = color) + else + new/obj/item/stack/cable_coil(T, 1, paramcolor = color) + qdel(src) + /////////////////////////////////// // General procedures /////////////////////////////////// //If underfloor, hide the cable -/obj/structure/cable/hide(var/i) +/obj/structure/cable/hide(i) - if(level == 1 && istype(loc, /turf)) + if(level == 1 && isturf(loc)) invisibility = i ? 101 : 0 updateicon() @@ -101,9 +107,49 @@ By design, d1 is the smallest direction and d2 is the highest icon_state = "[d1]-[d2]" -// returns the powernet this cable belongs to -/obj/structure/cable/proc/get_powernet() //TODO: remove this as it is obsolete - return powernet +//////////////////////////////////////////// +// Power related +/////////////////////////////////////////// + +// All power generation handled in add_avail() +// Machines should use add_load(), surplus(), avail() +// Non-machines should use add_delayedload(), delayed_surplus(), newavail() + +/obj/structure/cable/proc/add_avail(amount) + if(powernet) + powernet.newavail += amount + +/obj/structure/cable/proc/add_load(amount) + if(powernet) + powernet.load += amount + +/obj/structure/cable/proc/surplus() + if(powernet) + return Clamp(powernet.avail-powernet.load, 0, powernet.avail) + else + return 0 + +/obj/structure/cable/proc/avail() + if(powernet) + return powernet.avail + else + return 0 + +/obj/structure/cable/proc/add_delayedload(amount) + if(powernet) + powernet.delayedload += amount + +/obj/structure/cable/proc/delayed_surplus() + if(powernet) + return Clamp(powernet.newavail - powernet.delayedload, 0, powernet.newavail) + else + return 0 + +/obj/structure/cable/proc/newavail() + if(powernet) + return powernet.newavail + else + return 0 //Telekinesis has no effect on a cable /obj/structure/cable/attack_tk(mob/user) @@ -120,47 +166,19 @@ By design, d1 is the smallest direction and d2 is the highest if(T.intact) return - if(istype(W, /obj/item/wirecutters)) -///// Z-Level Stuff - /* if(src.d1 == 12 || src.d2 == 12) - to_chat(user, "You must cut this cable from above.") - return */ -///// Z-Level Stuff - /* if(breaker_box) - to_chat(user, "This cable is connected to nearby breaker box. Use breaker box to interact with it.") - return */ - + if(iswirecutter(W)) if(shock(user, 50)) return - - if(src.d1) // 0-X cables are 1 unit, X-X cables are 2 units long - new/obj/item/stack/cable_coil(T, 2, paramcolor = color) - else - new/obj/item/stack/cable_coil(T, 1, paramcolor = color) - - for(var/mob/O in viewers(src, null)) - O.show_message("[user] cuts the cable.", 1) - -///// Z-Level Stuff - /*if(src.d1 == 11 || src.d2 == 11) - var/turf/controllerlocation = locate(1, 1, z) - for(var/obj/effect/landmark/zcontroller/controller in controllerlocation) - if(controller.down) - var/turf/below = locate(src.x, src.y, controller.down_target) - for(var/obj/structure/cable/c in below) - if(c.d1 == 12 || c.d2 == 12) - c.qdel()*/ -///// Z-Level Stuff + user.visible_message("[user] cuts the cable.", "You cut the cable.") investigate_log("was cut by [key_name(usr, 1)] in [get_area(user)]([T.x], [T.y], [T.z] - [ADMIN_JMP(T)])","wires") - - qdel(src) // qdel + deconstruct() return else if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(coil.get_amount() < 1) - to_chat(user, "Not enough cable") + to_chat(user, "Not enough cable!") return coil.cable_join(src, user) @@ -173,11 +191,9 @@ By design, d1 is the smallest direction and d2 is the highest else if(istype(W, /obj/item/multitool)) if(powernet && (powernet.avail > 0)) // is it powered? - to_chat(user, "[powernet.avail]W in power network.") - + to_chat(user, "Total power: [DisplayPower(powernet.avail)]\nLoad: [DisplayPower(powernet.load)]\nExcess power: [DisplayPower(surplus())]") else - to_chat(user, "The cable is not powered.") - + to_chat(user, "The cable is not powered.") shock(user, 5, 0.2) else if(istype(W, /obj/item/toy/crayon)) @@ -188,7 +204,7 @@ By design, d1 is the smallest direction and d2 is the highest if(W.flags & CONDUCT) shock(user, 50, 0.7) - src.add_fingerprint(user) + add_fingerprint(user) // shock the user with probability prb /obj/structure/cable/proc/shock(mob/user, prb, siemens_coeff = 1) @@ -200,21 +216,22 @@ By design, d1 is the smallest direction and d2 is the highest else return FALSE +/obj/structure/cable/singularity_pull(S, current_size) + ..() + if(current_size >= STAGE_FIVE) + deconstruct() + //explosion handling /obj/structure/cable/ex_act(severity) switch(severity) - if(1.0) + if(1) qdel(src) // qdel - if(2.0) + if(2) if(prob(50)) - new/obj/item/stack/cable_coil(get_turf(src), src.d1 ? 2 : 1, paramcolor = color) - qdel(src) // qdel - - if(3.0) + deconstruct() + if(3) if(prob(25)) - new/obj/item/stack/cable_coil(get_turf(src), src.d1 ? 2 : 1, paramcolor = color) - qdel(src) // qdel - return + deconstruct() obj/structure/cable/proc/cable_color(var/colorC) if(colorC) @@ -235,7 +252,7 @@ obj/structure/cable/proc/cable_color(var/colorC) //handles merging diagonally matching cables //for info : direction^3 is flipping horizontally, direction^12 is flipping vertically -/obj/structure/cable/proc/mergeDiagonalsNetworks(var/direction) +/obj/structure/cable/proc/mergeDiagonalsNetworks(direction) //search for and merge diagonally matching cables from the first direction component (north/south) var/turf/T = get_step(src, direction&3)//go north/south @@ -279,7 +296,7 @@ obj/structure/cable/proc/cable_color(var/colorC) C.powernet.add_cable(src) //else, we simply connect to the matching cable powernet // merge with the powernets of power objects in the given direction -/obj/structure/cable/proc/mergeConnectedNetworks(var/direction) +/obj/structure/cable/proc/mergeConnectedNetworks(direction) var/fdir = (!direction)? 0 : turn(direction, 180) //flip the direction, to match with the source position on its turf @@ -317,25 +334,27 @@ obj/structure/cable/proc/cable_color(var/colorC) //first let's add turf cables to our powernet //then we'll connect machines on turf with a node cable is present for(var/AM in loc) - if(istype(AM,/obj/structure/cable)) + if(istype(AM, /obj/structure/cable)) var/obj/structure/cable/C = AM if(C.d1 == d1 || C.d2 == d1 || C.d1 == d2 || C.d2 == d2) //only connected if they have a common direction - if(C.powernet == powernet) continue + if(C.powernet == powernet) + continue if(C.powernet) merge_powernets(powernet, C.powernet) else powernet.add_cable(C) //the cable was powernetless, let's just add it to our powernet - else if(istype(AM,/obj/machinery/power/apc)) + else if(istype(AM, /obj/machinery/power/apc)) var/obj/machinery/power/apc/N = AM - if(!N.terminal) continue // APC are connected through their terminal + if(!N.terminal) + continue // APC are connected through their terminal if(N.terminal.powernet == powernet) continue to_connect += N.terminal //we'll connect the machines after all cables are merged - else if(istype(AM,/obj/machinery/power)) //other power machines + else if(istype(AM, /obj/machinery/power)) //other power machines var/obj/machinery/power/M = AM if(M.powernet == powernet) @@ -353,23 +372,10 @@ obj/structure/cable/proc/cable_color(var/colorC) ////////////////////////////////////////////// //if powernetless_only = 1, will only get connections without powernet -/obj/structure/cable/proc/get_connections(var/powernetless_only = 0) +/obj/structure/cable/proc/get_connections(powernetless_only = 0) . = list() // this will be a list of all connected power objects var/turf/T -///// Z-Level Stuff - /* if(d1 == 11 || d1 == 12) - var/turf/controllerlocation = locate(1, 1, z) - for(var/obj/effect/landmark/zcontroller/controller in controllerlocation) - if(controller.up && d1 == 12) - T = locate(src.x, src.y, controller.up_target) - if(T) - . += power_list(T, src, 11, 1) - if(controller.down && d1 == 11) - T = locate(src.x, src.y, controller.down_target) - if(T) - . += power_list(T, src, 12, 1) */ -///// Z-Level Stuff //get matching cables from the first direction if(d1) //if not a node cable T = get_step(src, d1) @@ -386,20 +392,6 @@ obj/structure/cable/proc/cable_color(var/colorC) . += power_list(loc, src, d1, powernetless_only) //get on turf matching cables -///// Z-Level Stuff - /*if(d2 == 11 || d2 == 12) - var/turf/controllerlocation = locate(1, 1, z) - for(var/obj/effect/landmark/zcontroller/controller in controllerlocation) - if(controller.up && d2 == 12) - T = locate(src.x, src.y, controller.up_target) - if(T) - . += power_list(T, src, 11, 1) - if(controller.down && d2 == 11) - T = locate(src.x, src.y, controller.down_target) - if(T) - . += power_list(T, src, 12, 1) -///// Z-Level Stuff - else */ //do the same on the second direction (which can't be 0) T = get_step(src, d2) if(T) @@ -420,7 +412,8 @@ obj/structure/cable/proc/cable_color(var/colorC) //needed as this can, unlike other placements, disconnect cables /obj/structure/cable/proc/denode() var/turf/T1 = loc - if(!T1) return + if(!T1) + return var/list/powerlist = power_list(T1,src,0,0) //find the other cables that ended in the centre of the turf, with or without a powernet if(powerlist.len>0) @@ -428,13 +421,19 @@ obj/structure/cable/proc/cable_color(var/colorC) propagate_network(powerlist[1],PN) //propagates the new powernet beginning at the source cable if(PN.is_empty()) //can happen with machines made nodeless when smoothing cables - qdel(PN) // qdel + qdel(PN) + +/obj/structure/cable/proc/auto_propogate_cut_cable(obj/O) + if(O && !QDELETED(O)) + var/datum/powernet/newPN = new()// creates a new powernet... + propagate_network(O, newPN)//... and propagates it to the other side of the cable // cut the cable's powernet at this cable and updates the powergrid -/obj/structure/cable/proc/cut_cable_from_powernet() +/obj/structure/cable/proc/cut_cable_from_powernet(remove=TRUE) var/turf/T1 = loc var/list/P_list - if(!T1) return + if(!T1) + return if(d1) T1 = get_step(T1, d1) P_list = power_list(T1, src, turn(d1,180),0,cable_only = 1) // what adjacently joins on to cut cable... @@ -452,11 +451,13 @@ obj/structure/cable/proc/cable_color(var/colorC) var/obj/O = P_list[1] // remove the cut cable from its turf and powernet, so that it doesn't get count in propagate_network worklist - loc = null + if(remove) + loc = null powernet.remove_cable(src) //remove the cut cable from its powernet // queue it to rebuild SSmachines.deferred_powernet_rebuilds += O +// addtimer(CALLBACK(O, .proc/auto_propogate_cut_cable, O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables // Disconnect machines connected to nodes if(d1 == 0) // if we cut a node (O-X) cable @@ -464,6 +465,7 @@ obj/structure/cable/proc/cable_color(var/colorC) if(!P.connect_to_network()) //can't find a node cable on a the turf to connect to P.disconnect_from_network() //remove from current network + /////////////////////////////////////////////// // The cable coil object, used for laying cable /////////////////////////////////////////////// @@ -472,9 +474,7 @@ obj/structure/cable/proc/cable_color(var/colorC) // Definitions //////////////////////////////// -var/global/list/datum/stack_recipe/cable_coil_recipes = list( - new /datum/stack_recipe/cable_restraints("cable restraints", /obj/item/restraints/handcuffs/cable, 15), -) +GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restraints", /obj/item/restraints/handcuffs/cable, 15))) /obj/item/stack/cable_coil name = "cable coil" @@ -514,7 +514,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( pixel_x = rand(-2,2) pixel_y = rand(-2,2) update_icon() - recipes = cable_coil_recipes + recipes = GLOB.cable_coil_recipes update_wclass() /////////////////////////////////// @@ -657,7 +657,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( to_chat(user, "You can't lay cable at a place that far away!") return - var/dirn = null + var/dirn if(!dirnew) //If we weren't given a direction, come up with one! (Called as null from catwalk.dm and floor.dm) if(user.loc == T) dirn = user.dir //If laying on the tile we're on, lay in the direction we're facing @@ -694,7 +694,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( if(C.shock(user, 50)) if(prob(50)) //fail new /obj/item/stack/cable_coil(get_turf(C), 1, paramcolor = C.color) - qdel(C) // qdel + C.deconstruct() return C @@ -711,7 +711,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( return if(get_dist(C, user) > 1) // make sure it's close enough - to_chat(user, "You can't lay cable at a place that far away.") + to_chat(user, "You can't lay cable at a place that far away!") return @@ -724,13 +724,41 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( // one end of the clicked cable is pointing towards us if(C.d1 == dirn || C.d2 == dirn) if(U.intact) // can't place a cable if the floor is complete - to_chat(user, "You can't lay cable there unless the floor tiles are removed.") + to_chat(user, "You can't lay cable there unless the floor tiles are removed!") return else // cable is pointing at us, we're standing on an open tile // so create a stub pointing at the clicked cable on our tile - place_turf(U, user, turn(dirn, 180)) + var/fdirn = turn(dirn, 180) // the opposite direction + + for(var/obj/structure/cable/LC in U) // check to make sure there's not a cable there already + if(LC.d1 == fdirn || LC.d2 == fdirn) + to_chat(user, "There's already a cable at that position!") + return + + var/obj/structure/cable/NC = get_new_cable (U) + + NC.d1 = 0 + NC.d2 = fdirn + NC.add_fingerprint(user) + NC.update_icon() + + //create a new powernet with the cable, if needed it will be merged later + var/datum/powernet/newPN = new() + newPN.add_cable(NC) + + NC.mergeConnectedNetworks(NC.d2) //merge the powernet with adjacents powernets + NC.mergeConnectedNetworksOnTurf() //merge the powernet with on turf powernets + + if(NC.d2 & (NC.d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions + NC.mergeDiagonalsNetworks(NC.d2) + + use(1) + + if(NC.shock(user, 50)) + if(prob(50)) //fail + NC.deconstruct() return // exisiting cable doesn't point at our position, so see if it's a stub @@ -749,7 +777,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( if(LC == C) // skip the cable we're interacting with continue if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction - to_chat(user, "There's already a cable at that position.") + to_chat(user, "There's already a cable at that position!") return @@ -776,8 +804,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( if(C.shock(user, 50)) if(prob(50)) //fail - new/obj/item/stack/cable_coil(get_turf(C), 2, paramcolor = C.color) - qdel(C) // qdel + C.deconstruct() return C.denode()// this call may have disconnected some cables that terminated on the centre of the turf, if so split the powernets. @@ -790,8 +817,8 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list( /obj/item/stack/cable_coil/cut item_state = "coil2" -/obj/item/stack/cable_coil/cut/New(loc) - ..() +/obj/item/stack/cable_coil/cut/Initialize(mapload) + . = ..() src.amount = rand(1,2) pixel_x = rand(-2,2) pixel_y = rand(-2,2) diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index dfe10113f12..4719ff75261 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -21,23 +21,23 @@ /obj/item/stock_parts/cell/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) charge = maxcharge if(ratingdesc) desc += " This one has a power rating of [DisplayPower(maxcharge)], and you should not swallow it." update_icon() /obj/item/stock_parts/cell/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/stock_parts/cell/vv_edit_var(var_name, var_value) switch(var_name) if("self_recharge") if(var_value) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) . = ..() /obj/item/stock_parts/cell/process() diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 3a453ffe10c..8b5f64e94fb 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -85,8 +85,8 @@ var/const/GRAV_NEEDS_WRENCH = 3 // Generator which spawns with the station. // -/obj/machinery/gravity_generator/main/station/Initialize() - ..() +/obj/machinery/gravity_generator/main/station/Initialize(mapload) + . = ..() setup_parts() middle.overlays += "activated" update_list() diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 3e5d614896e..33741d1475b 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -9,7 +9,7 @@ /obj/machinery/power name = null icon = 'icons/obj/power.dmi' - anchored = 1.0 + anchored = TRUE on_blueprints = TRUE var/datum/powernet/powernet = null use_power = NO_POWER_USE @@ -25,18 +25,24 @@ ////////////////////////////// // common helper procs for all power machines -/obj/machinery/power/proc/add_avail(var/amount) +// All power generation handled in add_avail() +// Machines should use add_load(), surplus(), avail() +// Non-machines should use add_delayedload(), delayed_surplus(), newavail() + +/obj/machinery/power/proc/add_avail(amount) if(powernet) powernet.newavail += amount + return TRUE + else + return FALSE -/obj/machinery/power/proc/draw_power(var/amount) +/obj/machinery/power/proc/add_load(amount) if(powernet) - return powernet.draw_power(amount) - return 0 + powernet.load += amount /obj/machinery/power/proc/surplus() if(powernet) - return powernet.avail-powernet.load + return Clamp(powernet.avail-powernet.load, 0, powernet.avail) else return 0 @@ -46,9 +52,19 @@ else return 0 -/obj/machinery/power/proc/load() +/obj/machinery/power/proc/add_delayedload(amount) if(powernet) - return powernet.load + powernet.delayedload += amount + +/obj/machinery/power/proc/delayed_surplus() + if(powernet) + return Clamp(powernet.newavail - powernet.delayedload, 0, powernet.newavail) + else + return 0 + +/obj/machinery/power/proc/newavail() + if(powernet) + return powernet.newavail else return 0 @@ -58,21 +74,20 @@ // returns true if the area has power on given channel (or doesn't require power). // defaults to power_channel /obj/machinery/proc/powered(var/chan = -1) // defaults to power_channel - if(!loc) - return 0 + return FALSE if(!use_power) - return 1 + return TRUE var/area/A = get_area(src) // make sure it's in an area if(!A) - return 0 // if not, then not powered + return FALSE // if not, then not powered if(chan == -1) chan = power_channel return A.powered(chan) // return power status of the area // increment the power usage stats for an area -/obj/machinery/proc/use_power(var/amount, var/chan = -1) // defaults to power_channel +/obj/machinery/proc/use_power(amount, chan = -1) // defaults to power_channel var/area/A = get_area(src) // make sure it's in an area if(!A) return @@ -103,43 +118,36 @@ /obj/machinery/power/proc/connect_to_network() var/turf/T = src.loc if(!T || !istype(T)) - return 0 + return FALSE var/obj/structure/cable/C = T.get_cable_node() //check if we have a node cable on the machine turf, the first found is picked if(!C || !C.powernet) - return 0 + return FALSE C.powernet.add_machine(src) - return 1 + return TRUE // remove and disconnect the machine from its current powernet /obj/machinery/power/proc/disconnect_from_network() if(!powernet) - return 0 + return FALSE powernet.remove_machine(src) - return 1 + return TRUE // attach a wire to a power machine - leads from the turf you are standing on //almost never called, overwritten by all power machines but terminal and generator -/obj/machinery/power/attackby(obj/item/W, mob/user) - - if(istype(W, /obj/item/stack/cable_coil)) - - var/obj/item/stack/cable_coil/coil = W - +/obj/machinery/power/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/coil = I var/turf/T = user.loc - - if(T.intact || !istype(T, /turf/simulated/floor)) + if(T.intact || !isfloorturf(T)) return - if(get_dist(src, user) > 1) return - coil.place_turf(T, user) - return else - ..() - return + return ..() + /////////////////////////////////////////// // Powernet handling helpers @@ -159,7 +167,8 @@ cdir = get_dir(T,loc) for(var/obj/structure/cable/C in T) - if(C.powernet) continue + if(C.powernet) + continue if(C.d1 == cdir || C.d2 == cdir) . += C return . @@ -186,7 +195,8 @@ /obj/machinery/power/proc/get_indirect_connections() . = list() for(var/obj/structure/cable/C in loc) - if(C.powernet) continue + if(C.powernet) + continue if(C.d1 == 0) // the cable is a node cable . += C return . @@ -199,44 +209,32 @@ // returns a list of all power-related objects (nodes, cable, junctions) in turf, // excluding source, that match the direction d // if unmarked==1, only return those with no powernet -/proc/power_list(var/turf/T, var/source, var/d, var/unmarked=0, var/cable_only = 0) +/proc/power_list(turf/T, source, d, unmarked=0, cable_only = 0) . = list() - var/fdir = (!d)? 0 : turn(d, 180) // the opposite direction to d (or 0 if d==0) -///// Z-Level Stuff - var/Zdir - if(d==11) - Zdir = 11 - else if(d==12) - Zdir = 12 - else - Zdir = 999 -///// Z-Level Stuff - for(var/AM in T) - if(AM == source) continue //we don't want to return source - if(!cable_only && istype(AM,/obj/machinery/power)) + for(var/AM in T) + if(AM == source) + continue //we don't want to return source + + if(!cable_only && istype(AM, /obj/machinery/power)) var/obj/machinery/power/P = AM - if(P.powernet == 0) continue // exclude APCs which have powernet=0 + if(P.powernet == 0) + continue // exclude APCs which have powernet=0 if(!unmarked || !P.powernet) //if unmarked=1 we only return things with no powernet if(d == 0) . += P - else if(istype(AM,/obj/structure/cable)) + else if(istype(AM, /obj/structure/cable)) var/obj/structure/cable/C = AM if(!unmarked || !C.powernet) -///// Z-Level Stuff - if(C.d1 == fdir || C.d2 == fdir || C.d1 == Zdir || C.d2 == Zdir) -///// Z-Level Stuff - . += C - else if(C.d1 == d || C.d2 == d) + if(C.d1 == d || C.d2 == d) . += C return . //remove the old powernet and replace it with a new one throughout the network. -/proc/propagate_network(var/obj/O, var/datum/powernet/PN) - //log_world("propagating new network") +/proc/propagate_network(obj/O, datum/powernet/PN) var/list/worklist = list() var/list/found_machines = list() var/index = 1 @@ -248,13 +246,13 @@ P = worklist[index] //get the next power object found index++ - if( istype(P,/obj/structure/cable)) + if(istype(P, /obj/structure/cable)) var/obj/structure/cable/C = P if(C.powernet != PN) //add it to the powernet, if it isn't already there PN.add_cable(C) worklist |= C.get_connections() //get adjacents power objects, with or without a powernet - else if(P.anchored && istype(P,/obj/machinery/power)) + else if(P.anchored && istype(P, /obj/machinery/power)) var/obj/machinery/power/M = P found_machines |= M //we wait until the powernet is fully propagates to connect the machines @@ -268,7 +266,7 @@ //Merge two powernets, the bigger (in cable length term) absorbing the other -/proc/merge_powernets(var/datum/powernet/net1, var/datum/powernet/net2) +/proc/merge_powernets(datum/powernet/net1, datum/powernet/net2) if(!net1 || !net2) //if one of the powernet doesn't exist, return return @@ -285,8 +283,6 @@ for(var/obj/structure/cable/Cable in net2.cables) //merge cables net1.add_cable(Cable) - if(!net2) return net1 - for(var/obj/machinery/power/Node in net2.nodes) //merge power machines if(!Node.connect_to_network()) Node.disconnect_from_network() //if somehow we can't connect the machine to the new powernet, disconnect it from the old nonetheless @@ -299,14 +295,12 @@ //source is an object caused electrocuting (airlock, grille, etc) //No animations will be performed by this proc. /proc/electrocute_mob(mob/living/M, power_source, obj/source, siemens_coeff = 1, dist_check = FALSE) - if(!istype(M)) - return FALSE - if(istype(M.loc,/obj/mecha)) + if(!M || ismecha(M.loc)) return FALSE //feckin mechs are dumb if(dist_check) if(!in_range(source, M)) return FALSE - if(istype(M,/mob/living/carbon/human)) + if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.gloves) var/obj/item/clothing/gloves/G = H.gloves @@ -326,7 +320,7 @@ if(istype(power_source, /datum/powernet)) PN = power_source - else if(istype(power_source,/obj/item/stock_parts/cell)) + else if(istype(power_source, /obj/item/stock_parts/cell)) cell = power_source else if(istype(power_source, /obj/machinery/power/apc)) var/obj/machinery/power/apc/apc = power_source @@ -357,10 +351,30 @@ var/drained_energy = drained_hp*20 if(source_area) - source_area.use_power(drained_energy/CELLRATE) - else if(istype(power_source,/datum/powernet)) - var/drained_power = drained_energy/CELLRATE //convert from "joules" to "watts" - drained_power = PN.draw_power(drained_power) - else if(istype(power_source, /obj/item/stock_parts/cell)) + source_area.use_power(drained_energy/GLOB.CELLRATE) + else if(istype(power_source, /datum/powernet)) + var/drained_power = drained_energy/GLOB.CELLRATE //convert from "joules" to "watts" + PN.delayedload += (min(drained_power, max(PN.newavail - PN.delayedload, 0))) + else if (istype(power_source, /obj/item/stock_parts/cell)) cell.use(drained_energy) return drained_energy + +//////////////////////////////////////////////// +// Misc. +/////////////////////////////////////////////// + + +// return a knot cable (O-X) if one is present in the turf +// null if there's none +/turf/proc/get_cable_node() + if(!can_have_cabling()) + return null + for(var/obj/structure/cable/C in src) + if(C.d1 == 0) + return C + return null + +/area/proc/get_apc() + for(var/obj/machinery/power/apc/APC in GLOB.apcs) + if(APC.area == src) + return APC \ No newline at end of file diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index 228b4232968..b64481b1104 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -1,19 +1,19 @@ +//////////////////////////////////////////// +// POWERNET DATUM +// each contiguous network of cables & nodes +///////////////////////////////////// /datum/powernet + var/number // unique id var/list/cables = list() // all cables & junctions var/list/nodes = list() // all connected machines var/load = 0 // the current load on the powernet, increased by each machine at processing var/newavail = 0 // what available power was gathered last tick, then becomes... var/avail = 0 //...the current available power in the powernet + var/viewavail = 0 // the available power as it appears on the power console (gradually updated) var/viewload = 0 // the load as it appears on the power console (gradually updated) - var/number = 0 // Unused //TODEL - - var/perapc = 0 // per-apc avilability - var/perapc_excess = 0 - var/netexcess = 0 // excess power on the powernet (typically avail-load) - - var/problem = 0 // If either of these is set to 1 there is some sort of issue at the powernet. - + var/netexcess = 0 // excess power on the powernet (typically avail-load)/////// + var/delayedload = 0 // load applied to powernet between power ticks. /datum/powernet/New() SSmachines.powernets += src @@ -31,31 +31,21 @@ SSmachines.powernets -= src return ..() -//Returns the amount of excess power (before refunding to SMESs) from last tick. -//This is for machines that might adjust their power consumption using this data. -/datum/powernet/proc/last_surplus() - return max(avail - load, 0) - -/datum/powernet/proc/draw_power(var/amount) - var/draw = between(0, amount, avail - load) - load += draw - return draw - /datum/powernet/proc/is_empty() return !cables.len && !nodes.len //remove a cable from the current powernet //if the powernet is then empty, delete it //Warning : this proc DON'T check if the cable exists -/datum/powernet/proc/remove_cable(var/obj/structure/cable/C) +/datum/powernet/proc/remove_cable(obj/structure/cable/C) cables -= C C.powernet = null if(is_empty())//the powernet is now empty... - qdel(src)///... delete it - qdel + qdel(src)///... delete it //add a cable to the current powernet //Warning : this proc DON'T check if the cable exists -/datum/powernet/proc/add_cable(var/obj/structure/cable/C) +/datum/powernet/proc/add_cable(obj/structure/cable/C) if(C.powernet)// if C already has a powernet... if(C.powernet == src) return @@ -67,16 +57,16 @@ //remove a power machine from the current powernet //if the powernet is then empty, delete it //Warning : this proc DON'T check if the machine exists -/datum/powernet/proc/remove_machine(var/obj/machinery/power/M) +/datum/powernet/proc/remove_machine(obj/machinery/power/M) nodes -=M M.powernet = null if(is_empty())//the powernet is now empty... - qdel(src)///... delete it - qdel + qdel(src)///... delete it //add a power machine to the current powernet //Warning : this proc DON'T check if the machine exists -/datum/powernet/proc/add_machine(var/obj/machinery/power/M) +/datum/powernet/proc/add_machine(obj/machinery/power/M) if(M.powernet)// if M already has a powernet... if(M.powernet == src) return @@ -85,45 +75,23 @@ M.powernet = src nodes[M] = M -// Triggers warning for certain amount of ticks -/datum/powernet/proc/trigger_warning(var/duration_ticks = 20) - problem = max(duration_ticks, problem) - //handles the power changes in the powernet //called every ticks by the powernet controller /datum/powernet/proc/reset() - var/numapc = 0 - - if(problem > 0) - problem = max(problem - 1, 0) - - if(nodes && nodes.len) // Added to fix a bad list bug -- TLE - for(var/obj/machinery/power/terminal/term in nodes) - if( istype( term.master, /obj/machinery/power/apc ) ) - numapc++ - + //see if there's a surplus of power remaining in the powernet and stores unused power in the SMES netexcess = avail - load - if(numapc) - //very simple load balancing. If there was a net excess this tick then it must have been that some APCs used less than perapc, since perapc*numapc = avail - //Therefore we can raise the amount of power rationed out to APCs on the assumption that those APCs that used less than perapc will continue to do so. - //If that assumption fails, then some APCs will miss out on power next tick, however it will be rebalanced for the tick after. - if(netexcess >= 0) - perapc_excess += min(netexcess/numapc, (avail - perapc) - perapc_excess) - else - perapc_excess = 0 - - perapc = avail/numapc + perapc_excess - if(netexcess > 100 && nodes && nodes.len) // if there was excess power last cycle for(var/obj/machinery/power/smes/S in nodes) // find the SMESes in the network S.restore() // and restore some of the power that was used - //updates the viewed load (as seen on power computers) - viewload = round(load) + // update power consoles + viewavail = round(0.8 * viewavail + 0.2 * avail) + viewload = round(0.8 * viewload + 0.2 * load) - //reset the powernet - load = 0 + // reset the powernet + load = delayedload + delayedload = 0 avail = newavail newavail = 0 @@ -131,27 +99,4 @@ if(avail >= 1000) return Clamp(20 + round(avail / 25000), 20, 195) + rand(-5, 5) else - return 0 - -//////////////////////////////////////////////// -// Misc. -/////////////////////////////////////////////// - - -// return a knot cable (O-X) if one is present in the turf -// null if there's none -/turf/proc/get_cable_node() - if(!istype(src, /turf/simulated/floor)) - return null - for(var/obj/structure/cable/C in src) - if(C.d1 == 0) - return C - return null - -/area/proc/get_apc() - // This was a simple locate() in src, but an unresolved BYOND bug causes trying to locate() in an - // area to take an inconceivably long time, especially for large areas. - // See: http://www.byond.com/forum/?post=1860571 - var/obj/machinery/power/apc/FINDME - for(FINDME in src) - return FINDME \ No newline at end of file + return 0 \ No newline at end of file diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index a85d9e880bd..3e910a613b0 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -15,8 +15,8 @@ var/global/list/rad_collectors = list() var/locked = 0 var/drainratio = 1 -/obj/machinery/power/rad_collector/New() - ..() +/obj/machinery/power/rad_collector/Initialize(mapload) + . = ..() rad_collectors += src /obj/machinery/power/rad_collector/Destroy() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 7e031755e22..9ba302ab19b 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -23,18 +23,25 @@ var/frequency = 0 var/id_tag = null + var/projectile_type = /obj/item/projectile/beam/emitter + var/projectile_sound = 'sound/weapons/emitter.ogg' var/datum/radio_frequency/radio_connection var/datum/effect_system/spark_spread/sparks -/obj/machinery/power/emitter/New() - ..() +/obj/machinery/power/emitter/Initialize(mapload) + . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/emitter(null) component_parts += new /obj/item/stock_parts/micro_laser(null) component_parts += new /obj/item/stock_parts/manipulator(null) RefreshParts() + if(state == 2 && anchored) + connect_to_network() sparks = new + sparks.attach(src) sparks.set_up(5, 1, src) + if(frequency) + set_frequency(frequency) /obj/machinery/power/emitter/RefreshParts() var/max_firedelay = 120 @@ -79,13 +86,6 @@ return rotate() -/obj/machinery/power/emitter/Initialize() - ..() - if(state == 2 && anchored) - connect_to_network() - if(frequency) - set_frequency(frequency) - /obj/machinery/power/emitter/multitool_menu(var/mob/user,var/obj/item/multitool/P) return {"
    @@ -182,10 +182,9 @@ src.active = 0 update_icon() return - if(((src.last_shot + src.fire_delay) <= world.time) && (src.active == 1)) - - var/actual_load = draw_power(active_power_usage) - if(actual_load >= active_power_usage) //does the laser have enough power to shoot? + if(active == TRUE) + if(!active_power_usage || surplus() >= active_power_usage) + add_load(active_power_usage) if(!powered) powered = 1 update_icon() @@ -197,36 +196,57 @@ investigate_log("lost power and turned off","singulo") return - src.last_shot = world.time - if(src.shot_number < 3) - src.fire_delay = 2 - src.shot_number++ - else - src.fire_delay = rand(minimum_fire_delay,maximum_fire_delay) - src.shot_number = 0 + if(!check_delay()) + return FALSE + fire_beam() - var/obj/item/projectile/beam/emitter/A = new /obj/item/projectile/beam/emitter(src.loc) +/obj/machinery/power/emitter/proc/check_delay() + if((last_shot + fire_delay) <= world.time) + return TRUE + return FALSE - A.dir = src.dir - playsound(get_turf(src), 'sound/weapons/emitter.ogg', 25, 1) - if(prob(35)) - sparks.start() - - switch(dir) - if(NORTH) - A.yo = 20 - A.xo = 0 - if(EAST) - A.yo = 0 - A.xo = 20 - if(WEST) - A.yo = 0 - A.xo = -20 - else // Any other - A.yo = -20 - A.xo = 0 - A.fire() //TODO: Carn: check this out +/obj/machinery/power/emitter/proc/fire_beam() + var/obj/item/projectile/P = new projectile_type(get_turf(src)) + playsound(get_turf(src), projectile_sound, 50, TRUE) + if(prob(35)) + sparks.start() + switch(dir) + if(NORTH) + P.yo = 20 + P.xo = 0 + if(NORTHEAST) + P.yo = 20 + P.xo = 20 + if(EAST) + P.yo = 0 + P.xo = 20 + if(SOUTHEAST) + P.yo = -20 + P.xo = 20 + if(WEST) + P.yo = 0 + P.xo = -20 + if(SOUTHWEST) + P.yo = -20 + P.xo = -20 + if(NORTHWEST) + P.yo = 20 + P.xo = -20 + else // Any other + P.yo = -20 + P.xo = 0 + last_shot = world.time + if(shot_number < 3) + fire_delay = 20 + shot_number ++ + else + fire_delay = rand(minimum_fire_delay, maximum_fire_delay) + shot_number = 0 + P.setDir(dir) + P.starting = loc + P.fire() + return P /obj/machinery/power/emitter/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/multitool)) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 40947d79368..420a112c352 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -48,8 +48,8 @@ field_generator power level display overlays += "+p[power_level]" -/obj/machinery/field/generator/New() - ..() +/obj/machinery/field/generator/Initialize(mapload) + . = ..() fields = list() connected_gens = list() diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index 85ef45eef20..2b6695b9e85 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -2,11 +2,12 @@ name = "Accelerated Particles" desc = "Small things moving very fast." icon = 'icons/obj/machines/particle_accelerator.dmi' - icon_state = "particle"//Need a new icon for this - anchored = 1 - density = 1 + icon_state = "particle" + anchored = TRUE + density = FALSE var/movement_range = 10 var/energy = 10 + var/speed = 1 /obj/effect/accelerated_particle/weak movement_range = 8 @@ -21,50 +22,45 @@ energy = 50 -/obj/effect/accelerated_particle/New(loc, dir = 2) - src.loc = loc - src.dir = dir +/obj/effect/accelerated_particle/New(loc) + ..() - if(movement_range > 20) - movement_range = 20 - spawn(0) - move(1) - return + addtimer(CALLBACK(src, .proc/move), 1) /obj/effect/accelerated_particle/Bump(atom/A) if(A) - if(ismob(A)) + if(isliving(A)) toxmob(A) - if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/singularity/))) - A:energy += energy - return + else if(istype(A, /obj/machinery/the_singularitygen)) + var/obj/machinery/the_singularitygen/S = A + S.energy += energy + else if(istype(A, /obj/singularity)) + var/obj/singularity/S = A + S.energy += energy - -/obj/effect/accelerated_particle/Bumped(atom/A) - if(ismob(A)) - Bump(A) - return +/obj/effect/accelerated_particle/Crossed(atom/A) + if(isliving(A)) + toxmob(A) /obj/effect/accelerated_particle/ex_act(severity) qdel(src) + +/obj/effect/accelerated_particle/singularity_pull() return -/obj/effect/accelerated_particle/proc/toxmob(var/mob/living/M) - M.apply_effect((energy*6),IRRADIATE,0) - M.updatehealth() - return +/obj/effect/accelerated_particle/proc/toxmob(mob/living/M) + M.apply_effect((energy * 6), IRRADIATE, 0) - -/obj/effect/accelerated_particle/proc/move(var/lag) +/obj/effect/accelerated_particle/proc/move() if(!step(src,dir)) - src.loc = get_step(src,dir) + forceMove(get_step(src, dir)) movement_range-- - if(movement_range <= 0) + if(movement_range == 0) qdel(src) else - sleep(lag) - move(lag) + sleep(speed) + move() \ No newline at end of file diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index bf20ef45140..80de53fe22d 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -19,11 +19,11 @@ var/parts = null var/datum/wires/particle_acc/control_box/wires = null -/obj/machinery/particle_accelerator/control_box/New() +/obj/machinery/particle_accelerator/control_box/Initialize(mapload) + . = ..() wires = new(src) connected_parts = list() update_icon() - ..() /obj/machinery/particle_accelerator/control_box/Destroy() if(active) diff --git a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm index 97bf4fa4277..c2a1ccfa8da 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_emitter.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_emitter.dm @@ -29,21 +29,20 @@ return 0 -/obj/structure/particle_accelerator/particle_emitter/proc/emit_particle(var/strength = 0) +/obj/structure/particle_accelerator/particle_emitter/proc/emit_particle(strength = 0) if((last_shot + fire_delay) <= world.time) last_shot = world.time - var/obj/effect/accelerated_particle/A = null - var/turf/T = get_step(src, dir) + var/turf/T = get_turf(src) + var/obj/effect/accelerated_particle/P switch(strength) if(0) - A = new/obj/effect/accelerated_particle/weak(T, dir) + P = new/obj/effect/accelerated_particle/weak(T) if(1) - A = new/obj/effect/accelerated_particle(T, dir) + P = new/obj/effect/accelerated_particle(T) if(2) - A = new/obj/effect/accelerated_particle/strong(T, dir) + P = new/obj/effect/accelerated_particle/strong(T) if(3) - A = new/obj/effect/accelerated_particle/powerful(T, dir) - if(A) - A.dir = dir - return 1 - return 0 + P = new/obj/effect/accelerated_particle/powerful(T) + P.setDir(dir) + return TRUE + return FALSE \ No newline at end of file diff --git a/code/modules/power/singularity/particle_accelerator/particle_power.dm b/code/modules/power/singularity/particle_accelerator/particle_power.dm index dafd19917da..75ae7eb3263 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_power.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_power.dm @@ -3,8 +3,4 @@ desc_holder = "This part uses electromagnetic waves to focus the Alpha particles." icon = 'icons/obj/machines/particle_accelerator.dmi' icon_state = "power_box" - reference = "power_box" - -/obj/structure/particle_accelerator/power_box/update_icon() - ..() - return + reference = "power_box" \ No newline at end of file diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 632fb7726ee..12d6c8b831a 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -35,7 +35,7 @@ src.energy = starting_energy ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) GLOB.poi_list |= src GLOB.singularities += src for(var/obj/machinery/power/singularity_beacon/singubeacon in GLOB.machines) @@ -44,7 +44,7 @@ break /obj/singularity/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) GLOB.poi_list.Remove(src) GLOB.singularities -= src target = null diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 2884fc18b4c..6c9ecb55afc 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -11,21 +11,20 @@ name = "power storage unit" desc = "A high-capacity superconducting magnetic energy storage (SMES) unit." icon_state = "smes" - density = 1 - anchored = 1 - defer_process = 1 + density = TRUE + use_power = NO_POWER_USE var/capacity = 5e6 // maximum charge var/charge = 0 // actual charge - var/input_attempt = 0 // 1 = attempting to charge, 0 = not attempting to charge - var/inputting = 0 // 1 = actually inputting, 0 = not inputting + var/input_attempt = TRUE // 1 = attempting to charge, 0 = not attempting to charge + var/inputting = TRUE // 1 = actually inputting, 0 = not inputting var/input_level = 50000 // amount of power the SMES attempts to charge by var/input_level_max = 200000 // cap on input_level var/input_available = 0 // amount of charge available from input last tick - var/output_attempt = 1 // 1 = attempting to output, 0 = not attempting to output - var/outputting = 1 // 1 = actually outputting, 0 = not outputting + var/output_attempt = TRUE // 1 = attempting to output, 0 = not attempting to output + var/outputting = TRUE // 1 = actually outputting, 0 = not outputting var/output_level = 50000 // amount of power the SMES attempts to output var/output_level_max = 200000 // cap on output_level var/output_used = 0 // amount of power actually outputted. may be less than output_level if the powernet returns excess power @@ -35,13 +34,11 @@ var/last_input_attempt = 0 var/last_charge = 0 - var/open_hatch = 0 var/name_tag = null - var/building_terminal = 0 //Suggestions about how to avoid clickspam building several terminals accepted! var/obj/machinery/power/terminal/terminal = null -/obj/machinery/power/smes/New() - ..() +/obj/machinery/power/smes/Initialize(mapload) + . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/smes(null) component_parts += new /obj/item/stock_parts/cell/high(null) @@ -53,28 +50,22 @@ component_parts += new /obj/item/stack/cable_coil(null, 5) RefreshParts() - spawn(5) - if(!powernet) - connect_to_network() + dir_loop: + for(var/d in cardinal) + var/turf/T = get_step(src, d) + for(var/obj/machinery/power/terminal/term in T) + if(term && term.dir == turn(d, 180)) + terminal = term + break dir_loop - dir_loop: - for(var/d in cardinal) - var/turf/T = get_step(src, d) - for(var/obj/machinery/power/terminal/term in T) - if(term && term.dir == turn(d, 180)) - terminal = term - break dir_loop - if(!terminal) - stat |= BROKEN - return - terminal.master = src - if(!terminal.powernet) - terminal.connect_to_network() - update_icon() - return + if(!terminal) + stat |= BROKEN + return + terminal.master = src + update_icon() -/obj/machinery/power/smes/upgraded/New() - ..() +/obj/machinery/power/smes/upgraded/Initialize(mapload) + . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/smes(null) component_parts += new /obj/item/stock_parts/cell/hyper(null) @@ -223,8 +214,8 @@ return round(5.5*charge/(capacity ? capacity : 5e6)) /obj/machinery/power/smes/process() - - if(stat & BROKEN) return + if(stat & BROKEN) + return //store machine state to see if we need to update the icon overlays var/last_disp = chargedisplay() @@ -232,33 +223,46 @@ var/last_onln = outputting //inputting - if(input_attempt) - var/target_load = min((capacity-charge)/SMESRATE, input_level) // charge at set rate, limited to spare capacity - var/actual_load = draw_power(target_load) // add the load to the terminal side network - charge += actual_load * SMESRATE // increase the charge + if(terminal && input_attempt) + input_available = terminal.surplus() - if(actual_load >= target_load) // Did we charge at full rate? - inputting = 2 - else if(actual_load) // If not, did we charge at least partially? - inputting = 1 - else // Or not at all? - inputting = 0 + if(inputting) + if(input_available > 0) // if there's power available, try to charge + + var/load = min(min((capacity-charge)/SMESRATE, input_level), input_available) // charge at set rate, limited to spare capacity + + charge += load * SMESRATE // increase the charge + + terminal.add_load(load) // add the load to the terminal side network + + else // if not enough capcity + inputting = FALSE // stop inputting + + else + if(input_attempt && input_available > 0) + inputting = TRUE + else + inputting = FALSE //outputting - if(outputting) - output_used = min( charge/SMESRATE, output_level) //limit output to that stored + if(output_attempt) + if(outputting) + output_used = min( charge/SMESRATE, output_level) //limit output to that stored - charge -= output_used*SMESRATE // reduce the storage (may be recovered in /restore() if excessive) + if (add_avail(output_used)) // add output to powernet if it exists (smes side) + charge -= output_used*SMESRATE // reduce the storage (may be recovered in /restore() if excessive) + else + outputting = FALSE - add_avail(output_used) // add output to powernet (smes side) - - if(output_used < 0.0001) // either from no charge or set to 0 - outputting = 0 - investigate_log("lost power and turned off","singulo") - else if(output_attempt && charge > output_level && output_level > 0) - outputting = 1 + if(output_used < 0.0001) // either from no charge or set to 0 + outputting = FALSE + investigate_log("lost power and turned off", "singulo") + else if(output_attempt && charge > output_level && output_level > 0) + outputting = TRUE + else + output_used = 0 else - output_used = 0 + outputting = FALSE // only update icon if state changed if(last_disp != chargedisplay() || last_chrg != inputting || last_onln != outputting) @@ -334,11 +338,6 @@ return 0 return 1 -/obj/machinery/power/smes/draw_power(var/amount) - if(terminal && terminal.powernet) - return terminal.powernet.draw_power(amount) - return 0 - /obj/machinery/power/smes/attack_ai(mob/user) add_hiddenprint(user) ui_interact(user) @@ -484,7 +483,8 @@ output_level = 250000 /obj/machinery/power/smes/magical/process() - charge = 5000000 + capacity = INFINITY + charge = INFINITY ..() #undef SMESRATE diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 7342c1f26c1..1384c8d21e6 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -6,8 +6,7 @@ desc = "A solar panel. Generates electricity when in contact with sunlight." icon = 'icons/obj/power.dmi' icon_state = "sp_base" - anchored = 1 - density = 1 + density = TRUE use_power = NO_POWER_USE idle_power_usage = 0 active_power_usage = 0 @@ -20,8 +19,8 @@ var/turn_angle = 0 var/obj/machinery/power/solar_control/control = null -/obj/machinery/power/solar/New(var/turf/loc, var/obj/item/solar_assembly/S) - ..(loc) +/obj/machinery/power/solar/Initialize(mapload, obj/item/solar_assembly/S) + . = ..() Make(S) connect_to_network() @@ -118,7 +117,7 @@ return sunfrac = cos(p_angle) ** 2 - //isn't the power recieved from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? + //isn't the power received from the incoming light proportionnal to cos(p_angle) (Lambert's cosine law) rather than cos(p_angle)^2 ? /obj/machinery/power/solar/process()//TODO: remove/add this from machines to save on processing as needed ~Carn PRIORITY if(stat & BROKEN) diff --git a/code/modules/power/switch.dm b/code/modules/power/switch.dm deleted file mode 100644 index 34e867005e1..00000000000 --- a/code/modules/power/switch.dm +++ /dev/null @@ -1,84 +0,0 @@ -//This is a power switch. When turned on it looks at the cables around the tile that it's on and notes which cables are trying to connect to it. -//After it knows this it creates the number of cables from the center to each of the cables attempting to conenct. These cables cannot be removed -//with wirecutters. When the switch is turned off it removes all the cables on the tile it's on. -//The switch uses a 5s delay to prevent powernet change spamming. -/* -/obj/structure/powerswitch - name = "power switch" - desc = "A switch that controls power." - icon = 'icons/obj/power.dmi' - icon_state = "switch-dbl-up" - var/icon_state_on = "switch-dbl-down" - var/icon_state_off = "switch-dbl-up" - density = 0 - anchored = 1 - var/on = 0 //up is off, down is on - var/busy = 0 //set to 1 when you start pulling - -/obj/structure/powerswitch/simple - icon_state = "switch-up" - icon_state_on = "switch-down" - icon_state_off = "switch-up" - - -/obj/structure/powerswitch/examine(mob/user) - ..(user) - if(on) - to_chat(user, "The switch is in the on position") - else - to_chat(user, "The switch is in the off position") - -/obj/structure/powerswitch/attack_ai(mob/user) - to_chat(user, "You're an AI. This is a manual switch. It's not going to work.") - return - -/obj/structure/powerswitch/attack_hand(mob/user) - - if(busy) - to_chat(user, "This switch is already being toggled.") - return - - ..() - - busy = 1 - for(var/mob/O in viewers(user)) - O.show_message(text("[user] starts pulling the [src]."), 1) - - if(do_after(user, 50, target = src)) - set_state(!on) - for(var/mob/O in viewers(user)) - O.show_message(text("[user] flips the [src] into the [on ? "on": "off"] position."), 1) - busy = 0 - -/obj/structure/powerswitch/proc/set_state(var/state) - on = state - if(on) - icon_state = icon_state_on - var/list/connection_dirs = list() - for(var/direction in list(1,2,4,8,5,6,9,10)) - for(var/obj/structure/cable/C in get_step(src,direction)) - if(C.d1 == turn(direction, 180) || C.d2 == turn(direction, 180)) - connection_dirs += direction - break - - for(var/direction in connection_dirs) - var/obj/structure/cable/C = new/obj/structure/cable(src.loc) - C.d1 = 0 - C.d2 = direction - C.icon_state = "[C.d1]-[C.d2]" - C.power_switch = src - - var/datum/powernet/PN = new() - PN.number = powernets.len + 1 - powernets += PN - C.netnum = PN.number - PN.cables += C - - C.mergeConnectedNetworks(C.d2) - C.mergeConnectedNetworksOnTurf() - - else - icon_state = icon_state_off - for(var/obj/structure/cable/C in src.loc) - qdel(C) -*/ \ No newline at end of file diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index 194e96f6dba..80c38e0a9fe 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -8,25 +8,24 @@ icon_state = "term" desc = "It's an underfloor wiring terminal for power equipment." level = 1 - layer = TURF_LAYER + layer = WIRE_TERMINAL_LAYER //a bit above wires var/obj/machinery/power/master = null - anchored = 1 - layer = 2.6 // a bit above wires -/obj/machinery/power/terminal/New() - ..() - var/turf/T = src.loc - if(level==1) hide(T.intact) - return - +/obj/machinery/power/terminal/Initialize(mapload) + . = ..() + var/turf/T = get_turf(src) + if(level == 1) + hide(T.intact) + /obj/machinery/power/terminal/Destroy() if(master) master.disconnect_terminal() + master = null return ..() -/obj/machinery/power/terminal/hide(var/i) +/obj/machinery/power/terminal/hide(i) if(i) invisibility = 101 icon_state = "term-f" diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index efafd8909ea..cc564c98d4c 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -12,8 +12,8 @@ var/last_zap = 0 var/datum/wires/tesla_coil/wires = null -/obj/machinery/power/tesla_coil/New() - ..() +/obj/machinery/power/tesla_coil/Initialize(mapload) + . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/tesla_coil(null) component_parts += new /obj/item/stock_parts/capacitor(null) @@ -77,7 +77,7 @@ var/coeff = (20 - ((input_power_multiplier - 1) * 3)) coeff = max(coeff, 10) var/power = (powernet.avail/2) - draw_power(power) + add_load(power) playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 10, power/(coeff/2)) @@ -89,8 +89,8 @@ anchored = 0 density = 1 -/obj/machinery/power/grounding_rod/New() - ..() +/obj/machinery/power/grounding_rod/Initialize(mapload) + . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/grounding_rod(null) component_parts += new /obj/item/stock_parts/capacitor(null) diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index e4e3275ef26..0b7f417b52e 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -8,16 +8,15 @@ desc = "A solar directional tracker." icon = 'icons/obj/power.dmi' icon_state = "tracker" - anchored = 1 - density = 1 + density = TRUE use_power = NO_POWER_USE var/id = 0 var/sun_angle = 0 // sun angle as set by sun datum var/obj/machinery/power/solar_control/control = null -/obj/machinery/power/tracker/New(var/turf/loc, var/obj/item/solar_assembly/S) - ..(loc) +/obj/machinery/power/tracker/Initialize(mapload, obj/item/solar_assembly/S) + . = ..() Make(S) connect_to_network() @@ -26,7 +25,7 @@ return ..() //set the control of the tracker to a given computer if closer than SOLAR_MAX_DIST -/obj/machinery/power/tracker/proc/set_control(var/obj/machinery/power/solar_control/SC) +/obj/machinery/power/tracker/proc/set_control(obj/machinery/power/solar_control/SC) if(SC && (get_dist(src, SC) > SOLAR_MAX_DIST)) return 0 control = SC @@ -39,21 +38,21 @@ control.connected_tracker = null control = null -/obj/machinery/power/tracker/proc/Make(var/obj/item/solar_assembly/S) +/obj/machinery/power/tracker/proc/Make(obj/item/solar_assembly/S) if(!S) S = new /obj/item/solar_assembly(src) S.glass_type = /obj/item/stack/sheet/glass S.tracker = 1 - S.anchored = 1 - S.loc = src + S.anchored = TRUE + S.forceMove(src) update_icon() //updates the tracker icon and the facing angle for the control computer -/obj/machinery/power/tracker/proc/set_angle(var/angle) +/obj/machinery/power/tracker/proc/set_angle(angle) sun_angle = angle //set icon dir to show sun illumination - dir = turn(NORTH, -angle - 22.5) // 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST + setDir(turn(NORTH, -angle - 22.5)) // 22.5 deg bias ensures, e.g. 67.5-112.5 is EAST if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet control.cdir = angle diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm index c611585a8cc..1548738f3f5 100644 --- a/code/modules/power/treadmill.dm +++ b/code/modules/power/treadmill.dm @@ -7,7 +7,6 @@ name = "treadmill" desc = "A power-generating treadmill." layer = 2.2 - anchored = 1 use_power = NO_POWER_USE var/speed = 0 @@ -18,8 +17,8 @@ var/list/mobs_running[0] var/id = null // for linking to monitor -/obj/machinery/power/treadmill/Initialize() - ..() +/obj/machinery/power/treadmill/Initialize(mapload) + . = ..() if(anchored) connect_to_network() @@ -138,8 +137,8 @@ var/frame = 0 // on 0, show labels, on 1 show numbers var/redeem_immediately = 0 // redeem immediately for holding cell -/obj/machinery/treadmill_monitor/Initialize() - ..() +/obj/machinery/treadmill_monitor/Initialize(mapload) + . = ..() if(id) for(var/obj/machinery/power/treadmill/T in GLOB.machines) if(T.id == id) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 641682490d4..7b1764c354d 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -64,8 +64,8 @@ // the inlet stage of the gas turbine electricity generator -/obj/machinery/power/compressor/New() - ..() +/obj/machinery/power/compressor/Initialize(mapload) + . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/power_compressor(null) component_parts += new /obj/item/stock_parts/manipulator(null) @@ -80,10 +80,6 @@ gas_contained = new inturf = get_step(src, dir) - - -/obj/machinery/power/compressor/Initialize() - ..() locate_machinery() if(!turbine) stat |= BROKEN @@ -185,8 +181,8 @@ #define TURBGENQ 100000 #define TURBGENG 0.5 -/obj/machinery/power/turbine/New() - ..() +/obj/machinery/power/turbine/Initialize(mapload) + . = ..() component_parts = list() component_parts += new /obj/item/circuitboard/power_turbine(src) component_parts += new /obj/item/stock_parts/capacitor(src) @@ -200,10 +196,6 @@ // The outlet is pointed at the direction of the turbine component outturf = get_step(src, dir) - - -/obj/machinery/power/turbine/Initialize() - ..() locate_machinery() if(!compressor) stat |= BROKEN diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index 95e1a586469..2a20e7e6c81 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -15,10 +15,10 @@ /obj/item/gun/projectile/automatic/spikethrower/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/gun/projectile/automatic/spikethrower/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/gun/projectile/automatic/spikethrower/update_icon() diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 8c9b0cf66f8..b25420b5491 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -32,7 +32,7 @@ power_supply.give(power_supply.maxcharge) update_ammo_types() if(selfcharge) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) update_icon() /obj/item/gun/energy/proc/update_ammo_types() @@ -47,7 +47,7 @@ /obj/item/gun/energy/Destroy() if(selfcharge) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/gun/energy/process() @@ -167,9 +167,9 @@ switch(var_name) if("selfcharge") if(var_value) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) . = ..() /obj/item/gun/energy/proc/robocharge() diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 623986f5837..fa34753c6a9 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -340,11 +340,11 @@ /obj/item/gun/energy/temperature/New() ..() update_icon() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/gun/energy/temperature/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/gun/energy/temperature/newshot() diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index f6d84635c08..75f94dd83d0 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -51,12 +51,12 @@ charges = max_charges chambered = new ammo_type(src) if(can_charge) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/gun/magic/Destroy() if(can_charge) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index face61e79c3..a1677b764e0 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -17,10 +17,10 @@ /obj/item/gun/medbeam/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/gun/medbeam/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/gun/medbeam/handle_suicide() diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 8d7201d0645..69023a3e6e8 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -16,7 +16,7 @@ var/const/INGEST = 2 /datum/reagents/New(maximum = 100) maximum_volume = maximum if(!(flags & REAGENT_NOREACT)) - processing_objects |= src + START_PROCESSING(SSobj, src) //I dislike having these here but map-objects are initialised before world/New() is called. >_> if(!GLOB.chemical_reagents_list) //Chemical Reagents - Initialises all /datum/reagent into a list indexed by reagent id @@ -333,9 +333,9 @@ var/const/INGEST = 2 od_chems.Add(R.id) return od_chems -/datum/reagents/proc/process() +/datum/reagents/process() if(flags & REAGENT_NOREACT) - processing_objects -= src + STOP_PROCESSING(SSobj, src) return for(var/datum/reagent/R in reagent_list) @@ -346,9 +346,9 @@ var/const/INGEST = 2 // Order is important, process() can remove from processing if // the flag is present flags &= ~(REAGENT_NOREACT) - processing_objects |= src + START_PROCESSING(SSobj, src) else - processing_objects -= src + STOP_PROCESSING(SSobj, src) flags |= REAGENT_NOREACT /* @@ -819,7 +819,7 @@ var/const/INGEST = 2 /datum/reagents/Destroy() . = ..() - processing_objects -= src + STOP_PROCESSING(SSobj, src) QDEL_LIST(reagent_list) reagent_list = null QDEL_LIST(addiction_list) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 258237f0ddd..57a57ef8e0a 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -184,6 +184,8 @@ if(href_list["ejectBeaker"]) if(beaker) beaker.forceMove(loc) + if(Adjacent(usr) && !issilicon(usr)) + usr.put_in_hands(beaker) beaker = null overlays.Cut() diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 848c1ca4ecd..5f5bd8de2d4 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -38,9 +38,11 @@ if(state_change) SSnanoui.update_uis(src) -/obj/machinery/chem_heater/proc/eject_beaker() +/obj/machinery/chem_heater/proc/eject_beaker(mob/user) if(beaker) beaker.forceMove(get_turf(src)) + if(Adjacent(user) && !issilicon(user)) + user.put_in_hands(beaker) beaker = null icon_state = "mixer0b" on = FALSE @@ -118,7 +120,7 @@ . = 1 if(href_list["eject_beaker"]) - eject_beaker() + eject_beaker(usr) . = 0 //updated in eject_beaker() already /obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index ffd3ae57bd5..e10cd5c9203 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -229,6 +229,8 @@ else if(href_list["eject"]) if(beaker) beaker.forceMove(get_turf(src)) + if(Adjacent(usr) && !issilicon(usr)) + usr.put_in_hands(beaker) beaker = null reagents.clear_reagents() update_icon() diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index a2ecc811e6a..d4199c3dcec 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -169,7 +169,7 @@ return if(M.mind && M.mind.changeling && M.mind.changeling.regenerating) //no messing with changeling's fake death return - M.visible_message("[M] seizes up and falls limp, [M.p_their()] eyes dead and lifeless...") //so you can't trigger deathgasp emote on people. Edge case, but necessary. + M.emote("deathgasp") M.status_flags |= FAKEDEATH M.update_stat("fakedeath reagent") M.med_hud_set_health() diff --git a/code/modules/reagents/chemistry/reagents/drinks.dm b/code/modules/reagents/chemistry/reagents/drinks.dm index 52ae0f0c93b..b50ed09a27c 100644 --- a/code/modules/reagents/chemistry/reagents/drinks.dm +++ b/code/modules/reagents/chemistry/reagents/drinks.dm @@ -8,7 +8,7 @@ drink_desc = "Vitamins! Yay!" taste_message = "orange juice" -/datum/reagent/consumable/drink/orangejuicde/on_mob_life(mob/living/M) +/datum/reagent/consumable/drink/orangejuice/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE if(prob(30)) update_flags |= M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE) @@ -89,7 +89,7 @@ drink_desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place." taste_message = "healthy dietary choices" -/datum/reagent/consumable/drink/doctors_delight/on_mob_life(mob/living/M) +/datum/reagent/consumable/drink/doctor_delight/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE if(prob(20)) update_flags |= M.adjustToxLoss(-1, FALSE) diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm index 9b1aca91f8d..bf2417a192e 100644 --- a/code/modules/reagents/chemistry/reagents/food.dm +++ b/code/modules/reagents/chemistry/reagents/food.dm @@ -905,8 +905,7 @@ /datum/reagent/vomit/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) - new /obj/effect/decal/cleanable/vomit(T) - playsound(T, 'sound/effects/splat.ogg', 50, 1, -3) + T.add_vomit_floor() /datum/reagent/greenvomit name = "Green vomit" @@ -918,8 +917,7 @@ /datum/reagent/greenvomit/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) - new /obj/effect/decal/cleanable/vomit/green(T) - playsound(T, 'sound/effects/splat.ogg', 50, 1, -3) + T.add_vomit_floor(FALSE, TRUE) ////Lavaland Flora Reagents//// diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 4f92f21aee7..6e15090ea88 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -38,10 +38,10 @@ for(var/R in reagent_ids) add_reagent(R) - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/reagent_containers/borghypo/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/reagent_containers/borghypo/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm index 709b20f070f..825aa69632b 100644 --- a/code/modules/reagents/reagent_containers/iv_bag.dm +++ b/code/modules/reagents/reagent_containers/iv_bag.dm @@ -42,11 +42,11 @@ /obj/item/reagent_containers/iv_bag/proc/begin_processing(mob/target) injection_target = target - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/reagent_containers/iv_bag/proc/end_processing() injection_target = null - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /obj/item/reagent_containers/iv_bag/process() if(!injection_target) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 069efe5807c..8ddb4e0fd7c 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -447,6 +447,14 @@ build_path = /obj/item/healthanalyzer category = list("initial", "Medical") +/datum/design/pillbottle + name = "Pill Bottle" + id = "pillbottle" + build_type = AUTOLATHE + materials = list(MAT_METAL = 80, MAT_GLASS = 20) + build_path = /obj/item/storage/pill_bottle + category = list("initial", "Medical") + /datum/design/beanbag_slug name = "Beanbag Slug" id = "beanbag_slug" diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm index bc264cb8f62..0c535fa61a1 100644 --- a/code/modules/research/designs/biogenerator_designs.dm +++ b/code/modules/research/designs/biogenerator_designs.dm @@ -113,7 +113,15 @@ build_type = BIOGENERATOR materials = list(MAT_BIOMASS = 50) build_path = /obj/item/stack/sheet/cloth - category = list("initial","Leather and Cloth") + category = list("initial", "Organic Materials") + +/datum/design/cardboard + name = "Sheet of cardboard" + id = "cardboard" + build_type = BIOGENERATOR + materials = list(MAT_BIOMASS = 25) + build_path = /obj/item/stack/sheet/cardboard + category = list("initial", "Organic Materials") /datum/design/wallet name = "Wallet" diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 8cb29ecf3b4..0bac5824780 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -90,22 +90,13 @@ var/ert_request_answered = FALSE return 0 var/index = 1 - var/ert_spawn_seconds = 120 - spawn(ert_spawn_seconds * 10) // to account for spawn() using deciseconds - var/list/unspawnable_ert = list() - for(var/mob/M in response_team_members) - if(M) - unspawnable_ert |= M - if(unspawnable_ert.len) - message_admins("ERT SPAWN: The following ERT members could not be spawned within [ert_spawn_seconds] seconds:") - for(var/mob/M in unspawnable_ert) - message_admins("- Unspawned ERT: [ADMIN_FULLMONTY(M)]") for(var/mob/M in response_team_members) if(index > emergencyresponseteamspawn.len) index = 1 if(!M || !M.client) continue + log_debug("Spawning as ERT: [M.ckey] ([M])") var/client/C = M.client var/mob/living/new_commando = C.create_response_team(emergencyresponseteamspawn[index]) if(!M || !new_commando) diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm index 715adb668ab..273ea75e832 100644 --- a/code/modules/spacepods/spacepod.dm +++ b/code/modules/spacepods/spacepod.dm @@ -152,7 +152,7 @@ if(src.empcounter > 0) src.empcounter-- else - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) /obj/spacepod/proc/update_icons() if(!pod_overlays) @@ -286,7 +286,7 @@ deal_damage(80 / severity) if(empcounter < (40 / severity)) empcounter = 40 / severity - processing_objects.Add(src) + START_PROCESSING(SSobj, src) switch(severity) if(1) diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm index a4444938d96..09ccb3ce36b 100644 --- a/code/modules/station_goals/shield.dm +++ b/code/modules/station_goals/shield.dm @@ -175,7 +175,7 @@ change_meteor_chance(0.5) /obj/machinery/satellite/meteor_shield/proc/change_meteor_chance(mod) - for(var/datum/event_container/container in event_manager.event_containers) + for(var/datum/event_container/container in SSevents.event_containers) for(var/datum/event_meta/M in container.available_events) if(M.event_type == /datum/event/meteor_wave) M.weight *= mod diff --git a/code/modules/surgery/organs/body_egg.dm b/code/modules/surgery/organs/body_egg.dm index 335d4e5b751..a8ba9192ae4 100644 --- a/code/modules/surgery/organs/body_egg.dm +++ b/code/modules/surgery/organs/body_egg.dm @@ -13,13 +13,13 @@ /obj/item/organ/internal/body_egg/insert(var/mob/living/carbon/M, special = 0) ..() owner.status_flags |= XENO_HOST - processing_objects.Add(src) + START_PROCESSING(SSobj, src) owner.med_hud_set_status() spawn(0) AddInfectionImages(owner) /obj/item/organ/internal/body_egg/remove(var/mob/living/carbon/M, special = 0) - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) if(owner) owner.status_flags &= ~(XENO_HOST) owner.med_hud_set_status() diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index a5e85bf572c..67ea1be1d05 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -33,7 +33,7 @@ /obj/item/organ/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) if(owner) remove(owner, 1) QDEL_LIST_ASSOC_VAL(autopsy_data) @@ -84,7 +84,7 @@ /obj/item/organ/proc/necrotize(update_sprite = TRUE) damage = max_damage status |= ORGAN_DEAD - processing_objects -= src + STOP_PROCESSING(SSobj, src) if(dead_icon && !is_robotic()) icon_state = dead_icon if(owner && vital) @@ -189,7 +189,7 @@ else status = 0 if(!owner) - processing_objects |= src + START_PROCESSING(SSobj, src) /obj/item/organ/proc/is_damaged() return damage > 0 @@ -295,7 +295,7 @@ if(affected) affected.internal_organs -= src loc = get_turf(owner) - processing_objects |= src + START_PROCESSING(SSobj, src) if(owner && vital && is_primary_organ()) // I'd do another check for species or whatever so that you couldn't "kill" an IPC by removing a human head from them, but it doesn't matter since they'll come right back from the dead add_attack_logs(user, owner, "Removed vital organ ([src])", !!user ? ATKLOG_FEW : ATKLOG_ALL) diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index f8534ffe078..4462e4ea470 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -286,7 +286,7 @@ This function completely restores a damaged organ to perfect condition. owner.updatehealth("limb rejuvenate") update_icon() if(!owner) - processing_objects |= src + START_PROCESSING(SSobj, src) /**************************************************** PROCESSING & UPDATING diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 063a4d6880a..6dbc6f4febe 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -41,6 +41,8 @@ for(var/X in actions) var/datum/action/A = X A.Grant(M) + if(vital) + M.update_stat("Vital organ inserted") // Removes the given organ from its owner. // Returns the removed object, which is usually just itself @@ -193,10 +195,10 @@ /obj/item/organ/internal/shadowtumor/New() ..() - processing_objects.Add(src) + START_PROCESSING(SSobj, src) /obj/item/organ/internal/shadowtumor/Destroy() - processing_objects.Remove(src) + STOP_PROCESSING(SSobj, src) return ..() /obj/item/organ/internal/shadowtumor/process() diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 3672070e8f0..ca22fb5cb0e 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -137,10 +137,10 @@ var/list/GPS_list = list() for marking the area around the transition edges." var/list/turf/tagged -/obj/item/gps/visible_debug/New() +/obj/item/gps/visible_debug/Initialize(mapload) . = ..() tagged = list() - GLOB.fast_processing.Add(src) + START_PROCESSING(SSfastprocess, src) /obj/item/gps/visible_debug/process() var/turf/T = get_turf(src) @@ -161,5 +161,5 @@ var/list/GPS_list = list() if(tagged) clear() tagged = null - GLOB.fast_processing.Remove(src) + STOP_PROCESSING(SSfastprocess, src) . = ..() diff --git a/config/example/config.txt b/config/example/config.txt index 684b38c50fb..ca81181c027 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -1,6 +1,12 @@ ## Server name: This appears at the top of the screen in-game. In this case it will read "spacestation13: station_name" where station_name is the randomly generated name of the station for the round. Remove the # infront of SERVERNAME and replace 'spacestation13' with the name of your choice # SERVERNAME spacestation13 +## Server tagline: This appears on the hub entry. +#SERVER_TAG_LINE The Perfect Mix of RP & Action + +## Server extra features: This appears in the feature list on the hub entry. +#SERVER_EXTRA_FEATURES medium RP, varied species/jobs/modes + ## Add a # infront of this if you want to use the SQL based admin system, the legacy system uses admins.txt. You need to set up your database to use the SQL based system. ADMIN_LEGACY_SYSTEM @@ -265,6 +271,12 @@ ASSISTANT_LIMIT ## If you enabled assistant limiting set the ratio of assistants to security members default is 2 assistants to 1 officer ASSISTANT_RATIO 2 +# Mins before SSD crew are cryoed. +AUTO_CRYO_SSD_MINS 15 + +# If enabled, prevents people interacting with SSD players unless they acknowledge they have read the server rules. +SSD_WARNING + ## Remove the # to make rounds which end instantly (Rev, Wizard, Malf) to continue until the shuttle is called or the station is nuked. ## Malf and Rev will let the shuttle be called when the antags/protags are dead. #CONTINUOUS_ROUNDS @@ -417,4 +429,4 @@ DISABLE_HIGH_POP_MC_MODE_AMOUNT 60 #DISABLE_LOCALHOST_ADMIN ## Uncomment to give a confirmation before hitting start now -#START_NOW_CONFIRMATION \ No newline at end of file +#START_NOW_CONFIRMATION diff --git a/html/changelogs/AutoChangeLog-pr-11129.yml b/html/changelogs/AutoChangeLog-pr-11129.yml new file mode 100644 index 00000000000..de26a8b8f1b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11129.yml @@ -0,0 +1,4 @@ +author: "iantine" +delete-after: True +changes: + - rscadd: "Adds Lumi's vox suit fluff" diff --git a/html/changelogs/AutoChangeLog-pr-11278.yml b/html/changelogs/AutoChangeLog-pr-11278.yml new file mode 100644 index 00000000000..24f9c3ab4cc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11278.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Added new Wizard Spell - Summon Ghosts! This nefarious spell will make all ghosts visible to the living. Be careful though, as while they cannot harm you in any way, they might prove a bit.. annoying. Costs 0 points in the Wizard's spellbook." diff --git a/html/changelogs/AutoChangeLog-pr-11283.yml b/html/changelogs/AutoChangeLog-pr-11283.yml new file mode 100644 index 00000000000..9056578d68b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11283.yml @@ -0,0 +1,4 @@ +author: "Fox McCloud" +delete-after: True +changes: + - bugfix: "Fixes a few potential exploits with forcing chem, dust, and explosive implants activating with the deathgasp emote, prior to death" diff --git a/html/changelogs/AutoChangeLog-pr-11284.yml b/html/changelogs/AutoChangeLog-pr-11284.yml new file mode 100644 index 00000000000..433a7fb3f68 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11284.yml @@ -0,0 +1,6 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Added new Shadowling Ability - Null Charge! This new ability allows Shadowling to completely drain an APC of it's power after a moderate delay. Shadowling must not be interrupted, or the whole process will fail." + - imageadd: "Added custom icon for the Null Charge ability" + - rscdel: "Shadowling Drain Life ability removed" diff --git a/html/changelogs/AutoChangeLog-pr-11292.yml b/html/changelogs/AutoChangeLog-pr-11292.yml new file mode 100644 index 00000000000..814c8530858 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11292.yml @@ -0,0 +1,5 @@ +author: "farie82" +delete-after: True +changes: + - tweak: "Makes puke less lag inducing" + - tweak: "Puke can now appear on all kinds of turfs except spess" diff --git a/html/changelogs/AutoChangeLog-pr-11299.yml b/html/changelogs/AutoChangeLog-pr-11299.yml new file mode 100644 index 00000000000..4994b017d39 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11299.yml @@ -0,0 +1,5 @@ +author: "Kyep" +delete-after: True +changes: + - rscadd: "Added a config file option which allows SSD crew members to be moved to cryo after a defined amount of minutes." + - rscadd: "Added a config file option which causes most people trying to attack/loot/interact with a SSD character to need to confirm they've read the rules before being able to do so." diff --git a/html/changelogs/AutoChangeLog-pr-11300.yml b/html/changelogs/AutoChangeLog-pr-11300.yml new file mode 100644 index 00000000000..b949b7f91f5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11300.yml @@ -0,0 +1,5 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Added Observer HUD buttons for Jump to Mob, Orbit, Re-enter corpse, and Teleport" + - imageadd: "Added custom icons for Observer HUD buttons" diff --git a/html/changelogs/AutoChangeLog-pr-11312.yml b/html/changelogs/AutoChangeLog-pr-11312.yml new file mode 100644 index 00000000000..c7b31729672 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11312.yml @@ -0,0 +1,4 @@ +author: "farie82" +delete-after: True +changes: + - tweak: "Cure text for Shock and Cardiac failure are more clear now" diff --git a/html/changelogs/AutoChangeLog-pr-11319.yml b/html/changelogs/AutoChangeLog-pr-11319.yml new file mode 100644 index 00000000000..c9c992c83d1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11319.yml @@ -0,0 +1,6 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Added Floorbot color variants. Different toolboxes will result in a differently colored Floorbots. One even might be a little stronger than others.." + - imageadd: "Added sprites of Floorbot color variants" + - bugfix: "Fixed incorrect amount of required floortiles for the Floorbot in the crafting tab" diff --git a/html/changelogs/AutoChangeLog-pr-11323.yml b/html/changelogs/AutoChangeLog-pr-11323.yml new file mode 100644 index 00000000000..20da5d256b3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11323.yml @@ -0,0 +1,4 @@ +author: "AffectedArc07" +delete-after: True +changes: + - tweak: "Darkmode chat department colors match NTTC theming now" diff --git a/html/changelogs/AutoChangeLog-pr-11328.yml b/html/changelogs/AutoChangeLog-pr-11328.yml new file mode 100644 index 00000000000..e91103f07cd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11328.yml @@ -0,0 +1,5 @@ +author: "farie82" +delete-after: True +changes: + - bugfix: "Admins can now use all mhelp related things again" + - spellcheck: "Fixed the toggle mentor ticket messages text" diff --git a/html/changelogs/AutoChangeLog-pr-11329.yml b/html/changelogs/AutoChangeLog-pr-11329.yml new file mode 100644 index 00000000000..e25e56b8828 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11329.yml @@ -0,0 +1,4 @@ +author: "farie82" +delete-after: True +changes: + - bugfix: "Vampiric glaring is logged now" diff --git a/html/changelogs/AutoChangeLog-pr-11332.yml b/html/changelogs/AutoChangeLog-pr-11332.yml new file mode 100644 index 00000000000..f76e2e2b48b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11332.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Added an option to grant Martial Arts via administrative Var menu" diff --git a/html/changelogs/AutoChangeLog-pr-11334.yml b/html/changelogs/AutoChangeLog-pr-11334.yml new file mode 100644 index 00000000000..7e119901704 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11334.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - soundadd: "Added deathsound for Silicons" diff --git a/html/changelogs/AutoChangeLog-pr-11335.yml b/html/changelogs/AutoChangeLog-pr-11335.yml new file mode 100644 index 00000000000..084f93320cb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11335.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - tweak: "Dice will now roll when thrown" diff --git a/html/changelogs/AutoChangeLog-pr-11338.yml b/html/changelogs/AutoChangeLog-pr-11338.yml new file mode 100644 index 00000000000..6505d695841 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11338.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - soundadd: "Added sound when adding or removing IDs from ID modification computers" diff --git a/html/changelogs/AutoChangeLog-pr-11340.yml b/html/changelogs/AutoChangeLog-pr-11340.yml new file mode 100644 index 00000000000..3b9d667166a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11340.yml @@ -0,0 +1,4 @@ +author: "Markolie" +delete-after: True +changes: + - tweak: "Jumpsuits are now removed by clicking instead of clicking and dragging." diff --git a/html/changelogs/AutoChangeLog-pr-11347.yml b/html/changelogs/AutoChangeLog-pr-11347.yml new file mode 100644 index 00000000000..57248e4f861 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11347.yml @@ -0,0 +1,5 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Added cancel button to transfer amount from stack menu" + - tweak: "Alt-click is a new shortcut to take a custom amount from stack" diff --git a/html/changelogs/AutoChangeLog-pr-11348.yml b/html/changelogs/AutoChangeLog-pr-11348.yml new file mode 100644 index 00000000000..55335793f97 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11348.yml @@ -0,0 +1,5 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Added shortcuts for handling pumps, volume pumps, filters, and mixers. Ctrl-click these devices to turn them on/off and Alt-click them to set their output to maximum." + - rscadd: "Added ability to rename pumps, volume pumps, filters and mixers with a pen." diff --git a/html/changelogs/AutoChangeLog-pr-11349.yml b/html/changelogs/AutoChangeLog-pr-11349.yml new file mode 100644 index 00000000000..329fec2e5cc --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11349.yml @@ -0,0 +1,5 @@ +author: "Arkatos" +delete-after: True +changes: + - soundadd: "Added sound for throwing bolas" + - soundadd: "Added hitsound for all types of bolas" diff --git a/html/changelogs/AutoChangeLog-pr-11351.yml b/html/changelogs/AutoChangeLog-pr-11351.yml new file mode 100644 index 00000000000..8fbca5fe9c0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11351.yml @@ -0,0 +1,5 @@ +author: "Citinited" +delete-after: True +changes: + - bugfix: "Pipe dispensers (the big ones) now work again." + - tweak: "Cooldown on pipe dispensers reduced to 0.4 seconds, down from 1.5 seconds" diff --git a/html/changelogs/AutoChangeLog-pr-11353.yml b/html/changelogs/AutoChangeLog-pr-11353.yml new file mode 100644 index 00000000000..9807b7a0681 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11353.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Added AntagHUD to everyone at the round end" diff --git a/html/changelogs/AutoChangeLog-pr-11355.yml b/html/changelogs/AutoChangeLog-pr-11355.yml new file mode 100644 index 00000000000..934e85808ba --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11355.yml @@ -0,0 +1,4 @@ +author: "Kyep" +delete-after: True +changes: + - bugfix: "Fixed an error message being inappropriately generated for admins when someone signs up as a pAI." diff --git a/html/changelogs/AutoChangeLog-pr-11356.yml b/html/changelogs/AutoChangeLog-pr-11356.yml new file mode 100644 index 00000000000..d441bd658e1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11356.yml @@ -0,0 +1,4 @@ +author: "McDonald072" +delete-after: True +changes: + - bugfix: "You can no longer examine or teleport things using clipboards" diff --git a/html/changelogs/AutoChangeLog-pr-11360.yml b/html/changelogs/AutoChangeLog-pr-11360.yml new file mode 100644 index 00000000000..3fb01b5b8f9 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11360.yml @@ -0,0 +1,6 @@ +author: "AffectedArc07" +delete-after: True +changes: + - rscadd: "SSevents" + - rscadd: "SSholiday" + - tweak: "We no longer check if its Christmas every tick. Dont ask." diff --git a/html/changelogs/AutoChangeLog-pr-11361.yml b/html/changelogs/AutoChangeLog-pr-11361.yml new file mode 100644 index 00000000000..7207d6d5daf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11361.yml @@ -0,0 +1,4 @@ +author: "AffectedArc07" +delete-after: True +changes: + - rscadd: "SSalarms" diff --git a/html/changelogs/AutoChangeLog-pr-11362.yml b/html/changelogs/AutoChangeLog-pr-11362.yml new file mode 100644 index 00000000000..72282104dc1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11362.yml @@ -0,0 +1,4 @@ +author: "uc_guy" +delete-after: True +changes: + - bugfix: "Players in the lobby no longer see cult speak." diff --git a/html/changelogs/AutoChangeLog-pr-11364.yml b/html/changelogs/AutoChangeLog-pr-11364.yml new file mode 100644 index 00000000000..b331b4d009d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11364.yml @@ -0,0 +1,4 @@ +author: "Fox McCloud" +delete-after: True +changes: + - tweak: "object and fast processing are now proper subsystems" diff --git a/html/changelogs/AutoChangeLog-pr-11365.yml b/html/changelogs/AutoChangeLog-pr-11365.yml new file mode 100644 index 00000000000..fd5fe573104 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11365.yml @@ -0,0 +1,7 @@ +author: "Kyep" +delete-after: True +changes: + - rscadd: "The ID computer now color-codes potential job transfer options, highlighting good choices for a job transfer in green, and bad ones in gray." + - bugfix: "Taking a job transfer now gives you playtime based on your new job, instead of incorrectly still giving you playtime based on your old job." + - tweak: "Job transfers to karma jobs are now possible - if you have the job unlocked." + - rscadd: "Attempting to bypass a job ban via a job transfer now generates a warning to all online admins." diff --git a/html/changelogs/AutoChangeLog-pr-11367.yml b/html/changelogs/AutoChangeLog-pr-11367.yml new file mode 100644 index 00000000000..5d90a0b3f30 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11367.yml @@ -0,0 +1,4 @@ +author: "farie82" +delete-after: True +changes: + - bugfix: "Doctor delight and orange juice now heal again" diff --git a/html/changelogs/AutoChangeLog-pr-11369.yml b/html/changelogs/AutoChangeLog-pr-11369.yml new file mode 100644 index 00000000000..c8bc9be9e2d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11369.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Circuit Boards now show their required components on examine" diff --git a/html/changelogs/AutoChangeLog-pr-11370.yml b/html/changelogs/AutoChangeLog-pr-11370.yml new file mode 100644 index 00000000000..9cd7a28a5b6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11370.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Revenants now have randomly generated flavor names" diff --git a/html/changelogs/AutoChangeLog-pr-11371.yml b/html/changelogs/AutoChangeLog-pr-11371.yml new file mode 100644 index 00000000000..220e6962bc5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11371.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - tweak: "You can shift-click any action button to reset it's position. Alt-click on Hide Buttons will reset all action buttons to their default positions." diff --git a/html/changelogs/AutoChangeLog-pr-11372.yml b/html/changelogs/AutoChangeLog-pr-11372.yml new file mode 100644 index 00000000000..963e58006f1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11372.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Pill Bottles are now printable in the Autolathe. You can find them in the Medical section, and each costs 80 metal and 20 glass to print." diff --git a/html/changelogs/AutoChangeLog-pr-11373.yml b/html/changelogs/AutoChangeLog-pr-11373.yml new file mode 100644 index 00000000000..9f90ffcd554 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11373.yml @@ -0,0 +1,4 @@ +author: "Quantum-M" +delete-after: True +changes: + - rscadd: "Two multicolor pens to the Internal Affairs Office" diff --git a/html/changelogs/AutoChangeLog-pr-11375.yml b/html/changelogs/AutoChangeLog-pr-11375.yml new file mode 100644 index 00000000000..34d17cb10ce --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11375.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - tweak: "Puts beakers in your hand upon eject from chemistry machines" diff --git a/html/changelogs/AutoChangeLog-pr-11376.yml b/html/changelogs/AutoChangeLog-pr-11376.yml new file mode 100644 index 00000000000..c3ed1239eb5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11376.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Cardboard can now be made in the Biogenerator" diff --git a/html/changelogs/AutoChangeLog-pr-11377.yml b/html/changelogs/AutoChangeLog-pr-11377.yml new file mode 100644 index 00000000000..7b040fcc944 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11377.yml @@ -0,0 +1,5 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "You can now hotswap tanks in a canister or gas pump by clicking it with a new tank!" + - rscadd: "You can now also close a canister's valve and remove the tank inside it by alt-clicking it." diff --git a/html/changelogs/AutoChangeLog-pr-11378.yml b/html/changelogs/AutoChangeLog-pr-11378.yml new file mode 100644 index 00000000000..fefbf428e06 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11378.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Added examine toolptips. Hover over any equipped or hold item for a little while and it will display the item description as a tooltip." diff --git a/html/changelogs/AutoChangeLog-pr-11381.yml b/html/changelogs/AutoChangeLog-pr-11381.yml new file mode 100644 index 00000000000..604f3096553 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11381.yml @@ -0,0 +1,4 @@ +author: "Ty-Omaha" +delete-after: True +changes: + - tweak: "Moves AI admin log to the all preference" diff --git a/html/changelogs/AutoChangeLog-pr-11389.yml b/html/changelogs/AutoChangeLog-pr-11389.yml new file mode 100644 index 00000000000..90d66861196 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11389.yml @@ -0,0 +1,4 @@ +author: "Kyep" +delete-after: True +changes: + - tweak: "Refactored and improved our entry on the server hub." diff --git a/html/changelogs/AutoChangeLog-pr-11390.yml b/html/changelogs/AutoChangeLog-pr-11390.yml new file mode 100644 index 00000000000..12edd2d1fa2 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11390.yml @@ -0,0 +1,4 @@ +author: "Fox McCloud" +delete-after: True +changes: + - bugfix: "Fixes multi-spawn blobs" diff --git a/html/changelogs/AutoChangeLog-pr-11391.yml b/html/changelogs/AutoChangeLog-pr-11391.yml new file mode 100644 index 00000000000..2d23260b1e4 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11391.yml @@ -0,0 +1,4 @@ +author: "farie82" +delete-after: True +changes: + - bugfix: "Fixes admin PM's. Bwoinks are back on the menu!" diff --git a/html/changelogs/AutoChangeLog-pr-11393.yml b/html/changelogs/AutoChangeLog-pr-11393.yml new file mode 100644 index 00000000000..955e99dab7a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11393.yml @@ -0,0 +1,6 @@ +author: "Fox McCloud" +delete-after: True +changes: + - tweak: "Powersinks drain rate increased, but they also explode a bit sooner" + - rscadd: "Multitools display total power, load, and free power" + - bugfix: "Fix emitter sparks sparking at the location of emitters where biult as opposed to emitter current location" diff --git a/html/changelogs/AutoChangeLog-pr-11395.yml b/html/changelogs/AutoChangeLog-pr-11395.yml new file mode 100644 index 00000000000..08ad539b42d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11395.yml @@ -0,0 +1,4 @@ +author: "farie82" +delete-after: True +changes: + - bugfix: "Organs will now prompt a update_stat. Meaning that IRCs and the like now get revived when possible when you put their battery and brain in" diff --git a/html/changelogs/AutoChangeLog-pr-11396.yml b/html/changelogs/AutoChangeLog-pr-11396.yml new file mode 100644 index 00000000000..7cbd431c75b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11396.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - bugfix: "Ghost teleport verb will no locker flicker when used" diff --git a/html/changelogs/AutoChangeLog-pr-11397.yml b/html/changelogs/AutoChangeLog-pr-11397.yml new file mode 100644 index 00000000000..c19f8d2bd25 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11397.yml @@ -0,0 +1,7 @@ +author: "Arkatos" +delete-after: True +changes: + - rscadd: "Alt-click now opens and closes fire extinguisher cabinet" + - bugfix: "Fire extinguisher cabinet now properly updates it's sprite correctly when putting fire extinquisher inside the cabinet" + - bugfix: "Fire extinguisher no longer sprays when put into fire extinguisher cabinet with a safety off" + - soundadd: "Added sound for opening and closing fire extinguisher cabinet" diff --git a/html/changelogs/AutoChangeLog-pr-11400.yml b/html/changelogs/AutoChangeLog-pr-11400.yml new file mode 100644 index 00000000000..199c334303b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11400.yml @@ -0,0 +1,6 @@ +author: "Arkatos" +delete-after: True +changes: + - imageadd: "Added new torch sprites" + - tweak: "Torch light color is now orange instead of red" + - bugfix: "Torch sprite now correctly shows all inhand sprites" diff --git a/html/changelogs/AutoChangeLog-pr-11404.yml b/html/changelogs/AutoChangeLog-pr-11404.yml new file mode 100644 index 00000000000..e4161ce9d6c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11404.yml @@ -0,0 +1,4 @@ +author: "farie82" +delete-after: True +changes: + - bugfix: "The typing limiter option should now work for all edge cases. Such as dying while talking and such" diff --git a/html/changelogs/AutoChangeLog-pr-11405.yml b/html/changelogs/AutoChangeLog-pr-11405.yml new file mode 100644 index 00000000000..82b5d6e22c6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11405.yml @@ -0,0 +1,4 @@ +author: "Markolie" +delete-after: True +changes: + - bugfix: "Removed a useless message that would be sent to admins whenever a drone joins the round." diff --git a/html/changelogs/AutoChangeLog-pr-11406.yml b/html/changelogs/AutoChangeLog-pr-11406.yml new file mode 100644 index 00000000000..4a3191624ea --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11406.yml @@ -0,0 +1,7 @@ +author: "Arkatos" +delete-after: True +changes: + - tweak: "Blob Rally Spores power is now free to use" + - bugfix: "Blob mobs can no longer speak while being dead via Blob Broadcast" + - bugfix: "Blob structures now properly show working animation" + - imageadd: "Added new sprites for variants of Blob resource, factory and storage structures" diff --git a/html/changelogs/AutoChangeLog-pr-11414.yml b/html/changelogs/AutoChangeLog-pr-11414.yml new file mode 100644 index 00000000000..a994f91763e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-11414.yml @@ -0,0 +1,4 @@ +author: "Markolie" +delete-after: True +changes: + - bugfix: "Fixed an issue where admins would receive a message whenever someone joined up as a pAI." diff --git a/icons/mob/actions/actions.dmi b/icons/mob/actions/actions.dmi index d21323c80b1..b4d8a34a6e0 100644 Binary files a/icons/mob/actions/actions.dmi and b/icons/mob/actions/actions.dmi differ diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi index 4797c79496e..809c68bd59b 100644 Binary files a/icons/mob/blob.dmi and b/icons/mob/blob.dmi differ diff --git a/icons/mob/inhands/fluff_lefthand.dmi b/icons/mob/inhands/fluff_lefthand.dmi index 5f18b1623ab..c2604c8b57c 100644 Binary files a/icons/mob/inhands/fluff_lefthand.dmi and b/icons/mob/inhands/fluff_lefthand.dmi differ diff --git a/icons/mob/inhands/fluff_righthand.dmi b/icons/mob/inhands/fluff_righthand.dmi index 5b7005ab48f..b75a67a7d8e 100644 Binary files a/icons/mob/inhands/fluff_righthand.dmi and b/icons/mob/inhands/fluff_righthand.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 42fbccba2b0..35bd70efd28 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index fe096499427..0f2b8b0996d 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/mob/screen_ghost.dmi b/icons/mob/screen_ghost.dmi new file mode 100644 index 00000000000..6519d00aa97 Binary files /dev/null and b/icons/mob/screen_ghost.dmi differ diff --git a/icons/mob/species/vox/uniform.dmi b/icons/mob/species/vox/uniform.dmi index e22a631d6cd..b8169f9bd51 100644 Binary files a/icons/mob/species/vox/uniform.dmi and b/icons/mob/species/vox/uniform.dmi differ diff --git a/icons/obj/aibots.dmi b/icons/obj/aibots.dmi index 273fbf77133..9299c999342 100644 Binary files a/icons/obj/aibots.dmi and b/icons/obj/aibots.dmi differ diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index e1ca3d3380e..9315f8223af 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi index 8934666fddb..a7146793675 100644 Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ diff --git a/nano/assets/nanoui.css b/nano/assets/nanoui.css index 598da509f43..158b96ef0ff 100644 --- a/nano/assets/nanoui.css +++ b/nano/assets/nanoui.css @@ -1,2 +1,2 @@ -@charset "utf-8";@font-face{font-family:'FontAwesome';src:url(fontawesome-webfont.eot?v=4.7.0);src:url(fontawesome-webfont.eot?#iefix&v=4.7.0) format('embedded-opentype'),url(fontawesome-webfont.woff2?v=4.7.0) format('woff2'),url(fontawesome-webfont.woff?v=4.7.0) format('woff'),url(fontawesome-webfont.ttf?v=4.7.0) format('truetype'),url(fontawesome-webfont.svg?v=4.7.0#fontawesomeregular) format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:0.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul > li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:0.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:0.2em 0.25em 0.15em;border:solid 0.08em #eee;border-radius:0.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:0.3em}.fa.fa-pull-right{margin-left:0.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:0.3em}.fa.pull-right{margin-left:0.3em}.fa-spin{animation:fa-spin 2s infinite linear}.fa-pulse{animation:fa-spin 1s infinite steps(8)}@keyframes fa-spin{0%{transform:rotate(0)}100%{transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-rotate-90{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-close:before,.fa-remove:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-cog:before,.fa-gear:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-repeat:before,.fa-rotate-right:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-image:before,.fa-photo:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-exclamation-triangle:before,.fa-warning:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-cogs:before,.fa-gears:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-floppy-o:before,.fa-save:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before,.fa-navicon:before,.fa-reorder:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-sort:before,.fa-unsorted:before{content:"\f0dc"}.fa-sort-desc:before,.fa-sort-down:before{content:"\f0dd"}.fa-sort-asc:before,.fa-sort-up:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-gavel:before,.fa-legal:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-bolt:before,.fa-flash:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-clipboard:before,.fa-paste:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-chain-broken:before,.fa-unlink:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-caret-square-o-down:before,.fa-toggle-down:before{content:"\f150"}.fa-caret-square-o-up:before,.fa-toggle-up:before{content:"\f151"}.fa-caret-square-o-right:before,.fa-toggle-right:before{content:"\f152"}.fa-eur:before,.fa-euro:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-inr:before,.fa-rupee:before{content:"\f156"}.fa-cny:before,.fa-jpy:before,.fa-rmb:before,.fa-yen:before{content:"\f157"}.fa-rouble:before,.fa-rub:before,.fa-ruble:before{content:"\f158"}.fa-krw:before,.fa-won:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-caret-square-o-left:before,.fa-toggle-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-try:before,.fa-turkish-lira:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-bank:before,.fa-institution:before,.fa-university:before{content:"\f19c"}.fa-graduation-cap:before,.fa-mortar-board:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-image-o:before,.fa-file-photo-o:before,.fa-file-picture-o:before{content:"\f1c5"}.fa-file-archive-o:before,.fa-file-zip-o:before{content:"\f1c6"}.fa-file-audio-o:before,.fa-file-sound-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-ring:before,.fa-life-saver:before,.fa-support:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before,.fa-resistance:before{content:"\f1d0"}.fa-empire:before,.fa-ge:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before,.fa-y-combinator-square:before,.fa-yc-square:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-paper-plane:before,.fa-send:before{content:"\f1d8"}.fa-paper-plane-o:before,.fa-send-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-futbol-o:before,.fa-soccer-ball-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-ils:before,.fa-shekel:before,.fa-sheqel:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-bed:before,.fa-hotel:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-y-combinator:before,.fa-yc:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before,.fa-battery:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-paper-o:before,.fa-hand-stop-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-television:before,.fa-tv:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-american-sign-language-interpreting:before,.fa-asl-interpreting:before{content:"\f2a3"}.fa-deaf:before,.fa-deafness:before,.fa-hard-of-hearing:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-sign-language:before,.fa-signing:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-address-card:before,.fa-vcard:before{content:"\f2bb"}.fa-address-card-o:before,.fa-vcard-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer-full:before,.fa-thermometer:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bath:before,.fa-bathtub:before,.fa-s15:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.displayBar{position:relative;width:236px;height:16px;border:1px solid #666;float:left;margin:0 5px 0 0;overflow:hidden;background:#000}.displayBarText{position:absolute;top:-2px;left:5px;width:100%;height:100%;color:#fff;font-weight:normal}.displayBarFill{width:0%;height:100%;background:#40628a;overflow:hidden;float:left}.displayBarFill.alignRight{float:right}.displayBarText.good{color:#fff}.displayBarText.notgood{color:#fff}.displayBarText.average{color:#fff}.displayBarText.bad{color:#fff}.displayBarText.highlight{color:#000}.displayBarFill.good{color:#fff;background:#4f7529}.displayBarFill.notgood{color:#fff;background:#ffb400}.displayBarFill.average{color:#fff;background:#cd6500}.displayBarFill.bad{color:#fff;background:#e00}.displayBarFill.highlight{color:#fff;background:#8ba5c4}.disabled,.link,.linkOff,.linkOn,.redButton,.selected,.yellowButton{float:left;min-width:15px;height:16px;text-align:center;color:#fff;text-decoration:none;background:#40628a;border:1px solid #161616;padding:0 4px 4px 4px;margin:0 2px 2px 0;cursor:default;white-space:nowrap}.hasIcon{padding:0 4px 4px 0}.linkActive.hover,.zoomLink.hover,a.hover{background:#507aac}@keyframes pendingAnimation{to{color:#fff;background:#507aac}}.linkPending,.linkPending.hover{animation-name:pendingAnimation;animation-duration:0.25s}a.white,a.white:active,a.white:link,a.white:visited{color:#40628a;text-decoration:none;background:#fff;border:1px solid #161616;padding:1px 4px 1px 4px;margin:0 2px 0 0;cursor:default}a.white.hover{color:#fff;background:#40628a}.linkOn,.selected,a.linkOn.hover,a.linkOn:active,a.linkOn:link,a.linkOn:visited,a.selected.hover,a.selected:active,a.selected:link,a.selected:visited{color:#fff;background:#2f943c}.disabled,.linkOff,a.disabled.hover,a.disabled:active,a.disabled:link,a.disabled:visited,a.linkOff.hover,a.linkOff:active,a.linkOff:link,a.linkOff:visited{color:#fff;background:#999;border-color:#666}.disabled.icon,.linkOff.icon,.linkOn.icon,.selected.icon,a.icon{position:relative;padding:1px 4px 2px 20px}.disabled.icon img,.linkOff.icon img,.linkOn.icon img,.selected.icon img,a.icon img{position:absolute;top:0;left:0;width:18px;height:18px}.linkDanger,a.linkDanger:active,a.linkDanger:link,a.linkDanger:visited{color:#fff;background-color:red;border-color:#a00}.linkDanger.hover{background-color:#f66}.inactive,a.inactive.hover,a.inactive:active,a.inactive:link,a.inactive:visited{color:#fff;background:#999;border-color:#666}.white{color:#fff;font-weight:bold}.good{color:#4f7529;font-weight:bold}.average{color:#cd6500;font-weight:bold}.bad{color:#e00;font-weight:bold}.idle{color:#272727;font-weight:bold}.redButton{background:#ea0000}.yellowButton{background:#cacc00}.highlight{color:#8ba5c4}.dark{color:#272727}.burn{color:orange}.brute{color:red}.toxin{color:green}.toxin_light{color:#3adf00}.oxyloss{color:#00f}.oxyloss_light{color:#6698ff}.Red{color:red}.Blue{color:#00f}.Green{color:#0f0}.Marigold{color:#fda505}.Fuschia{color:#ff0080}.Black{color:#000}.Pearl{color:#c6cacb}.cold1{color:#94b8ff}.cold2{color:#69f}.cold3{color:#293d66}.hot1{color:#f96}.hot2{color:#993d00}.hot3{color:#f60}div.display{padding:4px;margin:6px 0;background-color:#000;background-color:rgba(0, 0, 0, 0.33);box-shadow:inset 0 0 5px rgba(0, 0, 0, 0.5)}div.display header{display:block;position:relative;width:98.5%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}div.display header .buttonRight{position:absolute;bottom:6px;right:4px}div.display article{display:table;width:100%;border-collapse:collapse}.itemGroup{border:1px solid #e9c183;background:#2c2c2c;padding:4px;clear:both}.item{width:100%;margin:4px 0 0 0;clear:both;overflow:auto}.itemContent,.itemContentNarrow{float:left}.itemContentNarrow{width:30%}.itemContent{width:69%}.itemLabel,.itemLabelNarrow,.itemLabelWide,.itemLabelWider,.itemLabelWidest{float:left;color:#e9c183}.itemLabelNarrow{width:20%}.itemLabel{width:30%}.itemLabelWide{width:45%}.itemLabelWider{width:69%}.itemLabelWidest{width:100%}.itemContentWide{float:left;width:79%}.itemContentSmall{float:left;width:33%}.itemContentMedium{float:left;width:55%}.block{padding:8px;margin:10px 4px 4px 4px;border:1px solid #40628a;background-color:#202020}.block h3{padding:0}.clearBoth{clear:both}.clearLeft{clear:left}.clearRight{clear:right}.line{width:100%;clear:both}.fixedLeft{width:110px;float:left}.fixedLeftWide{width:165px;float:left}.fixedLeftWider{width:220px;float:left}.fixedLeftWidest{width:250px;float:left}.floatRight{float:right}.floatLeft{float:left}.hidden{display:none}.statusDisplay{background:#000;background:rgba(0, 0, 0, 0.5);color:#fff;border:1px solid #40628a;padding:4px;margin:3px 0;overflow:hidden}.statusDisplayRecords{background:#000;background:rgba(0, 0, 0, 0.5);color:#fff;border:1px solid #40628a;padding:4px;margin:3px 0;overflow-x:hidden;overflow-y:auto}.statusLabel{width:138px;float:left;overflow:hidden;color:#98b0c3}.statusValue{float:left}.jobValues{float:left;width:30%}.fancy{display:none}i.fancy{display:none}.minimize{color:#e9c183;cursor:pointer!important;z-index:102;position:absolute;top:6px;right:46px}.minimize:hover{color:#b8c9d6}.close{color:#e9c183;cursor:pointer!important;z-index:102;position:absolute;top:4px;right:12px}.close:hover{color:#b8c9d6}#uiCornerTL{position:fixed;z-index:101;min-width:30px;min-height:30px;top:0;left:0;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAIAAAC0Ujn1AAAACXBIWXMAAAsTAAALEwEAmpwYAAAGTGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTExLTIwVDIyOjM4OjI1LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOC0xMS0yMFQyMzowMzowMS0wODowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOC0xMS0yMFQyMzowMzowMS0wODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpkOWRlMzc1Yi04ZWQwLWI3NDctOTQzZS0zN2UwZGU2NDkyODQiIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo0ZmVhZjJmZC03YWVhLWUyNGQtYTNkZS05ZmI5ZGM0ZTA0YzIiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpjZTU4OTk5My1mZDU2LTEzNDktYWMyMC03NGZkZmY5NjNjYTgiPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjcmVhdGVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmNlNTg5OTkzLWZkNTYtMTM0OS1hYzIwLTc0ZmRmZjk2M2NhOCIgc3RFdnQ6d2hlbj0iMjAxOC0xMS0yMFQyMjozODoyNS0wODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjb252ZXJ0ZWQiIHN0RXZ0OnBhcmFtZXRlcnM9ImZyb20gaW1hZ2UvZ2lmIHRvIGltYWdlL3BuZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZDlkZTM3NWItOGVkMC1iNzQ3LTk0M2UtMzdlMGRlNjQ5Mjg0IiBzdEV2dDp3aGVuPSIyMDE4LTExLTIwVDIzOjAzOjAxLTA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+QnRKRAAAAIhJREFUSIm1zLcRgEAMBMCDokQf9B/SBwQwmOeNzGkL2GnHhgSLrHPSC4Bfny+/vl9y/X6ZdfHS6v/LqasvoW690brzhur+66+Hr7PWvJ5a+Zpr/WurTa+htr7a2vGqat87rt3voI68vTr4Nuv4W68pb6VmvWVNfD81931q+nvVGS+ASUQyXgAHuOgYYwOkhIYAAAAASUVORK5CYII=) no-repeat}.resizeArea{position:absolute;z-index:99999}.resizeArea.top{top:0;left:10px;right:10px;height:5px;cursor:n-resize}.resizeArea.tr{top:0;right:0;height:10px;width:10px;cursor:ne-resize}.resizeArea.right{top:10px;right:0;bottom:10px;width:5px;cursor:e-resize}.resizeArea.br{bottom:0;right:0;height:10px;width:10px;cursor:se-resize}.resizeArea.bottom{bottom:0;left:10px;right:10px;height:5px;cursor:s-resize}.resizeArea.bl{bottom:0;left:0;height:10px;width:10px;cursor:sw-resize}.resizeArea.left{top:10px;left:0;bottom:10px;width:5px;cursor:w-resize}.resizeArea.tl{top:0;left:0;height:10px;width:10px;cursor:nw-resize}.uiLinkPendingIcon{display:none;float:left;width:16px;height:16px;margin:2px 2px 0 2px;background-image:url(uiLinkPendingIcon.gif)}.linkPending .fa{display:none}.linkPending .uiLinkPendingIcon{display:block}.mapIcon16{position:absolute;width:16px;height:16px;background-image:url(uiIcons16Green.png);background-position:-144px -96px;background-repeat:no-repeat;zoom:0.125;margin-left:-1px}.mapIcon16.dead{background-image:url(uiIcons16Red.png)}.mapIcon16.bad{background-image:url(uiIcons16Red.png)}.mapIcon16.average{background-image:url(uiIcons16Orange.png)}.mapIcon16.good{background-image:url(uiIcons16Green.png)}.mapIcon16.icon-airalarm{background-position:0 -144px}.mapIcon16.rank-captain{background-position:-224px -112px}.mapIcon16.rank-headofpersonnel{background-position:-112px -96px}.mapIcon16.rank-headofsecurity{background-position:-112px -128px}.mapIcon16.rank-chiefengineer{background-position:-176px -112px}.mapIcon16.rank-researchdirector{background-position:-128px -128px}.mapIcon16.rank-chiefmedicalofficer{background-position:-32px -128px}.mapIcon16.rank-stationengineer{background-position:-176px -112px}.mapIcon16.rank-atmospherictechnician{background-position:-176px -112px}.mapIcon16.rank-medicaldoctor{background-position:-32px -128px}.mapIcon16.rank-geneticist{background-position:-32px -128px}.mapIcon16.rank-psychiatrist{background-position:-32px -128px}.mapIcon16.rank-chemist{background-position:-32px -128px}.mapIcon16.rank-scientist{background-position:-128px -128px}.mapIcon16.rank-geneticist{background-position:-128px -128px}.mapIcon16.rank-roboticist{background-position:-128px -128px}.mapIcon16.rank-xenobiologist{background-position:-128px -128px}.mapIcon16.rank-warden{background-position:-112px -128px}.mapIcon16.rank-detective{background-position:-112px -128px}.mapIcon16.rank-securityofficer{background-position:-112px -128px}ul{padding:4px 0 0 10px;margin:0;list-style-type:none}li{padding:0 0 2px 0}table.fixed{table-layout:fixed}table.fixed td{overflow:hidden}table.pmon{border:2px solid #4169e1}table.pmon td,table.pmon th{border-bottom:1px dotted #000;padding:0 5px 0 5px}th.command{background:#33f;font-weight:bold;color:#fff}th.sec{background:#8e0000;font-weight:bold;color:#fff}th.med{background:#060;font-weight:bold;color:#fff}th.eng{background:#b27300;font-weight:bold;color:#fff}th.sci{background:#a65ba6;font-weight:bold;color:#fff}th.ser{background:#7100aa;font-weight:bold;color:#fff}th.sup{background:#666621;font-weight:bold;color:#fff}th.civ{background:#a32800;font-weight:bold;color:#fff}th.misc{background:#666;font-weight:bold;color:#fff}span.qm-job{color:#b77a41;font-weight:bold}.striped tr:nth-child(even){background-color:#404040}.striped:not(table) > :nth-child(even){background-color:#404040}#uiNoScript{position:fixed;top:50%;left:50%;margin:-60px 0 0 -150px;width:280px;height:120px;background:#fff;border:2px solid red;color:#000;font-size:10px;font-weight:bold;z-index:9999;padding:0 10px;text-align:center}.notice{position:relative;background:url(uiNoticeBackground.jpg) 50% 50%;color:#000;font-size:12px;font-style:italic;font-weight:bold;padding:3px 4px 3px 4px;margin:4px 0 4px 0}.noticePlaceholder{position:relative;font-size:12px;font-style:italic;font-weight:bold;padding:3px 4px 3px 4px;margin:4px 0 4px 0}.notice.icon{padding:2px 4px 0 20px}.notice img{position:absolute;top:0;left:0;width:16px;height:16px}div.notice{clear:both}.wholeScreen{position:absolute;color:#517087;font-size:16px;font-weight:bold;text-align:center}.pdalink{float:left;white-space:nowrap;cursor:default!important}.pdalink.disabled{background:none;border:none;color:#999;text-align:left}.pdanote{color:#cd6500;font-weight:bold}.item.mainmenu{padding-bottom:0.5em}div.clock{color:#fff;font-weight:bold;float:right;padding-right:2em}#pdaFooter{position:fixed;left:0;bottom:0;width:100%;background:#272727}.pdaFooterButton{width:33%;padding:0.5em 0;font-size:200%;border:none;background:none;color:#fff}.pdaFooterButton.hover{background:#507aac}.pdaFooterButton.disabled{background:none!important;color:#555!important}.pdaFooterButton .uiLinkPendingIcon{position:absolute;width:33%;background-repeat:no-repeat;background-position:center}.dnaBlock{float:left;width:90px;padding:0 0 5px 0}.dnaBlockNumber{font-family:Fixed,monospace;float:left;color:#fff;background:#363636;min-width:20px;height:20px;padding:0;text-align:center}.dnaSubBlock{font-family:Fixed,monospace;float:left;padding:0;min-width:16px;height:20px;text-align:center}.mask{position:fixed;left:0;top:0;width:100%;height:100%;background:url(uiMaskBackground.png)}.maskContent{width:100%;height:200px;margin:200px 0;text-align:center}body{color:#fff;font-family:Verdana,Geneva,sans-serif;font-size:12px;line-height:170%;margin:0;padding:0}hr{background-color:#40628a;height:1px;border:none}a img,img{border-style:none}h1,h2,h3,h4,h5,h6{margin:0;padding:12px 0 6px 0;color:#fff;clear:both}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}*[data-tooltip]{position:relative}*[data-tooltip]::after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";opacity:0;white-space:normal;text-align:left;content:attr(data-tooltip);transition:all 0.5s;border:1px solid #999;background-color:#363636}*[data-tooltip]:hover::after{visibility:visible;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";opacity:1}*[data-tooltip].tooltipTop::after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}*[data-tooltip].tooltipTop:hover::after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}*[data-tooltip].tooltipBottom::after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}*[data-tooltip].tooltipBottom:hover::after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}*[data-tooltip].tooltipLeft::after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}*[data-tooltip].tooltipLeft:hover::after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}*[data-tooltip].tooltipRight::after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}*[data-tooltip].tooltipRight:hover::after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}.mainBG{position:fixed;z-index:-1;top:30px;left:0;right:0;bottom:0;background:url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%20standalone%3D%22no%22%3F%3E%0D%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.0%22%20viewBox%3D%220%200%20425%20200%22%20opacity%3D%22.25%22%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20178.00399%2C0.03869%20-71.20393%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76134%2C6.02555%20l%200%2C187.87147%20a%206.7613422%2C6.0255495%200%200%200%206.76134%2C6.02554%20l%2053.1072%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-101.544018%2072.21628%2C104.699398%20a%206.7613422%2C6.0255495%200%200%200%205.76015%2C2.87016%20l%2073.55487%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-187.87147%20a%206.7613422%2C6.0255495%200%200%200%20-6.76135%2C-6.02555%20l%20-54.71644%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76133%2C6.02555%20l%200%2C102.61935%20L%20183.76413%2C2.90886%20a%206.7613422%2C6.0255495%200%200%200%20-5.76014%2C-2.87017%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22M%204.8446333%2C22.10875%20A%2013.412039%2C12.501842%200%200%201%2013.477588%2C0.03924%20l%2066.118315%2C0%20a%205.3648158%2C5.000737%200%200%201%205.364823%2C5.00073%20l%200%2C79.87931%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20420.15535%2C177.89119%20a%2013.412038%2C12.501842%200%200%201%20-8.63295%2C22.06951%20l%20-66.11832%2C0%20a%205.3648152%2C5.000737%200%200%201%20-5.36482%2C-5.00074%20l%200%2C-79.87931%20z%22%20%2F%3E%0D%0A%3C%2Fsvg%3E%0D%0A) no-repeat fixed center/70% 70%,linear-gradient(to bottom, #2a2a2a 0, #202020 100%) no-repeat fixed center/100% 100%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a', endColorstr='#ff202020', GradientType=0)}body,html{scrollbar-face-color:#666;scrollbar-arrow-color:#e9c183;scrollbar-track-color:#363636;scrollbar-shadow-color:#555}#uiWrapper{width:100%;height:100%;-ms-user-select:none;user-select:none}#uiTitleWrapper{position:fixed;min-height:30px;min-width:100%;background-color:#363636;left:0;top:0;right:0;overflow:hidden;z-index:100}#uiTitleWrapper > div{cursor:default}#uiTitleWrapper > i{cursor:default}#uiTitleText{position:absolute;top:6px;left:44px;width:66%;overflow:hidden;color:#e9c183;font-size:16px}#uiTitle.icon{padding:6px 8px 6px 42px;background-position:2px 50%;background-repeat:no-repeat}#uiTitleFluff{position:absolute;top:4px;right:12px;width:42px;height:24px;background:url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%20standalone%3D%22no%22%3F%3E%0D%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.0%22%20viewBox%3D%220%200%20425%20200%22%20opacity%3D%22.25%22%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20178.00399%2C0.03869%20-71.20393%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76134%2C6.02555%20l%200%2C187.87147%20a%206.7613422%2C6.0255495%200%200%200%206.76134%2C6.02554%20l%2053.1072%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-101.544018%2072.21628%2C104.699398%20a%206.7613422%2C6.0255495%200%200%200%205.76015%2C2.87016%20l%2073.55487%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-187.87147%20a%206.7613422%2C6.0255495%200%200%200%20-6.76135%2C-6.02555%20l%20-54.71644%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76133%2C6.02555%20l%200%2C102.61935%20L%20183.76413%2C2.90886%20a%206.7613422%2C6.0255495%200%200%200%20-5.76014%2C-2.87017%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22M%204.8446333%2C22.10875%20A%2013.412039%2C12.501842%200%200%201%2013.477588%2C0.03924%20l%2066.118315%2C0%20a%205.3648158%2C5.000737%200%200%201%205.364823%2C5.00073%20l%200%2C79.87931%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20420.15535%2C177.89119%20a%2013.412038%2C12.501842%200%200%201%20-8.63295%2C22.06951%20l%20-66.11832%2C0%20a%205.3648152%2C5.000737%200%200%201%20-5.36482%2C-5.00074%20l%200%2C-79.87931%20z%22%20%2F%3E%0D%0A%3C%2Fsvg%3E%0D%0A) 50% 50% no-repeat}.statusicon{position:absolute;top:4px;left:12px}#uiMapWrapper{clear:both;padding:8px;margin-top:30px}#uiMapHeader{position:relative;clear:both}#uiMapContainer{position:relative;width:100%;height:600px;overflow:hidden;border:1px solid #40628a;background:url(nanomapBackground.png)}#uiMap{position:absolute;top:50%;left:50%;margin:-512px 0 0 -512px;width:256px;height:256px;overflow:hidden;zoom:4}#uiMapImage{position:absolute;bottom:1px;left:1px;width:256px;height:256px}#uiMapContent{position:absolute;bottom:-13.5px;left:0;width:256px;height:256px}#uiMapFooter{position:relative;clear:both}#uiContent{clear:both;padding:8px;margin-top:30px}#uiMapTooltip{position:absolute;right:10px;top:10px;border:1px solid #40628a;background-color:#272727;padding:8px;display:none;z-index:9999}#uiLoadingNotice{position:relative;background:url(uiNoticeBackground.jpg) 50% 50%;color:#000;font-size:14px;font-style:italic;font-weight:bold;padding:3px 4px 3px 4px;margin:4px 0 4px 0}.underTitle{margin-top:30px} -/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["path.less","screen-reader.less","core.less","larger.less","fixed-width.less","list.less","bordered-pulled.less","animated.less","mixins.less","nanoui.css","rotated-flipped.less","stacked.less","icons.less","_bars.less","_link.less","_color.less","_display.less","_formatting.less","_fancy.less","_icon.less","_lists.less","_misc.less","_native.less","_tooltip.less","<no source>","nanoui.less"],"names":[],"mappings":"iBAGA,WACE,YAAA,cACA,IAAA,qCACA,IAAA,4CAAA,2BAAA,CAAA,uCAAA,eAAA,CAAA,sCAAA,cAAA,CAAA,qCAAA,kBAAA,CAAA,wDAAA,cAMA,YAAA,OACA,WAAA,OCbD,ICIC,QAAA,aACA,KAAA,OAAA,OAAA,OAAA,IAAA,CAAA,EAAA,YACA,UAAA,QACA,eAAA,KACA,uBAAA,YACA,wBAAA,UDTD,OEKC,UAAA,aACA,YAAA,OACA,eAAA,KFPD,OESsB,UAAA,IFTtB,OEUsB,UAAA,IFVtB,OEWsB,UAAA,IFXtB,OEYsB,UAAA,IFZtB,OGGC,MAAA,aACA,WAAA,OHJD,OIIC,aAAA,EACA,YAAA,aACA,gBAAA,KJND,YIOQ,SAAA,SJPR,OIUC,SAAA,SACA,KAAA,cACA,MAAA,aACA,IAAA,aACA,WAAA,OJdD,aIgBG,KAAA,cJhBH,WKIC,QAAA,MAAA,OAAA,OACA,OAAA,MAAA,OAAA,KACA,cAAA,MLND,cKS6B,MAAA,KLT7B,eKU8B,MAAA,MLV9B,iBKagC,aAAA,MLbhC,kBKciC,YAAA,MAIlC,YAAc,MAAA,MACd,WAAa,MAAA,KAGX,cAAc,aAAA,MACd,eAAe,YAAA,MLvBhB,SMKS,UAAA,QAAA,GAAA,SAAA,ONLT,UMUS,UAAA,QAAA,GAAA,SAAA,SAcV,mBACE,GAEU,UAAA,UAEV,KAEU,UAAA,gBN/BX,cOcC,WAAA,2DAEI,cAAA,cACI,UAAA,cPjBT,eOcC,WAAA,2DAEI,cAAA,eACI,UAAA,ePjBT,eOcC,WAAA,2DAEI,cAAA,eACI,UAAA,ePjBT,oBOqBC,WAAA,qEAEI,cAAA,aACI,UAAA,aPxBT,kBOqBC,WAAA,qEAEI,cAAA,aACI,UAAA,aC6GV,0BACA,wBAHA,qBACA,qBRpIC,oBSkBC,OAAA,KTlBD,UUIC,SAAA,SACA,QAAA,aACA,MAAA,IACA,OAAA,IACA,YAAA,IACA,eAAA,OVTD,aQkJD,aEtIE,SAAA,SACA,KAAA,EACA,MAAA,KACA,WAAA,OVfD,aUiB4B,YAAA,QVjB5B,aUkB4B,UAAA,IVlB5B,YUmB2B,MAAA,KVnB3B,iBWGgC,QAAA,QXHhC,iBWIgC,QAAA,QXJhC,kBWKiC,QAAA,QXLjC,sBWMqC,QAAA,QXNrC,iBWOgC,QAAA,QXPhC,gBWQ+B,QAAA,QXR/B,kBWSiC,QAAA,QXTjC,gBWU+B,QAAA,QXV/B,gBWW+B,QAAA,QXX/B,oBWYmC,QAAA,QXZnC,cWa6B,QAAA,QXb7B,mBWckC,QAAA,QXdlC,iBWegC,QAAA,QH4LjC,iBR3MC,kBQ4MD,iBG1LiC,QAAA,QXlBhC,uBWmBsC,QAAA,QXnBtC,wBWoBuC,QAAA,QXpBvC,qBWqBoC,QAAA,QXrBpC,kBWsBiC,QAAA,QHsMlC,eR5NC,gBWwB8B,QAAA,QXxB9B,mBWyBkC,QAAA,QXzBlC,gBW0B+B,QAAA,QX1B/B,kBW2BiC,QAAA,QX3BjC,mBW4BkC,QAAA,QX5BlC,gBW6B+B,QAAA,QX7B/B,oBW8BmC,QAAA,QX9BnC,+BW+B8C,QAAA,QX/B9C,6BWgC4C,QAAA,QXhC5C,iBWiCgC,QAAA,QXjChC,yBWkCwC,QAAA,QH4NzC,kBR9PC,wBWoCiC,QAAA,QXpCjC,mBWqCkC,QAAA,QXrClC,oBWsCmC,QAAA,QXtCnC,gBWuC+B,QAAA,QXvC/B,gBWwC+B,QAAA,QXxC/B,sBWyCqC,QAAA,QXzCrC,sBW0CqC,QAAA,QX1CrC,uBW2CsC,QAAA,QX3CtC,qBW4CoC,QAAA,QX5CpC,kBW6CiC,QAAA,QX7CjC,mBW8CkC,QAAA,QX9ClC,eW+C8B,QAAA,QX/C9B,gBWgD+B,QAAA,QXhD/B,gBWiD+B,QAAA,QXjD/B,oBWkDmC,QAAA,QXlDnC,iBWmDgC,QAAA,QXnDhC,kBWoDiC,QAAA,QXpDjC,gBWqD+B,QAAA,QXrD/B,gBWsD+B,QAAA,QXtD/B,kBWuDiC,QAAA,QXvDjC,uBWwDsC,QAAA,QXxDtC,sBWyDqC,QAAA,QXzDrC,sBW0DqC,QAAA,QX1DrC,wBW2DuC,QAAA,QX3DvC,uBW4DsC,QAAA,QX5DtC,yBW6DwC,QAAA,QX7DxC,gBW8D+B,QAAA,QX9D/B,kBQgVD,mBGhRmC,QAAA,QXhElC,kBWiEiC,QAAA,QXjEjC,wBWkEuC,QAAA,QHwRxC,iBR1VC,iBQ2VD,qBGtRqC,QAAA,QXrEpC,kBWsEiC,QAAA,QXtEjC,sBWuEqC,QAAA,QXvErC,kBWwEiC,QAAA,QXxEjC,gBWyE+B,QAAA,QXzE/B,gBQ2WD,2BGhS2C,QAAA,QX3E1C,0BW4EyC,QAAA,QX5EzC,0BW6EyC,QAAA,QX7EzC,kBW8EiC,QAAA,QX9EjC,yBW+EwC,QAAA,QX/ExC,yBWgFwC,QAAA,QXhFxC,oBWiFmC,QAAA,QXjFnC,gBWkF+B,QAAA,QXlF/B,iBWmFgC,QAAA,QXnFhC,gBWoF+B,QAAA,QXpF/B,mBWqFkC,QAAA,QXrFlC,wBWsFuC,QAAA,QXtFvC,wBWuFuC,QAAA,QXvFvC,iBWwFgC,QAAA,QXxFhC,wBWyFuC,QAAA,QXzFvC,yBW0FwC,QAAA,QX1FxC,uBW2FsC,QAAA,QX3FtC,wBW4FuC,QAAA,QX5FvC,wBW6FuC,QAAA,QX7FvC,wBW8FuC,QAAA,QX9FvC,2BW+F0C,QAAA,QX/F1C,uBWgGsC,QAAA,QXhGtC,sBWiGqC,QAAA,QXjGrC,0BWkGyC,QAAA,QXlGzC,0BWmGyC,QAAA,QXnGzC,eWoG8B,QAAA,QXpG9B,sBWqGqC,QAAA,QXrGrC,uBWsGsC,QAAA,QXtGtC,oBWuGmC,QAAA,QXvGnC,sBWwGqC,QAAA,QXxGrC,wBQscD,iBG5ViC,QAAA,QX1GhC,kBW2GiC,QAAA,QX3GjC,oBW4GmC,QAAA,QX5GnC,gBW6G+B,QAAA,QX7G/B,iBW8GgC,QAAA,QX9GhC,oBW+GmC,QAAA,QX/GnC,8BWgH6C,QAAA,QXhH7C,gBWiH+B,QAAA,QXjH/B,gBWkH+B,QAAA,QXlH/B,gBWmH+B,QAAA,QXnH/B,eWoH8B,QAAA,QXpH9B,qBWqHoC,QAAA,QHsXrC,gCR3eC,mBWuH+C,QAAA,QXvH/C,iBWwHgC,QAAA,QXxHhC,oBWyHmC,QAAA,QXzHnC,kBW0HiC,QAAA,QX1HjC,mBW2HkC,QAAA,QX3HlC,kBW4HiC,QAAA,QX5HjC,sBW6HqC,QAAA,QX7HrC,wBW8HuC,QAAA,QX9HvC,mBW+HkC,QAAA,QX/HlC,yBWgIwC,QAAA,QXhIxC,kBWiIiC,QAAA,QXjIjC,uBWkIsC,QAAA,QXlItC,oBWmImC,QAAA,QXnInC,oBWoImC,QAAA,QXpInC,uBQshBD,qBGhZqC,QAAA,QXtIpC,0BWuIyC,QAAA,QXvIzC,2BWwI0C,QAAA,QXxI1C,wBWyIuC,QAAA,QXzIvC,eW0I8B,QAAA,QH4Z/B,gBRtiBC,iBW4I+B,QAAA,QX5I/B,oBW6ImC,QAAA,QX7InC,uBW8IsC,QAAA,QX9ItC,yBW+IwC,QAAA,QX/IxC,qBWgJoC,QAAA,QXhJpC,mBWiJkC,QAAA,QXjJlC,oBWkJmC,QAAA,QXlJnC,2BWmJ0C,QAAA,QXnJ1C,sBWoJqC,QAAA,QXpJrC,yBWqJwC,QAAA,QXrJxC,mBWsJkC,QAAA,QXtJlC,kBWuJiC,QAAA,QXvJjC,yBWwJwC,QAAA,QXxJxC,kBWyJiC,QAAA,QXzJjC,mBW0JkC,QAAA,QX1JlC,iBW2JgC,QAAA,QX3JhC,oBW4JmC,QAAA,QX5JnC,sBW6JqC,QAAA,QX7JrC,wBW8JuC,QAAA,QX9JvC,mBW+JkC,QAAA,QX/JlC,sBQmmBD,oBGlcoC,QAAA,QXjKnC,kBWkKiC,QAAA,QXlKjC,kBWmKiC,QAAA,QXnKjC,uBWoKsC,QAAA,QXpKtC,gBQgnBD,eG1c+B,QAAA,QXtK9B,iBWuKgC,QAAA,QXvKhC,oBWwKmC,QAAA,QXxKnC,gBWyK+B,QAAA,QXzK/B,uBW0KsC,QAAA,QX1KtC,wBW2KuC,QAAA,QX3KvC,uBW4KsC,QAAA,QX5KtC,qBW6KoC,QAAA,QX7KpC,uBW8KsC,QAAA,QX9KtC,6BW+K4C,QAAA,QX/K5C,8BWgL6C,QAAA,QXhL7C,2BWiL0C,QAAA,QXjL1C,6BWkL4C,QAAA,QXlL5C,iBWmLgC,QAAA,QXnLhC,kBWoLiC,QAAA,QXpLjC,iBWqLgC,QAAA,QXrLhC,kBWsLiC,QAAA,QXtLjC,qBWuLoC,QAAA,QXvLpC,sBWwLqC,QAAA,QXxLrC,iBQ0qBD,iBGhfiC,QAAA,QX1LhC,iBQ8qBD,gBGlfgC,QAAA,QX5L/B,iBW6LgC,QAAA,QX7LhC,iBW8LgC,QAAA,QX9LhC,eQwrBD,oBGxfoC,QAAA,QXhMnC,gBQ4rBD,mBG1fmC,QAAA,QXlMlC,qBWmMoC,QAAA,QHggBrC,oBRnsBC,gBWqMmC,QAAA,QXrMnC,kBWsMiC,QAAA,QHqgBlC,gBR3sBC,mBQ0sBD,mBGjgBgC,QAAA,QXzM/B,mBW0MkC,QAAA,QX1MlC,mBW2MkC,QAAA,QX3MlC,yBW4MwC,QAAA,QX5MxC,qBW6MoC,QAAA,QX7MpC,iBW8MgC,QAAA,QX9MhC,iBW+MgC,QAAA,QX/MhC,iBWgNgC,QAAA,QXhNhC,qBWiNoC,QAAA,QXjNpC,4BWkN2C,QAAA,QXlN3C,8BWmN6C,QAAA,QXnN7C,uBWoNsC,QAAA,QXpNtC,iBWqNgC,QAAA,QXrNhC,sBWsNqC,QAAA,QXtNrC,oBWuNmC,QAAA,QXvNnC,sBWwNqC,QAAA,QXxNrC,uBWyNsC,QAAA,QXzNtC,mBW0NkC,QAAA,QHwiBnC,gBRlwBC,oBW4N+B,QAAA,QH0iBhC,qBRtwBC,qBW8NoC,QAAA,QH4iBrC,oBR1wBC,mBWgOmC,QAAA,QXhOnC,oBWiOmC,QAAA,QXjOnC,oBWkOmC,QAAA,QXlOnC,uBQoxBD,gBGhjBgC,QAAA,QHojBhC,iBRxxBC,iBWsOgC,QAAA,QXtOhC,qBQ4xBD,sBGpjBsC,QAAA,QXxOrC,qBWyOoC,QAAA,QXzOpC,sBW0OqC,QAAA,QH4jBtC,gBRtyBC,iBW4O+B,QAAA,QX5O/B,mBW6OkC,QAAA,QX7OlC,oBW8OmC,QAAA,QHkkBpC,qBRhzBC,iBWgPoC,QAAA,QXhPpC,uBWiPsC,QAAA,QXjPtC,oBWkPmC,QAAA,QXlPnC,0BWmPyC,QAAA,QXnPzC,wBWoPuC,QAAA,QXpPvC,mBWqPkC,QAAA,QXrPlC,uBWsPsC,QAAA,QXtPtC,oBWuPmC,QAAA,QXvPnC,kBWwPiC,QAAA,QXxPjC,kBWyPiC,QAAA,QXzPjC,mBW0PkC,QAAA,QX1PlC,uBW2PsC,QAAA,QX3PtC,sBW4PqC,QAAA,QX5PrC,sBW6PqC,QAAA,QX7PrC,qBW8PoC,QAAA,QX9PpC,kBW+PiC,QAAA,QX/PjC,uBWgQsC,QAAA,QXhQtC,gBWiQ+B,QAAA,QXjQ/B,oBWkQmC,QAAA,QXlQnC,uBWmQsC,QAAA,QXnQtC,6BWoQ4C,QAAA,QXpQ5C,8BWqQ6C,QAAA,QXrQ7C,2BWsQ0C,QAAA,QXtQ1C,6BWuQ4C,QAAA,QXvQ5C,sBWwQqC,QAAA,QXxQrC,uBWyQsC,QAAA,QXzQtC,oBW0QmC,QAAA,QX1QnC,sBW2QqC,QAAA,QX3QrC,mBW4QkC,QAAA,QX5QlC,kBW6QiC,QAAA,QX7QjC,kBW8QiC,QAAA,QX9QjC,wBQ84BD,kBG9nBkC,QAAA,QXhRjC,oBWiRmC,QAAA,QXjRnC,sBWkRqC,QAAA,QXlRrC,uBWmRsC,QAAA,QXnRtC,mBWoRkC,QAAA,QXpRlC,kBWqRiC,QAAA,QXrRjC,sBQi6BD,iBG1oBiC,QAAA,QXvRhC,sBWwRqC,QAAA,QXxRrC,oBWyRmC,QAAA,QXzRnC,yBW0RwC,QAAA,QX1RxC,mBW2RkC,QAAA,QX3RlC,mBW4RkC,QAAA,QX5RlC,iBW6RgC,QAAA,QX7RhC,mBW8RkC,QAAA,QX9RlC,sBW+RqC,QAAA,QX/RrC,kBWgSiC,QAAA,QXhSjC,0BWiSyC,QAAA,QXjSzC,oBWkSmC,QAAA,QXlSnC,gBWmS+B,QAAA,QXnS/B,0BQy8BD,qBGpqBqC,QAAA,QXrSpC,2BQ68BD,0BACA,uBGtqBuC,QAAA,QXxStC,0BWySyC,QAAA,QXzSzC,gBW0S+B,QAAA,QX1S/B,qBW2SoC,QAAA,QHgrBrC,wBR39BC,kBW6SuC,QAAA,QX7SvC,oBW8SmC,QAAA,QX9SnC,gBW+S+B,QAAA,QX/S/B,uBWgTsC,QAAA,QXhTtC,uBWiTsC,QAAA,QXjTtC,qBWkToC,QAAA,QXlTpC,kBWmTiC,QAAA,QXnTjC,wBWoTuC,QAAA,QXpTvC,sBWqTqC,QAAA,QXrTrC,4BWsT2C,QAAA,QXtT3C,kBWuTiC,QAAA,QXvTjC,sBWwTqC,QAAA,QXxTrC,6BWyT4C,QAAA,QXzT5C,kBW0TiC,QAAA,QX1TjC,kBW2TiC,QAAA,QX3TjC,+BW4T8C,QAAA,QX5T9C,gCW6T+C,QAAA,QX7T/C,6BW8T4C,QAAA,QX9T5C,+BW+T8C,QAAA,QX/T9C,iBWgUgC,QAAA,QXhUhC,gBWiU+B,QAAA,QXjU/B,kBWkUiC,QAAA,QXlUjC,sBWmUqC,QAAA,QXnUrC,oBWoUmC,QAAA,QXpUnC,sBWqUqC,QAAA,QXrUrC,sBWsUqC,QAAA,QXtUrC,sBWuUqC,QAAA,QXvUrC,uBWwUsC,QAAA,QXxUtC,kBWyUiC,QAAA,QXzUjC,wBW0UuC,QAAA,QX1UvC,0BW2UyC,QAAA,QX3UzC,oBW4UmC,QAAA,QX5UnC,sBW6UqC,QAAA,QX7UrC,wBW8UuC,QAAA,QX9UvC,yBW+UwC,QAAA,QX/UxC,gCWgV+C,QAAA,QXhV/C,wBWiVuC,QAAA,QXjVvC,mBWkVkC,QAAA,QH4vBnC,+BR9kCC,uBWoV8C,QAAA,QH8vB/C,6BRllCC,qBWsV4C,QAAA,QHgwB7C,gCRtlCC,wBWwV+C,QAAA,QHkwBhD,eR1lCC,gBW0V8B,QAAA,QX1V9B,eW2V8B,QAAA,QX3V9B,kBQimCD,eGpwB+B,QAAA,QHwwB/B,eRrmCC,iBW+V8B,QAAA,QX/V9B,eQ2mCD,eAFA,eACA,eGvwB+B,QAAA,QH4wB/B,kBACA,eRhnCC,iBWsW8B,QAAA,QH8wB/B,eRpnCC,eWwW8B,QAAA,QXxW9B,mBQwnCD,eG9wB+B,QAAA,QX1W9B,gBW2W+B,QAAA,QX3W/B,qBW4WoC,QAAA,QX5WpC,0BW6WyC,QAAA,QX7WzC,2BW8W0C,QAAA,QX9W1C,2BW+W0C,QAAA,QX/W1C,4BWgX2C,QAAA,QXhX3C,4BWiX2C,QAAA,QXjX3C,6BWkX4C,QAAA,QXlX5C,qBWmXoC,QAAA,QXnXpC,uBWoXsC,QAAA,QXpXtC,0BWqXyC,QAAA,QXrXzC,mBWsXkC,QAAA,QXtXlC,gBWuX+B,QAAA,QXvX/B,uBWwXsC,QAAA,QXxXtC,wBWyXuC,QAAA,QXzXvC,mBW0XkC,QAAA,QX1XlC,0BW2XyC,QAAA,QX3XzC,qBW4XoC,QAAA,QX5XpC,kBW6XiC,QAAA,QX7XjC,eW8X8B,QAAA,QX9X9B,qBW+XoC,QAAA,QX/XpC,4BWgY2C,QAAA,QXhY3C,kBWiYiC,QAAA,QXjYjC,yBWkYwC,QAAA,QXlYxC,2BWmY0C,QAAA,QXnY1C,yBWoYwC,QAAA,QXpYxC,2BWqY0C,QAAA,QXrY1C,4BWsY2C,QAAA,QXtY3C,iBWuYgC,QAAA,QXvYhC,mBWwYkC,QAAA,QXxYlC,mBWyYkC,QAAA,QXzYlC,iBW0YgC,QAAA,QX1YhC,oBW2YmC,QAAA,QX3YnC,iBW4YgC,QAAA,QX5YhC,sBW6YqC,QAAA,QX7YrC,kBW8YiC,QAAA,QX9YjC,kBW+YiC,QAAA,QX/YjC,gBWgZ+B,QAAA,QXhZ/B,kBQ8uCD,oBG51BoC,QAAA,QXlZnC,iBWmZgC,QAAA,QXnZhC,kBWoZiC,QAAA,QXpZjC,mBWqZkC,QAAA,QXrZlC,eWsZ8B,QAAA,QXtZ9B,cWuZ6B,QAAA,QXvZ7B,iBWwZgC,QAAA,QXxZhC,kBWyZiC,QAAA,QXzZjC,qBW0ZoC,QAAA,QX1ZpC,0BW2ZyC,QAAA,QX3ZzC,gCW4Z+C,QAAA,QX5Z/C,+BW6Z8C,QAAA,QHs3B/C,+BRnxCC,uBW+Z8C,QAAA,QX/Z9C,wBWgauC,QAAA,QXhavC,sBWiaqC,QAAA,QXjarC,wBWkauC,QAAA,QH83BxC,eRhyCC,wBWoa8B,QAAA,QXpa9B,yBWqawC,QAAA,QXraxC,yBWsawC,QAAA,QXtaxC,iBWuagC,QAAA,QXvahC,2BWwa0C,QAAA,QXxa1C,qBWyaoC,QAAA,QXzapC,kBW0aiC,QAAA,QH44BlC,gBRtzCC,uBQuzCD,sBG14BsC,QAAA,QH84BtC,0BR3zCC,wBW+ayC,QAAA,QX/azC,iBWgbgC,QAAA,QXhbhC,kBWibiC,QAAA,QXjbjC,kBWkbiC,QAAA,QXlbjC,yBWmbwC,QAAA,QXnbxC,8BWob6C,QAAA,QXpb7C,uBWqbsC,QAAA,QXrbtC,qBWsboC,QAAA,QXtbpC,gBWub+B,QAAA,QXvb/B,yBWwbwC,QAAA,QXxbxC,0BWybyC,QAAA,QXzbzC,kBW0biC,QAAA,QX1bjC,kBW2biC,QAAA,QX3bjC,oBW4bmC,QAAA,QX5bnC,eW6b8B,QAAA,QX7b9B,oBW8bmC,QAAA,QX9bnC,iBW+bgC,QAAA,QX/bhC,eWgc8B,QAAA,QXhc9B,iBWicgC,QAAA,QXjchC,gBWkc+B,QAAA,QXlc/B,iBWmcgC,QAAA,QXnchC,mBWockC,QAAA,QXpclC,0BWqcyC,QAAA,QXrczC,iBWscgC,QAAA,QXtchC,wBWucuC,QAAA,QXvcvC,mBWwckC,QAAA,QXxclC,sBQ04CD,eGh8B+B,QAAA,QX1c9B,eQ84CD,gBGl8BgC,QAAA,QX5c/B,gBW6c+B,QAAA,QX7c/B,mBW8ckC,QAAA,QX9clC,sBW+cqC,QAAA,QX/crC,sBWgdqC,QAAA,QXhdrC,oBWidmC,QAAA,QXjdnC,sBWkdqC,QAAA,QXldrC,uBWmdsC,QAAA,QXndtC,wBWoduC,QAAA,QXpdvC,6BWqd4C,QAAA,QHy9B7C,wBR96CC,wBQ66CD,0BGr9BwC,QAAA,QH09BxC,0BRl7CC,sBW0dyC,QAAA,QH49B1C,wBRt7CC,wBW4duC,QAAA,QX5dvC,wBQ07CD,wBG59BwC,QAAA,QX9dvC,uBW+dsC,QAAA,QX/dtC,gBWge+B,QAAA,QXhe/B,mBWiekC,QAAA,QXjelC,oBWkemC,QAAA,QXlenC,qBQ08CD,qBAGA,qBAFA,sBACA,mBGr+BqC,QAAA,QXvepC,0BWweyC,QAAA,QXxezC,cQq9CD,iBADA,sBGz+BiC,QAAA,QH8+BjC,kBRz9CC,cW6eiC,QAAA,QX7ejC,sBW8eqC,QAAA,QX9erC,eW+e8B,QAAA,QHq/B/B,uBRp+CC,+BQm+CD,qBGj/BuC,QAAA,QXlftC,yBWmfwC,QAAA,QXnfxC,cWof6B,QAAA,QXpf7B,kBQ8+CD,kBGx/BkC,QAAA,QH4/BlC,uBRl/CC,gBWwfsC,QAAA,QH8/BvC,yBRt/CC,kBW0fwC,QAAA,QX1fxC,mBW2fkC,QAAA,QX3flC,uBW4fsC,QAAA,QX5ftC,kBW6fiC,QAAA,QX7fjC,qBW8foC,QAAA,QX9fpC,mBW+fkC,QAAA,QX/flC,qBWggBoC,QAAA,QXhgBpC,4BWigB2C,QAAA,QXjgB3C,gBWkgB+B,QAAA,QHghChC,oBRlhDC,yBWogBmC,QAAA,QXpgBnC,eWqgB8B,QAAA,QXrgB9B,sBWsgBqC,QAAA,QXtgBrC,gBWugB+B,QAAA,QXvgB/B,sBWwgBqC,QAAA,QXxgBrC,kBWygBiC,QAAA,QXzgBjC,gBW0gB+B,QAAA,QX1gB/B,uBW2gBsC,QAAA,QX3gBtC,gBW4gB+B,QAAA,QX5gB/B,sBW6gBqC,QAAA,QX7gBrC,kBW8gBiC,QAAA,QX9gBjC,yBW+gBwC,QAAA,QX/gBxC,mBWghBkC,QAAA,QXhhBlC,yBWihBwC,QAAA,QXjhBxC,uBWkhBsC,QAAA,QXlhBtC,mBWmhBkC,QAAA,QXnhBlC,qBWohBoC,QAAA,QXphBpC,qBWqhBoC,QAAA,QXrhBpC,sBWshBqC,QAAA,QXthBrC,wBWuhBuC,QAAA,QXvhBvC,iBWwhBgC,QAAA,QXxhBhC,qBWyhBoC,QAAA,QXzhBpC,cW0hB6B,QAAA,QX1hB7B,sBW2hBqC,QAAA,QX3hBrC,uBW4hBsC,QAAA,QX5hBtC,yBW6hBwC,QAAA,QX7hBxC,sBW8hBqC,QAAA,QX9hBrC,qBW+hBoC,QAAA,QX/hBpC,sBWgiBqC,QAAA,QXhiBrC,kBWiiBiC,QAAA,QXjiBjC,yBWkiBwC,QAAA,QXliBxC,sBWmiBqC,QAAA,QXniBrC,qBWoiBoC,QAAA,QXpiBpC,mBWqiBkC,QAAA,QXriBlC,eWsiB8B,QAAA,QXtiB9B,mBWuiBkC,QAAA,QXviBlC,qBWwiBoC,QAAA,QXxiBpC,cWyiB6B,QAAA,QH6lC9B,eRtoDC,kBQqoDD,kBGzlC+B,QAAA,QX5iB9B,oBW6iBmC,QAAA,QX7iBnC,sBW8iBqC,QAAA,QX9iBrC,0BW+iByC,QAAA,QX/iBzC,oBWgjBmC,QAAA,QXhjBnC,oBWijBmC,QAAA,QXjjBnC,mBWkjBkC,QAAA,QXljBlC,kBWmjBiC,QAAA,QXnjBjC,wBWojBuC,QAAA,QXpjBvC,uBWqjBsC,QAAA,QXrjBtC,oBWsjBmC,QAAA,QXtjBnC,qBWujBoC,QAAA,QXvjBpC,2BWwjB0C,QAAA,QXxjB1C,mBWyjBkC,QAAA,QXzjBlC,gBW0jB+B,QAAA,QX1jB/B,uBW2jBsC,QAAA,QX3jBtC,sBW4jBqC,QAAA,QX5jBrC,uBW6jBsC,QAAA,QX7jBtC,qBW8jBoC,QAAA,QX9jBpC,iBW+jBgC,QAAA,QX/jBhC,gBWgkB+B,QAAA,QXhkB/B,mBWikBkC,QAAA,QXjkBlC,oBQysDD,uBGtoCuC,QAAA,QXnkBtC,2BWokB0C,QAAA,QXpkB1C,wBWqkBuC,QAAA,QXrkBvC,uBWskBsC,QAAA,QXtkBtC,sBWukBqC,QAAA,QXvkBrC,uBWwkBsC,QAAA,QXxkBtC,yBWykBwC,QAAA,QXzkBxC,yBW0kBwC,QAAA,QX1kBxC,kBW2kBiC,QAAA,QX3kBjC,sBW4kBqC,QAAA,QX5kBrC,6BW6kB4C,QAAA,QX7kB5C,uBW8kBsC,QAAA,QX9kBtC,oBW+kBmC,QAAA,QX/kBnC,kBWglBiC,QAAA,QXhlBjC,qBWilBoC,QAAA,QXjlBpC,sBWklBqC,QAAA,QHwqCtC,eR1vDC,iBWolB8B,QAAA,QXplB9B,mBWqlBkC,QAAA,QXrlBlC,iBWslBgC,QAAA,QXtlBhC,kBWulBiC,QAAA,QXvlBjC,kBWwlBiC,QAAA,QHkrClC,wBR1wDC,cW0lBuC,QAAA,QX1lBvC,yBW2lBwC,QAAA,QX3lBxC,oBW4lBmC,QAAA,QX5lBnC,wBW6lBuC,QAAA,QX7lBvC,qBQwxDD,wBADA,mBGvrCwC,QAAA,QXhmBvC,qBQ4xDD,kCG1rCkD,QAAA,QXlmBjD,qBQgyDD,wBG5rCwC,QAAA,QXpmBvC,qBQoyDD,2BG9rC2C,QAAA,QXtmB1C,qBQwyDD,yBGhsCyC,QAAA,QXxmBxC,yBWymBwC,QAAA,QXzmBxC,oBW0mBmC,QAAA,QX1mBnC,wBW2mBuC,QAAA,QX3mBvC,0BW4mByC,QAAA,QX5mBzC,uBW6mBsC,QAAA,QX7mBtC,yBW8mBwC,QAAA,QX9mBxC,kBW+mBiC,QAAA,QX/mBjC,0BWgnByC,QAAA,QXhnBzC,iBWinBgC,QAAA,QXjnBhC,yBWknBwC,QAAA,QXlnBxC,uBWmnBsC,QAAA,QXnnBtC,uBQ60DD,2BGxtC2C,QAAA,QXrnB1C,uBQi1DD,0BG1tC0C,QAAA,QXvnBzC,uBQq1DD,yBG5tCyC,QAAA,QXznBxC,qBW0nBoC,QAAA,QX1nBpC,uBQ41DD,uBGhuCuC,QAAA,QHouCvC,wBRh2DC,uBW8nBuC,QAAA,QX9nBvC,2BW+nB0C,QAAA,QX/nB1C,yBWgoBwC,QAAA,QXhoBxC,wBWioBuC,QAAA,QXjoBvC,0BWkoByC,QAAA,QXloBzC,wBWmoBuC,QAAA,QXnoBvC,qBWooBoC,QAAA,QXpoBpC,sBWqoBqC,QAAA,QXroBrC,4BWsoB2C,QAAA,QXtoB3C,cWuoB6B,QAAA,QXvoB7B,qBWwoBoC,QAAA,QXxoBpC,uBWyoBsC,QAAA,QXzoBtC,yBW0oBwC,QAAA,QX1oBxC,gCW2oB+C,QAAA,QX3oB/C,sBW4oBqC,QAAA,QX5oBrC,uBW6oBsC,QAAA,QX7oBtC,kBW8oBiC,QAAA,QX9oBjC,kBW+oBiC,QAAA,QX/oBjC,mBWgpBkC,QAAA,QXhpBlC,iBWipBgC,QAAA,QXjpBhC,6BWkpB4C,QAAA,QH8wC7C,sBRh6DC,cWopBqC,QAAA,QXppBrC,kBWqpBiC,QAAA,QXrpBjC,iBWspBgC,QAAA,QXtpBhC,kBWupBiC,QAAA,QXvpBjC,2BWwpB0C,QAAA,QXxpB1C,4BWypB2C,QAAA,QXzpB3C,4BW0pB2C,QAAA,QX1pB3C,4BW2pB2C,QAAA,QX3pB3C,oBW4pBmC,QAAA,QX5pBnC,mBW6pBkC,QAAA,QX7pBlC,qBW8pBoC,QAAA,QX9pBpC,iBW+pBgC,QAAA,QX/pBhC,eWgqB8B,QAAA,QXhqB9B,sBWiqBqC,QAAA,QXjqBrC,wBWkqBuC,QAAA,QXlqBvC,iBWmqBgC,QAAA,QXnqBhC,iBWoqBgC,QAAA,QXpqBhC,qBWqqBoC,QAAA,QXrqBpC,qBWsqBoC,QAAA,QXtqBpC,wBWuqBuC,QAAA,QXvqBvC,gBWwqB+B,QAAA,QXxqB/B,2BWyqB0C,QAAA,QXzqB1C,oBW0qBmC,QAAA,QX1qBnC,gBW2qB+B,QAAA,QX3qB/B,wBW4qBuC,QAAA,QX5qBvC,eW6qB8B,QAAA,QX7qB9B,wBW8qBuC,QAAA,QX9qBvC,oBW+qBmC,QAAA,QX/qBnC,kBWgrBiC,QAAA,QXhrBjC,wBWirBuC,QAAA,QXjrBvC,0BWkrByC,QAAA,QXlrBzC,uBWmrBsC,QAAA,QXnrBtC,yBWorBwC,QAAA,QXprBxC,wBWqrBuC,QAAA,QXrrBvC,2BWsrB0C,QAAA,QXtrB1C,mBWurBkC,QAAA,QXvrBlC,qBWwrBoC,QAAA,QXxrBpC,uBWyrBsC,QAAA,QXzrBtC,mBW0rBkC,QAAA,QX1rBlC,kBW2rBiC,QAAA,QX3rBjC,sBW4rBqC,QAAA,QX5rBrC,mBW6rBkC,QAAA,QX7rBlC,kBW8rBiC,QAAA,QX9rBjC,4BW+rB2C,QAAA,QX/rB3C,0BWgsByC,QAAA,QXhsBzC,6BWisB4C,QAAA,QXjsB5C,iBWksBgC,QAAA,QXlsBhC,6BWmsB4C,QAAA,QXnsB5C,gCWosB+C,QAAA,QXpsB/C,mBWqsBkC,QAAA,QXrsBlC,uCWssBsD,QAAA,QHo3CvD,+CR1jEC,4BWwsB8D,QAAA,QHu3C/D,gBR/jEC,oBQ8jED,2BGn3CgC,QAAA,QX3sB/B,iBW4sBgC,QAAA,QX5sBhC,mBW6sBkC,QAAA,QH43CnC,yBRzkEC,mBW+sBwC,QAAA,QX/sBxC,sBWgtBqC,QAAA,QXhtBrC,kBWitBiC,QAAA,QXjtBjC,yBWktBwC,QAAA,QXltBxC,oBWmtBmC,QAAA,QXntBnC,0BWotByC,QAAA,QXptBzC,2BWqtB0C,QAAA,QXrtB1C,sBWstBqC,QAAA,QXttBrC,uBWutBsC,QAAA,QXvtBtC,iBWwtBgC,QAAA,QXxtBhC,qBWytBoC,QAAA,QXztBpC,8BQ2mED,gCGh5CgD,QAAA,QX3tB/C,cQ+mED,wBGl5CwC,QAAA,QX7tBvC,uBW8tBsC,QAAA,QX9tBtC,yBW+tBwC,QAAA,QX/tBxC,2BWguB0C,QAAA,QXhuB1C,kBWiuBiC,QAAA,QXjuBjC,wBWkuBuC,QAAA,QXluBvC,0BWmuByC,QAAA,QHk6C1C,wBRroEC,iBWquBuC,QAAA,QHo6CxC,0BRzoEC,mBWuuByC,QAAA,QXvuBzC,uBWwuBsC,QAAA,QXxuBtC,yBWyuBwC,QAAA,QXzuBxC,kBW0uBiC,QAAA,QX1uBjC,oBW2uBmC,QAAA,QX3uBnC,2BQypED,mBG56CmC,QAAA,QX7uBlC,6BQ6pED,qBG96CqC,QAAA,QX/uBpC,iBWgvBgC,QAAA,QXhvBhC,0BWivByC,QAAA,QXjvBzC,oBWkvBmC,QAAA,QXlvBnC,yBQ2qED,4BADA,uBGr7C4C,QAAA,QXrvB3C,yBQ+qED,sCGx7CsD,QAAA,QXvvBrD,yBQmrED,4BG17C4C,QAAA,QXzvB3C,yBQurED,+BG57C+C,QAAA,QX3vB9C,yBQ2rED,6BG97C6C,QAAA,QX7vB5C,kBW8vBiC,QAAA,QHq8ClC,gBRnsEC,mBQksED,eGj8CgC,QAAA,QXjwB/B,mBWk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","file":"nanoui.css","sourcesContent":[null,null,null,null,null,null,null,null,null,null,null,null,null,".displayBar {\r\n    position: relative;\r\n    width: 236px;\r\n    height: 16px;\r\n    border: 1px solid #666666;\r\n    float: left;\r\n    margin: 0 5px 0 0;\r\n    overflow: hidden;\r\n    background: #000000;\r\n}\r\n\r\n.displayBarText {\r\n    position: absolute;\r\n    top: -2px;\r\n    left: 5px;\r\n    width: 100%;\r\n    height: 100%;\r\n    color: #ffffff;\r\n    font-weight: normal;\r\n}\r\n\r\n.displayBarFill {\r\n    width: 0%;\r\n    height: 100%;\r\n    background: #40628a;\r\n    overflow: hidden;\r\n    float: left;\r\n}\r\n\r\n.displayBarFill.alignRight {\r\n    float: right;\r\n}\r\n\r\n.displayBarText.good {\r\n\tcolor: white;\r\n}\r\n\r\n.displayBarText.notgood {\r\n\tcolor: white;\r\n}\r\n\r\n.displayBarText.average {\r\n\tcolor: white;\r\n}\r\n\r\n.displayBarText.bad {\r\n\tcolor: white;\r\n}\r\n\r\n.displayBarText.highlight {\r\n\tcolor: black;\r\n}\r\n\r\n.displayBarFill.good {\r\n    color: #ffffff;\r\n    background: @good-color;\r\n}\r\n\r\n.displayBarFill.notgood {\r\n    color: #ffffff;\r\n    background: #ffb400;\r\n}\r\n\r\n.displayBarFill.average {\r\n    color: #ffffff;\r\n    background: @average-color;\r\n}\r\n\r\n.displayBarFill.bad {\r\n    color: #ffffff;\r\n    background: @bad-color;\r\n}\r\n\r\n.displayBarFill.highlight {\r\n    color: #ffffff;\r\n    background: @highlight-color;\r\n}\r\n",".link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton {\r\n    float: left;\r\n    min-width: 15px;\r\n    height: 16px;\r\n    text-align: center;\r\n    color: #ffffff;\r\n    text-decoration: none;\r\n    background: #40628a;\r\n    border: 1px solid #161616;\r\n    padding: 0px 4px 4px 4px;\r\n    margin: 0 2px 2px 0;\r\n    cursor: default;\r\n    white-space: nowrap;\r\n}\r\n\r\n.hasIcon {\r\n    padding: 0px 4px 4px 0px;\r\n}\r\n\r\na.hover, .zoomLink.hover, .linkActive.hover {\r\n    background: #507aac;\r\n}\r\n\r\n@keyframes pendingAnimation {\r\n    to {\r\n        color: #ffffff;\r\n        background: #507aac;\r\n    }\r\n}\r\n\r\n.linkPending, .linkPending.hover {\r\n    animation-name: pendingAnimation;\r\n    animation-duration: 0.25s;\r\n}\r\n\r\na.white, a.white:link, a.white:visited, a.white:active {\r\n    color: #40628a;\r\n    text-decoration: none;\r\n    background: #ffffff;\r\n    border: 1px solid #161616;\r\n    padding: 1px 4px 1px 4px;\r\n    margin: 0 2px 0 0;\r\n    cursor: default;\r\n}\r\n\r\na.white.hover {\r\n    color: #ffffff;\r\n    background: #40628a;\r\n}\r\n\r\n.linkOn, a.linkOn:link, a.linkOn:visited, a.linkOn:active, a.linkOn.hover, .selected, a.selected:link, a.selected:visited, a.selected:active, a.selected.hover {\r\n    color: #ffffff;\r\n    background: #2f943c;\r\n}\r\n\r\n.linkOff, a.linkOff:link, a.linkOff:visited, a.linkOff:active, a.linkOff.hover, .disabled, a.disabled:link, a.disabled:visited, a.disabled:active, a.disabled.hover {\r\n    color: #ffffff;\r\n    background: #999999;\r\n    border-color: #666666;\r\n}\r\n\r\na.icon, .linkOn.icon, .linkOff.icon, .selected.icon, .disabled.icon {\r\n    position: relative;\r\n    padding: 1px 4px 2px 20px;\r\n}\r\n\r\na.icon img, .linkOn.icon img, .linkOff.icon img, .selected.icon img, .disabled.icon img {\r\n    position: absolute;\r\n    top: 0;\r\n    left: 0;\r\n    width: 18px;\r\n    height: 18px;\r\n}\r\n\r\n.linkDanger, a.linkDanger:link, a.linkDanger:visited, a.linkDanger:active {\r\n    color: #ffffff;\r\n    background-color: #ff0000;\r\n    border-color: #aa0000;\r\n}\r\n\r\n.linkDanger.hover {\r\n    background-color: #ff6666;\r\n}\r\n\r\n.inactive, a.inactive:link, a.inactive:visited, a.inactive:active, a.inactive.hover {\r\n    color: #ffffff;\r\n    background: #999999;\r\n    border-color: #666666;\r\n}","@import \"_config\";\r\n\r\n.white {\r\n    color: white;\r\n    font-weight: bold;\r\n}\r\n\r\n.good {\r\n    color: @good-color;\r\n    font-weight: bold;\r\n}\r\n\r\n.average {\r\n    color: @average-color;\r\n    font-weight: bold;\r\n}\r\n\r\n.bad {\r\n    color: @bad-color;\r\n    font-weight: bold;\r\n}\r\n\r\n.idle {\r\n    color: @dark-color;\r\n    font-weight: bold;\r\n}\r\n\r\n.redButton {\r\n    background: #ea0000;\r\n}\r\n\r\n.yellowButton {\r\n    background: #cacc00;\r\n}\r\n\r\n.highlight {\r\n    color: @highlight-color;\r\n}\r\n\r\n.dark {\r\n    color: @dark-color;\r\n}\r\n\r\n/* Damage colors for crew monitoring computer */\r\n.burn {\r\n    color: orange;\r\n}\r\n\r\n.brute {\r\n    color: red;\r\n}\r\n\r\n.toxin {\r\n    color: green;\r\n}\r\n\r\n.toxin_light {\r\n    color: #3ADF00;\r\n}\r\n\r\n.oxyloss {\r\n    color: blue;\r\n}\r\n\r\n.oxyloss_light {\r\n    color: #6698FF;\r\n}\r\n\r\n/* Wire colors for nuclear bomb defusion */\r\n.Red {\r\n    color: #FF0000;\r\n}\r\n\r\n.Blue {\r\n    color: #0000FF;\r\n}\r\n\r\n.Green {\r\n    color: #00FF00;\r\n}\r\n\r\n.Marigold {\r\n    color: #FDA505;\r\n}\r\n\r\n.Fuschia {\r\n    color: #FF0080;\r\n}\r\n\r\n.Black {\r\n    color: #000000;\r\n}\r\n\r\n.Pearl {\r\n    color: #C6CACB;\r\n}\r\n\r\n/* Status bar colors for sleeper temperatures */\r\n.cold1 {\r\n    color: #94B8FF;\r\n}\r\n\r\n.cold2 {\r\n    color: #6699FF;\r\n}\r\n\r\n.cold3 {\r\n    color: #293D66;\r\n}\r\n\r\n.hot1 {\r\n    color: #FF9966;\r\n}\r\n\r\n.hot2 {\r\n    color: #993D00;\r\n}\r\n\r\n.hot3 {\r\n    color: #FF6600;\r\n}","div.display {\r\n\tpadding: 4px;\r\n\tmargin: 6px 0;\r\n\r\n\tbackground-color: rgba(0, 0, 0, 0.33);\r\n\tbox-shadow: inset 0 0 5px rgba(0, 0, 0, 0.5);\r\n}\r\n\r\ndiv.display header {\r\n    display: block;\r\n    position: relative;\r\n\twidth: 98.5%;\r\n    padding: 0 4px;\r\n    margin-bottom: 6px;\r\n    color: #FFFFFF;\r\n    border-bottom: 2px solid #40628a;\r\n}\r\n\r\ndiv.display header .buttonRight {\r\n    position: absolute;\r\n    bottom: 6px;\r\n    right: 4px;\r\n}\r\n\r\ndiv.display article {\r\n    display: table;\r\n    width: 100%;\r\n    border-collapse: collapse;\r\n}",".itemGroup {\r\n    border: 1px solid #e9c183;\r\n    background: #2c2c2c;\r\n    padding: 4px;\r\n    clear: both;\r\n}\r\n\r\n\r\n.item {\r\n    width: 100%;\r\n    margin: 4px 0 0 0;\r\n    clear: both;\r\n    overflow: auto;\r\n}\r\n\r\n.itemContentNarrow, .itemContent {\r\n    float: left;\r\n}\r\n\r\n.itemContentNarrow {\r\n    width: 30%;\r\n}\r\n\r\n.itemContent {\r\n    width: 69%;\r\n}\r\n\r\n.itemLabelNarrow, .itemLabel, .itemLabelWide, .itemLabelWider, .itemLabelWidest {\r\n    float: left;\r\n    color: #e9c183;\r\n}\r\n\r\n.itemLabelNarrow {\r\n    width: 20%;\r\n}\r\n\r\n.itemLabel {\r\n    width: 30%;\r\n}\r\n\r\n.itemLabelWide {\r\n    width: 45%;\r\n}\r\n\r\n.itemLabelWider {\r\n    width: 69%;\r\n}\r\n\r\n.itemLabelWidest {\r\n    width: 100%;\r\n}\r\n\r\n.itemContentWide {\r\n    float: left;\r\n    width: 79%;\r\n}\r\n\r\n.itemContentSmall {\r\n    float: left;\r\n    width: 33%;\r\n}\r\n\r\n.itemContentMedium {\r\n    float: left;\r\n    width: 55%;\r\n}\r\n\r\n.block {\r\n    padding: 8px;\r\n    margin: 10px 4px 4px 4px;\r\n    border: 1px solid #40628a;\r\n    background-color: #202020;\r\n}\r\n\r\n.block h3 {\r\n    padding: 0;\r\n}\r\n\r\n.clearBoth {\r\n    clear: both;\r\n}\r\n\r\n.clearLeft {\r\n    clear: left;\r\n}\r\n\r\n.clearRight {\r\n    clear: right;\r\n}\r\n\r\n.line {\r\n    width: 100%;\r\n    clear: both;\r\n}\r\n\r\n.fixedLeft {\r\n    width: 110px;\r\n    float: left;\r\n}\r\n\r\n.fixedLeftWide {\r\n    width: 165px;\r\n    float: left;\r\n}\r\n\r\n.fixedLeftWider {\r\n    width: 220px;\r\n    float: left;\r\n}\r\n\r\n.fixedLeftWidest {\r\n    width: 250px;\r\n    float: left;\r\n}\r\n\r\n.floatRight {\r\n    float: right;\r\n}\r\n\r\n.floatLeft {\r\n    float: left;\r\n}\r\n\r\n.hidden {\r\n    display: none;\r\n}\r\n\r\n\r\n.statusDisplay {\r\n    background: rgba(0, 0, 0, 0.5);\r\n    color: #ffffff;\r\n    border: 1px solid #40628a;\r\n    padding: 4px;\r\n    margin: 3px 0;\r\n    overflow: hidden;\r\n}\r\n\r\n.statusDisplayRecords {\r\n    background: rgba(0, 0, 0, 0.5);\r\n    color: #ffffff;\r\n    border: 1px solid #40628a;\r\n    padding: 4px;\r\n    margin: 3px 0;\r\n    overflow-x: hidden;\r\n    overflow-y: auto;\r\n}\r\n\r\n.statusLabel {\r\n    width: 138px;\r\n    float: left;\r\n    overflow: hidden;\r\n    color: #98B0C3;\r\n}\r\n\r\n.statusValue {\r\n    float: left;\r\n}\r\n\r\n.jobValues {\r\n\tfloat: left;\r\n\twidth: 30%;\r\n}\r\n\r\n// CHROMELESS STUFF\r\n\r\n.fancy {\r\n    display: none;\r\n}\r\n\r\ni.fancy {\r\n    display: none;\r\n}\r\n\r\n.titlebutton() {\r\n    color: #E9C183;\r\n    // Since we're on some hilariously outdated libraries, the below is an issue\r\n    // https://github.com/FortAwesome/Font-Awesome/issues/1274\r\n    // Using the !important directive is necessary to override the FA styles\r\n    cursor: pointer !important; \r\n    z-index: 102; // This is for the corners - makes sure the buttons render on top\r\n\r\n    &:hover {\r\n        color: lighten(#98b0c3, 10%);\r\n    }\r\n}\r\n.minimize {\r\n    .titlebutton;\r\n    position: absolute;\r\n    top: 6px;\r\n    right: 46px;\r\n}\r\n.close {\r\n    .titlebutton;\r\n    position: absolute;\r\n    top: 4px;\r\n    right: 12px;\r\n}",".corner() {\r\n    position: fixed;\r\n    z-index: 101;\r\n    min-width: 30px;\r\n    min-height: 30px;\r\n}\r\n\r\n#uiCornerTL {\r\n    .corner;\r\n    top: 0;\r\n    left: 0;\r\n    background: data-uri('tl.png') no-repeat;\r\n}\r\n\r\n/* Resizing (Stolen from Goon CC-BY-NC-SA) */\r\n@resize: 5px;\r\n.resizeArea {\r\n    position: absolute;\r\n    z-index: 99999;\r\n}\r\n.resizeArea.top {\r\n    top: 0;\r\n    left: 10px;\r\n    right: 10px;\r\n    height: @resize;\r\n    cursor: n-resize;\r\n}\r\n.resizeArea.tr {\r\n    top: 0;\r\n    right: 0;\r\n    height: 10px;\r\n    width: 10px;\r\n    cursor: ne-resize;\r\n}\r\n.resizeArea.right {\r\n    top: 10px;\r\n    right: 0;\r\n    bottom: 10px;\r\n    width: @resize;\r\n    cursor: e-resize;\r\n}\r\n.resizeArea.br {\r\n    bottom: 0;\r\n    right: 0;\r\n    height: 10px;\r\n    width: 10px;\r\n    cursor: se-resize;\r\n}\r\n.resizeArea.bottom {\r\n    bottom: 0;\r\n    left: 10px;\r\n    right: 10px;\r\n    height: @resize;\r\n    cursor: s-resize;\r\n}\r\n.resizeArea.bl {\r\n    bottom: 0;\r\n    left: 0;\r\n    height: 10px;\r\n    width: 10px;\r\n    cursor: sw-resize;\r\n}\r\n.resizeArea.left {\r\n    top: 10px;\r\n    left: 0;\r\n    bottom: 10px;\r\n    width: @resize;\r\n    cursor: w-resize;\r\n}\r\n.resizeArea.tl {\r\n    top: 0;\r\n    left: 0;\r\n    height: 10px;\r\n    width: 10px;\r\n    cursor: nw-resize;\r\n}\r\n/* End Resizing */","/* Icons\r\n----------------------------------*/\r\n\r\n/* states and images */\r\n.uiLinkPendingIcon {\r\n    display: none;\r\n    float: left;\r\n    width: 16px;\r\n    height: 16px;\r\n    margin: 2px 2px 0 2px;\r\n    background-image: url(uiLinkPendingIcon.gif);\r\n}\r\n\r\n.linkPending .fa {\r\n    display: none;\r\n}\r\n\r\n.linkPending .uiLinkPendingIcon {\r\n    display: block;\r\n}\r\n\r\n.mapIcon16 {\r\n    position: absolute;\r\n    width: 16px;\r\n    height: 16px;\r\n    background-image: url(uiIcons16Green.png);\r\n    background-position: -144px -96px;\r\n    background-repeat: no-repeat;\r\n    zoom: 0.125;\r\n    margin-left: -1px;\r\n    /*margin-bottom: -1px;*/\r\n}\r\n.mapIcon16.dead                       { background-image: url(uiIcons16Red.png);    }\r\n.mapIcon16.bad                        { background-image: url(uiIcons16Red.png);    }\r\n.mapIcon16.average                    { background-image: url(uiIcons16Orange.png); }\r\n.mapIcon16.good                       { background-image: url(uiIcons16Green.png);  }\r\n/* AirAlarm */\r\n.mapIcon16.icon-airalarm              { background-position: 0 -144px;              } \r\n/* Command Positions */\r\n.mapIcon16.rank-captain               { background-position: -224px -112px;         } \r\n.mapIcon16.rank-headofpersonnel       { background-position: -112px -96px;          }\r\n.mapIcon16.rank-headofsecurity        { background-position: -112px -128px;         }\r\n.mapIcon16.rank-chiefengineer         { background-position: -176px -112px;         }\r\n.mapIcon16.rank-researchdirector      { background-position: -128px -128px;         }\r\n.mapIcon16.rank-chiefmedicalofficer   { background-position: -32px -128px;          }\r\n/* Engineering Positions */\r\n.mapIcon16.rank-stationengineer       { background-position: -176px -112px;         } \r\n.mapIcon16.rank-atmospherictechnician { background-position: -176px -112px;         }\r\n/* Medical Positions */\r\n.mapIcon16.rank-medicaldoctor         {background-position: -32px -128px;           } \r\n.mapIcon16.rank-geneticist            {background-position: -32px -128px;           }\r\n.mapIcon16.rank-psychiatrist          {background-position: -32px -128px;           }\r\n.mapIcon16.rank-chemist               { background-position: -32px -128px;          }\r\n/* Science Positions */\r\n.mapIcon16.rank-scientist             { background-position: -128px -128px;         } \r\n.mapIcon16.rank-geneticist            { background-position: -128px -128px;         }\r\n.mapIcon16.rank-roboticist            { background-position: -128px -128px;         }\r\n.mapIcon16.rank-xenobiologist         { background-position: -128px -128px;         }\r\n/* Security Positions */\r\n.mapIcon16.rank-warden                { background-position: -112px -128px;         }\r\n.mapIcon16.rank-detective             { background-position: -112px -128px;         }\r\n.mapIcon16.rank-securityofficer       { background-position: -112px -128px;         }","ul {\r\n    padding: 4px 0 0 10px;\r\n    margin: 0;\r\n    list-style-type: none;\r\n}\r\n\r\nli {\r\n    padding: 0 0 2px 0;\r\n}\r\n\r\ntable.fixed {\r\n    table-layout:fixed;\r\n}\r\n\r\ntable.fixed td {\r\n    overflow: hidden;\r\n}\r\n\r\n/* Table styling for the power monitor */\r\ntable.pmon {\r\n    border: 2px solid RoyalBlue;\r\n}\r\n\r\ntable.pmon td, table.pmon th {\r\n    border-bottom: 1px dotted black;\r\n    padding: 0px 5px 0px 5px;\r\n}\r\n\r\n/* Table styling for the crew manifest */\r\n.manifest-header(@color: #666) {\r\n\tbackground: @color;\r\n    font-weight: bold;\r\n    color: #ffffff;\r\n}\r\n\r\nth.command {\r\n\t.manifest-header(#3333FF);\r\n}\r\n\r\nth.sec {\r\n\t.manifest-header(#8e0000);\r\n}\r\n\r\nth.med {\r\n\t.manifest-header(#006600);\r\n}\r\n\r\nth.eng {\r\n\t.manifest-header(#b27300);\r\n}\r\n\r\nth.sci {\r\n\t.manifest-header(#a65ba6);\r\n}\r\n\r\nth.ser {\r\n\t.manifest-header(#7100AA);\r\n}\r\n\r\nth.sup {\r\n\t.manifest-header(#666621);\r\n}\r\n\r\nth.civ {\r\n\t.manifest-header(#a32800);\r\n}\r\n\r\nth.misc {\r\n\t.manifest-header;\r\n}\r\n\r\nspan.qm-job {\r\n\tcolor: mix(@highlight-color, @average-color, 33%);\r\n    font-weight: bold;\r\n}\r\n\r\n/* Striped lines for tables and divs */\r\n.striped {\r\n    .striped-base() {\r\n        background-color: #404040;\r\n    }\r\n    tr:nth-child(even) {\r\n        .striped-base;\r\n    }\r\n    &:not(table) > :nth-child(even) {\r\n        .striped-base;\r\n    }\r\n}","#uiNoScript {\r\n    position: fixed;\r\n    top: 50%;\r\n    left: 50%;\r\n    margin: -60px 0 0 -150px;\r\n    width: 280px;\r\n    height: 120px;\r\n    background: #ffffff;\r\n    border: 2px solid #ff0000;\r\n    color: #000000;\r\n    font-size: 10px;\r\n    font-weight: bold;\r\n    z-index: 9999;\r\n    padding: 0px 10px;\r\n    text-align: center;\r\n}\r\n\r\n/**********************************\r\n     .notice | Caution Stripes\r\n**********************************/\r\n.notice {\r\n    position: relative;\r\n    background: url(uiNoticeBackground.jpg) 50% 50%;\r\n    color: #000000;\r\n    font-size: 12px;\r\n    font-style: italic;\r\n    font-weight: bold;\r\n    padding: 3px 4px 3px 4px;\r\n    margin: 4px 0 4px 0;\r\n}\r\n\r\n.noticePlaceholder {\r\n    position: relative;\r\n    font-size: 12px;\r\n    font-style: italic;\r\n    font-weight: bold;\r\n    padding: 3px 4px 3px 4px;\r\n    margin: 4px 0 4px 0;\r\n}\r\n\r\n.notice.icon {\r\n    padding: 2px 4px 0 20px;\r\n}\r\n\r\n.notice img {\r\n    position: absolute;\r\n    top: 0;\r\n    left: 0;\r\n    width: 16px;\r\n    height: 16px;\r\n}\r\n\r\ndiv.notice {\r\n    clear: both;\r\n}\r\n/********************\\\r\n\\********************/\r\n\r\n\r\n/**********************************\r\n    PDA, DNA Modifier styles\r\n    Don't fit anywhere else.\r\n**********************************/\r\n\r\n/* PDA styling */\r\n.wholeScreen {\r\n    position: absolute;\r\n    color: #517087;\r\n    font-size: 16px;\r\n    font-weight: bold;\r\n    text-align: center;\r\n}\r\n\r\n.pdalink {\r\n    float: left;\r\n    white-space: nowrap;\r\n    cursor: default !important;\r\n\r\n\t&.disabled {\r\n\t\tbackground: none;\r\n\t\tborder: none;\r\n\t\tcolor: #999;\r\n\t\ttext-align: left;\r\n\t}\r\n}\r\n\r\n.pdanote {\r\n    color: #cd6500;\r\n    font-weight: bold;\r\n}\r\n\r\n.item.mainmenu {\r\n\tpadding-bottom: 0.5em;\r\n}\r\n\r\ndiv.clock {\r\n\tcolor: white;\r\n\tfont-weight: bold;\r\n\tfloat: right;\r\n\tpadding-right: 2em;\r\n}\r\n\r\n#pdaFooter {\r\n\tposition: fixed;\r\n\tleft: 0;\r\n\tbottom: 0;\r\n\twidth: 100%;\r\n\tbackground: @dark-color;\r\n}\r\n\r\n.pdaFooterButton {\r\n\twidth: 33%;\r\n\tpadding: 0.5em 0;\r\n\tfont-size: 200%;\r\n\tborder: none;\r\n\tbackground: none;\r\n\tcolor: #fff;\r\n\r\n\t&.hover {\r\n\t\tbackground: #507aac;\r\n\t}\r\n\r\n\t&.disabled {\r\n\t\tbackground: none !important;\r\n\t\tcolor: #555 !important;\r\n\t}\r\n\r\n\t.uiLinkPendingIcon {\r\n\t\tposition: absolute;\r\n\t\twidth: 33%;\r\n\t\tbackground-repeat: no-repeat;\r\n\t\tbackground-position: center;\r\n\t}\r\n}\r\n\r\n/* DNA Modifier styling */\r\n.dnaBlock {\r\n    float: left;\r\n    width: 90px;\r\n    padding: 0 0 5px 0;\r\n}\r\n\r\n.dnaBlockNumber {\r\n    font-family: Fixed, monospace;\r\n    float: left;\r\n    color: #ffffff;\r\n    background: #363636;\r\n    min-width: 20px;\r\n    height: 20px;\r\n    padding: 0;\r\n    text-align: center;\r\n}\r\n\r\n.dnaSubBlock {\r\n    font-family: Fixed, monospace;\r\n    float: left;\r\n    padding: 0;\r\n    min-width: 16px;\r\n    height: 20px;\r\n    text-align: center;\r\n}\r\n\r\n.mask {\r\n    position: fixed;\r\n    left: 0;\r\n    top: 0;\r\n    width: 100%;\r\n    height: 100%;\r\n    background: url(uiMaskBackground.png);\r\n}\r\n\r\n.maskContent {\r\n    width: 100%;\r\n    height: 200px;\r\n    margin: 200px 0;\r\n    text-align: center;\r\n}\r\n/********************\\\r\n\\********************/","@import \"_config\";\r\n\r\nbody {\r\n    color: #ffffff;\r\n    font-family: @font;\r\n    font-size: @fontsize;\r\n    line-height: 170%;\r\n    margin: 0;\r\n    padding: 0;\r\n}\r\n\r\nhr {\r\n    background-color: #40628a;\r\n    height: 1px;\r\n    border: none;\r\n}\r\n\r\nimg, a img {\r\n    border-style: none;\r\n}\r\n\r\nh1, h2, h3, h4, h5, h6 {\r\n    margin: 0;\r\n    padding: 12px 0 6px 0;\r\n    color: #FFFFFF;\r\n    clear: both;\r\n}\r\n\r\nh1 {\r\n    font-size: 18px;\r\n}\r\n\r\nh2 {\r\n    font-size: 16px;\r\n}\r\n\r\nh3 {\r\n    font-size: 14px;\r\n}\r\n\r\nh4 {\r\n    font-size: 12px;\r\n}","*[data-tooltip] {\r\n  position: relative;\r\n\r\n  &::after {\r\n    position: absolute;\r\n    display: block;\r\n    z-index: 2;\r\n    width: 250px;\r\n    padding: 10px;\r\n    transform: translateX(-50%);\r\n\r\n    visibility: hidden;\r\n    opacity: 0;\r\n\r\n    white-space: normal;\r\n    text-align: left;\r\n    content: attr(data-tooltip);\r\n\r\n    transition: all .5s;\r\n    border: 1px solid #999999;\r\n    background-color: #363636;\r\n  }\r\n\r\n  &:hover::after {\r\n    visibility: visible;\r\n    opacity: 1;\r\n  }\r\n\r\n  &.tooltipTop::after {\r\n    bottom: 100%;\r\n    left: 50%;\r\n    transform: translateX(-50%) translateY(8px);\r\n  }\r\n  &.tooltipTop:hover::after {\r\n    transform: translateX(-50%) translateY(-8px);\r\n  }\r\n\r\n  &.tooltipBottom::after {\r\n    top: 100%;\r\n    left: 50%;\r\n    transform: translateX(-50%) translateY(-8px);\r\n  }\r\n  &.tooltipBottom:hover::after {\r\n    transform: translateX(-50%) translateY(8px);\r\n  }\r\n\r\n  &.tooltipLeft::after {\r\n    top: 50%;\r\n    right: 100%;\r\n    transform: translateX(8px) translateY(-50%);\r\n  }\r\n  &.tooltipLeft:hover::after {\r\n    transform: translateX(-8px) translateY(-50%);\r\n  }\r\n\r\n  &.tooltipRight::after {\r\n    top: 50%;\r\n    left: 100%;\r\n    transform: translateX(-8px) translateY(-50%);\r\n  }\r\n  &.tooltipRight:hover::after {\r\n    transform: translateX(8px) translateY(-50%);\r\n  }\r\n}",null,"@charset \"utf-8\";\r\n\r\n@import \"_bars\";\r\n@import \"_link\";\r\n@import \"_color\";\r\n@import \"_config\";\r\n@import \"_display\";\r\n@import \"_formatting\";\r\n@import \"_fancy\";\r\n@import \"_icon\";\r\n@import \"_lists\";\r\n@import \"_misc\";\r\n@import \"_native\";\r\n@import \"_tooltip\";\r\n\r\n\r\n.mainBG {\r\n    position: fixed;\r\n    z-index: -1;\r\n    top: 30px;\r\n    left: 0px;\r\n    right: 0px;\r\n    bottom: 0px;\r\n    background: data-uri('nanotrasen.svg') no-repeat fixed center/70% 70%,\r\n        linear-gradient(to bottom,\r\n        @background-start 0%,\r\n        @background-end 100%) no-repeat fixed center/100% 100%;\r\n}\r\n\r\n//nano scrollbar styling\r\nhtml,body {\r\n    scrollbar-face-color:#666666;\r\n    scrollbar-arrow-color:#E9C183;\r\n    scrollbar-track-color:#363636;\r\n    scrollbar-shadow-color:#555555;    \r\n}\r\n\r\n#uiWrapper {\r\n    width: 100%;\r\n    height: 100%;\r\n    -ms-user-select: none;\r\n    user-select: none;\r\n}\r\n\r\n#uiTitleWrapper {\r\n    position: fixed;\r\n    min-height: 30px;\r\n    min-width: 100%; \r\n    background-color: #363636;\r\n    left: 0px;\r\n    top: 0px;\r\n    right: 0px;\r\n    overflow: hidden;\r\n    z-index: 100;\r\n    & > div {\r\n        cursor: default;\r\n    }\r\n    & > i {\r\n        cursor: default;\r\n    }\r\n}\r\n\r\n#uiTitleText {\r\n    position: absolute;\r\n    top: 6px;\r\n    left: 44px;\r\n    width: 66%;\r\n    overflow: hidden;\r\n    color: #E9C183;\r\n    font-size: 16px;\r\n}\r\n\r\n#uiTitle.icon {\r\n    padding: 6px 8px 6px 42px;\r\n    background-position: 2px 50%;\r\n    background-repeat: no-repeat;\r\n}\r\n\r\n#uiTitleFluff {\r\n    position: absolute;\r\n    top: 4px;\r\n    right: 12px;\r\n    width: 42px;\r\n    height: 24px;\r\n    background: data-uri('nanotrasen.svg') 50% 50% no-repeat;\r\n}\r\n\r\n.statusicon {\r\n    position: absolute;\r\n    top: 4px;\r\n    left: 12px;\r\n}\r\n\r\n#uiMapWrapper {\r\n    clear: both;\r\n    padding: 8px;\r\n    margin-top: 30px;\r\n}\r\n\r\n#uiMapHeader {\r\n    position: relative;\r\n    clear: both;\r\n}\r\n\r\n#uiMapContainer {\r\n    position: relative;\r\n    width: 100%;\r\n    height: 600px;\r\n    overflow: hidden;\r\n    border: 1px solid #40628a;\r\n    background: url(nanomapBackground.png);\r\n}\r\n\r\n#uiMap {\r\n    position: absolute;\r\n    top: 50%;\r\n    left: 50%;\r\n    margin: -512px 0 0 -512px;\r\n    width: 256px;\r\n    height: 256px;\r\n    overflow: hidden;\r\n    zoom: 4;\r\n}\r\n\r\n#uiMapImage {\r\n    position: absolute;\r\n    bottom: 1px;\r\n    left: 1px;\r\n    width: 256px;\r\n    height: 256px;\r\n}\r\n\r\n#uiMapContent {\r\n    position: absolute;\r\n    bottom: -13.5px;\r\n    left: 0px;\r\n    width: 256px;\r\n    height: 256px;\r\n}\r\n\r\n#uiMapFooter {\r\n    position: relative;\r\n    clear: both;\r\n}\r\n\r\n#uiContent {\r\n    clear: both;\r\n    padding: 8px;\r\n    margin-top: 30px;\r\n}\r\n\r\n#uiMapTooltip {\r\n    position: absolute;\r\n    right: 10px;\r\n    top: 10px;\r\n    border: 1px solid #40628a;\r\n    background-color: #272727;\r\n    padding: 8px;\r\n    display: none;\r\n    z-index: 9999;\r\n}\r\n\r\n#uiLoadingNotice {\r\n    position: relative;\r\n    background: url(uiNoticeBackground.jpg) 50% 50%;\r\n    color: #000000;\r\n    font-size: 14px;\r\n    font-style: italic;\r\n    font-weight: bold;\r\n    padding: 3px 4px 3px 4px;\r\n    margin: 4px 0 4px 0;\r\n}\r\n\r\n.underTitle {\r\n    margin-top: 30px;\r\n}"]} */ +@charset "utf-8";@font-face{font-family:'FontAwesome';src:url(fontawesome-webfont.eot?v=4.7.0);src:url(fontawesome-webfont.eot?#iefix&v=4.7.0) format('embedded-opentype'),url(fontawesome-webfont.woff2?v=4.7.0) format('woff2'),url(fontawesome-webfont.woff?v=4.7.0) format('woff'),url(fontawesome-webfont.ttf?v=4.7.0) format('truetype'),url(fontawesome-webfont.svg?v=4.7.0#fontawesomeregular) format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:0.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul > li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:0.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:0.2em 0.25em 0.15em;border:solid 0.08em #eee;border-radius:0.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:0.3em}.fa.fa-pull-right{margin-left:0.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:0.3em}.fa.pull-right{margin-left:0.3em}.fa-spin{animation:fa-spin 2s infinite linear}.fa-pulse{animation:fa-spin 1s infinite steps(8)}@keyframes fa-spin{0%{transform:rotate(0)}100%{transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-rotate-90{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-close:before,.fa-remove:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-cog:before,.fa-gear:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-repeat:before,.fa-rotate-right:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-image:before,.fa-photo:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-exclamation-triangle:before,.fa-warning:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-cogs:before,.fa-gears:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-floppy-o:before,.fa-save:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-bars:before,.fa-navicon:before,.fa-reorder:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-sort:before,.fa-unsorted:before{content:"\f0dc"}.fa-sort-desc:before,.fa-sort-down:before{content:"\f0dd"}.fa-sort-asc:before,.fa-sort-up:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-gavel:before,.fa-legal:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-bolt:before,.fa-flash:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-clipboard:before,.fa-paste:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-chain-broken:before,.fa-unlink:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-caret-square-o-down:before,.fa-toggle-down:before{content:"\f150"}.fa-caret-square-o-up:before,.fa-toggle-up:before{content:"\f151"}.fa-caret-square-o-right:before,.fa-toggle-right:before{content:"\f152"}.fa-eur:before,.fa-euro:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-inr:before,.fa-rupee:before{content:"\f156"}.fa-cny:before,.fa-jpy:before,.fa-rmb:before,.fa-yen:before{content:"\f157"}.fa-rouble:before,.fa-rub:before,.fa-ruble:before{content:"\f158"}.fa-krw:before,.fa-won:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-caret-square-o-left:before,.fa-toggle-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-try:before,.fa-turkish-lira:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-bank:before,.fa-institution:before,.fa-university:before{content:"\f19c"}.fa-graduation-cap:before,.fa-mortar-board:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-image-o:before,.fa-file-photo-o:before,.fa-file-picture-o:before{content:"\f1c5"}.fa-file-archive-o:before,.fa-file-zip-o:before{content:"\f1c6"}.fa-file-audio-o:before,.fa-file-sound-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-ring:before,.fa-life-saver:before,.fa-support:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before,.fa-resistance:before{content:"\f1d0"}.fa-empire:before,.fa-ge:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before,.fa-y-combinator-square:before,.fa-yc-square:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-paper-plane:before,.fa-send:before{content:"\f1d8"}.fa-paper-plane-o:before,.fa-send-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-futbol-o:before,.fa-soccer-ball-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-ils:before,.fa-shekel:before,.fa-sheqel:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-bed:before,.fa-hotel:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-y-combinator:before,.fa-yc:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before,.fa-battery:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-paper-o:before,.fa-hand-stop-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-television:before,.fa-tv:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-american-sign-language-interpreting:before,.fa-asl-interpreting:before{content:"\f2a3"}.fa-deaf:before,.fa-deafness:before,.fa-hard-of-hearing:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-sign-language:before,.fa-signing:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-address-card:before,.fa-vcard:before{content:"\f2bb"}.fa-address-card-o:before,.fa-vcard-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer-full:before,.fa-thermometer:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bath:before,.fa-bathtub:before,.fa-s15:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.displayBar{position:relative;width:236px;height:16px;border:1px solid #666;float:left;margin:0 5px 0 0;overflow:hidden;background:#000}.displayBarText{position:absolute;top:-2px;left:5px;width:100%;height:100%;color:#fff;font-weight:normal}.displayBarFill{width:0%;height:100%;background:#40628a;overflow:hidden;float:left}.displayBarFill.alignRight{float:right}.displayBarText.good{color:#fff}.displayBarText.notgood{color:#fff}.displayBarText.average{color:#fff}.displayBarText.bad{color:#fff}.displayBarText.highlight{color:#000}.displayBarFill.good{color:#fff;background:#4f7529}.displayBarFill.notgood{color:#fff;background:#ffb400}.displayBarFill.average{color:#fff;background:#cd6500}.displayBarFill.bad{color:#fff;background:#e00}.displayBarFill.highlight{color:#fff;background:#8ba5c4}.disabled,.link,.linkDiscourage,.linkEncourage,.linkOff,.linkOn,.redButton,.selected,.yellowButton{float:left;min-width:15px;height:16px;text-align:center;color:#fff;text-decoration:none;background:#40628a;border:1px solid #161616;padding:0 4px 4px 4px;margin:0 2px 2px 0;cursor:default;white-space:nowrap}.hasIcon{padding:0 4px 4px 0}.linkActive.hover,.zoomLink.hover,a.hover{background:#507aac}@keyframes pendingAnimation{to{color:#fff;background:#507aac}}.linkPending,.linkPending.hover{animation-name:pendingAnimation;animation-duration:0.25s}a.white,a.white:active,a.white:link,a.white:visited{color:#40628a;text-decoration:none;background:#fff;border:1px solid #161616;padding:1px 4px 1px 4px;margin:0 2px 0 0;cursor:default}a.white.hover{color:#fff;background:#40628a}.linkOn,.selected,a.linkOn.hover,a.linkOn:active,a.linkOn:link,a.linkOn:visited,a.selected.hover,a.selected:active,a.selected:link,a.selected:visited{color:#fff;background:#2f943c}.disabled,.linkOff,a.disabled.hover,a.disabled:active,a.disabled:link,a.disabled:visited,a.linkOff.hover,a.linkOff:active,a.linkOff:link,a.linkOff:visited{color:#fff;background:#999;border-color:#666}.disabled.icon,.linkOff.icon,.linkOn.icon,.selected.icon,a.icon{position:relative;padding:1px 4px 2px 20px}.disabled.icon img,.linkOff.icon img,.linkOn.icon img,.selected.icon img,a.icon img{position:absolute;top:0;left:0;width:18px;height:18px}.linkDanger,a.linkDanger:active,a.linkDanger:link,a.linkDanger:visited{color:#fff;background-color:red;border-color:#a00}.linkDanger.hover{background-color:#f66}.linkEncourage,a.linkEncourage:active,a.linkEncourage:link,a.linkEncourage:visited{color:#9f3;background-color:#40628a;border-color:#161616}.linkEncourage.hover{background-color:#507aac}.linkDiscourage,a.linkDiscourage:active,a.linkDiscourage:link,a.linkDiscourage:visited{color:#8c8c8c;background-color:#40628a;border-color:#161616}.linkDiscourage.hover{color:red;background-color:#507aac}.inactive,a.inactive.hover,a.inactive:active,a.inactive:link,a.inactive:visited{color:#fff;background:#999;border-color:#666}.white{color:#fff;font-weight:bold}.good{color:#4f7529;font-weight:bold}.average{color:#cd6500;font-weight:bold}.bad{color:#e00;font-weight:bold}.idle{color:#272727;font-weight:bold}.redButton{background:#ea0000}.yellowButton{background:#cacc00}.highlight{color:#8ba5c4}.dark{color:#272727}.burn{color:orange}.brute{color:red}.toxin{color:green}.toxin_light{color:#3adf00}.oxyloss{color:#00f}.oxyloss_light{color:#6698ff}.Red{color:red}.Blue{color:#00f}.Green{color:#0f0}.Marigold{color:#fda505}.Fuschia{color:#ff0080}.Black{color:#000}.Pearl{color:#c6cacb}.cold1{color:#94b8ff}.cold2{color:#69f}.cold3{color:#293d66}.hot1{color:#f96}.hot2{color:#993d00}.hot3{color:#f60}div.display{padding:4px;margin:6px 0;background-color:#000;background-color:rgba(0, 0, 0, 0.33);box-shadow:inset 0 0 5px rgba(0, 0, 0, 0.5)}div.display header{display:block;position:relative;width:98.5%;padding:0 4px;margin-bottom:6px;color:#fff;border-bottom:2px solid #40628a}div.display header .buttonRight{position:absolute;bottom:6px;right:4px}div.display article{display:table;width:100%;border-collapse:collapse}.itemGroup{border:1px solid #e9c183;background:#2c2c2c;padding:4px;clear:both}.item{width:100%;margin:4px 0 0 0;clear:both;overflow:auto}.itemContent,.itemContentNarrow{float:left}.itemContentNarrow{width:30%}.itemContent{width:69%}.itemLabel,.itemLabelNarrow,.itemLabelWide,.itemLabelWider,.itemLabelWidest{float:left;color:#e9c183}.itemLabelNarrow{width:20%}.itemLabel{width:30%}.itemLabelWide{width:45%}.itemLabelWider{width:69%}.itemLabelWidest{width:100%}.itemContentWide{float:left;width:79%}.itemContentSmall{float:left;width:33%}.itemContentMedium{float:left;width:55%}.block{padding:8px;margin:10px 4px 4px 4px;border:1px solid #40628a;background-color:#202020}.block h3{padding:0}.clearBoth{clear:both}.clearLeft{clear:left}.clearRight{clear:right}.line{width:100%;clear:both}.fixedLeft{width:110px;float:left}.fixedLeftWide{width:165px;float:left}.fixedLeftWider{width:220px;float:left}.fixedLeftWidest{width:250px;float:left}.floatRight{float:right}.floatLeft{float:left}.hidden{display:none}.statusDisplay{background:#000;background:rgba(0, 0, 0, 0.5);color:#fff;border:1px solid #40628a;padding:4px;margin:3px 0;overflow:hidden}.statusDisplayRecords{background:#000;background:rgba(0, 0, 0, 0.5);color:#fff;border:1px solid #40628a;padding:4px;margin:3px 0;overflow-x:hidden;overflow-y:auto}.statusLabel{width:138px;float:left;overflow:hidden;color:#98b0c3}.statusValue{float:left}.jobValues{float:left;width:30%}.fancy{display:none}i.fancy{display:none}.minimize{color:#e9c183;cursor:pointer!important;z-index:102;position:absolute;top:6px;right:46px}.minimize:hover{color:#b8c9d6}.close{color:#e9c183;cursor:pointer!important;z-index:102;position:absolute;top:4px;right:12px}.close:hover{color:#b8c9d6}#uiCornerTL{position:fixed;z-index:101;min-width:30px;min-height:30px;top:0;left:0;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAIAAAC0Ujn1AAAACXBIWXMAAAsTAAALEwEAmpwYAAAGTGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTExLTIwVDIyOjM4OjI1LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOC0xMS0yMFQyMzowMzowMS0wODowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOC0xMS0yMFQyMzowMzowMS0wODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpkOWRlMzc1Yi04ZWQwLWI3NDctOTQzZS0zN2UwZGU2NDkyODQiIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo0ZmVhZjJmZC03YWVhLWUyNGQtYTNkZS05ZmI5ZGM0ZTA0YzIiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpjZTU4OTk5My1mZDU2LTEzNDktYWMyMC03NGZkZmY5NjNjYTgiPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjcmVhdGVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmNlNTg5OTkzLWZkNTYtMTM0OS1hYzIwLTc0ZmRmZjk2M2NhOCIgc3RFdnQ6d2hlbj0iMjAxOC0xMS0yMFQyMjozODoyNS0wODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjb252ZXJ0ZWQiIHN0RXZ0OnBhcmFtZXRlcnM9ImZyb20gaW1hZ2UvZ2lmIHRvIGltYWdlL3BuZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZDlkZTM3NWItOGVkMC1iNzQ3LTk0M2UtMzdlMGRlNjQ5Mjg0IiBzdEV2dDp3aGVuPSIyMDE4LTExLTIwVDIzOjAzOjAxLTA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+QnRKRAAAAIhJREFUSIm1zLcRgEAMBMCDokQf9B/SBwQwmOeNzGkL2GnHhgSLrHPSC4Bfny+/vl9y/X6ZdfHS6v/LqasvoW690brzhur+66+Hr7PWvJ5a+Zpr/WurTa+htr7a2vGqat87rt3voI68vTr4Nuv4W68pb6VmvWVNfD81931q+nvVGS+ASUQyXgAHuOgYYwOkhIYAAAAASUVORK5CYII=) no-repeat}.resizeArea{position:absolute;z-index:99999}.resizeArea.top{top:0;left:10px;right:10px;height:5px;cursor:n-resize}.resizeArea.tr{top:0;right:0;height:10px;width:10px;cursor:ne-resize}.resizeArea.right{top:10px;right:0;bottom:10px;width:5px;cursor:e-resize}.resizeArea.br{bottom:0;right:0;height:10px;width:10px;cursor:se-resize}.resizeArea.bottom{bottom:0;left:10px;right:10px;height:5px;cursor:s-resize}.resizeArea.bl{bottom:0;left:0;height:10px;width:10px;cursor:sw-resize}.resizeArea.left{top:10px;left:0;bottom:10px;width:5px;cursor:w-resize}.resizeArea.tl{top:0;left:0;height:10px;width:10px;cursor:nw-resize}.uiLinkPendingIcon{display:none;float:left;width:16px;height:16px;margin:2px 2px 0 2px;background-image:url(uiLinkPendingIcon.gif)}.linkPending .fa{display:none}.linkPending .uiLinkPendingIcon{display:block}.mapIcon16{position:absolute;width:16px;height:16px;background-image:url(uiIcons16Green.png);background-position:-144px -96px;background-repeat:no-repeat;zoom:0.125;margin-left:-1px}.mapIcon16.dead{background-image:url(uiIcons16Red.png)}.mapIcon16.bad{background-image:url(uiIcons16Red.png)}.mapIcon16.average{background-image:url(uiIcons16Orange.png)}.mapIcon16.good{background-image:url(uiIcons16Green.png)}.mapIcon16.icon-airalarm{background-position:0 -144px}.mapIcon16.rank-captain{background-position:-224px -112px}.mapIcon16.rank-headofpersonnel{background-position:-112px -96px}.mapIcon16.rank-headofsecurity{background-position:-112px -128px}.mapIcon16.rank-chiefengineer{background-position:-176px -112px}.mapIcon16.rank-researchdirector{background-position:-128px -128px}.mapIcon16.rank-chiefmedicalofficer{background-position:-32px -128px}.mapIcon16.rank-stationengineer{background-position:-176px -112px}.mapIcon16.rank-atmospherictechnician{background-position:-176px -112px}.mapIcon16.rank-medicaldoctor{background-position:-32px -128px}.mapIcon16.rank-geneticist{background-position:-32px -128px}.mapIcon16.rank-psychiatrist{background-position:-32px -128px}.mapIcon16.rank-chemist{background-position:-32px -128px}.mapIcon16.rank-scientist{background-position:-128px -128px}.mapIcon16.rank-geneticist{background-position:-128px -128px}.mapIcon16.rank-roboticist{background-position:-128px -128px}.mapIcon16.rank-xenobiologist{background-position:-128px -128px}.mapIcon16.rank-warden{background-position:-112px -128px}.mapIcon16.rank-detective{background-position:-112px -128px}.mapIcon16.rank-securityofficer{background-position:-112px -128px}ul{padding:4px 0 0 10px;margin:0;list-style-type:none}li{padding:0 0 2px 0}table.fixed{table-layout:fixed}table.fixed td{overflow:hidden}table.pmon{border:2px solid #4169e1}table.pmon td,table.pmon th{border-bottom:1px dotted #000;padding:0 5px 0 5px}th.command{background:#33f;font-weight:bold;color:#fff}th.sec{background:#8e0000;font-weight:bold;color:#fff}th.med{background:#060;font-weight:bold;color:#fff}th.eng{background:#b27300;font-weight:bold;color:#fff}th.sci{background:#a65ba6;font-weight:bold;color:#fff}th.ser{background:#7100aa;font-weight:bold;color:#fff}th.sup{background:#666621;font-weight:bold;color:#fff}th.civ{background:#a32800;font-weight:bold;color:#fff}th.misc{background:#666;font-weight:bold;color:#fff}span.qm-job{color:#b77a41;font-weight:bold}.striped tr:nth-child(even){background-color:#404040}.striped:not(table) > :nth-child(even){background-color:#404040}#uiNoScript{position:fixed;top:50%;left:50%;margin:-60px 0 0 -150px;width:280px;height:120px;background:#fff;border:2px solid red;color:#000;font-size:10px;font-weight:bold;z-index:9999;padding:0 10px;text-align:center}.notice{position:relative;background:url(uiNoticeBackground.jpg) 50% 50%;color:#000;font-size:12px;font-style:italic;font-weight:bold;padding:3px 4px 3px 4px;margin:4px 0 4px 0}.noticePlaceholder{position:relative;font-size:12px;font-style:italic;font-weight:bold;padding:3px 4px 3px 4px;margin:4px 0 4px 0}.notice.icon{padding:2px 4px 0 20px}.notice img{position:absolute;top:0;left:0;width:16px;height:16px}div.notice{clear:both}.wholeScreen{position:absolute;color:#517087;font-size:16px;font-weight:bold;text-align:center}.pdalink{float:left;white-space:nowrap;cursor:default!important}.pdalink.disabled{background:none;border:none;color:#999;text-align:left}.pdanote{color:#cd6500;font-weight:bold}.item.mainmenu{padding-bottom:0.5em}div.clock{color:#fff;font-weight:bold;float:right;padding-right:2em}#pdaFooter{position:fixed;left:0;bottom:0;width:100%;background:#272727}.pdaFooterButton{width:33%;padding:0.5em 0;font-size:200%;border:none;background:none;color:#fff}.pdaFooterButton.hover{background:#507aac}.pdaFooterButton.disabled{background:none!important;color:#555!important}.pdaFooterButton .uiLinkPendingIcon{position:absolute;width:33%;background-repeat:no-repeat;background-position:center}.dnaBlock{float:left;width:90px;padding:0 0 5px 0}.dnaBlockNumber{font-family:Fixed,monospace;float:left;color:#fff;background:#363636;min-width:20px;height:20px;padding:0;text-align:center}.dnaSubBlock{font-family:Fixed,monospace;float:left;padding:0;min-width:16px;height:20px;text-align:center}.mask{position:fixed;left:0;top:0;width:100%;height:100%;background:url(uiMaskBackground.png)}.maskContent{width:100%;height:200px;margin:200px 0;text-align:center}body{color:#fff;font-family:Verdana,Geneva,sans-serif;font-size:12px;line-height:170%;margin:0;padding:0}hr{background-color:#40628a;height:1px;border:none}a img,img{border-style:none}h1,h2,h3,h4,h5,h6{margin:0;padding:12px 0 6px 0;color:#fff;clear:both}h1{font-size:18px}h2{font-size:16px}h3{font-size:14px}h4{font-size:12px}*[data-tooltip]{position:relative}*[data-tooltip]::after{position:absolute;display:block;z-index:2;width:250px;padding:10px;-ms-transform:translateX(-50%);transform:translateX(-50%);visibility:hidden;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";opacity:0;white-space:normal;text-align:left;content:attr(data-tooltip);transition:all 0.5s;border:1px solid #999;background-color:#363636}*[data-tooltip]:hover::after{visibility:visible;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";opacity:1}*[data-tooltip].tooltipTop::after{bottom:100%;left:50%;-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}*[data-tooltip].tooltipTop:hover::after{-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}*[data-tooltip].tooltipBottom::after{top:100%;left:50%;-ms-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px)}*[data-tooltip].tooltipBottom:hover::after{-ms-transform:translateX(-50%) translateY(8px);transform:translateX(-50%) translateY(8px)}*[data-tooltip].tooltipLeft::after{top:50%;right:100%;-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}*[data-tooltip].tooltipLeft:hover::after{-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}*[data-tooltip].tooltipRight::after{top:50%;left:100%;-ms-transform:translateX(-8px) translateY(-50%);transform:translateX(-8px) translateY(-50%)}*[data-tooltip].tooltipRight:hover::after{-ms-transform:translateX(8px) translateY(-50%);transform:translateX(8px) translateY(-50%)}.mainBG{position:fixed;z-index:-1;top:30px;left:0;right:0;bottom:0;background:url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%20standalone%3D%22no%22%3F%3E%0D%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.0%22%20viewBox%3D%220%200%20425%20200%22%20opacity%3D%22.25%22%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20178.00399%2C0.03869%20-71.20393%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76134%2C6.02555%20l%200%2C187.87147%20a%206.7613422%2C6.0255495%200%200%200%206.76134%2C6.02554%20l%2053.1072%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-101.544018%2072.21628%2C104.699398%20a%206.7613422%2C6.0255495%200%200%200%205.76015%2C2.87016%20l%2073.55487%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-187.87147%20a%206.7613422%2C6.0255495%200%200%200%20-6.76135%2C-6.02555%20l%20-54.71644%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76133%2C6.02555%20l%200%2C102.61935%20L%20183.76413%2C2.90886%20a%206.7613422%2C6.0255495%200%200%200%20-5.76014%2C-2.87017%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22M%204.8446333%2C22.10875%20A%2013.412039%2C12.501842%200%200%201%2013.477588%2C0.03924%20l%2066.118315%2C0%20a%205.3648158%2C5.000737%200%200%201%205.364823%2C5.00073%20l%200%2C79.87931%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20420.15535%2C177.89119%20a%2013.412038%2C12.501842%200%200%201%20-8.63295%2C22.06951%20l%20-66.11832%2C0%20a%205.3648152%2C5.000737%200%200%201%20-5.36482%2C-5.00074%20l%200%2C-79.87931%20z%22%20%2F%3E%0D%0A%3C%2Fsvg%3E%0D%0A) no-repeat fixed center/70% 70%,linear-gradient(to bottom, #2a2a2a 0, #202020 100%) no-repeat fixed center/100% 100%;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2a2a2a', endColorstr='#ff202020', GradientType=0)}body,html{scrollbar-face-color:#666;scrollbar-arrow-color:#e9c183;scrollbar-track-color:#363636;scrollbar-shadow-color:#555}#uiWrapper{width:100%;height:100%;-ms-user-select:none;user-select:none}#uiTitleWrapper{position:fixed;min-height:30px;min-width:100%;background-color:#363636;left:0;top:0;right:0;overflow:hidden;z-index:100}#uiTitleWrapper > div{cursor:default}#uiTitleWrapper > i{cursor:default}#uiTitleText{position:absolute;top:6px;left:44px;width:66%;overflow:hidden;color:#e9c183;font-size:16px}#uiTitle.icon{padding:6px 8px 6px 42px;background-position:2px 50%;background-repeat:no-repeat}#uiTitleFluff{position:absolute;top:4px;right:12px;width:42px;height:24px;background:url(data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%20standalone%3D%22no%22%3F%3E%0D%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.0%22%20viewBox%3D%220%200%20425%20200%22%20opacity%3D%22.25%22%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20178.00399%2C0.03869%20-71.20393%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76134%2C6.02555%20l%200%2C187.87147%20a%206.7613422%2C6.0255495%200%200%200%206.76134%2C6.02554%20l%2053.1072%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-101.544018%2072.21628%2C104.699398%20a%206.7613422%2C6.0255495%200%200%200%205.76015%2C2.87016%20l%2073.55487%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-187.87147%20a%206.7613422%2C6.0255495%200%200%200%20-6.76135%2C-6.02555%20l%20-54.71644%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76133%2C6.02555%20l%200%2C102.61935%20L%20183.76413%2C2.90886%20a%206.7613422%2C6.0255495%200%200%200%20-5.76014%2C-2.87017%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22M%204.8446333%2C22.10875%20A%2013.412039%2C12.501842%200%200%201%2013.477588%2C0.03924%20l%2066.118315%2C0%20a%205.3648158%2C5.000737%200%200%201%205.364823%2C5.00073%20l%200%2C79.87931%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20420.15535%2C177.89119%20a%2013.412038%2C12.501842%200%200%201%20-8.63295%2C22.06951%20l%20-66.11832%2C0%20a%205.3648152%2C5.000737%200%200%201%20-5.36482%2C-5.00074%20l%200%2C-79.87931%20z%22%20%2F%3E%0D%0A%3C%2Fsvg%3E%0D%0A) 50% 50% no-repeat}.statusicon{position:absolute;top:4px;left:12px}#uiMapWrapper{clear:both;padding:8px;margin-top:30px}#uiMapHeader{position:relative;clear:both}#uiMapContainer{position:relative;width:100%;height:600px;overflow:hidden;border:1px solid #40628a;background:url(nanomapBackground.png)}#uiMap{position:absolute;top:50%;left:50%;margin:-512px 0 0 -512px;width:256px;height:256px;overflow:hidden;zoom:4}#uiMapImage{position:absolute;bottom:1px;left:1px;width:256px;height:256px}#uiMapContent{position:absolute;bottom:-13.5px;left:0;width:256px;height:256px}#uiMapFooter{position:relative;clear:both}#uiContent{clear:both;padding:8px;margin-top:30px}#uiMapTooltip{position:absolute;right:10px;top:10px;border:1px solid #40628a;background-color:#272727;padding:8px;display:none;z-index:9999}#uiLoadingNotice{position:relative;background:url(uiNoticeBackground.jpg) 50% 50%;color:#000;font-size:14px;font-style:italic;font-weight:bold;padding:3px 4px 3px 4px;margin:4px 0 4px 0}.underTitle{margin-top:30px} +/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["path.less","icons.less","core.less","larger.less","fixed-width.less","list.less","bordered-pulled.less","animated.less","mixins.less","nanoui.css","rotated-flipped.less","stacked.less","screen-reader.less","_bars.less","_link.less","_color.less","_display.less","_formatting.less","_fancy.less","_icon.less","_lists.less","_misc.less","_native.less","_tooltip.less","<no source>","nanoui.less"],"names":[],"mappings":"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","file":"nanoui.css","sourcesContent":[null,null,null,null,null,null,null,null,null,"/*!\n *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome\n *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)\n */\n/* FONT PATH\n * -------------------------- */\n@font-face {\n  font-family: 'FontAwesome';\n  src: url('fontawesome-webfont.eot?v=4.7.0');\n  src: url('fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('fontawesome-webfont.woff?v=4.7.0') format('woff'), url('fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');\n  font-weight: normal;\n  font-style: normal;\n}\n.fa {\n  display: inline-block;\n  font: normal normal normal 14px/1 FontAwesome;\n  font-size: inherit;\n  text-rendering: auto;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n/* makes the font 33% larger relative to the icon container */\n.fa-lg {\n  font-size: 1.33333333em;\n  line-height: 0.75em;\n  vertical-align: -15%;\n}\n.fa-2x {\n  font-size: 2em;\n}\n.fa-3x {\n  font-size: 3em;\n}\n.fa-4x {\n  font-size: 4em;\n}\n.fa-5x {\n  font-size: 5em;\n}\n.fa-fw {\n  width: 1.28571429em;\n  text-align: center;\n}\n.fa-ul {\n  padding-left: 0;\n  margin-left: 2.14285714em;\n  list-style-type: none;\n}\n.fa-ul > li {\n  position: relative;\n}\n.fa-li {\n  position: absolute;\n  left: -2.14285714em;\n  width: 2.14285714em;\n  top: 0.14285714em;\n  text-align: center;\n}\n.fa-li.fa-lg {\n  left: -1.85714286em;\n}\n.fa-border {\n  padding: 0.2em 0.25em 0.15em;\n  border: solid 0.08em #eee;\n  border-radius: 0.1em;\n}\n.fa-pull-left {\n  float: left;\n}\n.fa-pull-right {\n  float: right;\n}\n.fa.fa-pull-left {\n  margin-right: 0.3em;\n}\n.fa.fa-pull-right {\n  margin-left: 0.3em;\n}\n/* Deprecated as of 4.4.0 */\n.pull-right {\n  float: right;\n}\n.pull-left {\n  float: left;\n}\n.fa.pull-left {\n  margin-right: 0.3em;\n}\n.fa.pull-right {\n  margin-left: 0.3em;\n}\n.fa-spin {\n  animation: fa-spin 2s infinite linear;\n}\n.fa-pulse {\n  animation: fa-spin 1s infinite steps(8);\n}\n@keyframes fa-spin {\n  0% {\n    transform: rotate(0deg);\n  }\n  100% {\n    transform: rotate(359deg);\n  }\n}\n.fa-rotate-90 {\n  -ms-filter: \"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)\";\n  -ms-transform: rotate(90deg);\n  transform: rotate(90deg);\n}\n.fa-rotate-180 {\n  -ms-filter: \"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)\";\n  -ms-transform: rotate(180deg);\n  transform: rotate(180deg);\n}\n.fa-rotate-270 {\n  -ms-filter: \"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)\";\n  -ms-transform: rotate(270deg);\n  transform: rotate(270deg);\n}\n.fa-flip-horizontal {\n  -ms-filter: \"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)\";\n  -ms-transform: scale(-1, 1);\n  transform: scale(-1, 1);\n}\n.fa-flip-vertical {\n  -ms-filter: \"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)\";\n  -ms-transform: scale(1, -1);\n  transform: scale(1, -1);\n}\n:root .fa-rotate-90,\n:root .fa-rotate-180,\n:root .fa-rotate-270,\n:root .fa-flip-horizontal,\n:root .fa-flip-vertical {\n  filter: none;\n}\n.fa-stack {\n  position: relative;\n  display: inline-block;\n  width: 2em;\n  height: 2em;\n  line-height: 2em;\n  vertical-align: middle;\n}\n.fa-stack-1x,\n.fa-stack-2x {\n  position: absolute;\n  left: 0;\n  width: 100%;\n  text-align: center;\n}\n.fa-stack-1x {\n  line-height: inherit;\n}\n.fa-stack-2x {\n  font-size: 2em;\n}\n.fa-inverse {\n  color: #fff;\n}\n/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen\n   readers do not read off random characters that represent icons */\n.fa-glass:before {\n  content: \"\\f000\";\n}\n.fa-music:before {\n  content: \"\\f001\";\n}\n.fa-search:before {\n  content: \"\\f002\";\n}\n.fa-envelope-o:before {\n  content: \"\\f003\";\n}\n.fa-heart:before {\n  content: \"\\f004\";\n}\n.fa-star:before {\n  content: \"\\f005\";\n}\n.fa-star-o:before {\n  content: \"\\f006\";\n}\n.fa-user:before {\n  content: \"\\f007\";\n}\n.fa-film:before {\n  content: \"\\f008\";\n}\n.fa-th-large:before {\n  content: \"\\f009\";\n}\n.fa-th:before {\n  content: \"\\f00a\";\n}\n.fa-th-list:before {\n  content: \"\\f00b\";\n}\n.fa-check:before {\n  content: \"\\f00c\";\n}\n.fa-remove:before,\n.fa-close:before,\n.fa-times:before {\n  content: \"\\f00d\";\n}\n.fa-search-plus:before {\n  content: \"\\f00e\";\n}\n.fa-search-minus:before {\n  content: \"\\f010\";\n}\n.fa-power-off:before {\n  content: \"\\f011\";\n}\n.fa-signal:before {\n  content: \"\\f012\";\n}\n.fa-gear:before,\n.fa-cog:before {\n  content: \"\\f013\";\n}\n.fa-trash-o:before {\n  content: \"\\f014\";\n}\n.fa-home:before {\n  content: \"\\f015\";\n}\n.fa-file-o:before {\n  content: \"\\f016\";\n}\n.fa-clock-o:before {\n  content: \"\\f017\";\n}\n.fa-road:before {\n  content: \"\\f018\";\n}\n.fa-download:before {\n  content: \"\\f019\";\n}\n.fa-arrow-circle-o-down:before {\n  content: \"\\f01a\";\n}\n.fa-arrow-circle-o-up:before {\n  content: \"\\f01b\";\n}\n.fa-inbox:before {\n  content: \"\\f01c\";\n}\n.fa-play-circle-o:before {\n  content: \"\\f01d\";\n}\n.fa-rotate-right:before,\n.fa-repeat:before {\n  content: \"\\f01e\";\n}\n.fa-refresh:before {\n  content: \"\\f021\";\n}\n.fa-list-alt:before {\n  content: \"\\f022\";\n}\n.fa-lock:before {\n  content: \"\\f023\";\n}\n.fa-flag:before {\n  content: \"\\f024\";\n}\n.fa-headphones:before {\n  content: \"\\f025\";\n}\n.fa-volume-off:before {\n  content: \"\\f026\";\n}\n.fa-volume-down:before {\n  content: \"\\f027\";\n}\n.fa-volume-up:before {\n  content: \"\\f028\";\n}\n.fa-qrcode:before {\n  content: \"\\f029\";\n}\n.fa-barcode:before {\n  content: \"\\f02a\";\n}\n.fa-tag:before {\n  content: \"\\f02b\";\n}\n.fa-tags:before {\n  content: \"\\f02c\";\n}\n.fa-book:before {\n  content: \"\\f02d\";\n}\n.fa-bookmark:before {\n  content: \"\\f02e\";\n}\n.fa-print:before {\n  content: \"\\f02f\";\n}\n.fa-camera:before {\n  content: \"\\f030\";\n}\n.fa-font:before {\n  content: \"\\f031\";\n}\n.fa-bold:before {\n  content: \"\\f032\";\n}\n.fa-italic:before {\n  content: \"\\f033\";\n}\n.fa-text-height:before {\n  content: \"\\f034\";\n}\n.fa-text-width:before {\n  content: \"\\f035\";\n}\n.fa-align-left:before {\n  content: \"\\f036\";\n}\n.fa-align-center:before {\n  content: \"\\f037\";\n}\n.fa-align-right:before {\n  content: \"\\f038\";\n}\n.fa-align-justify:before {\n  content: \"\\f039\";\n}\n.fa-list:before {\n  content: \"\\f03a\";\n}\n.fa-dedent:before,\n.fa-outdent:before {\n  content: \"\\f03b\";\n}\n.fa-indent:before {\n  content: \"\\f03c\";\n}\n.fa-video-camera:before {\n  content: \"\\f03d\";\n}\n.fa-photo:before,\n.fa-image:before,\n.fa-picture-o:before {\n  content: \"\\f03e\";\n}\n.fa-pencil:before {\n  content: \"\\f040\";\n}\n.fa-map-marker:before {\n  content: \"\\f041\";\n}\n.fa-adjust:before {\n  content: \"\\f042\";\n}\n.fa-tint:before {\n  content: \"\\f043\";\n}\n.fa-edit:before,\n.fa-pencil-square-o:before {\n  content: \"\\f044\";\n}\n.fa-share-square-o:before {\n  content: \"\\f045\";\n}\n.fa-check-square-o:before {\n  content: \"\\f046\";\n}\n.fa-arrows:before {\n  content: \"\\f047\";\n}\n.fa-step-backward:before {\n  content: \"\\f048\";\n}\n.fa-fast-backward:before {\n  content: \"\\f049\";\n}\n.fa-backward:before {\n  content: \"\\f04a\";\n}\n.fa-play:before {\n  content: \"\\f04b\";\n}\n.fa-pause:before {\n  content: \"\\f04c\";\n}\n.fa-stop:before {\n  content: \"\\f04d\";\n}\n.fa-forward:before {\n  content: \"\\f04e\";\n}\n.fa-fast-forward:before {\n  content: \"\\f050\";\n}\n.fa-step-forward:before {\n  content: \"\\f051\";\n}\n.fa-eject:before {\n  content: \"\\f052\";\n}\n.fa-chevron-left:before {\n  content: \"\\f053\";\n}\n.fa-chevron-right:before {\n  content: \"\\f054\";\n}\n.fa-plus-circle:before {\n  content: \"\\f055\";\n}\n.fa-minus-circle:before {\n  content: \"\\f056\";\n}\n.fa-times-circle:before {\n  content: \"\\f057\";\n}\n.fa-check-circle:before {\n  content: \"\\f058\";\n}\n.fa-question-circle:before {\n  content: \"\\f059\";\n}\n.fa-info-circle:before {\n  content: \"\\f05a\";\n}\n.fa-crosshairs:before {\n  content: \"\\f05b\";\n}\n.fa-times-circle-o:before {\n  content: \"\\f05c\";\n}\n.fa-check-circle-o:before {\n  content: \"\\f05d\";\n}\n.fa-ban:before {\n  content: \"\\f05e\";\n}\n.fa-arrow-left:before {\n  content: \"\\f060\";\n}\n.fa-arrow-right:before {\n  content: \"\\f061\";\n}\n.fa-arrow-up:before {\n  content: \"\\f062\";\n}\n.fa-arrow-down:before {\n  content: \"\\f063\";\n}\n.fa-mail-forward:before,\n.fa-share:before {\n  content: \"\\f064\";\n}\n.fa-expand:before {\n  content: \"\\f065\";\n}\n.fa-compress:before {\n  content: \"\\f066\";\n}\n.fa-plus:before {\n  content: \"\\f067\";\n}\n.fa-minus:before {\n  content: \"\\f068\";\n}\n.fa-asterisk:before {\n  content: \"\\f069\";\n}\n.fa-exclamation-circle:before {\n  content: \"\\f06a\";\n}\n.fa-gift:before {\n  content: \"\\f06b\";\n}\n.fa-leaf:before {\n  content: \"\\f06c\";\n}\n.fa-fire:before {\n  content: \"\\f06d\";\n}\n.fa-eye:before {\n  content: \"\\f06e\";\n}\n.fa-eye-slash:before {\n  content: \"\\f070\";\n}\n.fa-warning:before,\n.fa-exclamation-triangle:before {\n  content: \"\\f071\";\n}\n.fa-plane:before {\n  content: \"\\f072\";\n}\n.fa-calendar:before {\n  content: \"\\f073\";\n}\n.fa-random:before {\n  content: \"\\f074\";\n}\n.fa-comment:before {\n  content: \"\\f075\";\n}\n.fa-magnet:before {\n  content: \"\\f076\";\n}\n.fa-chevron-up:before {\n  content: \"\\f077\";\n}\n.fa-chevron-down:before {\n  content: \"\\f078\";\n}\n.fa-retweet:before {\n  content: \"\\f079\";\n}\n.fa-shopping-cart:before {\n  content: \"\\f07a\";\n}\n.fa-folder:before {\n  content: \"\\f07b\";\n}\n.fa-folder-open:before {\n  content: \"\\f07c\";\n}\n.fa-arrows-v:before {\n  content: \"\\f07d\";\n}\n.fa-arrows-h:before {\n  content: \"\\f07e\";\n}\n.fa-bar-chart-o:before,\n.fa-bar-chart:before {\n  content: \"\\f080\";\n}\n.fa-twitter-square:before {\n  content: \"\\f081\";\n}\n.fa-facebook-square:before {\n  content: \"\\f082\";\n}\n.fa-camera-retro:before {\n  content: \"\\f083\";\n}\n.fa-key:before {\n  content: \"\\f084\";\n}\n.fa-gears:before,\n.fa-cogs:before {\n  content: \"\\f085\";\n}\n.fa-comments:before {\n  content: \"\\f086\";\n}\n.fa-thumbs-o-up:before {\n  content: \"\\f087\";\n}\n.fa-thumbs-o-down:before {\n  content: \"\\f088\";\n}\n.fa-star-half:before {\n  content: \"\\f089\";\n}\n.fa-heart-o:before {\n  content: \"\\f08a\";\n}\n.fa-sign-out:before {\n  content: \"\\f08b\";\n}\n.fa-linkedin-square:before {\n  content: \"\\f08c\";\n}\n.fa-thumb-tack:before {\n  content: \"\\f08d\";\n}\n.fa-external-link:before {\n  content: \"\\f08e\";\n}\n.fa-sign-in:before {\n  content: \"\\f090\";\n}\n.fa-trophy:before {\n  content: \"\\f091\";\n}\n.fa-github-square:before {\n  content: \"\\f092\";\n}\n.fa-upload:before {\n  content: \"\\f093\";\n}\n.fa-lemon-o:before {\n  content: \"\\f094\";\n}\n.fa-phone:before {\n  content: \"\\f095\";\n}\n.fa-square-o:before {\n  content: \"\\f096\";\n}\n.fa-bookmark-o:before {\n  content: \"\\f097\";\n}\n.fa-phone-square:before {\n  content: \"\\f098\";\n}\n.fa-twitter:before {\n  content: \"\\f099\";\n}\n.fa-facebook-f:before,\n.fa-facebook:before {\n  content: \"\\f09a\";\n}\n.fa-github:before {\n  content: \"\\f09b\";\n}\n.fa-unlock:before {\n  content: \"\\f09c\";\n}\n.fa-credit-card:before {\n  content: \"\\f09d\";\n}\n.fa-feed:before,\n.fa-rss:before {\n  content: \"\\f09e\";\n}\n.fa-hdd-o:before {\n  content: \"\\f0a0\";\n}\n.fa-bullhorn:before {\n  content: \"\\f0a1\";\n}\n.fa-bell:before {\n  content: \"\\f0f3\";\n}\n.fa-certificate:before {\n  content: \"\\f0a3\";\n}\n.fa-hand-o-right:before {\n  content: \"\\f0a4\";\n}\n.fa-hand-o-left:before {\n  content: \"\\f0a5\";\n}\n.fa-hand-o-up:before {\n  content: \"\\f0a6\";\n}\n.fa-hand-o-down:before {\n  content: \"\\f0a7\";\n}\n.fa-arrow-circle-left:before {\n  content: \"\\f0a8\";\n}\n.fa-arrow-circle-right:before {\n  content: \"\\f0a9\";\n}\n.fa-arrow-circle-up:before {\n  content: \"\\f0aa\";\n}\n.fa-arrow-circle-down:before {\n  content: \"\\f0ab\";\n}\n.fa-globe:before {\n  content: \"\\f0ac\";\n}\n.fa-wrench:before {\n  content: \"\\f0ad\";\n}\n.fa-tasks:before {\n  content: \"\\f0ae\";\n}\n.fa-filter:before {\n  content: \"\\f0b0\";\n}\n.fa-briefcase:before {\n  content: \"\\f0b1\";\n}\n.fa-arrows-alt:before {\n  content: \"\\f0b2\";\n}\n.fa-group:before,\n.fa-users:before {\n  content: \"\\f0c0\";\n}\n.fa-chain:before,\n.fa-link:before {\n  content: \"\\f0c1\";\n}\n.fa-cloud:before {\n  content: \"\\f0c2\";\n}\n.fa-flask:before {\n  content: \"\\f0c3\";\n}\n.fa-cut:before,\n.fa-scissors:before {\n  content: \"\\f0c4\";\n}\n.fa-copy:before,\n.fa-files-o:before {\n  content: \"\\f0c5\";\n}\n.fa-paperclip:before {\n  content: \"\\f0c6\";\n}\n.fa-save:before,\n.fa-floppy-o:before {\n  content: \"\\f0c7\";\n}\n.fa-square:before {\n  content: \"\\f0c8\";\n}\n.fa-navicon:before,\n.fa-reorder:before,\n.fa-bars:before {\n  content: \"\\f0c9\";\n}\n.fa-list-ul:before {\n  content: \"\\f0ca\";\n}\n.fa-list-ol:before {\n  content: \"\\f0cb\";\n}\n.fa-strikethrough:before {\n  content: \"\\f0cc\";\n}\n.fa-underline:before {\n  content: \"\\f0cd\";\n}\n.fa-table:before {\n  content: \"\\f0ce\";\n}\n.fa-magic:before {\n  content: \"\\f0d0\";\n}\n.fa-truck:before {\n  content: \"\\f0d1\";\n}\n.fa-pinterest:before {\n  content: \"\\f0d2\";\n}\n.fa-pinterest-square:before {\n  content: \"\\f0d3\";\n}\n.fa-google-plus-square:before {\n  content: \"\\f0d4\";\n}\n.fa-google-plus:before {\n  content: \"\\f0d5\";\n}\n.fa-money:before {\n  content: \"\\f0d6\";\n}\n.fa-caret-down:before {\n  content: \"\\f0d7\";\n}\n.fa-caret-up:before {\n  content: \"\\f0d8\";\n}\n.fa-caret-left:before {\n  content: \"\\f0d9\";\n}\n.fa-caret-right:before {\n  content: \"\\f0da\";\n}\n.fa-columns:before {\n  content: \"\\f0db\";\n}\n.fa-unsorted:before,\n.fa-sort:before {\n  content: \"\\f0dc\";\n}\n.fa-sort-down:before,\n.fa-sort-desc:before {\n  content: \"\\f0dd\";\n}\n.fa-sort-up:before,\n.fa-sort-asc:before {\n  content: \"\\f0de\";\n}\n.fa-envelope:before {\n  content: \"\\f0e0\";\n}\n.fa-linkedin:before {\n  content: \"\\f0e1\";\n}\n.fa-rotate-left:before,\n.fa-undo:before {\n  content: \"\\f0e2\";\n}\n.fa-legal:before,\n.fa-gavel:before {\n  content: \"\\f0e3\";\n}\n.fa-dashboard:before,\n.fa-tachometer:before {\n  content: \"\\f0e4\";\n}\n.fa-comment-o:before {\n  content: \"\\f0e5\";\n}\n.fa-comments-o:before {\n  content: \"\\f0e6\";\n}\n.fa-flash:before,\n.fa-bolt:before {\n  content: \"\\f0e7\";\n}\n.fa-sitemap:before {\n  content: \"\\f0e8\";\n}\n.fa-umbrella:before {\n  content: \"\\f0e9\";\n}\n.fa-paste:before,\n.fa-clipboard:before {\n  content: \"\\f0ea\";\n}\n.fa-lightbulb-o:before {\n  content: \"\\f0eb\";\n}\n.fa-exchange:before {\n  content: \"\\f0ec\";\n}\n.fa-cloud-download:before {\n  content: \"\\f0ed\";\n}\n.fa-cloud-upload:before {\n  content: \"\\f0ee\";\n}\n.fa-user-md:before {\n  content: \"\\f0f0\";\n}\n.fa-stethoscope:before {\n  content: \"\\f0f1\";\n}\n.fa-suitcase:before {\n  content: \"\\f0f2\";\n}\n.fa-bell-o:before {\n  content: \"\\f0a2\";\n}\n.fa-coffee:before {\n  content: \"\\f0f4\";\n}\n.fa-cutlery:before {\n  content: \"\\f0f5\";\n}\n.fa-file-text-o:before {\n  content: \"\\f0f6\";\n}\n.fa-building-o:before {\n  content: \"\\f0f7\";\n}\n.fa-hospital-o:before {\n  content: \"\\f0f8\";\n}\n.fa-ambulance:before {\n  content: \"\\f0f9\";\n}\n.fa-medkit:before {\n  content: \"\\f0fa\";\n}\n.fa-fighter-jet:before {\n  content: \"\\f0fb\";\n}\n.fa-beer:before {\n  content: \"\\f0fc\";\n}\n.fa-h-square:before {\n  content: \"\\f0fd\";\n}\n.fa-plus-square:before {\n  content: \"\\f0fe\";\n}\n.fa-angle-double-left:before {\n  content: \"\\f100\";\n}\n.fa-angle-double-right:before {\n  content: \"\\f101\";\n}\n.fa-angle-double-up:before {\n  content: \"\\f102\";\n}\n.fa-angle-double-down:before {\n  content: \"\\f103\";\n}\n.fa-angle-left:before {\n  content: \"\\f104\";\n}\n.fa-angle-right:before {\n  content: \"\\f105\";\n}\n.fa-angle-up:before {\n  content: \"\\f106\";\n}\n.fa-angle-down:before {\n  content: \"\\f107\";\n}\n.fa-desktop:before {\n  content: \"\\f108\";\n}\n.fa-laptop:before {\n  content: \"\\f109\";\n}\n.fa-tablet:before {\n  content: \"\\f10a\";\n}\n.fa-mobile-phone:before,\n.fa-mobile:before {\n  content: \"\\f10b\";\n}\n.fa-circle-o:before {\n  content: \"\\f10c\";\n}\n.fa-quote-left:before {\n  content: \"\\f10d\";\n}\n.fa-quote-right:before {\n  content: \"\\f10e\";\n}\n.fa-spinner:before {\n  content: \"\\f110\";\n}\n.fa-circle:before {\n  content: \"\\f111\";\n}\n.fa-mail-reply:before,\n.fa-reply:before {\n  content: \"\\f112\";\n}\n.fa-github-alt:before {\n  content: \"\\f113\";\n}\n.fa-folder-o:before {\n  content: \"\\f114\";\n}\n.fa-folder-open-o:before {\n  content: \"\\f115\";\n}\n.fa-smile-o:before {\n  content: \"\\f118\";\n}\n.fa-frown-o:before {\n  content: \"\\f119\";\n}\n.fa-meh-o:before {\n  content: \"\\f11a\";\n}\n.fa-gamepad:before {\n  content: \"\\f11b\";\n}\n.fa-keyboard-o:before {\n  content: \"\\f11c\";\n}\n.fa-flag-o:before {\n  content: \"\\f11d\";\n}\n.fa-flag-checkered:before {\n  content: \"\\f11e\";\n}\n.fa-terminal:before {\n  content: \"\\f120\";\n}\n.fa-code:before {\n  content: \"\\f121\";\n}\n.fa-mail-reply-all:before,\n.fa-reply-all:before {\n  content: \"\\f122\";\n}\n.fa-star-half-empty:before,\n.fa-star-half-full:before,\n.fa-star-half-o:before {\n  content: \"\\f123\";\n}\n.fa-location-arrow:before {\n  content: \"\\f124\";\n}\n.fa-crop:before {\n  content: \"\\f125\";\n}\n.fa-code-fork:before {\n  content: \"\\f126\";\n}\n.fa-unlink:before,\n.fa-chain-broken:before {\n  content: \"\\f127\";\n}\n.fa-question:before {\n  content: \"\\f128\";\n}\n.fa-info:before {\n  content: \"\\f129\";\n}\n.fa-exclamation:before {\n  content: \"\\f12a\";\n}\n.fa-superscript:before {\n  content: \"\\f12b\";\n}\n.fa-subscript:before {\n  content: \"\\f12c\";\n}\n.fa-eraser:before {\n  content: \"\\f12d\";\n}\n.fa-puzzle-piece:before {\n  content: \"\\f12e\";\n}\n.fa-microphone:before {\n  content: \"\\f130\";\n}\n.fa-microphone-slash:before {\n  content: \"\\f131\";\n}\n.fa-shield:before {\n  content: \"\\f132\";\n}\n.fa-calendar-o:before {\n  content: \"\\f133\";\n}\n.fa-fire-extinguisher:before {\n  content: \"\\f134\";\n}\n.fa-rocket:before {\n  content: \"\\f135\";\n}\n.fa-maxcdn:before {\n  content: \"\\f136\";\n}\n.fa-chevron-circle-left:before {\n  content: \"\\f137\";\n}\n.fa-chevron-circle-right:before {\n  content: \"\\f138\";\n}\n.fa-chevron-circle-up:before {\n  content: \"\\f139\";\n}\n.fa-chevron-circle-down:before {\n  content: \"\\f13a\";\n}\n.fa-html5:before {\n  content: \"\\f13b\";\n}\n.fa-css3:before {\n  content: \"\\f13c\";\n}\n.fa-anchor:before {\n  content: \"\\f13d\";\n}\n.fa-unlock-alt:before {\n  content: \"\\f13e\";\n}\n.fa-bullseye:before {\n  content: \"\\f140\";\n}\n.fa-ellipsis-h:before {\n  content: \"\\f141\";\n}\n.fa-ellipsis-v:before {\n  content: \"\\f142\";\n}\n.fa-rss-square:before {\n  content: \"\\f143\";\n}\n.fa-play-circle:before {\n  content: \"\\f144\";\n}\n.fa-ticket:before {\n  content: \"\\f145\";\n}\n.fa-minus-square:before {\n  content: \"\\f146\";\n}\n.fa-minus-square-o:before {\n  content: \"\\f147\";\n}\n.fa-level-up:before {\n  content: \"\\f148\";\n}\n.fa-level-down:before {\n  content: \"\\f149\";\n}\n.fa-check-square:before {\n  content: \"\\f14a\";\n}\n.fa-pencil-square:before {\n  content: \"\\f14b\";\n}\n.fa-external-link-square:before {\n  content: \"\\f14c\";\n}\n.fa-share-square:before {\n  content: \"\\f14d\";\n}\n.fa-compass:before {\n  content: \"\\f14e\";\n}\n.fa-toggle-down:before,\n.fa-caret-square-o-down:before {\n  content: \"\\f150\";\n}\n.fa-toggle-up:before,\n.fa-caret-square-o-up:before {\n  content: \"\\f151\";\n}\n.fa-toggle-right:before,\n.fa-caret-square-o-right:before {\n  content: \"\\f152\";\n}\n.fa-euro:before,\n.fa-eur:before {\n  content: \"\\f153\";\n}\n.fa-gbp:before {\n  content: \"\\f154\";\n}\n.fa-dollar:before,\n.fa-usd:before {\n  content: \"\\f155\";\n}\n.fa-rupee:before,\n.fa-inr:before {\n  content: \"\\f156\";\n}\n.fa-cny:before,\n.fa-rmb:before,\n.fa-yen:before,\n.fa-jpy:before {\n  content: \"\\f157\";\n}\n.fa-ruble:before,\n.fa-rouble:before,\n.fa-rub:before {\n  content: \"\\f158\";\n}\n.fa-won:before,\n.fa-krw:before {\n  content: \"\\f159\";\n}\n.fa-bitcoin:before,\n.fa-btc:before {\n  content: \"\\f15a\";\n}\n.fa-file:before {\n  content: \"\\f15b\";\n}\n.fa-file-text:before {\n  content: \"\\f15c\";\n}\n.fa-sort-alpha-asc:before {\n  content: \"\\f15d\";\n}\n.fa-sort-alpha-desc:before {\n  content: \"\\f15e\";\n}\n.fa-sort-amount-asc:before {\n  content: \"\\f160\";\n}\n.fa-sort-amount-desc:before {\n  content: \"\\f161\";\n}\n.fa-sort-numeric-asc:before {\n  content: \"\\f162\";\n}\n.fa-sort-numeric-desc:before {\n  content: \"\\f163\";\n}\n.fa-thumbs-up:before {\n  content: \"\\f164\";\n}\n.fa-thumbs-down:before {\n  content: \"\\f165\";\n}\n.fa-youtube-square:before {\n  content: \"\\f166\";\n}\n.fa-youtube:before {\n  content: \"\\f167\";\n}\n.fa-xing:before {\n  content: \"\\f168\";\n}\n.fa-xing-square:before {\n  content: \"\\f169\";\n}\n.fa-youtube-play:before {\n  content: \"\\f16a\";\n}\n.fa-dropbox:before {\n  content: \"\\f16b\";\n}\n.fa-stack-overflow:before {\n  content: \"\\f16c\";\n}\n.fa-instagram:before {\n  content: \"\\f16d\";\n}\n.fa-flickr:before {\n  content: \"\\f16e\";\n}\n.fa-adn:before {\n  content: \"\\f170\";\n}\n.fa-bitbucket:before {\n  content: \"\\f171\";\n}\n.fa-bitbucket-square:before {\n  content: \"\\f172\";\n}\n.fa-tumblr:before {\n  content: \"\\f173\";\n}\n.fa-tumblr-square:before {\n  content: \"\\f174\";\n}\n.fa-long-arrow-down:before {\n  content: \"\\f175\";\n}\n.fa-long-arrow-up:before {\n  content: \"\\f176\";\n}\n.fa-long-arrow-left:before {\n  content: \"\\f177\";\n}\n.fa-long-arrow-right:before {\n  content: \"\\f178\";\n}\n.fa-apple:before {\n  content: \"\\f179\";\n}\n.fa-windows:before {\n  content: \"\\f17a\";\n}\n.fa-android:before {\n  content: \"\\f17b\";\n}\n.fa-linux:before {\n  content: \"\\f17c\";\n}\n.fa-dribbble:before {\n  content: \"\\f17d\";\n}\n.fa-skype:before {\n  content: \"\\f17e\";\n}\n.fa-foursquare:before {\n  content: \"\\f180\";\n}\n.fa-trello:before {\n  content: \"\\f181\";\n}\n.fa-female:before {\n  content: \"\\f182\";\n}\n.fa-male:before {\n  content: \"\\f183\";\n}\n.fa-gittip:before,\n.fa-gratipay:before {\n  content: \"\\f184\";\n}\n.fa-sun-o:before {\n  content: \"\\f185\";\n}\n.fa-moon-o:before {\n  content: \"\\f186\";\n}\n.fa-archive:before {\n  content: \"\\f187\";\n}\n.fa-bug:before {\n  content: \"\\f188\";\n}\n.fa-vk:before {\n  content: \"\\f189\";\n}\n.fa-weibo:before {\n  content: \"\\f18a\";\n}\n.fa-renren:before {\n  content: \"\\f18b\";\n}\n.fa-pagelines:before {\n  content: \"\\f18c\";\n}\n.fa-stack-exchange:before {\n  content: \"\\f18d\";\n}\n.fa-arrow-circle-o-right:before {\n  content: \"\\f18e\";\n}\n.fa-arrow-circle-o-left:before {\n  content: \"\\f190\";\n}\n.fa-toggle-left:before,\n.fa-caret-square-o-left:before {\n  content: \"\\f191\";\n}\n.fa-dot-circle-o:before {\n  content: \"\\f192\";\n}\n.fa-wheelchair:before {\n  content: \"\\f193\";\n}\n.fa-vimeo-square:before {\n  content: \"\\f194\";\n}\n.fa-turkish-lira:before,\n.fa-try:before {\n  content: \"\\f195\";\n}\n.fa-plus-square-o:before {\n  content: \"\\f196\";\n}\n.fa-space-shuttle:before {\n  content: \"\\f197\";\n}\n.fa-slack:before {\n  content: \"\\f198\";\n}\n.fa-envelope-square:before {\n  content: \"\\f199\";\n}\n.fa-wordpress:before {\n  content: \"\\f19a\";\n}\n.fa-openid:before {\n  content: \"\\f19b\";\n}\n.fa-institution:before,\n.fa-bank:before,\n.fa-university:before {\n  content: \"\\f19c\";\n}\n.fa-mortar-board:before,\n.fa-graduation-cap:before {\n  content: \"\\f19d\";\n}\n.fa-yahoo:before {\n  content: \"\\f19e\";\n}\n.fa-google:before {\n  content: \"\\f1a0\";\n}\n.fa-reddit:before {\n  content: \"\\f1a1\";\n}\n.fa-reddit-square:before {\n  content: \"\\f1a2\";\n}\n.fa-stumbleupon-circle:before {\n  content: \"\\f1a3\";\n}\n.fa-stumbleupon:before {\n  content: \"\\f1a4\";\n}\n.fa-delicious:before {\n  content: \"\\f1a5\";\n}\n.fa-digg:before {\n  content: \"\\f1a6\";\n}\n.fa-pied-piper-pp:before {\n  content: \"\\f1a7\";\n}\n.fa-pied-piper-alt:before {\n  content: \"\\f1a8\";\n}\n.fa-drupal:before {\n  content: \"\\f1a9\";\n}\n.fa-joomla:before {\n  content: \"\\f1aa\";\n}\n.fa-language:before {\n  content: \"\\f1ab\";\n}\n.fa-fax:before {\n  content: \"\\f1ac\";\n}\n.fa-building:before {\n  content: \"\\f1ad\";\n}\n.fa-child:before {\n  content: \"\\f1ae\";\n}\n.fa-paw:before {\n  content: \"\\f1b0\";\n}\n.fa-spoon:before {\n  content: \"\\f1b1\";\n}\n.fa-cube:before {\n  content: \"\\f1b2\";\n}\n.fa-cubes:before {\n  content: \"\\f1b3\";\n}\n.fa-behance:before {\n  content: \"\\f1b4\";\n}\n.fa-behance-square:before {\n  content: \"\\f1b5\";\n}\n.fa-steam:before {\n  content: \"\\f1b6\";\n}\n.fa-steam-square:before {\n  content: \"\\f1b7\";\n}\n.fa-recycle:before {\n  content: \"\\f1b8\";\n}\n.fa-automobile:before,\n.fa-car:before {\n  content: \"\\f1b9\";\n}\n.fa-cab:before,\n.fa-taxi:before {\n  content: \"\\f1ba\";\n}\n.fa-tree:before {\n  content: \"\\f1bb\";\n}\n.fa-spotify:before {\n  content: \"\\f1bc\";\n}\n.fa-deviantart:before {\n  content: \"\\f1bd\";\n}\n.fa-soundcloud:before {\n  content: \"\\f1be\";\n}\n.fa-database:before {\n  content: \"\\f1c0\";\n}\n.fa-file-pdf-o:before {\n  content: \"\\f1c1\";\n}\n.fa-file-word-o:before {\n  content: \"\\f1c2\";\n}\n.fa-file-excel-o:before {\n  content: \"\\f1c3\";\n}\n.fa-file-powerpoint-o:before {\n  content: \"\\f1c4\";\n}\n.fa-file-photo-o:before,\n.fa-file-picture-o:before,\n.fa-file-image-o:before {\n  content: \"\\f1c5\";\n}\n.fa-file-zip-o:before,\n.fa-file-archive-o:before {\n  content: \"\\f1c6\";\n}\n.fa-file-sound-o:before,\n.fa-file-audio-o:before {\n  content: \"\\f1c7\";\n}\n.fa-file-movie-o:before,\n.fa-file-video-o:before {\n  content: \"\\f1c8\";\n}\n.fa-file-code-o:before {\n  content: \"\\f1c9\";\n}\n.fa-vine:before {\n  content: \"\\f1ca\";\n}\n.fa-codepen:before {\n  content: \"\\f1cb\";\n}\n.fa-jsfiddle:before {\n  content: \"\\f1cc\";\n}\n.fa-life-bouy:before,\n.fa-life-buoy:before,\n.fa-life-saver:before,\n.fa-support:before,\n.fa-life-ring:before {\n  content: \"\\f1cd\";\n}\n.fa-circle-o-notch:before {\n  content: \"\\f1ce\";\n}\n.fa-ra:before,\n.fa-resistance:before,\n.fa-rebel:before {\n  content: \"\\f1d0\";\n}\n.fa-ge:before,\n.fa-empire:before {\n  content: \"\\f1d1\";\n}\n.fa-git-square:before {\n  content: \"\\f1d2\";\n}\n.fa-git:before {\n  content: \"\\f1d3\";\n}\n.fa-y-combinator-square:before,\n.fa-yc-square:before,\n.fa-hacker-news:before {\n  content: \"\\f1d4\";\n}\n.fa-tencent-weibo:before {\n  content: \"\\f1d5\";\n}\n.fa-qq:before {\n  content: \"\\f1d6\";\n}\n.fa-wechat:before,\n.fa-weixin:before {\n  content: \"\\f1d7\";\n}\n.fa-send:before,\n.fa-paper-plane:before {\n  content: \"\\f1d8\";\n}\n.fa-send-o:before,\n.fa-paper-plane-o:before {\n  content: \"\\f1d9\";\n}\n.fa-history:before {\n  content: \"\\f1da\";\n}\n.fa-circle-thin:before {\n  content: \"\\f1db\";\n}\n.fa-header:before {\n  content: \"\\f1dc\";\n}\n.fa-paragraph:before {\n  content: \"\\f1dd\";\n}\n.fa-sliders:before {\n  content: \"\\f1de\";\n}\n.fa-share-alt:before {\n  content: \"\\f1e0\";\n}\n.fa-share-alt-square:before {\n  content: \"\\f1e1\";\n}\n.fa-bomb:before {\n  content: \"\\f1e2\";\n}\n.fa-soccer-ball-o:before,\n.fa-futbol-o:before {\n  content: \"\\f1e3\";\n}\n.fa-tty:before {\n  content: \"\\f1e4\";\n}\n.fa-binoculars:before {\n  content: \"\\f1e5\";\n}\n.fa-plug:before {\n  content: \"\\f1e6\";\n}\n.fa-slideshare:before {\n  content: \"\\f1e7\";\n}\n.fa-twitch:before {\n  content: \"\\f1e8\";\n}\n.fa-yelp:before {\n  content: \"\\f1e9\";\n}\n.fa-newspaper-o:before {\n  content: \"\\f1ea\";\n}\n.fa-wifi:before {\n  content: \"\\f1eb\";\n}\n.fa-calculator:before {\n  content: \"\\f1ec\";\n}\n.fa-paypal:before {\n  content: \"\\f1ed\";\n}\n.fa-google-wallet:before {\n  content: \"\\f1ee\";\n}\n.fa-cc-visa:before {\n  content: \"\\f1f0\";\n}\n.fa-cc-mastercard:before {\n  content: \"\\f1f1\";\n}\n.fa-cc-discover:before {\n  content: \"\\f1f2\";\n}\n.fa-cc-amex:before {\n  content: \"\\f1f3\";\n}\n.fa-cc-paypal:before {\n  content: \"\\f1f4\";\n}\n.fa-cc-stripe:before {\n  content: \"\\f1f5\";\n}\n.fa-bell-slash:before {\n  content: \"\\f1f6\";\n}\n.fa-bell-slash-o:before {\n  content: \"\\f1f7\";\n}\n.fa-trash:before {\n  content: \"\\f1f8\";\n}\n.fa-copyright:before {\n  content: \"\\f1f9\";\n}\n.fa-at:before {\n  content: \"\\f1fa\";\n}\n.fa-eyedropper:before {\n  content: \"\\f1fb\";\n}\n.fa-paint-brush:before {\n  content: \"\\f1fc\";\n}\n.fa-birthday-cake:before {\n  content: \"\\f1fd\";\n}\n.fa-area-chart:before {\n  content: \"\\f1fe\";\n}\n.fa-pie-chart:before {\n  content: \"\\f200\";\n}\n.fa-line-chart:before {\n  content: \"\\f201\";\n}\n.fa-lastfm:before {\n  content: \"\\f202\";\n}\n.fa-lastfm-square:before {\n  content: \"\\f203\";\n}\n.fa-toggle-off:before {\n  content: \"\\f204\";\n}\n.fa-toggle-on:before {\n  content: \"\\f205\";\n}\n.fa-bicycle:before {\n  content: \"\\f206\";\n}\n.fa-bus:before {\n  content: \"\\f207\";\n}\n.fa-ioxhost:before {\n  content: \"\\f208\";\n}\n.fa-angellist:before {\n  content: \"\\f209\";\n}\n.fa-cc:before {\n  content: \"\\f20a\";\n}\n.fa-shekel:before,\n.fa-sheqel:before,\n.fa-ils:before {\n  content: \"\\f20b\";\n}\n.fa-meanpath:before {\n  content: \"\\f20c\";\n}\n.fa-buysellads:before {\n  content: \"\\f20d\";\n}\n.fa-connectdevelop:before {\n  content: \"\\f20e\";\n}\n.fa-dashcube:before {\n  content: \"\\f210\";\n}\n.fa-forumbee:before {\n  content: \"\\f211\";\n}\n.fa-leanpub:before {\n  content: \"\\f212\";\n}\n.fa-sellsy:before {\n  content: \"\\f213\";\n}\n.fa-shirtsinbulk:before {\n  content: \"\\f214\";\n}\n.fa-simplybuilt:before {\n  content: \"\\f215\";\n}\n.fa-skyatlas:before {\n  content: \"\\f216\";\n}\n.fa-cart-plus:before {\n  content: \"\\f217\";\n}\n.fa-cart-arrow-down:before {\n  content: \"\\f218\";\n}\n.fa-diamond:before {\n  content: \"\\f219\";\n}\n.fa-ship:before {\n  content: \"\\f21a\";\n}\n.fa-user-secret:before {\n  content: \"\\f21b\";\n}\n.fa-motorcycle:before {\n  content: \"\\f21c\";\n}\n.fa-street-view:before {\n  content: \"\\f21d\";\n}\n.fa-heartbeat:before {\n  content: \"\\f21e\";\n}\n.fa-venus:before {\n  content: \"\\f221\";\n}\n.fa-mars:before {\n  content: \"\\f222\";\n}\n.fa-mercury:before {\n  content: \"\\f223\";\n}\n.fa-intersex:before,\n.fa-transgender:before {\n  content: \"\\f224\";\n}\n.fa-transgender-alt:before {\n  content: \"\\f225\";\n}\n.fa-venus-double:before {\n  content: \"\\f226\";\n}\n.fa-mars-double:before {\n  content: \"\\f227\";\n}\n.fa-venus-mars:before {\n  content: \"\\f228\";\n}\n.fa-mars-stroke:before {\n  content: \"\\f229\";\n}\n.fa-mars-stroke-v:before {\n  content: \"\\f22a\";\n}\n.fa-mars-stroke-h:before {\n  content: \"\\f22b\";\n}\n.fa-neuter:before {\n  content: \"\\f22c\";\n}\n.fa-genderless:before {\n  content: \"\\f22d\";\n}\n.fa-facebook-official:before {\n  content: \"\\f230\";\n}\n.fa-pinterest-p:before {\n  content: \"\\f231\";\n}\n.fa-whatsapp:before {\n  content: \"\\f232\";\n}\n.fa-server:before {\n  content: \"\\f233\";\n}\n.fa-user-plus:before {\n  content: \"\\f234\";\n}\n.fa-user-times:before {\n  content: \"\\f235\";\n}\n.fa-hotel:before,\n.fa-bed:before {\n  content: \"\\f236\";\n}\n.fa-viacoin:before {\n  content: \"\\f237\";\n}\n.fa-train:before {\n  content: \"\\f238\";\n}\n.fa-subway:before {\n  content: \"\\f239\";\n}\n.fa-medium:before {\n  content: \"\\f23a\";\n}\n.fa-yc:before,\n.fa-y-combinator:before {\n  content: \"\\f23b\";\n}\n.fa-optin-monster:before {\n  content: \"\\f23c\";\n}\n.fa-opencart:before {\n  content: \"\\f23d\";\n}\n.fa-expeditedssl:before {\n  content: \"\\f23e\";\n}\n.fa-battery-4:before,\n.fa-battery:before,\n.fa-battery-full:before {\n  content: \"\\f240\";\n}\n.fa-battery-3:before,\n.fa-battery-three-quarters:before {\n  content: \"\\f241\";\n}\n.fa-battery-2:before,\n.fa-battery-half:before {\n  content: \"\\f242\";\n}\n.fa-battery-1:before,\n.fa-battery-quarter:before {\n  content: \"\\f243\";\n}\n.fa-battery-0:before,\n.fa-battery-empty:before {\n  content: \"\\f244\";\n}\n.fa-mouse-pointer:before {\n  content: \"\\f245\";\n}\n.fa-i-cursor:before {\n  content: \"\\f246\";\n}\n.fa-object-group:before {\n  content: \"\\f247\";\n}\n.fa-object-ungroup:before {\n  content: \"\\f248\";\n}\n.fa-sticky-note:before {\n  content: \"\\f249\";\n}\n.fa-sticky-note-o:before {\n  content: \"\\f24a\";\n}\n.fa-cc-jcb:before {\n  content: \"\\f24b\";\n}\n.fa-cc-diners-club:before {\n  content: \"\\f24c\";\n}\n.fa-clone:before {\n  content: \"\\f24d\";\n}\n.fa-balance-scale:before {\n  content: \"\\f24e\";\n}\n.fa-hourglass-o:before {\n  content: \"\\f250\";\n}\n.fa-hourglass-1:before,\n.fa-hourglass-start:before {\n  content: \"\\f251\";\n}\n.fa-hourglass-2:before,\n.fa-hourglass-half:before {\n  content: \"\\f252\";\n}\n.fa-hourglass-3:before,\n.fa-hourglass-end:before {\n  content: \"\\f253\";\n}\n.fa-hourglass:before {\n  content: \"\\f254\";\n}\n.fa-hand-grab-o:before,\n.fa-hand-rock-o:before {\n  content: \"\\f255\";\n}\n.fa-hand-stop-o:before,\n.fa-hand-paper-o:before {\n  content: \"\\f256\";\n}\n.fa-hand-scissors-o:before {\n  content: \"\\f257\";\n}\n.fa-hand-lizard-o:before {\n  content: \"\\f258\";\n}\n.fa-hand-spock-o:before {\n  content: \"\\f259\";\n}\n.fa-hand-pointer-o:before {\n  content: \"\\f25a\";\n}\n.fa-hand-peace-o:before {\n  content: \"\\f25b\";\n}\n.fa-trademark:before {\n  content: \"\\f25c\";\n}\n.fa-registered:before {\n  content: \"\\f25d\";\n}\n.fa-creative-commons:before {\n  content: \"\\f25e\";\n}\n.fa-gg:before {\n  content: \"\\f260\";\n}\n.fa-gg-circle:before {\n  content: \"\\f261\";\n}\n.fa-tripadvisor:before {\n  content: \"\\f262\";\n}\n.fa-odnoklassniki:before {\n  content: \"\\f263\";\n}\n.fa-odnoklassniki-square:before {\n  content: \"\\f264\";\n}\n.fa-get-pocket:before {\n  content: \"\\f265\";\n}\n.fa-wikipedia-w:before {\n  content: \"\\f266\";\n}\n.fa-safari:before {\n  content: \"\\f267\";\n}\n.fa-chrome:before {\n  content: \"\\f268\";\n}\n.fa-firefox:before {\n  content: \"\\f269\";\n}\n.fa-opera:before {\n  content: \"\\f26a\";\n}\n.fa-internet-explorer:before {\n  content: \"\\f26b\";\n}\n.fa-tv:before,\n.fa-television:before {\n  content: \"\\f26c\";\n}\n.fa-contao:before {\n  content: \"\\f26d\";\n}\n.fa-500px:before {\n  content: \"\\f26e\";\n}\n.fa-amazon:before {\n  content: \"\\f270\";\n}\n.fa-calendar-plus-o:before {\n  content: \"\\f271\";\n}\n.fa-calendar-minus-o:before {\n  content: \"\\f272\";\n}\n.fa-calendar-times-o:before {\n  content: \"\\f273\";\n}\n.fa-calendar-check-o:before {\n  content: \"\\f274\";\n}\n.fa-industry:before {\n  content: \"\\f275\";\n}\n.fa-map-pin:before {\n  content: \"\\f276\";\n}\n.fa-map-signs:before {\n  content: \"\\f277\";\n}\n.fa-map-o:before {\n  content: \"\\f278\";\n}\n.fa-map:before {\n  content: \"\\f279\";\n}\n.fa-commenting:before {\n  content: \"\\f27a\";\n}\n.fa-commenting-o:before {\n  content: \"\\f27b\";\n}\n.fa-houzz:before {\n  content: \"\\f27c\";\n}\n.fa-vimeo:before {\n  content: \"\\f27d\";\n}\n.fa-black-tie:before {\n  content: \"\\f27e\";\n}\n.fa-fonticons:before {\n  content: \"\\f280\";\n}\n.fa-reddit-alien:before {\n  content: \"\\f281\";\n}\n.fa-edge:before {\n  content: \"\\f282\";\n}\n.fa-credit-card-alt:before {\n  content: \"\\f283\";\n}\n.fa-codiepie:before {\n  content: \"\\f284\";\n}\n.fa-modx:before {\n  content: \"\\f285\";\n}\n.fa-fort-awesome:before {\n  content: \"\\f286\";\n}\n.fa-usb:before {\n  content: \"\\f287\";\n}\n.fa-product-hunt:before {\n  content: \"\\f288\";\n}\n.fa-mixcloud:before {\n  content: \"\\f289\";\n}\n.fa-scribd:before {\n  content: \"\\f28a\";\n}\n.fa-pause-circle:before {\n  content: \"\\f28b\";\n}\n.fa-pause-circle-o:before {\n  content: \"\\f28c\";\n}\n.fa-stop-circle:before {\n  content: \"\\f28d\";\n}\n.fa-stop-circle-o:before {\n  content: \"\\f28e\";\n}\n.fa-shopping-bag:before {\n  content: \"\\f290\";\n}\n.fa-shopping-basket:before {\n  content: \"\\f291\";\n}\n.fa-hashtag:before {\n  content: \"\\f292\";\n}\n.fa-bluetooth:before {\n  content: \"\\f293\";\n}\n.fa-bluetooth-b:before {\n  content: \"\\f294\";\n}\n.fa-percent:before {\n  content: \"\\f295\";\n}\n.fa-gitlab:before {\n  content: \"\\f296\";\n}\n.fa-wpbeginner:before {\n  content: \"\\f297\";\n}\n.fa-wpforms:before {\n  content: \"\\f298\";\n}\n.fa-envira:before {\n  content: \"\\f299\";\n}\n.fa-universal-access:before {\n  content: \"\\f29a\";\n}\n.fa-wheelchair-alt:before {\n  content: \"\\f29b\";\n}\n.fa-question-circle-o:before {\n  content: \"\\f29c\";\n}\n.fa-blind:before {\n  content: \"\\f29d\";\n}\n.fa-audio-description:before {\n  content: \"\\f29e\";\n}\n.fa-volume-control-phone:before {\n  content: \"\\f2a0\";\n}\n.fa-braille:before {\n  content: \"\\f2a1\";\n}\n.fa-assistive-listening-systems:before {\n  content: \"\\f2a2\";\n}\n.fa-asl-interpreting:before,\n.fa-american-sign-language-interpreting:before {\n  content: \"\\f2a3\";\n}\n.fa-deafness:before,\n.fa-hard-of-hearing:before,\n.fa-deaf:before {\n  content: \"\\f2a4\";\n}\n.fa-glide:before {\n  content: \"\\f2a5\";\n}\n.fa-glide-g:before {\n  content: \"\\f2a6\";\n}\n.fa-signing:before,\n.fa-sign-language:before {\n  content: \"\\f2a7\";\n}\n.fa-low-vision:before {\n  content: \"\\f2a8\";\n}\n.fa-viadeo:before {\n  content: \"\\f2a9\";\n}\n.fa-viadeo-square:before {\n  content: \"\\f2aa\";\n}\n.fa-snapchat:before {\n  content: \"\\f2ab\";\n}\n.fa-snapchat-ghost:before {\n  content: \"\\f2ac\";\n}\n.fa-snapchat-square:before {\n  content: \"\\f2ad\";\n}\n.fa-pied-piper:before {\n  content: \"\\f2ae\";\n}\n.fa-first-order:before {\n  content: \"\\f2b0\";\n}\n.fa-yoast:before {\n  content: \"\\f2b1\";\n}\n.fa-themeisle:before {\n  content: \"\\f2b2\";\n}\n.fa-google-plus-circle:before,\n.fa-google-plus-official:before {\n  content: \"\\f2b3\";\n}\n.fa-fa:before,\n.fa-font-awesome:before {\n  content: \"\\f2b4\";\n}\n.fa-handshake-o:before {\n  content: \"\\f2b5\";\n}\n.fa-envelope-open:before {\n  content: \"\\f2b6\";\n}\n.fa-envelope-open-o:before {\n  content: \"\\f2b7\";\n}\n.fa-linode:before {\n  content: \"\\f2b8\";\n}\n.fa-address-book:before {\n  content: \"\\f2b9\";\n}\n.fa-address-book-o:before {\n  content: \"\\f2ba\";\n}\n.fa-vcard:before,\n.fa-address-card:before {\n  content: \"\\f2bb\";\n}\n.fa-vcard-o:before,\n.fa-address-card-o:before {\n  content: \"\\f2bc\";\n}\n.fa-user-circle:before {\n  content: \"\\f2bd\";\n}\n.fa-user-circle-o:before {\n  content: \"\\f2be\";\n}\n.fa-user-o:before {\n  content: \"\\f2c0\";\n}\n.fa-id-badge:before {\n  content: \"\\f2c1\";\n}\n.fa-drivers-license:before,\n.fa-id-card:before {\n  content: \"\\f2c2\";\n}\n.fa-drivers-license-o:before,\n.fa-id-card-o:before {\n  content: \"\\f2c3\";\n}\n.fa-quora:before {\n  content: \"\\f2c4\";\n}\n.fa-free-code-camp:before {\n  content: \"\\f2c5\";\n}\n.fa-telegram:before {\n  content: \"\\f2c6\";\n}\n.fa-thermometer-4:before,\n.fa-thermometer:before,\n.fa-thermometer-full:before {\n  content: \"\\f2c7\";\n}\n.fa-thermometer-3:before,\n.fa-thermometer-three-quarters:before {\n  content: \"\\f2c8\";\n}\n.fa-thermometer-2:before,\n.fa-thermometer-half:before {\n  content: \"\\f2c9\";\n}\n.fa-thermometer-1:before,\n.fa-thermometer-quarter:before {\n  content: \"\\f2ca\";\n}\n.fa-thermometer-0:before,\n.fa-thermometer-empty:before {\n  content: \"\\f2cb\";\n}\n.fa-shower:before {\n  content: \"\\f2cc\";\n}\n.fa-bathtub:before,\n.fa-s15:before,\n.fa-bath:before {\n  content: \"\\f2cd\";\n}\n.fa-podcast:before {\n  content: \"\\f2ce\";\n}\n.fa-window-maximize:before {\n  content: \"\\f2d0\";\n}\n.fa-window-minimize:before {\n  content: \"\\f2d1\";\n}\n.fa-window-restore:before {\n  content: \"\\f2d2\";\n}\n.fa-times-rectangle:before,\n.fa-window-close:before {\n  content: \"\\f2d3\";\n}\n.fa-times-rectangle-o:before,\n.fa-window-close-o:before {\n  content: \"\\f2d4\";\n}\n.fa-bandcamp:before {\n  content: \"\\f2d5\";\n}\n.fa-grav:before {\n  content: \"\\f2d6\";\n}\n.fa-etsy:before {\n  content: \"\\f2d7\";\n}\n.fa-imdb:before {\n  content: \"\\f2d8\";\n}\n.fa-ravelry:before {\n  content: \"\\f2d9\";\n}\n.fa-eercast:before {\n  content: \"\\f2da\";\n}\n.fa-microchip:before {\n  content: \"\\f2db\";\n}\n.fa-snowflake-o:before {\n  content: \"\\f2dc\";\n}\n.fa-superpowers:before {\n  content: \"\\f2dd\";\n}\n.fa-wpexplorer:before {\n  content: \"\\f2de\";\n}\n.fa-meetup:before {\n  content: \"\\f2e0\";\n}\n.sr-only {\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  padding: 0;\n  margin: -1px;\n  overflow: hidden;\n  clip: rect(0, 0, 0, 0);\n  border: 0;\n}\n.sr-only-focusable:active,\n.sr-only-focusable:focus {\n  position: static;\n  width: auto;\n  height: auto;\n  margin: 0;\n  overflow: visible;\n  clip: auto;\n}\n\n@charset \"utf-8\";\n.displayBar {\n  position: relative;\n  width: 236px;\n  height: 16px;\n  border: 1px solid #666666;\n  float: left;\n  margin: 0 5px 0 0;\n  overflow: hidden;\n  background: #000000;\n}\n.displayBarText {\n  position: absolute;\n  top: -2px;\n  left: 5px;\n  width: 100%;\n  height: 100%;\n  color: #ffffff;\n  font-weight: normal;\n}\n.displayBarFill {\n  width: 0%;\n  height: 100%;\n  background: #40628a;\n  overflow: hidden;\n  float: left;\n}\n.displayBarFill.alignRight {\n  float: right;\n}\n.displayBarText.good {\n  color: white;\n}\n.displayBarText.notgood {\n  color: white;\n}\n.displayBarText.average {\n  color: white;\n}\n.displayBarText.bad {\n  color: white;\n}\n.displayBarText.highlight {\n  color: black;\n}\n.displayBarFill.good {\n  color: #ffffff;\n  background: #4f7529;\n}\n.displayBarFill.notgood {\n  color: #ffffff;\n  background: #ffb400;\n}\n.displayBarFill.average {\n  color: #ffffff;\n  background: #cd6500;\n}\n.displayBarFill.bad {\n  color: #ffffff;\n  background: #ee0000;\n}\n.displayBarFill.highlight {\n  color: #ffffff;\n  background: #8BA5C4;\n}\n.link,\n.linkOn,\n.linkOff,\n.selected,\n.disabled,\n.yellowButton,\n.redButton,\n.linkEncourage,\n.linkDiscourage {\n  float: left;\n  min-width: 15px;\n  height: 16px;\n  text-align: center;\n  color: #ffffff;\n  text-decoration: none;\n  background: #40628a;\n  border: 1px solid #161616;\n  padding: 0px 4px 4px 4px;\n  margin: 0 2px 2px 0;\n  cursor: default;\n  white-space: nowrap;\n}\n.hasIcon {\n  padding: 0px 4px 4px 0px;\n}\na.hover,\n.zoomLink.hover,\n.linkActive.hover {\n  background: #507aac;\n}\n@keyframes pendingAnimation {\n  to {\n    color: #ffffff;\n    background: #507aac;\n  }\n}\n.linkPending,\n.linkPending.hover {\n  animation-name: pendingAnimation;\n  animation-duration: 0.25s;\n}\na.white,\na.white:link,\na.white:visited,\na.white:active {\n  color: #40628a;\n  text-decoration: none;\n  background: #ffffff;\n  border: 1px solid #161616;\n  padding: 1px 4px 1px 4px;\n  margin: 0 2px 0 0;\n  cursor: default;\n}\na.white.hover {\n  color: #ffffff;\n  background: #40628a;\n}\n.linkOn,\na.linkOn:link,\na.linkOn:visited,\na.linkOn:active,\na.linkOn.hover,\n.selected,\na.selected:link,\na.selected:visited,\na.selected:active,\na.selected.hover {\n  color: #ffffff;\n  background: #2f943c;\n}\n.linkOff,\na.linkOff:link,\na.linkOff:visited,\na.linkOff:active,\na.linkOff.hover,\n.disabled,\na.disabled:link,\na.disabled:visited,\na.disabled:active,\na.disabled.hover {\n  color: #ffffff;\n  background: #999999;\n  border-color: #666666;\n}\na.icon,\n.linkOn.icon,\n.linkOff.icon,\n.selected.icon,\n.disabled.icon {\n  position: relative;\n  padding: 1px 4px 2px 20px;\n}\na.icon img,\n.linkOn.icon img,\n.linkOff.icon img,\n.selected.icon img,\n.disabled.icon img {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 18px;\n  height: 18px;\n}\n.linkDanger,\na.linkDanger:link,\na.linkDanger:visited,\na.linkDanger:active {\n  color: #ffffff;\n  background-color: #ff0000;\n  border-color: #aa0000;\n}\n.linkDanger.hover {\n  background-color: #ff6666;\n}\n.linkEncourage,\na.linkEncourage:link,\na.linkEncourage:visited,\na.linkEncourage:active {\n  color: #99ff33;\n  background-color: #40628a;\n  border-color: #161616;\n}\n.linkEncourage.hover {\n  background-color: #507aac;\n}\n.linkDiscourage,\na.linkDiscourage:link,\na.linkDiscourage:visited,\na.linkDiscourage:active {\n  color: #8c8c8c;\n  background-color: #40628a;\n  border-color: #161616;\n}\n.linkDiscourage.hover {\n  color: #ff0000;\n  background-color: #507aac;\n}\n.inactive,\na.inactive:link,\na.inactive:visited,\na.inactive:active,\na.inactive.hover {\n  color: #ffffff;\n  background: #999999;\n  border-color: #666666;\n}\n.white {\n  color: white;\n  font-weight: bold;\n}\n.good {\n  color: #4f7529;\n  font-weight: bold;\n}\n.average {\n  color: #cd6500;\n  font-weight: bold;\n}\n.bad {\n  color: #ee0000;\n  font-weight: bold;\n}\n.idle {\n  color: #272727;\n  font-weight: bold;\n}\n.redButton {\n  background: #ea0000;\n}\n.yellowButton {\n  background: #cacc00;\n}\n.highlight {\n  color: #8BA5C4;\n}\n.dark {\n  color: #272727;\n}\n/* Damage colors for crew monitoring computer */\n.burn {\n  color: orange;\n}\n.brute {\n  color: red;\n}\n.toxin {\n  color: green;\n}\n.toxin_light {\n  color: #3ADF00;\n}\n.oxyloss {\n  color: blue;\n}\n.oxyloss_light {\n  color: #6698FF;\n}\n/* Wire colors for nuclear bomb defusion */\n.Red {\n  color: #FF0000;\n}\n.Blue {\n  color: #0000FF;\n}\n.Green {\n  color: #00FF00;\n}\n.Marigold {\n  color: #FDA505;\n}\n.Fuschia {\n  color: #FF0080;\n}\n.Black {\n  color: #000000;\n}\n.Pearl {\n  color: #C6CACB;\n}\n/* Status bar colors for sleeper temperatures */\n.cold1 {\n  color: #94B8FF;\n}\n.cold2 {\n  color: #6699FF;\n}\n.cold3 {\n  color: #293D66;\n}\n.hot1 {\n  color: #FF9966;\n}\n.hot2 {\n  color: #993D00;\n}\n.hot3 {\n  color: #FF6600;\n}\ndiv.display {\n  padding: 4px;\n  margin: 6px 0;\n  background-color: rgba(0, 0, 0, 0.33);\n  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.5);\n}\ndiv.display header {\n  display: block;\n  position: relative;\n  width: 98.5%;\n  padding: 0 4px;\n  margin-bottom: 6px;\n  color: #FFFFFF;\n  border-bottom: 2px solid #40628a;\n}\ndiv.display header .buttonRight {\n  position: absolute;\n  bottom: 6px;\n  right: 4px;\n}\ndiv.display article {\n  display: table;\n  width: 100%;\n  border-collapse: collapse;\n}\n.itemGroup {\n  border: 1px solid #e9c183;\n  background: #2c2c2c;\n  padding: 4px;\n  clear: both;\n}\n.item {\n  width: 100%;\n  margin: 4px 0 0 0;\n  clear: both;\n  overflow: auto;\n}\n.itemContentNarrow,\n.itemContent {\n  float: left;\n}\n.itemContentNarrow {\n  width: 30%;\n}\n.itemContent {\n  width: 69%;\n}\n.itemLabelNarrow,\n.itemLabel,\n.itemLabelWide,\n.itemLabelWider,\n.itemLabelWidest {\n  float: left;\n  color: #e9c183;\n}\n.itemLabelNarrow {\n  width: 20%;\n}\n.itemLabel {\n  width: 30%;\n}\n.itemLabelWide {\n  width: 45%;\n}\n.itemLabelWider {\n  width: 69%;\n}\n.itemLabelWidest {\n  width: 100%;\n}\n.itemContentWide {\n  float: left;\n  width: 79%;\n}\n.itemContentSmall {\n  float: left;\n  width: 33%;\n}\n.itemContentMedium {\n  float: left;\n  width: 55%;\n}\n.block {\n  padding: 8px;\n  margin: 10px 4px 4px 4px;\n  border: 1px solid #40628a;\n  background-color: #202020;\n}\n.block h3 {\n  padding: 0;\n}\n.clearBoth {\n  clear: both;\n}\n.clearLeft {\n  clear: left;\n}\n.clearRight {\n  clear: right;\n}\n.line {\n  width: 100%;\n  clear: both;\n}\n.fixedLeft {\n  width: 110px;\n  float: left;\n}\n.fixedLeftWide {\n  width: 165px;\n  float: left;\n}\n.fixedLeftWider {\n  width: 220px;\n  float: left;\n}\n.fixedLeftWidest {\n  width: 250px;\n  float: left;\n}\n.floatRight {\n  float: right;\n}\n.floatLeft {\n  float: left;\n}\n.hidden {\n  display: none;\n}\n.statusDisplay {\n  background: rgba(0, 0, 0, 0.5);\n  color: #ffffff;\n  border: 1px solid #40628a;\n  padding: 4px;\n  margin: 3px 0;\n  overflow: hidden;\n}\n.statusDisplayRecords {\n  background: rgba(0, 0, 0, 0.5);\n  color: #ffffff;\n  border: 1px solid #40628a;\n  padding: 4px;\n  margin: 3px 0;\n  overflow-x: hidden;\n  overflow-y: auto;\n}\n.statusLabel {\n  width: 138px;\n  float: left;\n  overflow: hidden;\n  color: #98B0C3;\n}\n.statusValue {\n  float: left;\n}\n.jobValues {\n  float: left;\n  width: 30%;\n}\n.fancy {\n  display: none;\n}\ni.fancy {\n  display: none;\n}\n.minimize {\n  color: #E9C183;\n  cursor: pointer !important;\n  z-index: 102;\n  position: absolute;\n  top: 6px;\n  right: 46px;\n}\n.minimize:hover {\n  color: #b8c9d6;\n}\n.close {\n  color: #E9C183;\n  cursor: pointer !important;\n  z-index: 102;\n  position: absolute;\n  top: 4px;\n  right: 12px;\n}\n.close:hover {\n  color: #b8c9d6;\n}\n#uiCornerTL {\n  position: fixed;\n  z-index: 101;\n  min-width: 30px;\n  min-height: 30px;\n  top: 0;\n  left: 0;\n  background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAIAAAC0Ujn1AAAACXBIWXMAAAsTAAALEwEAmpwYAAAGTGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS42LWMxNDIgNzkuMTYwOTI0LCAyMDE3LzA3LzEzLTAxOjA2OjM5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDE4LTExLTIwVDIyOjM4OjI1LTA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAxOC0xMS0yMFQyMzowMzowMS0wODowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAxOC0xMS0yMFQyMzowMzowMS0wODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHBob3Rvc2hvcDpJQ0NQcm9maWxlPSJzUkdCIElFQzYxOTY2LTIuMSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpkOWRlMzc1Yi04ZWQwLWI3NDctOTQzZS0zN2UwZGU2NDkyODQiIHhtcE1NOkRvY3VtZW50SUQ9ImFkb2JlOmRvY2lkOnBob3Rvc2hvcDo0ZmVhZjJmZC03YWVhLWUyNGQtYTNkZS05ZmI5ZGM0ZTA0YzIiIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpjZTU4OTk5My1mZDU2LTEzNDktYWMyMC03NGZkZmY5NjNjYTgiPiA8eG1wTU06SGlzdG9yeT4gPHJkZjpTZXE+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjcmVhdGVkIiBzdEV2dDppbnN0YW5jZUlEPSJ4bXAuaWlkOmNlNTg5OTkzLWZkNTYtMTM0OS1hYzIwLTc0ZmRmZjk2M2NhOCIgc3RFdnQ6d2hlbj0iMjAxOC0xMS0yMFQyMjozODoyNS0wODowMCIgc3RFdnQ6c29mdHdhcmVBZ2VudD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIi8+IDxyZGY6bGkgc3RFdnQ6YWN0aW9uPSJjb252ZXJ0ZWQiIHN0RXZ0OnBhcmFtZXRlcnM9ImZyb20gaW1hZ2UvZ2lmIHRvIGltYWdlL3BuZyIvPiA8cmRmOmxpIHN0RXZ0OmFjdGlvbj0ic2F2ZWQiIHN0RXZ0Omluc3RhbmNlSUQ9InhtcC5paWQ6ZDlkZTM3NWItOGVkMC1iNzQ3LTk0M2UtMzdlMGRlNjQ5Mjg0IiBzdEV2dDp3aGVuPSIyMDE4LTExLTIwVDIzOjAzOjAxLTA4OjAwIiBzdEV2dDpzb2Z0d2FyZUFnZW50PSJBZG9iZSBQaG90b3Nob3AgQ0MgMjAxOCAoV2luZG93cykiIHN0RXZ0OmNoYW5nZWQ9Ii8iLz4gPC9yZGY6U2VxPiA8L3htcE1NOkhpc3Rvcnk+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+QnRKRAAAAIhJREFUSIm1zLcRgEAMBMCDokQf9B/SBwQwmOeNzGkL2GnHhgSLrHPSC4Bfny+/vl9y/X6ZdfHS6v/LqasvoW690brzhur+66+Hr7PWvJ5a+Zpr/WurTa+htr7a2vGqat87rt3voI68vTr4Nuv4W68pb6VmvWVNfD81931q+nvVGS+ASUQyXgAHuOgYYwOkhIYAAAAASUVORK5CYII=\") no-repeat;\n}\n/* Resizing (Stolen from Goon CC-BY-NC-SA) */\n.resizeArea {\n  position: absolute;\n  z-index: 99999;\n}\n.resizeArea.top {\n  top: 0;\n  left: 10px;\n  right: 10px;\n  height: 5px;\n  cursor: n-resize;\n}\n.resizeArea.tr {\n  top: 0;\n  right: 0;\n  height: 10px;\n  width: 10px;\n  cursor: ne-resize;\n}\n.resizeArea.right {\n  top: 10px;\n  right: 0;\n  bottom: 10px;\n  width: 5px;\n  cursor: e-resize;\n}\n.resizeArea.br {\n  bottom: 0;\n  right: 0;\n  height: 10px;\n  width: 10px;\n  cursor: se-resize;\n}\n.resizeArea.bottom {\n  bottom: 0;\n  left: 10px;\n  right: 10px;\n  height: 5px;\n  cursor: s-resize;\n}\n.resizeArea.bl {\n  bottom: 0;\n  left: 0;\n  height: 10px;\n  width: 10px;\n  cursor: sw-resize;\n}\n.resizeArea.left {\n  top: 10px;\n  left: 0;\n  bottom: 10px;\n  width: 5px;\n  cursor: w-resize;\n}\n.resizeArea.tl {\n  top: 0;\n  left: 0;\n  height: 10px;\n  width: 10px;\n  cursor: nw-resize;\n}\n/* End Resizing */\n/* Icons\n----------------------------------*/\n/* states and images */\n.uiLinkPendingIcon {\n  display: none;\n  float: left;\n  width: 16px;\n  height: 16px;\n  margin: 2px 2px 0 2px;\n  background-image: url(uiLinkPendingIcon.gif);\n}\n.linkPending .fa {\n  display: none;\n}\n.linkPending .uiLinkPendingIcon {\n  display: block;\n}\n.mapIcon16 {\n  position: absolute;\n  width: 16px;\n  height: 16px;\n  background-image: url(uiIcons16Green.png);\n  background-position: -144px -96px;\n  background-repeat: no-repeat;\n  zoom: 0.125;\n  margin-left: -1px;\n  /*margin-bottom: -1px;*/\n}\n.mapIcon16.dead {\n  background-image: url(uiIcons16Red.png);\n}\n.mapIcon16.bad {\n  background-image: url(uiIcons16Red.png);\n}\n.mapIcon16.average {\n  background-image: url(uiIcons16Orange.png);\n}\n.mapIcon16.good {\n  background-image: url(uiIcons16Green.png);\n}\n/* AirAlarm */\n.mapIcon16.icon-airalarm {\n  background-position: 0 -144px;\n}\n/* Command Positions */\n.mapIcon16.rank-captain {\n  background-position: -224px -112px;\n}\n.mapIcon16.rank-headofpersonnel {\n  background-position: -112px -96px;\n}\n.mapIcon16.rank-headofsecurity {\n  background-position: -112px -128px;\n}\n.mapIcon16.rank-chiefengineer {\n  background-position: -176px -112px;\n}\n.mapIcon16.rank-researchdirector {\n  background-position: -128px -128px;\n}\n.mapIcon16.rank-chiefmedicalofficer {\n  background-position: -32px -128px;\n}\n/* Engineering Positions */\n.mapIcon16.rank-stationengineer {\n  background-position: -176px -112px;\n}\n.mapIcon16.rank-atmospherictechnician {\n  background-position: -176px -112px;\n}\n/* Medical Positions */\n.mapIcon16.rank-medicaldoctor {\n  background-position: -32px -128px;\n}\n.mapIcon16.rank-geneticist {\n  background-position: -32px -128px;\n}\n.mapIcon16.rank-psychiatrist {\n  background-position: -32px -128px;\n}\n.mapIcon16.rank-chemist {\n  background-position: -32px -128px;\n}\n/* Science Positions */\n.mapIcon16.rank-scientist {\n  background-position: -128px -128px;\n}\n.mapIcon16.rank-geneticist {\n  background-position: -128px -128px;\n}\n.mapIcon16.rank-roboticist {\n  background-position: -128px -128px;\n}\n.mapIcon16.rank-xenobiologist {\n  background-position: -128px -128px;\n}\n/* Security Positions */\n.mapIcon16.rank-warden {\n  background-position: -112px -128px;\n}\n.mapIcon16.rank-detective {\n  background-position: -112px -128px;\n}\n.mapIcon16.rank-securityofficer {\n  background-position: -112px -128px;\n}\nul {\n  padding: 4px 0 0 10px;\n  margin: 0;\n  list-style-type: none;\n}\nli {\n  padding: 0 0 2px 0;\n}\ntable.fixed {\n  table-layout: fixed;\n}\ntable.fixed td {\n  overflow: hidden;\n}\n/* Table styling for the power monitor */\ntable.pmon {\n  border: 2px solid RoyalBlue;\n}\ntable.pmon td,\ntable.pmon th {\n  border-bottom: 1px dotted black;\n  padding: 0px 5px 0px 5px;\n}\n/* Table styling for the crew manifest */\nth.command {\n  background: #3333FF;\n  font-weight: bold;\n  color: #ffffff;\n}\nth.sec {\n  background: #8e0000;\n  font-weight: bold;\n  color: #ffffff;\n}\nth.med {\n  background: #006600;\n  font-weight: bold;\n  color: #ffffff;\n}\nth.eng {\n  background: #b27300;\n  font-weight: bold;\n  color: #ffffff;\n}\nth.sci {\n  background: #a65ba6;\n  font-weight: bold;\n  color: #ffffff;\n}\nth.ser {\n  background: #7100AA;\n  font-weight: bold;\n  color: #ffffff;\n}\nth.sup {\n  background: #666621;\n  font-weight: bold;\n  color: #ffffff;\n}\nth.civ {\n  background: #a32800;\n  font-weight: bold;\n  color: #ffffff;\n}\nth.misc {\n  background: #666;\n  font-weight: bold;\n  color: #ffffff;\n}\nspan.qm-job {\n  color: #b77a41;\n  font-weight: bold;\n}\n/* Striped lines for tables and divs */\n.striped tr:nth-child(even) {\n  background-color: #404040;\n}\n.striped:not(table) > :nth-child(even) {\n  background-color: #404040;\n}\n#uiNoScript {\n  position: fixed;\n  top: 50%;\n  left: 50%;\n  margin: -60px 0 0 -150px;\n  width: 280px;\n  height: 120px;\n  background: #ffffff;\n  border: 2px solid #ff0000;\n  color: #000000;\n  font-size: 10px;\n  font-weight: bold;\n  z-index: 9999;\n  padding: 0px 10px;\n  text-align: center;\n}\n/**********************************\n     .notice | Caution Stripes\n**********************************/\n.notice {\n  position: relative;\n  background: url(uiNoticeBackground.jpg) 50% 50%;\n  color: #000000;\n  font-size: 12px;\n  font-style: italic;\n  font-weight: bold;\n  padding: 3px 4px 3px 4px;\n  margin: 4px 0 4px 0;\n}\n.noticePlaceholder {\n  position: relative;\n  font-size: 12px;\n  font-style: italic;\n  font-weight: bold;\n  padding: 3px 4px 3px 4px;\n  margin: 4px 0 4px 0;\n}\n.notice.icon {\n  padding: 2px 4px 0 20px;\n}\n.notice img {\n  position: absolute;\n  top: 0;\n  left: 0;\n  width: 16px;\n  height: 16px;\n}\ndiv.notice {\n  clear: both;\n}\n/********************\\\n\\********************/\n/**********************************\n    PDA, DNA Modifier styles\n    Don't fit anywhere else.\n**********************************/\n/* PDA styling */\n.wholeScreen {\n  position: absolute;\n  color: #517087;\n  font-size: 16px;\n  font-weight: bold;\n  text-align: center;\n}\n.pdalink {\n  float: left;\n  white-space: nowrap;\n  cursor: default !important;\n}\n.pdalink.disabled {\n  background: none;\n  border: none;\n  color: #999;\n  text-align: left;\n}\n.pdanote {\n  color: #cd6500;\n  font-weight: bold;\n}\n.item.mainmenu {\n  padding-bottom: 0.5em;\n}\ndiv.clock {\n  color: white;\n  font-weight: bold;\n  float: right;\n  padding-right: 2em;\n}\n#pdaFooter {\n  position: fixed;\n  left: 0;\n  bottom: 0;\n  width: 100%;\n  background: #272727;\n}\n.pdaFooterButton {\n  width: 33%;\n  padding: 0.5em 0;\n  font-size: 200%;\n  border: none;\n  background: none;\n  color: #fff;\n}\n.pdaFooterButton.hover {\n  background: #507aac;\n}\n.pdaFooterButton.disabled {\n  background: none !important;\n  color: #555 !important;\n}\n.pdaFooterButton .uiLinkPendingIcon {\n  position: absolute;\n  width: 33%;\n  background-repeat: no-repeat;\n  background-position: center;\n}\n/* DNA Modifier styling */\n.dnaBlock {\n  float: left;\n  width: 90px;\n  padding: 0 0 5px 0;\n}\n.dnaBlockNumber {\n  font-family: Fixed, monospace;\n  float: left;\n  color: #ffffff;\n  background: #363636;\n  min-width: 20px;\n  height: 20px;\n  padding: 0;\n  text-align: center;\n}\n.dnaSubBlock {\n  font-family: Fixed, monospace;\n  float: left;\n  padding: 0;\n  min-width: 16px;\n  height: 20px;\n  text-align: center;\n}\n.mask {\n  position: fixed;\n  left: 0;\n  top: 0;\n  width: 100%;\n  height: 100%;\n  background: url(uiMaskBackground.png);\n}\n.maskContent {\n  width: 100%;\n  height: 200px;\n  margin: 200px 0;\n  text-align: center;\n}\n/********************\\\n\\********************/\nbody {\n  color: #ffffff;\n  font-family: Verdana, Geneva, sans-serif;\n  font-size: 12px;\n  line-height: 170%;\n  margin: 0;\n  padding: 0;\n}\nhr {\n  background-color: #40628a;\n  height: 1px;\n  border: none;\n}\nimg,\na img {\n  border-style: none;\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n  margin: 0;\n  padding: 12px 0 6px 0;\n  color: #FFFFFF;\n  clear: both;\n}\nh1 {\n  font-size: 18px;\n}\nh2 {\n  font-size: 16px;\n}\nh3 {\n  font-size: 14px;\n}\nh4 {\n  font-size: 12px;\n}\n*[data-tooltip] {\n  position: relative;\n}\n*[data-tooltip]::after {\n  position: absolute;\n  display: block;\n  z-index: 2;\n  width: 250px;\n  padding: 10px;\n  -ms-transform: translateX(-50%);\n      transform: translateX(-50%);\n  visibility: hidden;\n  opacity: 0;\n  white-space: normal;\n  text-align: left;\n  content: attr(data-tooltip);\n  transition: all 0.5s;\n  border: 1px solid #999999;\n  background-color: #363636;\n}\n*[data-tooltip]:hover::after {\n  visibility: visible;\n  opacity: 1;\n}\n*[data-tooltip].tooltipTop::after {\n  bottom: 100%;\n  left: 50%;\n  -ms-transform: translateX(-50%) translateY(8px);\n      transform: translateX(-50%) translateY(8px);\n}\n*[data-tooltip].tooltipTop:hover::after {\n  -ms-transform: translateX(-50%) translateY(-8px);\n      transform: translateX(-50%) translateY(-8px);\n}\n*[data-tooltip].tooltipBottom::after {\n  top: 100%;\n  left: 50%;\n  -ms-transform: translateX(-50%) translateY(-8px);\n      transform: translateX(-50%) translateY(-8px);\n}\n*[data-tooltip].tooltipBottom:hover::after {\n  -ms-transform: translateX(-50%) translateY(8px);\n      transform: translateX(-50%) translateY(8px);\n}\n*[data-tooltip].tooltipLeft::after {\n  top: 50%;\n  right: 100%;\n  -ms-transform: translateX(8px) translateY(-50%);\n      transform: translateX(8px) translateY(-50%);\n}\n*[data-tooltip].tooltipLeft:hover::after {\n  -ms-transform: translateX(-8px) translateY(-50%);\n      transform: translateX(-8px) translateY(-50%);\n}\n*[data-tooltip].tooltipRight::after {\n  top: 50%;\n  left: 100%;\n  -ms-transform: translateX(-8px) translateY(-50%);\n      transform: translateX(-8px) translateY(-50%);\n}\n*[data-tooltip].tooltipRight:hover::after {\n  -ms-transform: translateX(8px) translateY(-50%);\n      transform: translateX(8px) translateY(-50%);\n}\n.mainBG {\n  position: fixed;\n  z-index: -1;\n  top: 30px;\n  left: 0px;\n  right: 0px;\n  bottom: 0px;\n  background: url(\"data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%20standalone%3D%22no%22%3F%3E%0D%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.0%22%20viewBox%3D%220%200%20425%20200%22%20opacity%3D%22.25%22%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20178.00399%2C0.03869%20-71.20393%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76134%2C6.02555%20l%200%2C187.87147%20a%206.7613422%2C6.0255495%200%200%200%206.76134%2C6.02554%20l%2053.1072%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-101.544018%2072.21628%2C104.699398%20a%206.7613422%2C6.0255495%200%200%200%205.76015%2C2.87016%20l%2073.55487%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-187.87147%20a%206.7613422%2C6.0255495%200%200%200%20-6.76135%2C-6.02555%20l%20-54.71644%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76133%2C6.02555%20l%200%2C102.61935%20L%20183.76413%2C2.90886%20a%206.7613422%2C6.0255495%200%200%200%20-5.76014%2C-2.87017%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22M%204.8446333%2C22.10875%20A%2013.412039%2C12.501842%200%200%201%2013.477588%2C0.03924%20l%2066.118315%2C0%20a%205.3648158%2C5.000737%200%200%201%205.364823%2C5.00073%20l%200%2C79.87931%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20420.15535%2C177.89119%20a%2013.412038%2C12.501842%200%200%201%20-8.63295%2C22.06951%20l%20-66.11832%2C0%20a%205.3648152%2C5.000737%200%200%201%20-5.36482%2C-5.00074%20l%200%2C-79.87931%20z%22%20%2F%3E%0D%0A%3C%2Fsvg%3E%0D%0A\") no-repeat fixed center / 70% 70%, linear-gradient(to bottom, #2a2a2a 0%, #202020 100%) no-repeat fixed center / 100% 100%;\n}\nhtml,\nbody {\n  scrollbar-face-color: #666666;\n  scrollbar-arrow-color: #E9C183;\n  scrollbar-track-color: #363636;\n  scrollbar-shadow-color: #555555;\n}\n#uiWrapper {\n  width: 100%;\n  height: 100%;\n  -ms-user-select: none;\n  user-select: none;\n}\n#uiTitleWrapper {\n  position: fixed;\n  min-height: 30px;\n  min-width: 100%;\n  background-color: #363636;\n  left: 0px;\n  top: 0px;\n  right: 0px;\n  overflow: hidden;\n  z-index: 100;\n}\n#uiTitleWrapper > div {\n  cursor: default;\n}\n#uiTitleWrapper > i {\n  cursor: default;\n}\n#uiTitleText {\n  position: absolute;\n  top: 6px;\n  left: 44px;\n  width: 66%;\n  overflow: hidden;\n  color: #E9C183;\n  font-size: 16px;\n}\n#uiTitle.icon {\n  padding: 6px 8px 6px 42px;\n  background-position: 2px 50%;\n  background-repeat: no-repeat;\n}\n#uiTitleFluff {\n  position: absolute;\n  top: 4px;\n  right: 12px;\n  width: 42px;\n  height: 24px;\n  background: url(\"data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%20standalone%3D%22no%22%3F%3E%0D%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.0%22%20viewBox%3D%220%200%20425%20200%22%20opacity%3D%22.25%22%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20178.00399%2C0.03869%20-71.20393%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76134%2C6.02555%20l%200%2C187.87147%20a%206.7613422%2C6.0255495%200%200%200%206.76134%2C6.02554%20l%2053.1072%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-101.544018%2072.21628%2C104.699398%20a%206.7613422%2C6.0255495%200%200%200%205.76015%2C2.87016%20l%2073.55487%2C0%20a%206.7613422%2C6.0255495%200%200%200%206.76135%2C-6.02554%20l%200%2C-187.87147%20a%206.7613422%2C6.0255495%200%200%200%20-6.76135%2C-6.02555%20l%20-54.71644%2C0%20a%206.7613422%2C6.0255495%200%200%200%20-6.76133%2C6.02555%20l%200%2C102.61935%20L%20183.76413%2C2.90886%20a%206.7613422%2C6.0255495%200%200%200%20-5.76014%2C-2.87017%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22M%204.8446333%2C22.10875%20A%2013.412039%2C12.501842%200%200%201%2013.477588%2C0.03924%20l%2066.118315%2C0%20a%205.3648158%2C5.000737%200%200%201%205.364823%2C5.00073%20l%200%2C79.87931%20z%22%20%2F%3E%0D%0A%20%20%3Cpath%20d%3D%22m%20420.15535%2C177.89119%20a%2013.412038%2C12.501842%200%200%201%20-8.63295%2C22.06951%20l%20-66.11832%2C0%20a%205.3648152%2C5.000737%200%200%201%20-5.36482%2C-5.00074%20l%200%2C-79.87931%20z%22%20%2F%3E%0D%0A%3C%2Fsvg%3E%0D%0A\") 50% 50% no-repeat;\n}\n.statusicon {\n  position: absolute;\n  top: 4px;\n  left: 12px;\n}\n#uiMapWrapper {\n  clear: both;\n  padding: 8px;\n  margin-top: 30px;\n}\n#uiMapHeader {\n  position: relative;\n  clear: both;\n}\n#uiMapContainer {\n  position: relative;\n  width: 100%;\n  height: 600px;\n  overflow: hidden;\n  border: 1px solid #40628a;\n  background: url(nanomapBackground.png);\n}\n#uiMap {\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  margin: -512px 0 0 -512px;\n  width: 256px;\n  height: 256px;\n  overflow: hidden;\n  zoom: 4;\n}\n#uiMapImage {\n  position: absolute;\n  bottom: 1px;\n  left: 1px;\n  width: 256px;\n  height: 256px;\n}\n#uiMapContent {\n  position: absolute;\n  bottom: -13.5px;\n  left: 0px;\n  width: 256px;\n  height: 256px;\n}\n#uiMapFooter {\n  position: relative;\n  clear: both;\n}\n#uiContent {\n  clear: both;\n  padding: 8px;\n  margin-top: 30px;\n}\n#uiMapTooltip {\n  position: absolute;\n  right: 10px;\n  top: 10px;\n  border: 1px solid #40628a;\n  background-color: #272727;\n  padding: 8px;\n  display: none;\n  z-index: 9999;\n}\n#uiLoadingNotice {\n  position: relative;\n  background: url(uiNoticeBackground.jpg) 50% 50%;\n  color: #000000;\n  font-size: 14px;\n  font-style: italic;\n  font-weight: bold;\n  padding: 3px 4px 3px 4px;\n  margin: 4px 0 4px 0;\n}\n.underTitle {\n  margin-top: 30px;\n}\n",null,null,null,".displayBar {\r\n    position: relative;\r\n    width: 236px;\r\n    height: 16px;\r\n    border: 1px solid #666666;\r\n    float: left;\r\n    margin: 0 5px 0 0;\r\n    overflow: hidden;\r\n    background: #000000;\r\n}\r\n\r\n.displayBarText {\r\n    position: absolute;\r\n    top: -2px;\r\n    left: 5px;\r\n    width: 100%;\r\n    height: 100%;\r\n    color: #ffffff;\r\n    font-weight: normal;\r\n}\r\n\r\n.displayBarFill {\r\n    width: 0%;\r\n    height: 100%;\r\n    background: #40628a;\r\n    overflow: hidden;\r\n    float: left;\r\n}\r\n\r\n.displayBarFill.alignRight {\r\n    float: right;\r\n}\r\n\r\n.displayBarText.good {\r\n\tcolor: white;\r\n}\r\n\r\n.displayBarText.notgood {\r\n\tcolor: white;\r\n}\r\n\r\n.displayBarText.average {\r\n\tcolor: white;\r\n}\r\n\r\n.displayBarText.bad {\r\n\tcolor: white;\r\n}\r\n\r\n.displayBarText.highlight {\r\n\tcolor: black;\r\n}\r\n\r\n.displayBarFill.good {\r\n    color: #ffffff;\r\n    background: @good-color;\r\n}\r\n\r\n.displayBarFill.notgood {\r\n    color: #ffffff;\r\n    background: #ffb400;\r\n}\r\n\r\n.displayBarFill.average {\r\n    color: #ffffff;\r\n    background: @average-color;\r\n}\r\n\r\n.displayBarFill.bad {\r\n    color: #ffffff;\r\n    background: @bad-color;\r\n}\r\n\r\n.displayBarFill.highlight {\r\n    color: #ffffff;\r\n    background: @highlight-color;\r\n}\r\n",".link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton, .linkEncourage, .linkDiscourage {\r\n    float: left;\r\n    min-width: 15px;\r\n    height: 16px;\r\n    text-align: center;\r\n    color: #ffffff;\r\n    text-decoration: none;\r\n    background: #40628a;\r\n    border: 1px solid #161616;\r\n    padding: 0px 4px 4px 4px;\r\n    margin: 0 2px 2px 0;\r\n    cursor: default;\r\n    white-space: nowrap;\r\n}\r\n\r\n.hasIcon {\r\n    padding: 0px 4px 4px 0px;\r\n}\r\n\r\na.hover, .zoomLink.hover, .linkActive.hover {\r\n    background: #507aac;\r\n}\r\n\r\n@keyframes pendingAnimation {\r\n    to {\r\n        color: #ffffff;\r\n        background: #507aac;\r\n    }\r\n}\r\n\r\n.linkPending, .linkPending.hover {\r\n    animation-name: pendingAnimation;\r\n    animation-duration: 0.25s;\r\n}\r\n\r\na.white, a.white:link, a.white:visited, a.white:active {\r\n    color: #40628a;\r\n    text-decoration: none;\r\n    background: #ffffff;\r\n    border: 1px solid #161616;\r\n    padding: 1px 4px 1px 4px;\r\n    margin: 0 2px 0 0;\r\n    cursor: default;\r\n}\r\n\r\na.white.hover {\r\n    color: #ffffff;\r\n    background: #40628a;\r\n}\r\n\r\n.linkOn, a.linkOn:link, a.linkOn:visited, a.linkOn:active, a.linkOn.hover, .selected, a.selected:link, a.selected:visited, a.selected:active, a.selected.hover {\r\n    color: #ffffff;\r\n    background: #2f943c;\r\n}\r\n\r\n.linkOff, a.linkOff:link, a.linkOff:visited, a.linkOff:active, a.linkOff.hover, .disabled, a.disabled:link, a.disabled:visited, a.disabled:active, a.disabled.hover {\r\n    color: #ffffff;\r\n    background: #999999;\r\n    border-color: #666666;\r\n}\r\n\r\na.icon, .linkOn.icon, .linkOff.icon, .selected.icon, .disabled.icon {\r\n    position: relative;\r\n    padding: 1px 4px 2px 20px;\r\n}\r\n\r\na.icon img, .linkOn.icon img, .linkOff.icon img, .selected.icon img, .disabled.icon img {\r\n    position: absolute;\r\n    top: 0;\r\n    left: 0;\r\n    width: 18px;\r\n    height: 18px;\r\n}\r\n\r\n.linkDanger, a.linkDanger:link, a.linkDanger:visited, a.linkDanger:active {\r\n    color: #ffffff;\r\n    background-color: #ff0000;\r\n    border-color: #aa0000;\r\n}\r\n\r\n.linkDanger.hover {\r\n    background-color: #ff6666;\r\n}\r\n\r\n.linkEncourage, a.linkEncourage:link, a.linkEncourage:visited, a.linkEncourage:active {\r\n    color: #99ff33;\r\n    background-color: #40628a;\r\n    border-color: #161616;\r\n}\r\n\r\n.linkEncourage.hover {\r\n    background-color: #507aac;\r\n}\r\n\r\n.linkDiscourage, a.linkDiscourage:link, a.linkDiscourage:visited, a.linkDiscourage:active {\r\n    color: #8c8c8c;\r\n    background-color: #40628a;\r\n    border-color: #161616;\r\n}\r\n\r\n.linkDiscourage.hover {\r\n\tcolor: #ff0000;\r\n    background-color: #507aac;\r\n}\r\n\r\n.inactive, a.inactive:link, a.inactive:visited, a.inactive:active, a.inactive.hover {\r\n    color: #ffffff;\r\n    background: #999999;\r\n    border-color: #666666;\r\n}","@import \"_config\";\r\n\r\n.white {\r\n    color: white;\r\n    font-weight: bold;\r\n}\r\n\r\n.good {\r\n    color: @good-color;\r\n    font-weight: bold;\r\n}\r\n\r\n.average {\r\n    color: @average-color;\r\n    font-weight: bold;\r\n}\r\n\r\n.bad {\r\n    color: @bad-color;\r\n    font-weight: bold;\r\n}\r\n\r\n.idle {\r\n    color: @dark-color;\r\n    font-weight: bold;\r\n}\r\n\r\n.redButton {\r\n    background: #ea0000;\r\n}\r\n\r\n.yellowButton {\r\n    background: #cacc00;\r\n}\r\n\r\n.highlight {\r\n    color: @highlight-color;\r\n}\r\n\r\n.dark {\r\n    color: @dark-color;\r\n}\r\n\r\n/* Damage colors for crew monitoring computer */\r\n.burn {\r\n    color: orange;\r\n}\r\n\r\n.brute {\r\n    color: red;\r\n}\r\n\r\n.toxin {\r\n    color: green;\r\n}\r\n\r\n.toxin_light {\r\n    color: #3ADF00;\r\n}\r\n\r\n.oxyloss {\r\n    color: blue;\r\n}\r\n\r\n.oxyloss_light {\r\n    color: #6698FF;\r\n}\r\n\r\n/* Wire colors for nuclear bomb defusion */\r\n.Red {\r\n    color: #FF0000;\r\n}\r\n\r\n.Blue {\r\n    color: #0000FF;\r\n}\r\n\r\n.Green {\r\n    color: #00FF00;\r\n}\r\n\r\n.Marigold {\r\n    color: #FDA505;\r\n}\r\n\r\n.Fuschia {\r\n    color: #FF0080;\r\n}\r\n\r\n.Black {\r\n    color: #000000;\r\n}\r\n\r\n.Pearl {\r\n    color: #C6CACB;\r\n}\r\n\r\n/* Status bar colors for sleeper temperatures */\r\n.cold1 {\r\n    color: #94B8FF;\r\n}\r\n\r\n.cold2 {\r\n    color: #6699FF;\r\n}\r\n\r\n.cold3 {\r\n    color: #293D66;\r\n}\r\n\r\n.hot1 {\r\n    color: #FF9966;\r\n}\r\n\r\n.hot2 {\r\n    color: #993D00;\r\n}\r\n\r\n.hot3 {\r\n    color: #FF6600;\r\n}","div.display {\r\n\tpadding: 4px;\r\n\tmargin: 6px 0;\r\n\r\n\tbackground-color: rgba(0, 0, 0, 0.33);\r\n\tbox-shadow: inset 0 0 5px rgba(0, 0, 0, 0.5);\r\n}\r\n\r\ndiv.display header {\r\n    display: block;\r\n    position: relative;\r\n\twidth: 98.5%;\r\n    padding: 0 4px;\r\n    margin-bottom: 6px;\r\n    color: #FFFFFF;\r\n    border-bottom: 2px solid #40628a;\r\n}\r\n\r\ndiv.display header .buttonRight {\r\n    position: absolute;\r\n    bottom: 6px;\r\n    right: 4px;\r\n}\r\n\r\ndiv.display article {\r\n    display: table;\r\n    width: 100%;\r\n    border-collapse: collapse;\r\n}",".itemGroup {\r\n    border: 1px solid #e9c183;\r\n    background: #2c2c2c;\r\n    padding: 4px;\r\n    clear: both;\r\n}\r\n\r\n\r\n.item {\r\n    width: 100%;\r\n    margin: 4px 0 0 0;\r\n    clear: both;\r\n    overflow: auto;\r\n}\r\n\r\n.itemContentNarrow, .itemContent {\r\n    float: left;\r\n}\r\n\r\n.itemContentNarrow {\r\n    width: 30%;\r\n}\r\n\r\n.itemContent {\r\n    width: 69%;\r\n}\r\n\r\n.itemLabelNarrow, .itemLabel, .itemLabelWide, .itemLabelWider, .itemLabelWidest {\r\n    float: left;\r\n    color: #e9c183;\r\n}\r\n\r\n.itemLabelNarrow {\r\n    width: 20%;\r\n}\r\n\r\n.itemLabel {\r\n    width: 30%;\r\n}\r\n\r\n.itemLabelWide {\r\n    width: 45%;\r\n}\r\n\r\n.itemLabelWider {\r\n    width: 69%;\r\n}\r\n\r\n.itemLabelWidest {\r\n    width: 100%;\r\n}\r\n\r\n.itemContentWide {\r\n    float: left;\r\n    width: 79%;\r\n}\r\n\r\n.itemContentSmall {\r\n    float: left;\r\n    width: 33%;\r\n}\r\n\r\n.itemContentMedium {\r\n    float: left;\r\n    width: 55%;\r\n}\r\n\r\n.block {\r\n    padding: 8px;\r\n    margin: 10px 4px 4px 4px;\r\n    border: 1px solid #40628a;\r\n    background-color: #202020;\r\n}\r\n\r\n.block h3 {\r\n    padding: 0;\r\n}\r\n\r\n.clearBoth {\r\n    clear: both;\r\n}\r\n\r\n.clearLeft {\r\n    clear: left;\r\n}\r\n\r\n.clearRight {\r\n    clear: right;\r\n}\r\n\r\n.line {\r\n    width: 100%;\r\n    clear: both;\r\n}\r\n\r\n.fixedLeft {\r\n    width: 110px;\r\n    float: left;\r\n}\r\n\r\n.fixedLeftWide {\r\n    width: 165px;\r\n    float: left;\r\n}\r\n\r\n.fixedLeftWider {\r\n    width: 220px;\r\n    float: left;\r\n}\r\n\r\n.fixedLeftWidest {\r\n    width: 250px;\r\n    float: left;\r\n}\r\n\r\n.floatRight {\r\n    float: right;\r\n}\r\n\r\n.floatLeft {\r\n    float: left;\r\n}\r\n\r\n.hidden {\r\n    display: none;\r\n}\r\n\r\n\r\n.statusDisplay {\r\n    background: rgba(0, 0, 0, 0.5);\r\n    color: #ffffff;\r\n    border: 1px solid #40628a;\r\n    padding: 4px;\r\n    margin: 3px 0;\r\n    overflow: hidden;\r\n}\r\n\r\n.statusDisplayRecords {\r\n    background: rgba(0, 0, 0, 0.5);\r\n    color: #ffffff;\r\n    border: 1px solid #40628a;\r\n    padding: 4px;\r\n    margin: 3px 0;\r\n    overflow-x: hidden;\r\n    overflow-y: auto;\r\n}\r\n\r\n.statusLabel {\r\n    width: 138px;\r\n    float: left;\r\n    overflow: hidden;\r\n    color: #98B0C3;\r\n}\r\n\r\n.statusValue {\r\n    float: left;\r\n}\r\n\r\n.jobValues {\r\n\tfloat: left;\r\n\twidth: 30%;\r\n}\r\n\r\n// CHROMELESS STUFF\r\n\r\n.fancy {\r\n    display: none;\r\n}\r\n\r\ni.fancy {\r\n    display: none;\r\n}\r\n\r\n.titlebutton() {\r\n    color: #E9C183;\r\n    // Since we're on some hilariously outdated libraries, the below is an issue\r\n    // https://github.com/FortAwesome/Font-Awesome/issues/1274\r\n    // Using the !important directive is necessary to override the FA styles\r\n    cursor: pointer !important; \r\n    z-index: 102; // This is for the corners - makes sure the buttons render on top\r\n\r\n    &:hover {\r\n        color: lighten(#98b0c3, 10%);\r\n    }\r\n}\r\n.minimize {\r\n    .titlebutton;\r\n    position: absolute;\r\n    top: 6px;\r\n    right: 46px;\r\n}\r\n.close {\r\n    .titlebutton;\r\n    position: absolute;\r\n    top: 4px;\r\n    right: 12px;\r\n}",".corner() {\r\n    position: fixed;\r\n    z-index: 101;\r\n    min-width: 30px;\r\n    min-height: 30px;\r\n}\r\n\r\n#uiCornerTL {\r\n    .corner;\r\n    top: 0;\r\n    left: 0;\r\n    background: data-uri('tl.png') no-repeat;\r\n}\r\n\r\n/* Resizing (Stolen from Goon CC-BY-NC-SA) */\r\n@resize: 5px;\r\n.resizeArea {\r\n    position: absolute;\r\n    z-index: 99999;\r\n}\r\n.resizeArea.top {\r\n    top: 0;\r\n    left: 10px;\r\n    right: 10px;\r\n    height: @resize;\r\n    cursor: n-resize;\r\n}\r\n.resizeArea.tr {\r\n    top: 0;\r\n    right: 0;\r\n    height: 10px;\r\n    width: 10px;\r\n    cursor: ne-resize;\r\n}\r\n.resizeArea.right {\r\n    top: 10px;\r\n    right: 0;\r\n    bottom: 10px;\r\n    width: @resize;\r\n    cursor: e-resize;\r\n}\r\n.resizeArea.br {\r\n    bottom: 0;\r\n    right: 0;\r\n    height: 10px;\r\n    width: 10px;\r\n    cursor: se-resize;\r\n}\r\n.resizeArea.bottom {\r\n    bottom: 0;\r\n    left: 10px;\r\n    right: 10px;\r\n    height: @resize;\r\n    cursor: s-resize;\r\n}\r\n.resizeArea.bl {\r\n    bottom: 0;\r\n    left: 0;\r\n    height: 10px;\r\n    width: 10px;\r\n    cursor: sw-resize;\r\n}\r\n.resizeArea.left {\r\n    top: 10px;\r\n    left: 0;\r\n    bottom: 10px;\r\n    width: @resize;\r\n    cursor: w-resize;\r\n}\r\n.resizeArea.tl {\r\n    top: 0;\r\n    left: 0;\r\n    height: 10px;\r\n    width: 10px;\r\n    cursor: nw-resize;\r\n}\r\n/* End Resizing */","/* Icons\r\n----------------------------------*/\r\n\r\n/* states and images */\r\n.uiLinkPendingIcon {\r\n    display: none;\r\n    float: left;\r\n    width: 16px;\r\n    height: 16px;\r\n    margin: 2px 2px 0 2px;\r\n    background-image: url(uiLinkPendingIcon.gif);\r\n}\r\n\r\n.linkPending .fa {\r\n    display: none;\r\n}\r\n\r\n.linkPending .uiLinkPendingIcon {\r\n    display: block;\r\n}\r\n\r\n.mapIcon16 {\r\n    position: absolute;\r\n    width: 16px;\r\n    height: 16px;\r\n    background-image: url(uiIcons16Green.png);\r\n    background-position: -144px -96px;\r\n    background-repeat: no-repeat;\r\n    zoom: 0.125;\r\n    margin-left: -1px;\r\n    /*margin-bottom: -1px;*/\r\n}\r\n.mapIcon16.dead                       { background-image: url(uiIcons16Red.png);    }\r\n.mapIcon16.bad                        { background-image: url(uiIcons16Red.png);    }\r\n.mapIcon16.average                    { background-image: url(uiIcons16Orange.png); }\r\n.mapIcon16.good                       { background-image: url(uiIcons16Green.png);  }\r\n/* AirAlarm */\r\n.mapIcon16.icon-airalarm              { background-position: 0 -144px;              } \r\n/* Command Positions */\r\n.mapIcon16.rank-captain               { background-position: -224px -112px;         } \r\n.mapIcon16.rank-headofpersonnel       { background-position: -112px -96px;          }\r\n.mapIcon16.rank-headofsecurity        { background-position: -112px -128px;         }\r\n.mapIcon16.rank-chiefengineer         { background-position: -176px -112px;         }\r\n.mapIcon16.rank-researchdirector      { background-position: -128px -128px;         }\r\n.mapIcon16.rank-chiefmedicalofficer   { background-position: -32px -128px;          }\r\n/* Engineering Positions */\r\n.mapIcon16.rank-stationengineer       { background-position: -176px -112px;         } \r\n.mapIcon16.rank-atmospherictechnician { background-position: -176px -112px;         }\r\n/* Medical Positions */\r\n.mapIcon16.rank-medicaldoctor         {background-position: -32px -128px;           } \r\n.mapIcon16.rank-geneticist            {background-position: -32px -128px;           }\r\n.mapIcon16.rank-psychiatrist          {background-position: -32px -128px;           }\r\n.mapIcon16.rank-chemist               { background-position: -32px -128px;          }\r\n/* Science Positions */\r\n.mapIcon16.rank-scientist             { background-position: -128px -128px;         } \r\n.mapIcon16.rank-geneticist            { background-position: -128px -128px;         }\r\n.mapIcon16.rank-roboticist            { background-position: -128px -128px;         }\r\n.mapIcon16.rank-xenobiologist         { background-position: -128px -128px;         }\r\n/* Security Positions */\r\n.mapIcon16.rank-warden                { background-position: -112px -128px;         }\r\n.mapIcon16.rank-detective             { background-position: -112px -128px;         }\r\n.mapIcon16.rank-securityofficer       { background-position: -112px -128px;         }","ul {\r\n    padding: 4px 0 0 10px;\r\n    margin: 0;\r\n    list-style-type: none;\r\n}\r\n\r\nli {\r\n    padding: 0 0 2px 0;\r\n}\r\n\r\ntable.fixed {\r\n    table-layout:fixed;\r\n}\r\n\r\ntable.fixed td {\r\n    overflow: hidden;\r\n}\r\n\r\n/* Table styling for the power monitor */\r\ntable.pmon {\r\n    border: 2px solid RoyalBlue;\r\n}\r\n\r\ntable.pmon td, table.pmon th {\r\n    border-bottom: 1px dotted black;\r\n    padding: 0px 5px 0px 5px;\r\n}\r\n\r\n/* Table styling for the crew manifest */\r\n.manifest-header(@color: #666) {\r\n\tbackground: @color;\r\n    font-weight: bold;\r\n    color: #ffffff;\r\n}\r\n\r\nth.command {\r\n\t.manifest-header(#3333FF);\r\n}\r\n\r\nth.sec {\r\n\t.manifest-header(#8e0000);\r\n}\r\n\r\nth.med {\r\n\t.manifest-header(#006600);\r\n}\r\n\r\nth.eng {\r\n\t.manifest-header(#b27300);\r\n}\r\n\r\nth.sci {\r\n\t.manifest-header(#a65ba6);\r\n}\r\n\r\nth.ser {\r\n\t.manifest-header(#7100AA);\r\n}\r\n\r\nth.sup {\r\n\t.manifest-header(#666621);\r\n}\r\n\r\nth.civ {\r\n\t.manifest-header(#a32800);\r\n}\r\n\r\nth.misc {\r\n\t.manifest-header;\r\n}\r\n\r\nspan.qm-job {\r\n\tcolor: mix(@highlight-color, @average-color, 33%);\r\n    font-weight: bold;\r\n}\r\n\r\n/* Striped lines for tables and divs */\r\n.striped {\r\n    .striped-base() {\r\n        background-color: #404040;\r\n    }\r\n    tr:nth-child(even) {\r\n        .striped-base;\r\n    }\r\n    &:not(table) > :nth-child(even) {\r\n        .striped-base;\r\n    }\r\n}","#uiNoScript {\r\n    position: fixed;\r\n    top: 50%;\r\n    left: 50%;\r\n    margin: -60px 0 0 -150px;\r\n    width: 280px;\r\n    height: 120px;\r\n    background: #ffffff;\r\n    border: 2px solid #ff0000;\r\n    color: #000000;\r\n    font-size: 10px;\r\n    font-weight: bold;\r\n    z-index: 9999;\r\n    padding: 0px 10px;\r\n    text-align: center;\r\n}\r\n\r\n/**********************************\r\n     .notice | Caution Stripes\r\n**********************************/\r\n.notice {\r\n    position: relative;\r\n    background: url(uiNoticeBackground.jpg) 50% 50%;\r\n    color: #000000;\r\n    font-size: 12px;\r\n    font-style: italic;\r\n    font-weight: bold;\r\n    padding: 3px 4px 3px 4px;\r\n    margin: 4px 0 4px 0;\r\n}\r\n\r\n.noticePlaceholder {\r\n    position: relative;\r\n    font-size: 12px;\r\n    font-style: italic;\r\n    font-weight: bold;\r\n    padding: 3px 4px 3px 4px;\r\n    margin: 4px 0 4px 0;\r\n}\r\n\r\n.notice.icon {\r\n    padding: 2px 4px 0 20px;\r\n}\r\n\r\n.notice img {\r\n    position: absolute;\r\n    top: 0;\r\n    left: 0;\r\n    width: 16px;\r\n    height: 16px;\r\n}\r\n\r\ndiv.notice {\r\n    clear: both;\r\n}\r\n/********************\\\r\n\\********************/\r\n\r\n\r\n/**********************************\r\n    PDA, DNA Modifier styles\r\n    Don't fit anywhere else.\r\n**********************************/\r\n\r\n/* PDA styling */\r\n.wholeScreen {\r\n    position: absolute;\r\n    color: #517087;\r\n    font-size: 16px;\r\n    font-weight: bold;\r\n    text-align: center;\r\n}\r\n\r\n.pdalink {\r\n    float: left;\r\n    white-space: nowrap;\r\n    cursor: default !important;\r\n\r\n\t&.disabled {\r\n\t\tbackground: none;\r\n\t\tborder: none;\r\n\t\tcolor: #999;\r\n\t\ttext-align: left;\r\n\t}\r\n}\r\n\r\n.pdanote {\r\n    color: #cd6500;\r\n    font-weight: bold;\r\n}\r\n\r\n.item.mainmenu {\r\n\tpadding-bottom: 0.5em;\r\n}\r\n\r\ndiv.clock {\r\n\tcolor: white;\r\n\tfont-weight: bold;\r\n\tfloat: right;\r\n\tpadding-right: 2em;\r\n}\r\n\r\n#pdaFooter {\r\n\tposition: fixed;\r\n\tleft: 0;\r\n\tbottom: 0;\r\n\twidth: 100%;\r\n\tbackground: @dark-color;\r\n}\r\n\r\n.pdaFooterButton {\r\n\twidth: 33%;\r\n\tpadding: 0.5em 0;\r\n\tfont-size: 200%;\r\n\tborder: none;\r\n\tbackground: none;\r\n\tcolor: #fff;\r\n\r\n\t&.hover {\r\n\t\tbackground: #507aac;\r\n\t}\r\n\r\n\t&.disabled {\r\n\t\tbackground: none !important;\r\n\t\tcolor: #555 !important;\r\n\t}\r\n\r\n\t.uiLinkPendingIcon {\r\n\t\tposition: absolute;\r\n\t\twidth: 33%;\r\n\t\tbackground-repeat: no-repeat;\r\n\t\tbackground-position: center;\r\n\t}\r\n}\r\n\r\n/* DNA Modifier styling */\r\n.dnaBlock {\r\n    float: left;\r\n    width: 90px;\r\n    padding: 0 0 5px 0;\r\n}\r\n\r\n.dnaBlockNumber {\r\n    font-family: Fixed, monospace;\r\n    float: left;\r\n    color: #ffffff;\r\n    background: #363636;\r\n    min-width: 20px;\r\n    height: 20px;\r\n    padding: 0;\r\n    text-align: center;\r\n}\r\n\r\n.dnaSubBlock {\r\n    font-family: Fixed, monospace;\r\n    float: left;\r\n    padding: 0;\r\n    min-width: 16px;\r\n    height: 20px;\r\n    text-align: center;\r\n}\r\n\r\n.mask {\r\n    position: fixed;\r\n    left: 0;\r\n    top: 0;\r\n    width: 100%;\r\n    height: 100%;\r\n    background: url(uiMaskBackground.png);\r\n}\r\n\r\n.maskContent {\r\n    width: 100%;\r\n    height: 200px;\r\n    margin: 200px 0;\r\n    text-align: center;\r\n}\r\n/********************\\\r\n\\********************/","@import \"_config\";\r\n\r\nbody {\r\n    color: #ffffff;\r\n    font-family: @font;\r\n    font-size: @fontsize;\r\n    line-height: 170%;\r\n    margin: 0;\r\n    padding: 0;\r\n}\r\n\r\nhr {\r\n    background-color: #40628a;\r\n    height: 1px;\r\n    border: none;\r\n}\r\n\r\nimg, a img {\r\n    border-style: none;\r\n}\r\n\r\nh1, h2, h3, h4, h5, h6 {\r\n    margin: 0;\r\n    padding: 12px 0 6px 0;\r\n    color: #FFFFFF;\r\n    clear: both;\r\n}\r\n\r\nh1 {\r\n    font-size: 18px;\r\n}\r\n\r\nh2 {\r\n    font-size: 16px;\r\n}\r\n\r\nh3 {\r\n    font-size: 14px;\r\n}\r\n\r\nh4 {\r\n    font-size: 12px;\r\n}","*[data-tooltip] {\r\n  position: relative;\r\n\r\n  &::after {\r\n    position: absolute;\r\n    display: block;\r\n    z-index: 2;\r\n    width: 250px;\r\n    padding: 10px;\r\n    transform: translateX(-50%);\r\n\r\n    visibility: hidden;\r\n    opacity: 0;\r\n\r\n    white-space: normal;\r\n    text-align: left;\r\n    content: attr(data-tooltip);\r\n\r\n    transition: all .5s;\r\n    border: 1px solid #999999;\r\n    background-color: #363636;\r\n  }\r\n\r\n  &:hover::after {\r\n    visibility: visible;\r\n    opacity: 1;\r\n  }\r\n\r\n  &.tooltipTop::after {\r\n    bottom: 100%;\r\n    left: 50%;\r\n    transform: translateX(-50%) translateY(8px);\r\n  }\r\n  &.tooltipTop:hover::after {\r\n    transform: translateX(-50%) translateY(-8px);\r\n  }\r\n\r\n  &.tooltipBottom::after {\r\n    top: 100%;\r\n    left: 50%;\r\n    transform: translateX(-50%) translateY(-8px);\r\n  }\r\n  &.tooltipBottom:hover::after {\r\n    transform: translateX(-50%) translateY(8px);\r\n  }\r\n\r\n  &.tooltipLeft::after {\r\n    top: 50%;\r\n    right: 100%;\r\n    transform: translateX(8px) translateY(-50%);\r\n  }\r\n  &.tooltipLeft:hover::after {\r\n    transform: translateX(-8px) translateY(-50%);\r\n  }\r\n\r\n  &.tooltipRight::after {\r\n    top: 50%;\r\n    left: 100%;\r\n    transform: translateX(-8px) translateY(-50%);\r\n  }\r\n  &.tooltipRight:hover::after {\r\n    transform: translateX(8px) translateY(-50%);\r\n  }\r\n}",null,"@charset \"utf-8\";\r\n\r\n@import \"_bars\";\r\n@import \"_link\";\r\n@import \"_color\";\r\n@import \"_config\";\r\n@import \"_display\";\r\n@import \"_formatting\";\r\n@import \"_fancy\";\r\n@import \"_icon\";\r\n@import \"_lists\";\r\n@import \"_misc\";\r\n@import \"_native\";\r\n@import \"_tooltip\";\r\n\r\n\r\n.mainBG {\r\n    position: fixed;\r\n    z-index: -1;\r\n    top: 30px;\r\n    left: 0px;\r\n    right: 0px;\r\n    bottom: 0px;\r\n    background: data-uri('nanotrasen.svg') no-repeat fixed center/70% 70%,\r\n        linear-gradient(to bottom,\r\n        @background-start 0%,\r\n        @background-end 100%) no-repeat fixed center/100% 100%;\r\n}\r\n\r\n//nano scrollbar styling\r\nhtml,body {\r\n    scrollbar-face-color:#666666;\r\n    scrollbar-arrow-color:#E9C183;\r\n    scrollbar-track-color:#363636;\r\n    scrollbar-shadow-color:#555555;    \r\n}\r\n\r\n#uiWrapper {\r\n    width: 100%;\r\n    height: 100%;\r\n    -ms-user-select: none;\r\n    user-select: none;\r\n}\r\n\r\n#uiTitleWrapper {\r\n    position: fixed;\r\n    min-height: 30px;\r\n    min-width: 100%; \r\n    background-color: #363636;\r\n    left: 0px;\r\n    top: 0px;\r\n    right: 0px;\r\n    overflow: hidden;\r\n    z-index: 100;\r\n    & > div {\r\n        cursor: default;\r\n    }\r\n    & > i {\r\n        cursor: default;\r\n    }\r\n}\r\n\r\n#uiTitleText {\r\n    position: absolute;\r\n    top: 6px;\r\n    left: 44px;\r\n    width: 66%;\r\n    overflow: hidden;\r\n    color: #E9C183;\r\n    font-size: 16px;\r\n}\r\n\r\n#uiTitle.icon {\r\n    padding: 6px 8px 6px 42px;\r\n    background-position: 2px 50%;\r\n    background-repeat: no-repeat;\r\n}\r\n\r\n#uiTitleFluff {\r\n    position: absolute;\r\n    top: 4px;\r\n    right: 12px;\r\n    width: 42px;\r\n    height: 24px;\r\n    background: data-uri('nanotrasen.svg') 50% 50% no-repeat;\r\n}\r\n\r\n.statusicon {\r\n    position: absolute;\r\n    top: 4px;\r\n    left: 12px;\r\n}\r\n\r\n#uiMapWrapper {\r\n    clear: both;\r\n    padding: 8px;\r\n    margin-top: 30px;\r\n}\r\n\r\n#uiMapHeader {\r\n    position: relative;\r\n    clear: both;\r\n}\r\n\r\n#uiMapContainer {\r\n    position: relative;\r\n    width: 100%;\r\n    height: 600px;\r\n    overflow: hidden;\r\n    border: 1px solid #40628a;\r\n    background: url(nanomapBackground.png);\r\n}\r\n\r\n#uiMap {\r\n    position: absolute;\r\n    top: 50%;\r\n    left: 50%;\r\n    margin: -512px 0 0 -512px;\r\n    width: 256px;\r\n    height: 256px;\r\n    overflow: hidden;\r\n    zoom: 4;\r\n}\r\n\r\n#uiMapImage {\r\n    position: absolute;\r\n    bottom: 1px;\r\n    left: 1px;\r\n    width: 256px;\r\n    height: 256px;\r\n}\r\n\r\n#uiMapContent {\r\n    position: absolute;\r\n    bottom: -13.5px;\r\n    left: 0px;\r\n    width: 256px;\r\n    height: 256px;\r\n}\r\n\r\n#uiMapFooter {\r\n    position: relative;\r\n    clear: both;\r\n}\r\n\r\n#uiContent {\r\n    clear: both;\r\n    padding: 8px;\r\n    margin-top: 30px;\r\n}\r\n\r\n#uiMapTooltip {\r\n    position: absolute;\r\n    right: 10px;\r\n    top: 10px;\r\n    border: 1px solid #40628a;\r\n    background-color: #272727;\r\n    padding: 8px;\r\n    display: none;\r\n    z-index: 9999;\r\n}\r\n\r\n#uiLoadingNotice {\r\n    position: relative;\r\n    background: url(uiNoticeBackground.jpg) 50% 50%;\r\n    color: #000000;\r\n    font-size: 14px;\r\n    font-style: italic;\r\n    font-weight: bold;\r\n    padding: 3px 4px 3px 4px;\r\n    margin: 4px 0 4px 0;\r\n}\r\n\r\n.underTitle {\r\n    margin-top: 30px;\r\n}"]} */ diff --git a/nano/styles/_link.less b/nano/styles/_link.less index 24a8c33c7b6..5a3d7fa267e 100644 --- a/nano/styles/_link.less +++ b/nano/styles/_link.less @@ -1,4 +1,4 @@ -.link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton { +.link, .linkOn, .linkOff, .selected, .disabled, .yellowButton, .redButton, .linkEncourage, .linkDiscourage { float: left; min-width: 15px; height: 16px; @@ -82,6 +82,27 @@ a.icon img, .linkOn.icon img, .linkOff.icon img, .selected.icon img, .disabled.i background-color: #ff6666; } +.linkEncourage, a.linkEncourage:link, a.linkEncourage:visited, a.linkEncourage:active { + color: #99ff33; + background-color: #40628a; + border-color: #161616; +} + +.linkEncourage.hover { + background-color: #507aac; +} + +.linkDiscourage, a.linkDiscourage:link, a.linkDiscourage:visited, a.linkDiscourage:active { + color: #8c8c8c; + background-color: #40628a; + border-color: #161616; +} + +.linkDiscourage.hover { + color: #ff0000; + background-color: #507aac; +} + .inactive, a.inactive:link, a.inactive:visited, a.inactive:active, a.inactive.hover { color: #ffffff; background: #999999; diff --git a/nano/templates/card_prog.tmpl b/nano/templates/card_prog.tmpl index 478c8f6b400..8ce688e1997 100644 --- a/nano/templates/card_prog.tmpl +++ b/nano/templates/card_prog.tmpl @@ -11,6 +11,7 @@ {{:helper.link('Job Management', 'gear', {'action' : 'PRG_mode', 'mode_target' : 1}, data.mode == 1 ? 'disabled' : null)}} {{:helper.link('Crew Manifest', 'folder-open', {'action' : 'PRG_mode', 'mode_target' : 2}, data.mode == 2 ? 'disabled' : null)}} {{:helper.link('Print', 'print', {'action' : 'PRG_print'}, data.printer && (data.mode == 2 || data.has_modify && !data.mode) ? null : 'disabled')}} + {{:helper.link('Records', 'file', {'action' : 'PRG_mode', 'mode_target' : 3}, (data.mode == 3) ? 'disabled' : null)}} {{if data.mode == 1}}
    @@ -52,6 +53,31 @@
    {{:data.manifest}}
    + {{else data.mode == 3}} +
    +

    Records

    +
    +
    +
    + Authorized Identity: +
    +
    + {{:helper.link(data.scan_name, 'eject', {'action' : 'scan'})}} +
    +
    +
    + {{if data.authenticated}} + {{:data.id_change_html}} + {{if data.centcom_access}} + {{:helper.link('Delete Records By: ' + data.scan_owner, null, {'action' : 'PRG_wipe_my_logs'}, null, 'linkDanger')}} + {{/if}} + {{if !data.target_dept}} + {{:helper.link('Delete ALL Records', null, {'action' : 'PRG_wipe_all_logs'}, null, 'linkDanger')}} + {{/if}} + {{else}} + Please insert an authorized ID into the terminal to proceed.
    + {{/if}} +
    {{else}}

    Access Modification

    @@ -149,7 +175,11 @@ Terminations:
    - {{:helper.link('Terminate ' + data.target_owner, 'gear', {'action' : 'PRG_terminate'}, data.target_rank == "Terminated" ? 'disabled' : null, data.target_rank == "Terminated" ? 'disabled' : 'linkDanger')}} + {{if data.target_rank == "Terminated"}} + {{:data.target_owner}} has already been terminated! + {{else}} + {{:helper.link('Terminate ' + data.target_owner, 'gear', {'action' : 'PRG_terminate'}, data.target_rank == "Terminated" ? 'disabled' : null, data.target_rank == "Terminated" ? 'disabled' : 'linkDanger')}} + {{/if}}
    @@ -168,15 +198,16 @@ Special - {{:helper.link("Captain", '', {'action' : 'PRG_assign', 'assign_target' : 'Captain'}, data.target_rank == 'Captain' ? 'disabled' : null)}} - {{:helper.link("Custom", '', {'action' : 'PRG_assign', 'assign_target' : 'Custom'})}} + {{for data.top_jobs}} + {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} + {{/for}} Engineering {{for data.engineering_jobs}} - {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -184,7 +215,7 @@ Medical {{for data.medical_jobs}} - {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -192,7 +223,7 @@ Security {{for data.security_jobs}} - {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -200,7 +231,7 @@ Science {{for data.science_jobs}} - {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -208,7 +239,7 @@ Support {{for data.support_jobs}} - {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -216,7 +247,7 @@ Civilian {{for data.civilian_jobs}} - {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -225,7 +256,7 @@ CentComm {{for data.centcom_jobs}} - {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'action' : 'PRG_assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} diff --git a/nano/templates/identification_computer.tmpl b/nano/templates/identification_computer.tmpl index ad2779f7864..606af520168 100644 --- a/nano/templates/identification_computer.tmpl +++ b/nano/templates/identification_computer.tmpl @@ -11,7 +11,8 @@ {{if !data.target_dept}}{{:helper.link('Job Management', 'gear', {'choice' : 'mode', 'mode_target' : 1}, data.mode == 1 ? 'disabled' : null)}}{{/if}} {{:helper.link('Crew Manifest', 'folder-open', {'choice' : 'mode', 'mode_target' : 2}, data.mode == 2 ? 'disabled' : null)}} {{if !data.target_dept}}{{:helper.link('Print', 'print', {'choice' : 'print'}, (data.mode == 2 || data.has_modify && !data.mode) ? null : 'disabled')}}{{/if}} - + {{:helper.link('Records', 'file', {'choice' : 'mode', 'mode_target' : 3}, (data.mode == 3) ? 'disabled' : null)}} + {{if data.mode == 1 && !data.target_dept}}

    Job Management

    @@ -52,6 +53,31 @@
    {{:data.manifest}}
    + {{else data.mode == 3}} +
    +

    Records

    +
    +
    +
    + Authorized Identity: +
    +
    + {{:helper.link(data.scan_name, 'eject', {'choice' : 'scan'})}} +
    +
    +
    + {{if data.authenticated}} + {{:data.id_change_html}} + {{if data.centcom_access}} + {{:helper.link('Delete Records By: ' + data.scan_owner, null, {'choice' : 'wipe_my_logs'}, null, 'linkDanger')}} + {{/if}} + {{if !data.target_dept}} + {{:helper.link('Delete ALL Records', null, {'choice' : 'wipe_all_logs'}, null, 'linkDanger')}} + {{/if}} + {{else}} + Please insert an authorized ID into the terminal to proceed.
    + {{/if}} +
    {{else}}

    Access Modification

    @@ -145,21 +171,31 @@
    {{/if}} -
    + {{if data.target_rank != "Terminated"}} +
    Demotions:
    - {{:helper.link('Demote ' + data.target_owner, 'gear', {'choice' : 'demote'}, (data.target_rank == "Civilian" || data.target_rank == "Unassigned" || data.target_rank == "Terminated") ? 'disabled' : null, (data.target_rank == "Civilian" || data.target_rank == "Unassigned" || data.target_rank == "Terminated") ? 'disabled' : 'linkDanger')}} + {{if data.target_rank == "Demoted"}} + {{:data.target_owner}} has already been demoted! + {{else}} + {{:helper.link('Demote ' + data.target_owner, 'gear', {'choice' : 'demote'}, (data.target_rank == "Civilian" || data.target_rank == "Unassigned") ? 'disabled' : null, (data.target_rank == "Civilian" || data.target_rank == "Unassigned") ? 'disabled' : 'linkDanger')}} + {{/if}}
    + {{/if}} {{if !data.target_dept}}
    Terminations:
    - {{:helper.link('Terminate ' + data.target_owner, 'gear', {'choice' : 'terminate'}, data.target_rank == "Terminated" ? 'disabled' : null, data.target_rank == "Terminated" ? 'disabled' : 'linkDanger')}} + {{if data.target_rank == "Terminated"}} + {{:data.target_owner}} has already been terminated! + {{else}} + {{:helper.link('Terminate ' + data.target_owner, 'gear', {'choice' : 'terminate'}, data.target_rank == "Terminated" ? 'disabled' : null, data.target_rank == "Terminated" ? 'disabled' : 'linkDanger')}} + {{/if}}
    @@ -187,8 +223,9 @@ Special - {{:helper.link("Captain", '', {'choice' : 'assign', 'assign_target' : 'Captain'}, data.target_rank == 'Captain' ? 'disabled' : null)}} - {{:helper.link("Custom", '', {'choice' : 'assign', 'assign_target' : 'Custom'})}} + {{for data.top_jobs}} + {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} + {{/for}} {{/if}} @@ -197,7 +234,7 @@ Engineering {{for data.engineering_jobs}} - {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -207,7 +244,7 @@ Medical {{for data.medical_jobs}} - {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -217,7 +254,7 @@ Security {{for data.security_jobs}} - {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -227,9 +264,9 @@ Science {{for data.science_jobs}} - {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} - + {{/if}} {{if !data.target_dept}} @@ -237,7 +274,7 @@ Support {{for data.support_jobs}} - {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -246,7 +283,7 @@ Civilian {{for data.civilian_jobs}} - {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} @@ -255,7 +292,7 @@ CentComm {{for data.centcom_jobs}} - {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}} + {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, value.jlinkformat == 'disabled' ? 'disabled' : null, value.jlinkformat ? value.jlinkformat : null)}} {{/for}} diff --git a/paradise.dme b/paradise.dme index 013c04fa842..42c6744a48b 100644 --- a/paradise.dme +++ b/paradise.dme @@ -137,6 +137,7 @@ #include "code\_onclick\hud\constructs.dm" #include "code\_onclick\hud\devil.dm" #include "code\_onclick\hud\fullscreen.dm" +#include "code\_onclick\hud\ghost.dm" #include "code\_onclick\hud\guardian.dm" #include "code\_onclick\hud\hud.dm" #include "code\_onclick\hud\human.dm" @@ -197,20 +198,19 @@ #include "code\controllers\master.dm" #include "code\controllers\subsystem.dm" #include "code\controllers\verbs.dm" -#include "code\controllers\Processes\alarm.dm" -#include "code\controllers\Processes\event.dm" -#include "code\controllers\Processes\fast_process.dm" #include "code\controllers\Processes\lighting.dm" #include "code\controllers\Processes\npcai.dm" -#include "code\controllers\Processes\obj.dm" #include "code\controllers\Processes\ticker.dm" #include "code\controllers\ProcessScheduler\core\process.dm" #include "code\controllers\ProcessScheduler\core\processScheduler.dm" #include "code\controllers\subsystem\air.dm" +#include "code\controllers\subsystem\alarm.dm" #include "code\controllers\subsystem\assets.dm" #include "code\controllers\subsystem\atoms.dm" +#include "code\controllers\subsystem\events.dm" #include "code\controllers\subsystem\fires.dm" #include "code\controllers\subsystem\garbage.dm" +#include "code\controllers\subsystem\holiday.dm" #include "code\controllers\subsystem\icon_smooth.dm" #include "code\controllers\subsystem\ipintel.dm" #include "code\controllers\subsystem\jobs.dm" @@ -231,6 +231,8 @@ #include "code\controllers\subsystem\timer.dm" #include "code\controllers\subsystem\vote.dm" #include "code\controllers\subsystem\weather.dm" +#include "code\controllers\subsystem\processing\fastprocess.dm" +#include "code\controllers\subsystem\processing\obj.dm" #include "code\controllers\subsystem\processing\processing.dm" #include "code\controllers\subsystem\tickets\mentor_tickets.dm" #include "code\controllers\subsystem\tickets\tickets.dm" @@ -1420,7 +1422,7 @@ #include "code\modules\events\electrical_storm.dm" #include "code\modules\events\event.dm" #include "code\modules\events\event_container.dm" -#include "code\modules\events\event_manager.dm" +#include "code\modules\events\event_procs.dm" #include "code\modules\events\false_alarm.dm" #include "code\modules\events\floorcluwne.dm" #include "code\modules\events\grid_check.dm" @@ -1452,6 +1454,7 @@ #include "code\modules\events\vent_clog.dm" #include "code\modules\events\wallrot.dm" #include "code\modules\events\wormholes.dm" +#include "code\modules\events\wizard\ghost.dm" #include "code\modules\examine\examine.dm" #include "code\modules\examine\descriptions\atmospherics.dm" #include "code\modules\examine\descriptions\engineering.dm" @@ -1807,7 +1810,6 @@ #include "code\modules\mob\living\silicon\decoy\decoy.dm" #include "code\modules\mob\living\silicon\decoy\life.dm" #include "code\modules\mob\living\silicon\pai\death.dm" -#include "code\modules\mob\living\silicon\pai\emote.dm" #include "code\modules\mob\living\silicon\pai\life.dm" #include "code\modules\mob\living\silicon\pai\pai.dm" #include "code\modules\mob\living\silicon\pai\personality.dm" @@ -2110,7 +2112,6 @@ #include "code\modules\power\powernet.dm" #include "code\modules\power\smes.dm" #include "code\modules\power\solar.dm" -#include "code\modules\power\switch.dm" #include "code\modules\power\terminal.dm" #include "code\modules\power\tracker.dm" #include "code\modules\power\treadmill.dm" diff --git a/sound/voice/borg_deathsound.ogg b/sound/voice/borg_deathsound.ogg new file mode 100644 index 00000000000..06e847165ff Binary files /dev/null and b/sound/voice/borg_deathsound.ogg differ diff --git a/sound/weapons/bolathrow.ogg b/sound/weapons/bolathrow.ogg new file mode 100644 index 00000000000..9a7b78fb67f Binary files /dev/null and b/sound/weapons/bolathrow.ogg differ diff --git a/strings/revenant_names.json b/strings/revenant_names.json new file mode 100644 index 00000000000..8c1229296f4 --- /dev/null +++ b/strings/revenant_names.json @@ -0,0 +1,55 @@ +{ + "spirit_type": [ + "Essence", + "Ghost", + "Phantom", + "Poltergeist", + "Revenant", + "Soul", + "Spectre", + "Spirit" + ], + + "adjective": [ + "", + "Abysmal ", + "Abyssal ", + "Brutal ", + "Dark ", + "Endless ", + "Eternal ", + "Fiery ", + "Hateful ", + "Hideous ", + "Hilarious ", + "Indifferent ", + "Malevolent ", + "Peaceful ", + "Searing ", + "Silent ", + "Spiteful ", + "Vicious ", + "Violent " + ], + + "theme": [ + "Agony", + "Anger", + "Death", + "Despair", + "Desperation", + "Destruction", + "Disease", + "Grief", + "Hate", + "Hellfire", + "Laughter", + "Misery", + "Ruin", + "Salt", + "Screams", + "Sorrow", + "Suffering", + "Vengeance" + ] +}