"
- else
- dat+="None"
- dat+="- Balance: $[detailed_account_view.money]
- Status: [detailed_account_view.suspended ? "Suspended" : "Active"]
- Transactions: ([detailed_account_view.transaction_log.len])
-
| Timestamp | -Target | -Reason | -Value | -Terminal | -
| [T.date] [T.time] | -[T.target_name] | -[T.purpose] | -[T.amount] | -[T.source_terminal] | -
+ Balance: $[detailed_account_view.money]
+ Status: [detailed_account_view.suspended ? "Suspended" : "Active"]
+ Transactions: ([detailed_account_view.transaction_log.len])
+
| Timestamp | +Target | +Reason | +Value | +Terminal | +
| Account Number | -Holder | -Balance | -Status | -|
| [T.date] [T.time] | +[T.target_name] | +[T.purpose] | +[T.amount] | +[T.source_terminal] | +
| #[D.account_number] | -[D.owner_name] | -$[D.money] | -[D.suspended ? "Suspended" : "Active"] | -
| Account Number | +Holder | +Balance | +Status | +
| #[D.account_number] | +[D.owner_name] | +$[D.money] | +[D.suspended ? "Suspended" : "Active"] | +
[message]
" - if (!P.message_silent) - playsound(P, 'sound/machines/twobeep.ogg', 50, 1) - for (var/mob/O in hearers(3, P.loc)) - if(!P.message_silent) O.show_message(text("[bicon(P)] *[P.ttone]*")) - //Search for holder of the PDA. - var/mob/living/L = null - if(P.loc && isliving(P.loc)) - L = P.loc - //Maybe they are a pAI! - else - L = get(P, /mob/living/silicon) - - if(L) - to_chat(L, "[bicon(P)] Message from [sender] (Unknown / spam?), \"[message]\" (Unable to Reply)") + var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) + PM.notify("Message from [sender] (Unknown / spam?), \"[message]\" (Unable to Reply)", 0) diff --git a/code/modules/events/supply_demand_vr.dm b/code/modules/events/supply_demand_vr.dm index 6c59145fe5..6447630c9e 100644 --- a/code/modules/events/supply_demand_vr.dm +++ b/code/modules/events/supply_demand_vr.dm @@ -84,17 +84,9 @@ var/datum/supply_demand_order/random = pick(required_items) command_announcement.Announce("What happened? Accounting is here right now and they're already asking where that [random.name] is. Damn, I gotta go", my_department) var/message = "The delivery deadline was reached with the following needs outstanding:
" - for (var/datum/supply_demand_order/req in required_items) + for(var/datum/supply_demand_order/req in required_items) message += req.describe() + "
" - for (var/obj/machinery/computer/communications/C in machines) - if(C.operable()) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) - P.name = "'[my_department] Mission Summary'" - P.info = message - P.update_space(P.info) - P.update_icon() - C.messagetitle.Add("[my_department] Mission Summary") - C.messagetext.Add(P.info) + post_comm_message("'[my_department] Mission Summary'", message) /** * Event Handler for responding to the supply shuttle arriving at centcom. */ diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 044bd74491..2723df7fe2 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -5,8 +5,8 @@ name = "drink" desc = "yummy" icon = 'icons/obj/drinks.dmi' - drop_sound = 'sound/items/drop/bottle.ogg' - pickup_sound = 'sound/items/pickup/bottle.ogg' + drop_sound = 'sound/items/drop/drinkglass.ogg' + pickup_sound = 'sound/items/pickup/drinkglass.ogg' icon_state = null flags = OPENCONTAINER amount_per_transfer_from_this = 5 @@ -234,6 +234,7 @@ trash = /obj/item/trash/coffee center_of_mass = list("x"=15, "y"=13) drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' /obj/item/weapon/reagent_containers/food/drinks/h_chocolate/Initialize() ..() @@ -248,6 +249,7 @@ trash = /obj/item/trash/coffee center_of_mass = list("x"=16, "y"=14) drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' /obj/item/weapon/reagent_containers/food/drinks/greentea/Initialize() . = ..() @@ -262,6 +264,7 @@ trash = /obj/item/trash/coffee center_of_mass = list("x"=16, "y"=14) drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' /obj/item/weapon/reagent_containers/food/drinks/chaitea/Initialize() . = ..() @@ -276,6 +279,7 @@ trash = /obj/item/trash/coffee center_of_mass = list("x"=16, "y"=14) drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' /obj/item/weapon/reagent_containers/food/drinks/decaf/Initialize() . = ..() @@ -289,6 +293,7 @@ trash = /obj/item/trash/ramen center_of_mass = list("x"=16, "y"=11) drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' /obj/item/weapon/reagent_containers/food/drinks/dry_ramen/Initialize() ..() @@ -302,6 +307,7 @@ volume = 10 center_of_mass = list("x"=16, "y"=12) drop_sound = 'sound/items/drop/papercup.ogg' + pickup_sound = 'sound/items/pickup/papercup.ogg' /obj/item/weapon/reagent_containers/food/drinks/sillycup/Initialize() . = ..() diff --git a/code/modules/food/food/drinks/bottle.dm b/code/modules/food/food/drinks/bottle.dm index b5d72d733f..a5fd76417b 100644 --- a/code/modules/food/food/drinks/bottle.dm +++ b/code/modules/food/food/drinks/bottle.dm @@ -19,6 +19,7 @@ if(isGlass) unacidable = 1 drop_sound = 'sound/items/drop/bottle.ogg' + pickup_sound = 'sound/items/pickup/bottle.ogg' /obj/item/weapon/reagent_containers/food/drinks/bottle/Destroy() if(rag) diff --git a/code/modules/food/food/drinks/bottle_ch.dm b/code/modules/food/food/drinks/bottle_ch.dm index ed813245da..45110f97c7 100644 --- a/code/modules/food/food/drinks/bottle_ch.dm +++ b/code/modules/food/food/drinks/bottle_ch.dm @@ -1,6 +1,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/snaps name = "Akvavit" desc = "This could go well with lunch." + icon = 'icons/obj/drinks_ch.dmi' icon_state = "snapsbottle" center_of_mass = list("x"=17, "y"=3) diff --git a/code/modules/food/food/drinks/drinkingglass.dm b/code/modules/food/food/drinks/drinkingglass.dm index 260c4a7ae6..7324dc8ad8 100644 --- a/code/modules/food/food/drinks/drinkingglass.dm +++ b/code/modules/food/food/drinks/drinkingglass.dm @@ -8,8 +8,6 @@ volume = 30 unacidable = 1 //glass center_of_mass = list("x"=16, "y"=10) - drop_sound = 'sound/items/drop/drinkglass.ogg' - pickup_sound = 'sound/items/pickup/drinkglass.ogg' matter = list("glass" = 500) on_reagent_change() diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 93e0b2c5ab..ad30c244f2 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -318,6 +318,7 @@ nutriment_amt = 1 nutriment_desc = list("candy" = 1) + /obj/item/weapon/reagent_containers/food/snacks/candy/Initialize() . = ..() reagents.add_reagent("sugar", 3) @@ -2001,7 +2002,7 @@ filling_color = "#AFC4B5" center_of_mass = list("x"=16, "y"=8) nutriment_amt = 8 - nutriment_desc = list("carot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2) + nutriment_desc = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2) /obj/item/weapon/reagent_containers/food/snacks/vegetablesoup/Initialize() . = ..() @@ -4161,6 +4162,8 @@ trash = /obj/item/trash/unajerky filling_color = "#631212" center_of_mass = list("x"=15, "y"=9) + drop_sound = 'sound/items/drop/soda.ogg' + pickup_sound = 'sound/items/pickup/soda.ogg' /obj/item/weapon/reagent_containers/food/snacks/unajerky/Initialize() . =..() diff --git a/code/modules/food/kitchen/cooking_machines/_appliance.dm b/code/modules/food/kitchen/cooking_machines/_appliance.dm index 780a1502ff..b2f51eacd7 100644 --- a/code/modules/food/kitchen/cooking_machines/_appliance.dm +++ b/code/modules/food/kitchen/cooking_machines/_appliance.dm @@ -16,7 +16,7 @@ use_power = USE_POWER_IDLE idle_power_usage = 5 // Power used when turned on, but not processing anything active_power_usage = 1000 // Power used when turned on and actively cooking something - + var/cooking_power = 0 // Effectiveness/speed at cooking var/cooking_coeff = 0 // Optimal power * proximity to optimal temp; used to calc. cooking power. var/heating_power = 1000 // Effectiveness at heating up; not used for mixers, should be equal to active_power_usage @@ -44,9 +44,9 @@ /obj/machinery/appliance/Initialize() . = ..() - + default_apply_parts() - + if(output_options.len) verbs += /obj/machinery/appliance/proc/choose_output @@ -81,6 +81,30 @@ else to_chat(user, "") +/obj/machinery/appliance/proc/report_progress_tgui(datum/cooking_item/CI) + if(!CI || !CI.max_cookwork) + return list("average", "Not Cooking.") + + if(!CI.cookwork) + return list("blue", "Cold.") + + var/progress = CI.cookwork / CI.max_cookwork + + if (progress < 0.25) + return list("blue", "It's barely started cooking.") + if (progress < 0.75) + return list("average", "It's cooking away nicely.") + if (progress < 1) + return list("good", "It's almost ready!") + + var/half_overcook = (CI.overcook_mult - 1)*0.5 + if (progress < 1+half_overcook) + return list("good", "It's done!") + if (progress < CI.overcook_mult) + return list("bad", "It looks overcooked, get it out!") + else + return list("bad", "It is burning!") + /obj/machinery/appliance/proc/report_progress(var/datum/cooking_item/CI) if (!CI || !CI.max_cookwork) return null @@ -182,7 +206,7 @@ //Handles all validity checking and error messages for inserting things /obj/machinery/appliance/proc/can_insert(var/obj/item/I, var/mob/user) - if (istype(I, /obj/item/weapon/gripper)) + if(istype(I.loc, /mob/living/silicon)) return 0 else if (istype(I.loc, /obj/item/rig_module)) return 0 @@ -240,27 +264,53 @@ /obj/machinery/appliance/attackby(var/obj/item/I, var/mob/user) if(!cook_type || (stat & (BROKEN))) to_chat(user, "\The [src] is not working.") - return + return FALSE - var/result = can_insert(I, user) - if(!result) - if(!(default_deconstruction_screwdriver(user, I))) - default_part_replacement(user, I) - return + var/obj/item/ToCook = I - if(result == 2) - var/obj/item/weapon/grab/G = I - if (G && istype(G) && G.affecting) - cook_mob(G.affecting, user) + if(istype(I, /obj/item/weapon/gripper)) + var/obj/item/weapon/gripper/GR = I + var/obj/item/Wrap = GR.wrapped + if(Wrap) + Wrap.loc = get_turf(src) + var/result = can_insert(Wrap, user) + if(!result) + Wrap.forceMove(GR) + if(!(default_deconstruction_screwdriver(user, I))) + default_part_replacement(user, I) + return + + if(QDELETED(GR.wrapped)) + GR.wrapped = null + + if(GR?.wrapped.loc != src) + GR.drop_item_nm() + + ToCook = Wrap + else + attack_hand(user) return + else + var/result = can_insert(I, user) + if(!result) + if(!(default_deconstruction_screwdriver(user, I))) + default_part_replacement(user, I) + return + + if(result == 2) + var/obj/item/weapon/grab/G = I + if (G && istype(G) && G.affecting) + cook_mob(G.affecting, user) + return + //From here we can start cooking food - add_content(I, user) + add_content(ToCook, user) update_icon() //Override for container mechanics /obj/machinery/appliance/proc/add_content(var/obj/item/I, var/mob/user) - if(!user.unEquip(I)) + if(!user.unEquip(I) && !isturf(I.loc)) return var/datum/cooking_item/CI = has_space(I) @@ -271,13 +321,13 @@ cooking_objs.Add(CI) user.visible_message("\The [user] puts \the [I] into \the [src].") if (CC.check_contents() == 0)//If we're just putting an empty container in, then dont start any processing. - return + return TRUE else if (CI && istype(CI)) I.forceMove(CI.container) else //Something went wrong - return + return FALSE if (selected_option) CI.combine_target = selected_option @@ -434,7 +484,7 @@ //Final step. Cook function just cooks batter for now. for (var/obj/item/weapon/reagent_containers/food/snacks/S in CI.container) S.cook() - + //Combination cooking involves combining the names and reagents of ingredients into a predefined output object //The ingredients represent flavours or fillings. EG: donut pizza, cheese bread @@ -542,18 +592,18 @@ smoke.attach(src) smoke.set_up(10, 0, get_turf(src), 300) smoke.start() - + // Set off fire alarms! var/obj/machinery/firealarm/FA = locate() in get_area(src) if(FA) FA.alarm() /obj/machinery/appliance/attack_hand(var/mob/user) - if (cooking_objs.len) - if (removal_menu(user)) - return - else - ..() + if(..()) + return + + if(cooking_objs.len) + removal_menu(user) /obj/machinery/appliance/proc/removal_menu(var/mob/user) if (can_remove_items(user)) @@ -571,7 +621,7 @@ return TRUE return FALSE -/obj/machinery/appliance/proc/can_remove_items(var/mob/user) +/obj/machinery/appliance/proc/can_remove_items(var/mob/user, show_warning = TRUE) if (!Adjacent(user)) return FALSE diff --git a/code/modules/food/kitchen/cooking_machines/_cooker.dm b/code/modules/food/kitchen/cooking_machines/_cooker.dm index 94b40b44b2..ef097485b9 100644 --- a/code/modules/food/kitchen/cooking_machines/_cooker.dm +++ b/code/modules/food/kitchen/cooking_machines/_cooker.dm @@ -14,6 +14,63 @@ mobdamagetype = BURN can_burn_food = TRUE +/obj/machinery/appliance/cooker/attack_hand(mob/user) + tgui_interact(user) + +/obj/machinery/appliance/cooker/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "CookingAppliance", name) + ui.open() + +/obj/machinery/appliance/cooker/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + data["temperature"] = round(temperature - T0C, 0.1) + data["optimalTemp"] = round(optimal_temp - T0C, 0.1) + data["temperatureEnough"] = temperature >= min_temp + data["efficiency"] = round(get_efficiency(), 0.1) + data["containersRemovable"] = can_remove_items(user, show_warning = FALSE) + + var/list/our_contents = list() + for(var/i in 1 to max_contents) + our_contents += list(list("empty" = TRUE)) + if(i <= LAZYLEN(cooking_objs)) + var/datum/cooking_item/CI = cooking_objs[i] + if(istype(CI)) + our_contents[i] = list() + our_contents[i]["progress"] = 0 + our_contents[i]["progressText"] = report_progress_tgui(CI) + if(CI.max_cookwork) + our_contents[i]["progress"] = CI.cookwork / CI.max_cookwork + if(CI.container) + our_contents[i]["container"] = CI.container.label(i) + else + our_contents[i]["container"] = null + data["our_contents"] = our_contents + + return data + +/obj/machinery/appliance/cooker/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + switch(action) + if("slot") + var/slot = params["slot"] + var/obj/item/I = usr.get_active_hand() + if(slot <= LAZYLEN(cooking_objs)) // Inserting + var/datum/cooking_item/CI = cooking_objs[slot] + + if(istype(I) && can_insert(I)) // Why do hard work when we can just make them smack us? + attackby(I, usr) + else if(istype(CI)) + eject(CI, usr) + return TRUE + if(istype(I)) // Why do hard work when we can just make them smack us? + attackby(I, usr) + return TRUE + /obj/machinery/appliance/cooker/examine(var/mob/user) . = ..() if(.) //no need to duplicate adjacency check @@ -141,6 +198,6 @@ /obj/machinery/appliance/cooker/add_content(var/obj/item/I, var/mob/user) var/datum/cooking_item/CI = ..() - if (CI && CI.combine_target) + if(istype(CI) && CI.combine_target) to_chat(user, "\The [I] will be used to make a [selected_option]. Output selection is returned to default for future items.") selected_option = null \ No newline at end of file diff --git a/code/modules/food/kitchen/cooking_machines/_mixer.dm b/code/modules/food/kitchen/cooking_machines/_mixer.dm index e1c3b0d838..079b0c686c 100644 --- a/code/modules/food/kitchen/cooking_machines/_mixer.dm +++ b/code/modules/food/kitchen/cooking_machines/_mixer.dm @@ -68,11 +68,13 @@ fundamental differences return 0 -/obj/machinery/appliance/mixer/can_remove_items(var/mob/user) - if (stat) +/obj/machinery/appliance/mixer/can_remove_items(var/mob/user, show_warning = TRUE) + if(stat) return 1 else - to_chat(user, "You can't remove ingredients while it's turned on! Turn it off first or wait for it to finish.") + if(show_warning) + to_chat(user, "You can't remove ingredients while it's turned on! Turn it off first or wait for it to finish.") + return 0 //Container is not removable /obj/machinery/appliance/mixer/removal_menu(var/mob/user) diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index d650a2266e..408835a4da 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -32,13 +32,26 @@ /obj/item/weapon/reagent_containers/cooking_container/attackby(var/obj/item/I as obj, var/mob/user as mob) + if(istype(I, /obj/item/weapon/gripper)) + var/obj/item/weapon/gripper/GR = I + if(GR.wrapped) + GR.wrapped.forceMove(get_turf(src)) + attackby(GR.wrapped, user) + if(QDELETED(GR.wrapped)) + GR.wrapped = null + + if(GR?.wrapped.loc != src) + GR.wrapped = null + + return + for (var/possible_type in insertable) if (istype(I, possible_type)) if (!can_fit(I)) to_chat(user, "There's no more space in the [src] for that!") return 0 - if(!user.unEquip(I)) + if(!user.unEquip(I) && !isturf(I.loc)) return I.forceMove(src) to_chat(user, "You put the [I] into the [src].") @@ -152,7 +165,7 @@ /obj/item/weapon/reagent_containers/cooking_container/oven/Initialize() . = ..() - + // We add to the insertable list specifically for the oven trays, to allow specialty cakes. insertable += list( /obj/item/clothing/head/cakehat, // This is because we want to allow birthday cakes to be makeable. @@ -164,7 +177,7 @@ shortname = "basket" desc = "Put ingredients in this; designed for use with a deep fryer. Warranty void if used incorrectly. Alt click to remove contents." icon_state = "basket" - + /obj/item/weapon/reagent_containers/cooking_container/grill name = "grill rack" shortname = "rack" diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/kitchen/cooking_machines/oven.dm index fef49c2cbd..1236b51c9c 100644 --- a/code/modules/food/kitchen/cooking_machines/oven.dm +++ b/code/modules/food/kitchen/cooking_machines/oven.dm @@ -105,7 +105,7 @@ cooking = FALSE playsound(src, 'sound/machines/hatch_open.ogg', 20, 1) - to_chat(user, "You [open? "close":"open"] the oven door") + to_chat(user, "You [open ? "open" : "close"] the oven door.") update_icon() /obj/machinery/appliance/cooker/oven/proc/manip(var/obj/item/I) @@ -152,4 +152,4 @@ combination_cook(CI) return else - ..() + ..() \ No newline at end of file diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 065d036920..5a499ae846 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -120,6 +120,7 @@ src.broken = 0 // just to be sure src.icon_state = "mw" src.flags = OPENCONTAINER | NOREACT + SStgui.update_uis(src) else //Otherwise bad luck!! to_chat(user, "It's dirty!") return 1 @@ -141,10 +142,11 @@ user.visible_message( \ "\The [user] has added \the [O] to \the [src].", \ "You add \the [O] to \the [src].") + SStgui.update_uis(src) return else if(istype(O,/obj/item/weapon/reagent_containers/glass) || \ - istype(O,/obj/item/weapon/reagent_containers/food/drinks) || \ - istype(O,/obj/item/weapon/reagent_containers/food/condiment) \ + istype(O,/obj/item/weapon/reagent_containers/food/drinks) || \ + istype(O,/obj/item/weapon/reagent_containers/food/condiment) \ ) if (!O.reagents) return 1 @@ -181,83 +183,168 @@ else to_chat(user, "You have no idea what you can cook with this [O].") ..() - src.updateUsrDialog() + SStgui.update_uis(src) + +/obj/machinery/microwave/tgui_state(mob/user) + return GLOB.tgui_physical_state /obj/machinery/microwave/attack_ai(mob/user as mob) - if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) - attack_hand(user) + attack_hand(user) /obj/machinery/microwave/attack_hand(mob/user as mob) user.set_machine(src) - interact(user) + tgui_interact(user) /******************* * Microwave Menu ********************/ +/obj/machinery/microwave/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Microwave", name) + ui.open() -/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu - var/dat = "" - if(src.broken > 0) - dat = {"Bzzzzttttt"} - else if(src.operating) - dat = {"Microwaving in progress!
Please wait...!"} - else if(src.dirty==100) - dat = {"This microwave is dirty!
Please clean it before use!"} - else - var/list/items_counts = new - var/list/items_measures = new - var/list/items_measures_p = new - for (var/obj/O in ((contents - component_parts) - circuit)) - var/display_name = O.name - if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg)) - items_measures[display_name] = "egg" - items_measures_p[display_name] = "eggs" - if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) - items_measures[display_name] = "tofu chunk" - items_measures_p[display_name] = "tofu chunks" - if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat - items_measures[display_name] = "slab of meat" - items_measures_p[display_name] = "slabs of meat" - if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) - display_name = "Turnovers" - items_measures[display_name] = "turnover" - items_measures_p[display_name] = "turnovers" - if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) - items_measures[display_name] = "fillet of meat" - items_measures_p[display_name] = "fillets of meat" - items_counts[display_name]++ - for (var/O in items_counts) - var/N = items_counts[O] - if (!(O in items_measures)) - dat += {"[capitalize(O)]: [N] [lowertext(O)]\s
"} - else - if (N==1) - dat += {"[capitalize(O)]: [N] [items_measures[O]]
"} - else - dat += {"[capitalize(O)]: [N] [items_measures_p[O]]
"} +/obj/machinery/microwave/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() - for (var/datum/reagent/R in reagents.reagent_list) - var/display_name = R.name - if (R.id == "capsaicin") - display_name = "Hotsauce" - if (R.id == "frostoil") - display_name = "Coldsauce" - dat += {"[display_name]: [R.volume] unit\s
"} + data["broken"] = broken + data["operating"] = operating + data["dirty"] = dirty == 100 + data["items"] = get_items_list() + + return data - if (items_counts.len==0 && reagents.reagent_list.len==0) - dat = {"The microwave is empty
"} +/obj/machinery/microwave/proc/get_items_list() + var/list/data = list() + + var/list/items_counts = list() + var/list/items_measures = list() + var/list/items_measures_p = list() + for(var/obj/O in ((contents - component_parts) - circuit)) + var/display_name = O.name + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg)) + items_measures[display_name] = "egg" + items_measures_p[display_name] = "eggs" + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) + items_measures[display_name] = "tofu chunk" + items_measures_p[display_name] = "tofu chunks" + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat + items_measures[display_name] = "slab of meat" + items_measures_p[display_name] = "slabs of meat" + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) + display_name = "Turnovers" + items_measures[display_name] = "turnover" + items_measures_p[display_name] = "turnovers" + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) + items_measures[display_name] = "fillet of meat" + items_measures_p[display_name] = "fillets of meat" + items_counts[display_name]++ + for(var/O in items_counts) + var/N = items_counts[O] + if(!(O in items_measures)) + data.Add(list(list( + "name" = capitalize(O), + "amt" = N, + "extra" = "[lowertext(O)][N > 1 ? "s" : ""]", + ))) else - dat = {"Ingredients:
[dat]"} - dat += {"
\ -Turn on!
\ -Eject ingredients!
\ -"} + data.Add(list(list( + "name" = capitalize(O), + "amt" = N, + "extra" = N == 1 ? items_measures[O] : items_measures_p[O], + ))) - user << browse("
Please wait...!"} +// else if(src.dirty==100) +// dat = {"This microwave is dirty!
Please clean it before use!"} +// else +// var/list/items_counts = new +// var/list/items_measures = new +// var/list/items_measures_p = new +// for (var/obj/O in ((contents - component_parts) - circuit)) +// var/display_name = O.name +// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg)) +// items_measures[display_name] = "egg" +// items_measures_p[display_name] = "eggs" +// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) +// items_measures[display_name] = "tofu chunk" +// items_measures_p[display_name] = "tofu chunks" +// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat +// items_measures[display_name] = "slab of meat" +// items_measures_p[display_name] = "slabs of meat" +// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) +// display_name = "Turnovers" +// items_measures[display_name] = "turnover" +// items_measures_p[display_name] = "turnovers" +// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) +// items_measures[display_name] = "fillet of meat" +// items_measures_p[display_name] = "fillets of meat" +// items_counts[display_name]++ +// for (var/O in items_counts) +// var/N = items_counts[O] +// if (!(O in items_measures)) +// dat += {"[capitalize(O)]: [N] [lowertext(O)]\s
"} +// else +// if (N==1) +// dat += {"[capitalize(O)]: [N] [items_measures[O]]
"} +// else +// dat += {"[capitalize(O)]: [N] [items_measures_p[O]]
"} + +// for (var/datum/reagent/R in reagents.reagent_list) +// var/display_name = R.name +// if (R.id == "capsaicin") +// display_name = "Hotsauce" +// if (R.id == "frostoil") +// display_name = "Coldsauce" +// dat += {"[display_name]: [R.volume] unit\s
"} + +// if (items_counts.len==0 && reagents.reagent_list.len==0) +// dat = {"The microwave is empty
"} +// else +// dat = {"Ingredients:
[dat]"} +// dat += {"
\ +// Turn on!
\ +// Eject ingredients!
\ +// "} + +// user << browse("
2. View Checked Out Inventory
3. Check out a Book
- 4. Connect to Internal Archive
//VOREStation Edit + 4. Connect to Internal Archive
5. Upload New Title to Archive
6. Print a Bible
- 8. Access External Archive
"} //VOREStation Edit + 8. Access External Archive
"} //VOREStation Edit end if(src.emagged) dat += "7. Access the Forbidden Lore Vault
" if(src.arcanecheckout) @@ -338,11 +338,11 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f if(!bibledelay) var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(src.loc) - if(ticker && ( ticker.Bible_icon_state && ticker.Bible_item_state) ) - B.icon_state = ticker.Bible_icon_state - B.item_state = ticker.Bible_item_state - B.name = ticker.Bible_name - B.deity_name = ticker.Bible_deity_name + if(GLOB.religion) + B.icon_state = GLOB.bible_icon_state + B.item_state = GLOB.bible_item_state + B.name = GLOB.bible_name + B.deity_name = GLOB.deity bibledelay = 1 spawn(60) diff --git a/code/modules/looking_glass/lg_console.dm b/code/modules/looking_glass/lg_console.dm index 60b51a325a..b46ea9c5fb 100644 --- a/code/modules/looking_glass/lg_console.dm +++ b/code/modules/looking_glass/lg_console.dm @@ -50,27 +50,30 @@ return ..() /obj/machinery/computer/looking_glass/attack_ai(var/mob/user as mob) - return src.attack_hand(user) + return attack_hand(user) /obj/machinery/computer/looking_glass/attack_hand(var/mob/user as mob) if(..()) return - user.set_machine(src) - ui_interact(user) + tgui_interact(user) -/obj/machinery/computer/looking_glass/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - user.set_machine(src) - - var/list/data = list() - var/program_list[0] +/obj/machinery/computer/looking_glass/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "LookingGlass", name) + ui.open() +/obj/machinery/computer/looking_glass/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/list/program_list = list() for(var/P in supported_programs) - program_list[++program_list.len] = P + program_list.Add(P) if(emagged) for(var/P in secret_programs) - program_list[++program_list.len] = P + program_list.Add(P) data["supportedPrograms"] = program_list data["currentProgram"] = current_program @@ -78,24 +81,18 @@ if(my_area?.has_gravity) data["gravity"] = 1 else - data["gravity"] = null + data["gravity"] = 0 - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "lookingglass.tmpl", src.name, 400, 550) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(20) + return data -/obj/machinery/computer/looking_glass/Topic(href, href_list) +/obj/machinery/computer/looking_glass/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) - return 1 - if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) - usr.set_machine(src) - - if(href_list["program"]) + return TRUE + + switch(action) + if("program") if(ready) - var/prog = href_list["program"] + var/prog = params["program"] if(prog == "Off") current_program = "Off" unload_program() @@ -104,17 +101,18 @@ load_program(prog) else visible_message("ERROR. Recalibrating displays.") + return TRUE - else if(href_list["gravity"]) + if("gravity") toggle_gravity(my_area) + return TRUE - else if(href_list["immersion"]) + if("immersion") immersion = !immersion my_area.toggle_optional(immersion) + return TRUE - src.add_fingerprint(usr) - - SSnanoui.update_uis(src) + add_fingerprint(usr) /obj/machinery/computer/looking_glass/emag_act(var/remaining_charges, var/mob/user as mob) if (!emagged) diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm index b852e10383..ff567c55f4 100644 --- a/code/modules/materials/material_recipes.dm +++ b/code/modules/materials/material_recipes.dm @@ -1,9 +1,9 @@ -/material/proc/get_recipes() +/datum/material/proc/get_recipes() if(!recipes) generate_recipes() return recipes -/material/proc/generate_recipes() +/datum/material/proc/generate_recipes() recipes = list() // If is_brittle() returns true, these are only good for a single strike. @@ -29,7 +29,7 @@ recipes += new/datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/knife/plastic, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) recipes += new/datum/stack_recipe("[display_name] blade", /obj/item/weapon/material/butterflyblade, 6, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) -/material/steel/generate_recipes() +/datum/material/steel/generate_recipes() ..() recipes += new/datum/stack_recipe_list("office chairs",list( \ new/datum/stack_recipe("dark office chair", /obj/structure/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1), \ @@ -105,7 +105,7 @@ )) recipes += new/datum/stack_recipe("desk bell", /obj/item/weapon/deskbell, 1, on_floor = 1, supplied_material = "[name]") -/material/plasteel/generate_recipes() +/datum/material/plasteel/generate_recipes() ..() recipes += new/datum/stack_recipe("AI core", /obj/structure/AIcore, 4, time = 50, one_per_turf = 1) recipes += new/datum/stack_recipe("Metal crate", /obj/structure/closet/crate, 10, time = 50, one_per_turf = 1) @@ -114,16 +114,16 @@ recipes += new/datum/stack_recipe("roller bed", /obj/item/roller, 5, time = 30, on_floor = 1) recipes += new/datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 10) -/material/stone/generate_recipes() +/datum/material/stone/generate_recipes() ..() recipes += new/datum/stack_recipe("planting bed", /obj/machinery/portable_atmospherics/hydroponics/soil, 3, time = 10, one_per_turf = 1, on_floor = 1) -/material/stone/marble/generate_recipes() +/datum/material/stone/marble/generate_recipes() ..() recipes += new/datum/stack_recipe("light marble floor tile", /obj/item/stack/tile/wmarble, 1, 4, 20) recipes += new/datum/stack_recipe("dark marble floor tile", /obj/item/stack/tile/bmarble, 1, 4, 20) -/material/plastic/generate_recipes() +/datum/material/plastic/generate_recipes() ..() recipes += new/datum/stack_recipe("plastic crate", /obj/structure/closet/crate/plastic, 10, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE) recipes += new/datum/stack_recipe("plastic bag", /obj/item/weapon/storage/bag/plasticbag, 3, on_floor = 1, pass_stack_color = TRUE) @@ -141,7 +141,7 @@ recipes += new/datum/stack_recipe("plastic fishtank", /obj/item/glass_jar/fish/plastic, 2, time = 30 SECONDS) recipes += new/datum/stack_recipe("reagent tubing", /obj/item/stack/hose, 1, 4, 20, pass_stack_color = TRUE) -/material/wood/generate_recipes() +/datum/material/wood/generate_recipes() ..() recipes += new/datum/stack_recipe("oar", /obj/item/weapon/oar, 2, time = 30, supplied_material = "[name]", pass_stack_color = TRUE) recipes += new/datum/stack_recipe("boat", /obj/vehicle/boat, 20, time = 10 SECONDS, supplied_material = "[name]", pass_stack_color = TRUE) @@ -163,11 +163,11 @@ recipes += new/datum/stack_recipe("wooden standup figure", /obj/structure/barricade/cutout, 5, time = 10 SECONDS, pass_stack_color = TRUE) //VOREStation Add recipes += new/datum/stack_recipe("noticeboard", /obj/structure/noticeboard, 1) -/material/wood/log/generate_recipes() +/datum/material/wood/log/generate_recipes() recipes = list() recipes += new/datum/stack_recipe("bonfire", /obj/structure/bonfire, 5, time = 50, supplied_material = "[name]", pass_stack_color = TRUE) -/material/cardboard/generate_recipes() +/datum/material/cardboard/generate_recipes() ..() recipes += new/datum/stack_recipe("box", /obj/item/weapon/storage/box, pass_stack_color = TRUE) recipes += new/datum/stack_recipe("donut box", /obj/item/weapon/storage/box/donut/empty, pass_stack_color = TRUE) @@ -186,7 +186,7 @@ new/datum/stack_recipe("yellow folder", /obj/item/weapon/folder/yellow), \ )) -/material/snow/generate_recipes() +/datum/material/snow/generate_recipes() recipes = list() recipes += new/datum/stack_recipe("snowball", /obj/item/weapon/material/snow/snowball, 1, time = 10) recipes += new/datum/stack_recipe("snow brick", /obj/item/stack/material/snowbrick, 2, time = 10) @@ -194,7 +194,7 @@ recipes += new/datum/stack_recipe("snow robot", /obj/structure/snowman/borg, 2, time = 10) recipes += new/datum/stack_recipe("snow spider", /obj/structure/snowman/spider, 3, time = 20) -/material/snowbrick/generate_recipes() +/datum/material/snowbrick/generate_recipes() recipes = list() recipes += new/datum/stack_recipe("[display_name] door", /obj/structure/simple_door, 10, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] barricade", /obj/structure/barricade, 5, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") @@ -205,7 +205,7 @@ recipes += new/datum/stack_recipe("[display_name] wall girders", /obj/structure/girder, 2, time = 50, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") recipes += new/datum/stack_recipe("[display_name] ashtray", /obj/item/weapon/material/ashtray, 2, one_per_turf = 1, on_floor = 1, supplied_material = "[name]") -/material/wood/sif/generate_recipes() +/datum/material/wood/sif/generate_recipes() ..() recipes += new/datum/stack_recipe("alien wood floor tile", /obj/item/stack/tile/wood/sif, 1, 4, 20, pass_stack_color = TRUE) for(var/datum/stack_recipe/r_recipe in recipes) @@ -216,11 +216,11 @@ recipes -= r_recipe continue -/material/supermatter/generate_recipes() +/datum/material/supermatter/generate_recipes() recipes = list() recipes += new/datum/stack_recipe("supermatter shard", /obj/machinery/power/supermatter/shard, 30 , one_per_turf = 1, time = 600, on_floor = 1) -/material/cloth/generate_recipes() +/datum/material/cloth/generate_recipes() recipes = list() recipes += new/datum/stack_recipe("woven net", /obj/item/weapon/material/fishing_net, 10, time = 30 SECONDS, pass_stack_color = TRUE) recipes += new/datum/stack_recipe("bedsheet", /obj/item/weapon/bedsheet, 10, time = 30 SECONDS, pass_stack_color = TRUE) @@ -238,7 +238,7 @@ recipes += new/datum/stack_recipe("belt pouch", /obj/item/weapon/storage/belt/fannypack/white, 25, time = 1 MINUTE, pass_stack_color = TRUE) recipes += new/datum/stack_recipe("crude bandage", /obj/item/stack/medical/crude_pack, 1, time = 2 SECONDS, pass_stack_color = TRUE) -/material/resin/generate_recipes() +/datum/material/resin/generate_recipes() recipes = list() recipes += new/datum/stack_recipe("[display_name] door", /obj/structure/simple_door/resin, 10, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE) recipes += new/datum/stack_recipe("[display_name] barricade", /obj/effect/alien/resin/wall, 5, time = 5 SECONDS, one_per_turf = 1, on_floor = 1, pass_stack_color = TRUE) diff --git a/code/modules/materials/material_recipes_ch.dm b/code/modules/materials/material_recipes_ch.dm index e4a0016c05..009ac2b9fb 100644 --- a/code/modules/materials/material_recipes_ch.dm +++ b/code/modules/materials/material_recipes_ch.dm @@ -1,6 +1,6 @@ //In future consider cleaning up often used recipes by adding them to the general recipe list with material criteria -/material/plasteel/generate_recipes() +/datum/material/plasteel/generate_recipes() . = ..() // recipes += new/datum/stack_recipe("Hammer Head", /obj/item/weapon/hammer_head, 2) //CHOMPEdit - Disabled because I had to disable code/game/objects/items/weapons/material/sledgehammer_construction_ch.dm due to lots of errors recipes += new/datum/stack_recipe_list("sofas", list( \ @@ -10,7 +10,7 @@ new/datum/stack_recipe("sofa corner", /obj/structure/bed/chair/sofa/corner, 1, one_per_turf = 1, on_floor = 1), \ )) -/material/plastic/generate_recipes() +/datum/material/plastic/generate_recipes() . = ..() recipes += new/datum/stack_recipe_list("sofas", list( \ new/datum/stack_recipe("sofa middle", /obj/structure/bed/chair/sofa, 1, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), \ @@ -19,7 +19,7 @@ new/datum/stack_recipe("sofa corner", /obj/structure/bed/chair/sofa/corner, 1, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), \ )) -/material/wood/generate_recipes() //Is a little sad we cant have lovely wooden sofa +/datum/material/wood/generate_recipes() //Is a little sad we cant have lovely wooden sofa . = ..() recipes += new/datum/stack_recipe_list("sofas", list( \ new/datum/stack_recipe("sofa middle", /obj/structure/bed/chair/sofa, 1, one_per_turf = 1, on_floor = 1, supplied_material = "[name]"), \ diff --git a/code/modules/materials/material_recipes_vr.dm b/code/modules/materials/material_recipes_vr.dm index ba2a95250a..3dc6975a04 100644 --- a/code/modules/materials/material_recipes_vr.dm +++ b/code/modules/materials/material_recipes_vr.dm @@ -1,5 +1,5 @@ -/material/steel/generate_recipes() +/datum/material/steel/generate_recipes() . = ..() recipes += new/datum/stack_recipe_list("mounted chairs", list( new/datum/stack_recipe("mounted chair", /obj/structure/bed/chair/bay/chair, 2, one_per_turf = 1, on_floor = 1, time = 10), @@ -80,11 +80,11 @@ new/datum/stack_recipe("orange sofa corner", /obj/structure/bed/chair/sofa/orange/corner, 1, one_per_turf = 1, on_floor = 1), \ )) -/material/durasteel/generate_recipes() +/datum/material/durasteel/generate_recipes() . = ..() recipes += new/datum/stack_recipe("durasteel fishing rod", /obj/item/weapon/material/fishing_rod/modern/strong, 2) recipes += new/datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 30) -/material/plastitanium/generate_recipes() +/datum/material/plastitanium/generate_recipes() . = ..() recipes += new/datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 20) diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm index 153e023ad0..6eb7b990e8 100644 --- a/code/modules/materials/material_sheets.dm +++ b/code/modules/materials/material_sheets.dm @@ -14,7 +14,7 @@ ) var/default_type = DEFAULT_WALL_MATERIAL - var/material/material + var/datum/material/material var/perunit = SHEET_MATERIAL_AMOUNT var/apply_colour //temp pending icon rewrite drop_sound = 'sound/items/drop/axe.ogg' @@ -403,8 +403,8 @@ no_variants = FALSE pass_color = TRUE strict_color_stacking = TRUE - drop_sound = 'sound/items/drop/cloth.ogg' - pickup_sound = 'sound/items/pickup/cloth.ogg' + drop_sound = 'sound/items/drop/clothing.ogg' + pickup_sound = 'sound/items/pickup/clothing.ogg' /obj/item/stack/material/cloth/diyaab color = "#c6ccf0" diff --git a/code/modules/materials/material_sheets_vr.dm b/code/modules/materials/material_sheets_vr.dm index fa8676d92d..e198d6d3c0 100644 --- a/code/modules/materials/material_sheets_vr.dm +++ b/code/modules/materials/material_sheets_vr.dm @@ -21,7 +21,7 @@ type_to_spawn = /obj/item/stack/material/glass/titanium /obj/item/stack/material/plastitanium - name = "plas-tanium sheets" + name = "plastitanium sheets" icon = 'icons/obj/stacks_vr.dmi' icon_state = "sheet-plastitanium" item_state = "sheet-silver" @@ -32,8 +32,20 @@ name = "stack of plastitanium" type_to_spawn = /obj/item/stack/material/plastitanium +/obj/item/stack/material/plastitanium/hull + name = "plastitanium hull sheets" + icon = 'icons/obj/stacks_vr.dmi' + icon_state = "sheet-plastitanium" + item_state = "sheet-silver" + no_variants = FALSE + default_type = MAT_PLASTITANIUMHULL + +/obj/fiftyspawner/plastitanium_hull + name = "stack of plastitanium" + type_to_spawn = /obj/item/stack/material/plastitanium/hull + /obj/item/stack/material/glass/plastitanium - name = "plas-tanium glass sheets" + name = "plastitanium glass sheets" icon = 'icons/obj/stacks_vr.dmi' icon_state = "sheet-plastitaniumglass" item_state = "sheet-silver" diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm index af39896432..211ebcfe80 100644 --- a/code/modules/materials/materials.dm +++ b/code/modules/materials/materials.dm @@ -45,7 +45,7 @@ var/list/name_to_material //mostly for convenience /obj/proc/get_material_name() - var/material/material = get_material() + var/datum/material/material = get_material() if(material) return material.name @@ -53,8 +53,8 @@ var/list/name_to_material /proc/populate_material_list(force_remake=0) if(name_to_material && !force_remake) return // Already set up! name_to_material = list() - for(var/type in typesof(/material) - /material) - var/material/new_mineral = new type + for(var/type in typesof(/datum/material) - /datum/material) + var/datum/material/new_mineral = new type if(!new_mineral.name) continue name_to_material[lowertext(new_mineral.name)] = new_mineral @@ -67,13 +67,13 @@ var/list/name_to_material return name_to_material[name] /proc/material_display_name(name) - var/material/material = get_material_by_name(name) + var/datum/material/material = get_material_by_name(name) if(material) return material.display_name return null // Material definition and procs follow. -/material +/datum/material var/name // Unique name for use in indexing the list. var/display_name // Prettier name for display. var/use_name @@ -137,7 +137,7 @@ var/list/name_to_material var/rotting_touch_message = "crumbles under your touch" // Placeholders for light tiles and rglass. -/material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack) +/datum/material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack) if(!rod_product) to_chat(user, "You cannot make anything out of \the [target_stack]") return @@ -150,7 +150,7 @@ var/list/name_to_material S.add_fingerprint(user) S.add_to_stacks(user) -/material/proc/build_wired_product(var/mob/living/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack) +/datum/material/proc/build_wired_product(var/mob/living/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack) if(!wire_product) to_chat(user, "You cannot make anything out of \the [target_stack]") return @@ -165,7 +165,7 @@ var/list/name_to_material user.put_in_hands(product) // Make sure we have a display name and shard icon even if they aren't explicitly set. -/material/New() +/datum/material/New() ..() if(!display_name) display_name = name @@ -175,15 +175,15 @@ var/list/name_to_material shard_icon = shard_type // This is a placeholder for proper integration of windows/windoors into the system. -/material/proc/build_windows(var/mob/living/user, var/obj/item/stack/used_stack) +/datum/material/proc/build_windows(var/mob/living/user, var/obj/item/stack/used_stack) return 0 // Weapons handle applying a divisor for this value locally. -/material/proc/get_blunt_damage() +/datum/material/proc/get_blunt_damage() return weight //todo // Return the matter comprising this material. -/material/proc/get_matter() +/datum/material/proc/get_matter() var/list/temp_matter = list() if(islist(composite_material)) for(var/material_string in composite_material) @@ -193,61 +193,61 @@ var/list/name_to_material return temp_matter // As above. -/material/proc/get_edge_damage() +/datum/material/proc/get_edge_damage() return hardness //todo // Snowflakey, only checked for alien doors at the moment. -/material/proc/can_open_material_door(var/mob/living/user) +/datum/material/proc/can_open_material_door(var/mob/living/user) return 1 // Currently used for weapons and objects made of uranium to irradiate things. -/material/proc/products_need_process() +/datum/material/proc/products_need_process() return (radioactivity>0) //todo // Used by walls when qdel()ing to avoid neighbor merging. -/material/placeholder +/datum/material/placeholder name = "placeholder" // Places a girder object when a wall is dismantled, also applies reinforced material. -/material/proc/place_dismantled_girder(var/turf/target, var/material/reinf_material, var/material/girder_material) +/datum/material/proc/place_dismantled_girder(var/turf/target, var/datum/material/reinf_material, var/datum/material/girder_material) var/obj/structure/girder/G = new(target) if(reinf_material) G.reinf_material = reinf_material G.reinforce_girder() if(girder_material) - if(istype(girder_material, /material)) + if(istype(girder_material, /datum/material)) girder_material = girder_material.name G.set_material(girder_material) // General wall debris product placement. // Not particularly necessary aside from snowflakey cult girders. -/material/proc/place_dismantled_product(var/turf/target) +/datum/material/proc/place_dismantled_product(var/turf/target) place_sheet(target) // Debris product. Used ALL THE TIME. -/material/proc/place_sheet(var/turf/target) +/datum/material/proc/place_sheet(var/turf/target) if(stack_type) return new stack_type(target) // As above. -/material/proc/place_shard(var/turf/target) +/datum/material/proc/place_shard(var/turf/target) if(shard_type) return new /obj/item/weapon/material/shard(target, src.name) // Used by walls and weapons to determine if they break or not. -/material/proc/is_brittle() +/datum/material/proc/is_brittle() return !!(flags & MATERIAL_BRITTLE) -/material/proc/combustion_effect(var/turf/T, var/temperature) +/datum/material/proc/combustion_effect(var/turf/T, var/temperature) return // Used by walls to do on-touch things, after checking for crumbling and open-ability. -/material/proc/wall_touch_special(var/turf/simulated/wall/W, var/mob/living/L) +/datum/material/proc/wall_touch_special(var/turf/simulated/wall/W, var/mob/living/L) return // Datum definitions follow. -/material/uranium +/datum/material/uranium name = "uranium" stack_type = /obj/item/stack/material/uranium radioactivity = 12 @@ -259,7 +259,7 @@ var/list/name_to_material door_icon_base = "stone" supply_conversion_value = 2 -/material/diamond +/datum/material/diamond name = "diamond" stack_type = /obj/item/stack/material/diamond flags = MATERIAL_UNMELTABLE @@ -275,7 +275,7 @@ var/list/name_to_material stack_origin_tech = list(TECH_MATERIAL = 6) supply_conversion_value = 8 -/material/gold +/datum/material/gold name = "gold" stack_type = /obj/item/stack/material/gold icon_colour = "#EDD12F" @@ -287,11 +287,11 @@ var/list/name_to_material sheet_plural_name = "ingots" supply_conversion_value = 2 -/material/gold/bronze //placeholder for ashtrays +/datum/material/gold/bronze //placeholder for ashtrays name = "bronze" icon_colour = "#EDD12F" -/material/silver +/datum/material/silver name = "silver" stack_type = /obj/item/stack/material/silver icon_colour = "#D1E6E3" @@ -304,7 +304,7 @@ var/list/name_to_material supply_conversion_value = 2 //R-UST port -/material/supermatter +/datum/material/supermatter name = "supermatter" icon_colour = "#FFFF00" stack_type = /obj/item/stack/material/supermatter @@ -322,7 +322,7 @@ var/list/name_to_material is_fusion_fuel = 1 stack_origin_tech = list(TECH_MATERIAL = 8, TECH_PHORON = 5, TECH_BLUESPACE = 4) -/material/phoron +/datum/material/phoron name = "phoron" stack_type = /obj/item/stack/material/phoron ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE @@ -338,7 +338,7 @@ var/list/name_to_material /* // Commenting this out while fires are so spectacularly lethal, as I can't seem to get this balanced appropriately. -/material/phoron/combustion_effect(var/turf/T, var/temperature, var/effect_multiplier) +/datum/material/phoron/combustion_effect(var/turf/T, var/temperature, var/effect_multiplier) if(isnull(ignition_point)) return 0 if(temperature < ignition_point) @@ -353,7 +353,7 @@ var/list/name_to_material return round(totalPhoron/100) */ -/material/stone +/datum/material/stone name = "sandstone" stack_type = /obj/item/stack/material/sandstone icon_base = "stone" @@ -369,7 +369,7 @@ var/list/name_to_material sheet_singular_name = "brick" sheet_plural_name = "bricks" -/material/stone/marble +/datum/material/stone/marble name = "marble" icon_colour = "#AAAAAA" weight = 26 @@ -378,7 +378,7 @@ var/list/name_to_material stack_type = /obj/item/stack/material/marble supply_conversion_value = 2 -/material/steel +/datum/material/steel name = DEFAULT_WALL_MATERIAL stack_type = /obj/item/stack/material/steel integrity = 150 @@ -388,7 +388,7 @@ var/list/name_to_material icon_reinf = "reinf_over" icon_colour = "#666666" -/material/steel/hull +/datum/material/steel/hull name = MAT_STEELHULL stack_type = /obj/item/stack/material/steel/hull integrity = 250 @@ -397,10 +397,10 @@ var/list/name_to_material icon_reinf = "reinf_mesh" icon_colour = "#666677" -/material/steel/hull/place_sheet(var/turf/target) //Deconstructed into normal steel sheets. +/datum/material/steel/hull/place_sheet(var/turf/target) //Deconstructed into normal steel sheets. new /obj/item/stack/material/steel(target) -/material/diona +/datum/material/diona name = "biomass" icon_colour = null stack_type = null @@ -408,19 +408,19 @@ var/list/name_to_material icon_base = "diona" icon_reinf = "noreinf" -/material/diona/place_dismantled_product() +/datum/material/diona/place_dismantled_product() return -/material/diona/place_dismantled_girder(var/turf/target) +/datum/material/diona/place_dismantled_girder(var/turf/target) spawn_diona_nymph(target) -/material/steel/holographic +/datum/material/steel/holographic name = "holo" + DEFAULT_WALL_MATERIAL display_name = DEFAULT_WALL_MATERIAL stack_type = null shard_type = SHARD_NONE -/material/plasteel +/datum/material/plasteel name = "plasteel" stack_type = /obj/item/stack/material/plasteel integrity = 400 @@ -437,7 +437,7 @@ var/list/name_to_material composite_material = list(DEFAULT_WALL_MATERIAL = SHEET_MATERIAL_AMOUNT, "platinum" = SHEET_MATERIAL_AMOUNT) //todo supply_conversion_value = 6 -/material/plasteel/hull +/datum/material/plasteel/hull name = MAT_PLASTEELHULL stack_type = /obj/item/stack/material/plasteel/hull integrity = 600 @@ -446,11 +446,11 @@ var/list/name_to_material icon_colour = "#777788" explosion_resistance = 40 -/material/plasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets. +/datum/material/plasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets. new /obj/item/stack/material/plasteel(target) // Very rare alloy that is reflective, should be used sparingly. -/material/durasteel +/datum/material/durasteel name = "durasteel" stack_type = /obj/item/stack/material/durasteel/hull integrity = 600 @@ -467,7 +467,7 @@ var/list/name_to_material composite_material = list("plasteel" = SHEET_MATERIAL_AMOUNT, "diamond" = SHEET_MATERIAL_AMOUNT) //shrug supply_conversion_value = 9 -/material/durasteel/hull //The 'Hardball' of starship hulls. +/datum/material/durasteel/hull //The 'Hardball' of starship hulls. name = MAT_DURASTEELHULL icon_base = "hull" icon_reinf = "reinf_mesh" @@ -475,10 +475,10 @@ var/list/name_to_material explosion_resistance = 90 reflectivity = 0.9 -/material/durasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal durasteel sheets. +/datum/material/durasteel/hull/place_sheet(var/turf/target) //Deconstructed into normal durasteel sheets. new /obj/item/stack/material/durasteel(target) -/material/plasteel/titanium +/datum/material/plasteel/titanium name = MAT_TITANIUM stack_type = /obj/item/stack/material/titanium conductivity = 2.38 @@ -487,16 +487,16 @@ var/list/name_to_material icon_colour = "#D1E6E3" icon_reinf = "reinf_metal" -/material/plasteel/titanium/hull +/datum/material/plasteel/titanium/hull name = MAT_TITANIUMHULL stack_type = /obj/item/stack/material/titanium/hull icon_base = "hull" icon_reinf = "reinf_mesh" -/material/plasteel/titanium/hull/place_sheet(var/turf/target) //Deconstructed into normal titanium sheets. +/datum/material/plasteel/titanium/hull/place_sheet(var/turf/target) //Deconstructed into normal titanium sheets. new /obj/item/stack/material/titanium(target) -/material/glass +/datum/material/glass name = "glass" stack_type = /obj/item/stack/material/glass flags = MATERIAL_BRITTLE @@ -517,7 +517,7 @@ var/list/name_to_material created_fulltile_window = /obj/structure/window/basic/full rod_product = /obj/item/stack/material/glass/reinforced -/material/glass/build_windows(var/mob/living/user, var/obj/item/stack/used_stack) +/datum/material/glass/build_windows(var/mob/living/user, var/obj/item/stack/used_stack) if(!user || !used_stack || !created_window || !created_fulltile_window || !window_options.len) return 0 @@ -588,10 +588,10 @@ var/list/name_to_material new build_path(T, build_dir, 1) return 1 -/material/glass/proc/is_reinforced() +/datum/material/glass/proc/is_reinforced() return (hardness > 35) //todo -/material/glass/reinforced +/datum/material/glass/reinforced name = "rglass" display_name = "reinforced glass" stack_type = /obj/item/stack/material/glass/reinforced @@ -611,7 +611,7 @@ var/list/name_to_material wire_product = null rod_product = null -/material/glass/phoron +/datum/material/glass/phoron name = "borosilicate glass" display_name = "borosilicate glass" stack_type = /obj/item/stack/material/glass/phoronglass @@ -625,7 +625,7 @@ var/list/name_to_material wire_product = null rod_product = /obj/item/stack/material/glass/phoronrglass -/material/glass/phoron/reinforced +/datum/material/glass/phoron/reinforced name = "reinforced borosilicate glass" display_name = "reinforced borosilicate glass" stack_type = /obj/item/stack/material/glass/phoronrglass @@ -640,7 +640,7 @@ var/list/name_to_material composite_material = list() //todo rod_product = null -/material/plastic +/datum/material/plastic name = "plastic" stack_type = /obj/item/stack/material/plastic flags = MATERIAL_BRITTLE @@ -655,13 +655,13 @@ var/list/name_to_material melting_point = T0C+371 //assuming heat resistant plastic stack_origin_tech = list(TECH_MATERIAL = 3) -/material/plastic/holographic +/datum/material/plastic/holographic name = "holoplastic" display_name = "plastic" stack_type = null shard_type = SHARD_NONE -/material/graphite +/datum/material/graphite name = MAT_GRAPHITE stack_type = /obj/item/stack/material/graphite flags = MATERIAL_BRITTLE @@ -677,7 +677,7 @@ var/list/name_to_material radiation_resistance = 15 stack_origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 2) -/material/osmium +/datum/material/osmium name = "osmium" stack_type = /obj/item/stack/material/osmium icon_colour = "#9999FF" @@ -687,7 +687,7 @@ var/list/name_to_material conductivity = 100 supply_conversion_value = 6 -/material/tritium +/datum/material/tritium name = "tritium" stack_type = /obj/item/stack/material/tritium icon_colour = "#777777" @@ -697,7 +697,7 @@ var/list/name_to_material is_fusion_fuel = 1 conductive = 0 -/material/deuterium +/datum/material/deuterium name = "deuterium" stack_type = /obj/item/stack/material/deuterium icon_colour = "#999999" @@ -707,7 +707,7 @@ var/list/name_to_material is_fusion_fuel = 1 conductive = 0 -/material/mhydrogen +/datum/material/mhydrogen name = "mhydrogen" stack_type = /obj/item/stack/material/mhydrogen icon_colour = "#E6C5DE" @@ -716,7 +716,7 @@ var/list/name_to_material is_fusion_fuel = 1 supply_conversion_value = 6 -/material/platinum +/datum/material/platinum name = "platinum" stack_type = /obj/item/stack/material/platinum icon_colour = "#9999FF" @@ -727,7 +727,7 @@ var/list/name_to_material sheet_plural_name = "ingots" supply_conversion_value = 5 -/material/iron +/datum/material/iron name = "iron" stack_type = /obj/item/stack/material/iron icon_colour = "#5C5454" @@ -736,7 +736,7 @@ var/list/name_to_material sheet_singular_name = "ingot" sheet_plural_name = "ingots" -/material/lead +/datum/material/lead name = MAT_LEAD stack_type = /obj/item/stack/material/lead icon_colour = "#273956" @@ -749,7 +749,7 @@ var/list/name_to_material // Particle Smasher and other exotic materials. -/material/verdantium +/datum/material/verdantium name = MAT_VERDANTIUM stack_type = /obj/item/stack/material/verdantium icon_base = "metal" @@ -770,7 +770,7 @@ var/list/name_to_material sheet_plural_name = "sheets" supply_conversion_value = 8 -/material/morphium +/datum/material/morphium name = MAT_MORPHIUM stack_type = /obj/item/stack/material/morphium icon_base = "metal" @@ -791,13 +791,13 @@ var/list/name_to_material stack_origin_tech = list(TECH_MATERIAL = 8, TECH_ILLEGAL = 1, TECH_PHORON = 4, TECH_BLUESPACE = 4, TECH_ARCANE = 1) supply_conversion_value = 13 -/material/morphium/hull +/datum/material/morphium/hull name = MAT_MORPHIUMHULL stack_type = /obj/item/stack/material/morphium/hull icon_base = "hull" icon_reinf = "reinf_mesh" -/material/valhollide +/datum/material/valhollide name = MAT_VALHOLLIDE stack_type = /obj/item/stack/material/valhollide icon_base = "stone" @@ -820,7 +820,7 @@ var/list/name_to_material // Adminspawn only, do not let anyone get this. -/material/alienalloy +/datum/material/alienalloy name = "alienalloy" display_name = "durable alloy" stack_type = null @@ -834,31 +834,31 @@ var/list/name_to_material protectiveness = 80 // 80% // Likewise. -/material/alienalloy/elevatorium +/datum/material/alienalloy/elevatorium name = "elevatorium" display_name = "elevator panelling" icon_colour = "#666666" // Ditto. -/material/alienalloy/dungeonium +/datum/material/alienalloy/dungeonium name = "dungeonium" display_name = "ultra-durable" icon_base = "dungeon" icon_colour = "#FFFFFF" -/material/alienalloy/bedrock +/datum/material/alienalloy/bedrock name = "bedrock" display_name = "impassable rock" icon_base = "rock" icon_colour = "#FFFFFF" -/material/alienalloy/alium +/datum/material/alienalloy/alium name = "alium" display_name = "alien" icon_base = "alien" icon_colour = "#FFFFFF" -/material/resin +/datum/material/resin name = "resin" icon_colour = "#35343a" icon_base = "resin" @@ -874,13 +874,13 @@ var/list/name_to_material stack_origin_tech = list(TECH_MATERIAL = 8, TECH_PHORON = 4, TECH_BLUESPACE = 4, TECH_BIO = 7) stack_type = /obj/item/stack/material/resin -/material/resin/can_open_material_door(var/mob/living/user) +/datum/material/resin/can_open_material_door(var/mob/living/user) var/mob/living/carbon/M = user if(istype(M) && locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) return 1 return 0 -/material/resin/wall_touch_special(var/turf/simulated/wall/W, var/mob/living/L) +/datum/material/resin/wall_touch_special(var/turf/simulated/wall/W, var/mob/living/L) var/mob/living/carbon/M = L if(istype(M) && locate(/obj/item/organ/internal/xenos/hivenode) in M.internal_organs) to_chat(M, "\The [W] shudders under your touch, starting to become porous.") @@ -892,7 +892,7 @@ var/list/name_to_material return 1 return 0 -/material/wood +/datum/material/wood name = MAT_WOOD stack_type = /obj/item/stack/material/wood icon_colour = "#9c5930" @@ -915,7 +915,7 @@ var/list/name_to_material sheet_singular_name = "plank" sheet_plural_name = "planks" -/material/wood/log +/datum/material/wood/log name = MAT_LOG icon_base = "log" stack_type = /obj/item/stack/material/log @@ -924,25 +924,25 @@ var/list/name_to_material pass_stack_colors = TRUE supply_conversion_value = 3 //YW Adds: logs worth points -/material/wood/log/sif +/datum/material/wood/log/sif name = MAT_SIFLOG icon_colour = "#0099cc" // Cyan-ish stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) stack_type = /obj/item/stack/material/log/sif -/material/wood/holographic +/datum/material/wood/holographic name = "holowood" display_name = "wood" stack_type = null shard_type = SHARD_NONE -/material/wood/sif +/datum/material/wood/sif name = MAT_SIFWOOD stack_type = /obj/item/stack/material/wood/sif icon_colour = "#0099cc" // Cyan-ish stack_origin_tech = list(TECH_MATERIAL = 2, TECH_BIO = 2) // Alien wood would presumably be more interesting to the analyzer. -/material/cardboard +/datum/material/cardboard name = "cardboard" stack_type = /obj/item/stack/material/cardboard flags = MATERIAL_BRITTLE @@ -962,7 +962,7 @@ var/list/name_to_material radiation_resistance = 1 pass_stack_colors = TRUE -/material/snow +/datum/material/snow name = MAT_SNOW stack_type = /obj/item/stack/material/snow flags = MATERIAL_BRITTLE @@ -980,7 +980,7 @@ var/list/name_to_material sheet_plural_name = "pile" //Just a bigger pile radiation_resistance = 1 -/material/snowbrick //only slightly stronger than snow, used to make igloos mostly +/datum/material/snowbrick //only slightly stronger than snow, used to make igloos mostly name = "packed snow" flags = MATERIAL_BRITTLE stack_type = /obj/item/stack/material/snowbrick @@ -998,7 +998,7 @@ var/list/name_to_material sheet_plural_name = "bricks" radiation_resistance = 1 -/material/cloth //todo +/datum/material/cloth //todo name = "cloth" stack_origin_tech = list(TECH_MATERIAL = 2) door_icon_base = "wood" @@ -1009,7 +1009,7 @@ var/list/name_to_material conductive = 0 pass_stack_colors = TRUE -/material/cult +/datum/material/cult name = "cult" display_name = "disturbing stone" icon_base = "cult" @@ -1020,21 +1020,21 @@ var/list/name_to_material sheet_plural_name = "bricks" conductive = 0 -/material/cult/place_dismantled_girder(var/turf/target) +/datum/material/cult/place_dismantled_girder(var/turf/target) new /obj/structure/girder/cult(target, "cult") -/material/cult/place_dismantled_product(var/turf/target) +/datum/material/cult/place_dismantled_product(var/turf/target) new /obj/effect/decal/cleanable/blood(target) -/material/cult/reinf +/datum/material/cult/reinf name = "cult2" display_name = "human remains" -/material/cult/reinf/place_dismantled_product(var/turf/target) +/datum/material/cult/reinf/place_dismantled_product(var/turf/target) new /obj/effect/decal/remains/human(target) //TODO PLACEHOLDERS: -/material/leather +/datum/material/leather name = "leather" icon_colour = "#5C4831" stack_origin_tech = list(TECH_MATERIAL = 2) @@ -1061,7 +1061,7 @@ var/list/name_to_material */ //CHOMPstation Removal End -/material/cotton +/datum/material/cotton name = "cotton" display_name ="cotton" icon_colour = "#FFFFFF" @@ -1072,7 +1072,7 @@ var/list/name_to_material conductive = 0 // This all needs to be OOP'd and use inheritence if its ever used in the future. -/material/cloth_teal +/datum/material/cloth_teal name = "teal" display_name ="teal" use_name = "teal cloth" @@ -1083,7 +1083,7 @@ var/list/name_to_material protectiveness = 1 // 4% conductive = 0 -/material/cloth_black +/datum/material/cloth_black name = "black" display_name = "black" use_name = "black cloth" @@ -1094,7 +1094,7 @@ var/list/name_to_material protectiveness = 1 // 4% conductive = 0 -/material/cloth_green +/datum/material/cloth_green name = "green" display_name = "green" use_name = "green cloth" @@ -1105,7 +1105,7 @@ var/list/name_to_material protectiveness = 1 // 4% conductive = 0 -/material/cloth_puple +/datum/material/cloth_puple name = "purple" display_name = "purple" use_name = "purple cloth" @@ -1116,7 +1116,7 @@ var/list/name_to_material protectiveness = 1 // 4% conductive = 0 -/material/cloth_blue +/datum/material/cloth_blue name = "blue" display_name = "blue" use_name = "blue cloth" @@ -1127,7 +1127,7 @@ var/list/name_to_material protectiveness = 1 // 4% conductive = 0 -/material/cloth_beige +/datum/material/cloth_beige name = "beige" display_name = "beige" use_name = "beige cloth" @@ -1138,7 +1138,7 @@ var/list/name_to_material protectiveness = 1 // 4% conductive = 0 -/material/cloth_lime +/datum/material/cloth_lime name = "lime" display_name = "lime" use_name = "lime cloth" @@ -1149,7 +1149,7 @@ var/list/name_to_material protectiveness = 1 // 4% conductive = 0 -/material/cloth_yellow +/datum/material/cloth_yellow name = "yellow" display_name = "yellow" use_name = "yellow cloth" @@ -1160,7 +1160,7 @@ var/list/name_to_material protectiveness = 1 // 4% conductive = 0 -/material/cloth_orange +/datum/material/cloth_orange name = "orange" display_name = "orange" use_name = "orange cloth" @@ -1171,7 +1171,7 @@ var/list/name_to_material protectiveness = 1 // 4% conductive = 0 -/material/toy_foam +/datum/material/toy_foam name = "foam" display_name = "foam" use_name = "foam" diff --git a/code/modules/materials/materials_ch.dm b/code/modules/materials/materials_ch.dm index 94a1516f38..efad561c7a 100644 --- a/code/modules/materials/materials_ch.dm +++ b/code/modules/materials/materials_ch.dm @@ -1,6 +1,6 @@ //CARPET materials -/material/carpet +/datum/material/carpet name = MAT_CARPET display_name = "comfy" use_name = "upholstery" @@ -14,42 +14,42 @@ protectiveness = 1 // 4% conductive = 0 -/material/carpet/teal +/datum/material/carpet/teal name = MAT_CARPET_TEAL icon_colour = "#007575" stack_type = /obj/item/stack/tile/carpet/teal -/material/carpet/bcarpet +/datum/material/carpet/bcarpet name = MAT_CARPET_BLACK icon_colour = "#1B171E" stack_type = /obj/item/stack/tile/carpet/bcarpet -/material/carpet/blucarpet +/datum/material/carpet/blucarpet name = MAT_CARPET_BLUE icon_colour = "#122CDF" stack_type = /obj/item/stack/tile/carpet/blucarpet -/material/carpet/turcarpet +/datum/material/carpet/turcarpet name = MAT_CARPET_TURQUOISE icon_colour = "#41A997" stack_type = /obj/item/stack/tile/carpet/turcarpet -/material/carpet/sblucarpet +/datum/material/carpet/sblucarpet name = MAT_CARPET_SILVERBLUE icon_colour = "#547EC6" stack_type = /obj/item/stack/tile/carpet/sblucarpet -/material/carpet/gaycarpet +/datum/material/carpet/gaycarpet name = MAT_CARPET_PINK icon_colour = "#E12C87" stack_type = /obj/item/stack/tile/carpet/gaycarpet -/material/carpet/purcarpet +/datum/material/carpet/purcarpet name = MAT_CARPET_PURPLE icon_colour = "#B500A6" stack_type = /obj/item/stack/tile/carpet/purcarpet -/material/carpet/oracarpet +/datum/material/carpet/oracarpet name = MAT_CARPET_ORANGE icon_colour = "#D1D000" stack_type = /obj/item/stack/tile/carpet/oracarpet \ No newline at end of file diff --git a/code/modules/materials/materials_vr.dm b/code/modules/materials/materials_vr.dm index c341a15496..460869d32f 100644 --- a/code/modules/materials/materials_vr.dm +++ b/code/modules/materials/materials_vr.dm @@ -1,4 +1,4 @@ -/material/flesh +/datum/material/flesh name = "flesh" display_name = "chunk of flesh" icon_colour = "#dd90aa" @@ -10,7 +10,7 @@ hardness = 500 weight = 500 -/material/fluff //This is to allow for 2 handed weapons that don't want to have a prefix. +/datum/material/fluff //This is to allow for 2 handed weapons that don't want to have a prefix. name = " " display_name = "" icon_colour = "#000000" @@ -19,19 +19,19 @@ hardness = 60 weight = 20 //Strong as iron. -/material/darkglass +/datum/material/darkglass name = "darkglass" display_name = "darkglass" icon_base = "darkglass" icon_colour = "#FFFFFF" -/material/fancyblack +/datum/material/fancyblack name = "fancyblack" display_name = "fancyblack" icon_base = "fancyblack" icon_colour = "#FFFFFF" -/material/glass/titaniumglass +/datum/material/glass/titaniumglass name = MAT_TITANIUMGLASS display_name = "titanium glass" stack_type = /obj/item/stack/material/glass/titanium @@ -48,7 +48,7 @@ rod_product = /obj/item/stack/material/glass/titanium composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, "glass" = SHEET_MATERIAL_AMOUNT) -/material/plastitanium +/datum/material/plastitanium name = MAT_PLASTITANIUM stack_type = /obj/item/stack/material/plastitanium integrity = 600 @@ -65,7 +65,18 @@ composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT) supply_conversion_value = 8 -/material/glass/plastaniumglass +/datum/material/plastitanium/hull + name = MAT_PLASTITANIUMHULL + stack_type = /obj/item/stack/material/plastitanium/hull + icon_base = "hull" + icon_reinf = "reinf_mesh" + icon_colour = "#585658" + explosion_resistance = 50 + +/datum/material/plastitanium/hull/place_sheet(var/turf/target) //Deconstructed into normal plasteel sheets. + new /obj/item/stack/material/plastitanium(target) + +/datum/material/glass/plastaniumglass name = MAT_PLASTITANIUMGLASS display_name = "plas-titanium glass" stack_type = /obj/item/stack/material/glass/plastitanium diff --git a/code/modules/media/media_tracks.dm b/code/modules/media/media_tracks.dm index e84e4911a6..31a1dc6035 100644 --- a/code/modules/media/media_tracks.dm +++ b/code/modules/media/media_tracks.dm @@ -27,7 +27,7 @@ str += " by [artist]" return str -/datum/track/proc/toNanoList() +/datum/track/proc/toTguiList() return list("ref" = "\ref[src]", "title" = title, "artist" = artist, "duration" = duration) diff --git a/code/modules/mining/drilling/scanner.dm b/code/modules/mining/drilling/scanner.dm index 31da4a9753..50bf8bdd35 100644 --- a/code/modules/mining/drilling/scanner.dm +++ b/code/modules/mining/drilling/scanner.dm @@ -6,7 +6,7 @@ item_state = "electronic" origin_tech = list(TECH_MAGNET = 1, TECH_ENGINEERING = 1) matter = list(DEFAULT_WALL_MATERIAL = 150) - var/scan_time = 5 SECONDS + var/scan_time = 2 SECONDS /obj/item/weapon/mining_scanner/attack_self(mob/user as mob) to_chat(user, "You begin sweeping \the [src] about, scanning for metal deposits.") diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 93c711b6be..32d47681c3 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -275,7 +275,7 @@ var/can_make = CLAMP(ores_stored[metal],0,sheets_per_tick-sheets) if(can_make%2>0) can_make-- - var/material/M = get_material_by_name(O.compresses_to) + var/datum/material/M = get_material_by_name(O.compresses_to) if(!istype(M) || !can_make || ores_stored[metal] < 1) continue @@ -289,7 +289,7 @@ var/can_make = CLAMP(ores_stored[metal],0,sheets_per_tick-sheets) - var/material/M = get_material_by_name(O.smelts_to) + var/datum/material/M = get_material_by_name(O.smelts_to) if(!istype(M) || !can_make || ores_stored[metal] < 1) continue diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 2f388e2ba5..0ab8381002 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -91,8 +91,9 @@ EQUIPMENT("Fine Excavation Kit - Measuring Tape", /obj/item/device/measuring_tape, 125), EQUIPMENT("Fine Excavation Kit - Hand Pick", /obj/item/weapon/pickaxe/hand, 375), EQUIPMENT("Explosive Excavation Kit - Plastic Charge",/obj/item/weapon/plastique/seismic/locked, 1500), - EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 3000), - EQUIPMENT("Industrial Equipment - Sheet-Snatcher",/obj/item/weapon/storage/bag/sheetsnatcher, 500), + EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 3000), + EQUIPMENT("Industrial Equipment - Inducer", /obj/item/weapon/inducer, 900), + EQUIPMENT("Industrial Equipment - Sheet-Snatcher", /obj/item/weapon/storage/bag/sheetsnatcher, 500), ) prize_list["Hardsuit"] = list( EQUIPMENT("Hardsuit - Control Module", /obj/item/weapon/rig/industrial/vendor, 2000), diff --git a/code/modules/mining/ore_redemption_machine/survey_vendor.dm b/code/modules/mining/ore_redemption_machine/survey_vendor.dm index 1eb8672ef6..eaf5667094 100644 --- a/code/modules/mining/ore_redemption_machine/survey_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/survey_vendor.dm @@ -55,6 +55,7 @@ EQUIPMENT("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 50), EQUIPMENT("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 100), EQUIPMENT("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 300), + EQUIPMENT("Industrial Equipment - Inducer", /obj/item/weapon/inducer, 90), EQUIPMENT("Laser Pointer", /obj/item/device/laser_pointer, 90), EQUIPMENT("Luxury Shelter Capsule", /obj/item/device/survivalcapsule/luxury, 310), EQUIPMENT("Bar Shelter Capsule", /obj/item/device/survivalcapsule/luxurybar, 1000), diff --git a/code/modules/mob/living/bot/cleanbot.dm b/code/modules/mob/living/bot/cleanbot.dm index 6594126b1d..8071c184ee 100644 --- a/code/modules/mob/living/bot/cleanbot.dm +++ b/code/modules/mob/living/bot/cleanbot.dm @@ -221,6 +221,7 @@ target_types += /obj/effect/decal/cleanable/liquid_fuel target_types += /obj/effect/decal/cleanable/mucus target_types += /obj/effect/decal/cleanable/dirt + target_types += /obj/effect/decal/cleanable/filth if(blood) target_types += /obj/effect/decal/cleanable/blood diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3f0cab7f9d..c4480cf5ae 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -210,7 +210,7 @@ return spread_fire(AM) - + ..() // call parent because we moved behavior to parent // Get rank from ID, ID inside PDA, PDA, ID in wallet, etc. @@ -220,7 +220,7 @@ if (pda.id) return pda.id.rank ? pda.id.rank : if_no_job else - return pda.ownrank + return pda.ownrank ? pda.ownrank : if_no_job else var/obj/item/weapon/card/id/id = get_idcard() if(id) @@ -236,7 +236,7 @@ if (pda.id) return pda.id.assignment else - return pda.ownjob + return pda.ownjob ? pda.ownjob : if_no_job else var/obj/item/weapon/card/id/id = get_idcard() if(id) @@ -252,7 +252,7 @@ if (pda.id) return pda.id.registered_name else - return pda.owner + return pda.owner ? pda.owner : if_no_id else var/obj/item/weapon/card/id/id = get_idcard() if(id) @@ -285,7 +285,7 @@ . = if_no_id if(istype(wear_id,/obj/item/device/pda)) var/obj/item/device/pda/P = wear_id - return P.owner + return P.owner ? P.owner : if_no_id if(wear_id) var/obj/item/weapon/card/id/I = wear_id.GetID() if(I) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 2bda9a55d4..a7678647d8 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -183,31 +183,32 @@ // VOREstation Edit End. #undef HUMAN_LOWEST_SLOWDOWN +/mob/living/carbon/human/get_jetpack() + if(back) + var/obj/item/weapon/rig/rig = get_rig() + if(istype(back, /obj/item/weapon/tank/jetpack)) + return back + else if(istype(rig)) + for(var/obj/item/rig_module/maneuvering_jets.module in rig.installed_modules) + return module.jets + /mob/living/carbon/human/Process_Spacemove(var/check_drift = 0) //Can we act? if(restrained()) return 0 + if(..()) //Can move due to other reasons, don't use jetpack fuel + return 1 + //Do we have a working jetpack? - var/obj/item/weapon/tank/jetpack/thrust - if(back) - if(istype(back,/obj/item/weapon/tank/jetpack)) - thrust = back - else if(istype(get_rig(),/obj/item/weapon/rig)) - var/obj/item/weapon/rig/rig = get_rig() - for(var/obj/item/rig_module/maneuvering_jets/module in rig.installed_modules) - thrust = module.jets - break + var/obj/item/weapon/tank/jetpack/thrust = get_jetpack() if(thrust) - if(((!check_drift) || (check_drift && thrust.stabilization_on)) && (!lying) && (thrust.allow_thrust(0.01, src))) + if(((!check_drift) || (check_drift && thrust.stabilization_on)) && (!lying) && (thrust.do_thrust(0.01, src))) inertia_dir = 0 return 1 if(flying) //VOREStation Edit. If you're flying, you glide around! return 0 //VOREStation Edit. - //If no working jetpack then use the other checks - if(..()) - return 1 return 0 @@ -215,7 +216,11 @@ //If knocked out we might just hit it and stop. This makes it possible to get dead bodies and such. if(species.flags & NO_SLIP) - return + return 0 + + var/obj/item/weapon/tank/jetpack/thrust = get_jetpack() + if(thrust?.can_thrust(0.01)) + return 0 if(stat) prob_slip = 0 // Changing this to zero to make it line up with the comment, and also, make more sense. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 39ad53458b..fbf1b76b90 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1290,13 +1290,19 @@ clear_fullscreen("blind") clear_alert("blind") - if(disabilities & NEARSIGHTED) //this looks meh but saves a lot of memory by not requiring to add var/prescription - if(glasses) //to every /obj/item + var/apply_nearsighted_overlay = FALSE + if(disabilities & NEARSIGHTED) + apply_nearsighted_overlay = TRUE + + if(glasses) var/obj/item/clothing/glasses/G = glasses - if(!G.prescription) - set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1) - else if (!nif || !nif.flag_check(NIF_V_CORRECTIVE,NIF_FLAGS_VISION)) //VOREStation Edit - NIF - set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1) + if(G.prescription) + apply_nearsighted_overlay = FALSE + + if(nif && nif.flag_check(NIF_V_CORRECTIVE, NIF_FLAGS_VISION)) // VOREStation Edit - NIF + apply_nearsighted_overlay = FALSE + + set_fullscreen(apply_nearsighted_overlay, "nearsighted", /obj/screen/fullscreen/impaired, 1) set_fullscreen(eye_blurry, "blurry", /obj/screen/fullscreen/blurry) set_fullscreen(druggy, "high", /obj/screen/fullscreen/high) diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index fe7410c774..8353d36cba 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -111,19 +111,19 @@ //This is mostly normal breath code with some tweaks that apply to their particular biology. var/datum/gas_mixture/breath = null - var/fullysealed = FALSE //if they're wearing a fully sealed suit, their internals take priority. - var/environmentalair = FALSE //if no sealed suit, internals take priority in low pressure environements + var/fullysealed = FALSE //are they covered in a sealed suit or not - if(H.wear_suit && (H.wear_suit.min_pressure_protection = 0) && H.head && (H.head.min_pressure_protection = 0)) + if(H.wear_suit && (H.wear_suit.min_pressure_protection < hazard_low_pressure) && H.head && (H.head.min_pressure_protection < hazard_low_pressure)) + //if they're wearing a fully sealed suit, their internals take priority. + breath = H.get_breath_from_internal() fullysealed = TRUE - else // find out if local gas mixture is enough to override use of internals + else + // find out if local gas mixture is enough to override use of internals + // if pressure is low enough, they can still breathe from internals without a suit var/datum/gas_mixture/environment = H.loc.return_air() var/envpressure = environment.return_pressure() - if(envpressure >= hazard_low_pressure) - environmentalair = TRUE - - if(fullysealed || !environmentalair) - breath = H.get_breath_from_internal() + if(envpressure < hazard_low_pressure) + breath = H.get_breath_from_internal() if(!breath) //No breath from internals so let's try to get air from our location // cut-down version of get_breath_from_environment - notably, gas masks provide no benefit diff --git a/code/modules/mob/living/carbon/human/stripping.dm b/code/modules/mob/living/carbon/human/stripping.dm index 736109794a..7aa08accbb 100644 --- a/code/modules/mob/living/carbon/human/stripping.dm +++ b/code/modules/mob/living/carbon/human/stripping.dm @@ -58,14 +58,22 @@ var/stripping var/obj/item/held = user.get_active_hand() if(!istype(held) || is_robot_module(held)) + stripping = TRUE + else + var/obj/item/weapon/holder/holder = held + if(istype(holder) && src == holder.held_mob) + stripping = TRUE + else + var/obj/item/weapon/grab/grab = held + if(istype(grab) && grab.affecting == src) + stripping = TRUE + + if(stripping) if(!istype(target_slot)) // They aren't holding anything valid and there's nothing to remove, why are we even here? return if(!target_slot.canremove) to_chat(user, "You cannot remove \the [src]'s [target_slot.name].") return - stripping = 1 - - if(stripping) visible_message("\The [user] is trying to remove \the [src]'s [target_slot.name]!") else if(slot_to_strip == slot_wear_mask && istype(held, /obj/item/weapon/grenade)) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 063b4fe188..a88a434d96 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -10,9 +10,6 @@ if(!loc) return - if(machine && !CanMouseDrop(machine, src)) - machine = null - var/datum/gas_mixture/environment = loc.return_air() //handle_modifiers() // Do this early since it might affect other things later. //VOREStation Edit diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 1864ee5d01..05990e8de9 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -132,16 +132,25 @@ default behaviour is: if((tmob.mob_always_swap || (tmob.a_intent == I_HELP || tmob.restrained()) && (a_intent == I_HELP || src.restrained())) && tmob.canmove && canmove && !tmob.buckled && !buckled && can_swap && can_move_mob(tmob, 1, 0)) // mutual brohugs all around! var/turf/oldloc = loc + //VOREstation Edit - Begin + + //check bumpnom chance, if it's a simplemob that's doing the bumping + var/mob/living/simple_mob/srcsimp = src + if(istype(srcsimp)) + if(srcsimp.tryBumpNom(tmob)) + now_pushing = 0 + return + + //if it's a simplemob being bumped, and the above didn't make them start getting bumpnommed, they get a chance to bumpnom + var/mob/living/simple_mob/tmobsimp = tmob + if(istype(tmobsimp)) + if(tmobsimp.tryBumpNom(src)) + now_pushing = 0 + return + + //VOREstation Edit - End forceMove(tmob.loc) //VOREstation Edit - Begin - if (istype(tmob, /mob/living/simple_mob)) //check bumpnom chance, if it's a simplemob that's bumped - tmob.Bumped(src) - else if(istype(src, /mob/living/simple_mob)) //otherwise, if it's a simplemob doing the bumping. Simplemob on simplemob doesn't seem to trigger but that's fine. - Bumped(tmob) - if (tmob.loc == src) //check if they got ate, and if so skip the forcemove - now_pushing = 0 - return - // In case of micros, we don't swap positions; instead occupying the same square! if (handle_micro_bump_helping(tmob)) now_pushing = 0 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 60966f6da2..0c20f6bf31 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -20,7 +20,6 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/proc/ai_call_shuttle, /mob/living/silicon/ai/proc/ai_camera_track, /mob/living/silicon/ai/proc/ai_camera_list, - /mob/living/silicon/ai/proc/ai_roster, /mob/living/silicon/ai/proc/ai_checklaws, /mob/living/silicon/ai/proc/toggle_camera_light, /mob/living/silicon/ai/proc/take_image, @@ -48,7 +47,7 @@ var/list/ai_verbs_default = list( anchored = 1 // -- TLE density = 1 status_flags = CANSTUN|CANPARALYSE|CANPUSH - shouldnt_see = list(/obj/effect/rune) + shouldnt_see = list(/mob/observer/eye, /obj/effect/rune) var/list/network = list(NETWORK_DEFAULT) var/obj/machinery/camera/camera = null var/aiRestorePowerRoutine = 0 @@ -355,12 +354,6 @@ var/list/ai_verbs_default = list( if(new_sprite) selected_sprite = new_sprite updateicon() -// this verb lets the ai see the stations manifest -/mob/living/silicon/ai/proc/ai_roster() - set category = "AI Commands" - set name = "Show Crew Manifest" - show_station_manifest() - /mob/living/silicon/ai/var/message_cooldown = 0 /mob/living/silicon/ai/proc/ai_announcement() set category = "AI Commands" @@ -399,9 +392,7 @@ var/list/ai_verbs_default = list( // hack to display shuttle timer if(emergency_shuttle.online()) - var/obj/machinery/computer/communications/C = locate() in machines - if(C) - C.post_status("shuttle") + post_status(src, "shuttle", user = src) /mob/living/silicon/ai/proc/ai_recall_shuttle() set category = "AI Commands" diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 3a995ba19d..cf135f9d55 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -122,7 +122,10 @@ pda.ownjob = "Personal Assistant" pda.owner = text("[]", src) pda.name = pda.owner + " (" + pda.ownjob + ")" - pda.toff = 1 + + var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger) + if(M) + M.toff = TRUE ..() /mob/living/silicon/pai/Login() @@ -210,7 +213,7 @@ medicalActive1 = null medicalActive2 = null medical_cannotfind = 0 - SSnanoui.update_uis(src) + SStgui.update_uis(src) to_chat(usr, "You reset your record-viewing software.") /mob/living/silicon/pai/cancel_camera() diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index bbb038dead..cad5229097 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -41,27 +41,24 @@ var/global/list/default_pai_software = list() set category = "pAI Commands" set name = "Software Interface" - ui_interact(src) + tgui_interact(src) -/mob/living/silicon/pai/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1) - if(user != src) - if(ui) ui.set_status(STATUS_CLOSE, 0) - return +/mob/living/silicon/pai/tgui_state(mob/user) + return GLOB.tgui_self_state - if(ui_key != "main") - var/datum/pai_software/S = software[ui_key] - if(S && !S.toggle) - S.on_ui_interact(src, ui, force_open) - else - if(ui) ui.set_status(STATUS_CLOSE, 0) - return - - var/data[0] +/mob/living/silicon/pai/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIInterface", "pAI Software Interface") + ui.open() +/mob/living/silicon/pai/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + // Software we have bought - var/bought_software[0] + var/list/bought_software = list() // Software we have not bought - var/not_bought_software[0] + var/list/not_bought_software = list() for(var/key in pai_software_by_key) var/datum/pai_software/S = pai_software_by_key[key] @@ -70,62 +67,52 @@ var/global/list/default_pai_software = list() software_data["id"] = S.id if(key in software) software_data["on"] = S.is_active(src) - bought_software[++bought_software.len] = software_data + bought_software.Add(list(software_data)) else software_data["ram"] = S.ram_cost - not_bought_software[++not_bought_software.len] = software_data + not_bought_software.Add(list(software_data)) data["bought"] = bought_software data["not_bought"] = not_bought_software data["available_ram"] = ram // Emotions - var/emotions[0] + var/list/emotions = list() for(var/name in pai_emotions) - var/emote[0] + var/list/emote = list() emote["name"] = name emote["id"] = pai_emotions[name] - emotions[++emotions.len] = emote + emotions.Add(list(emote)) data["emotions"] = emotions data["current_emotion"] = card.current_emotion - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "pai_interface.tmpl", "pAI Software Interface", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data -/mob/living/silicon/pai/Topic(href, href_list) - . = ..() - if(.) return +/mob/living/silicon/pai/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE - if(href_list["software"]) - var/soft = href_list["software"] - var/datum/pai_software/S = software[soft] - if(S.toggle) - S.toggle(src) - else - ui_interact(src, ui_key = soft) - return 1 + switch(action) + if("software") + var/soft = params["software"] + var/datum/pai_software/S = software[soft] + if(S.toggle) + S.toggle(src) + else + S.tgui_interact(src, parent_ui = ui) + return TRUE - else if(href_list["stopic"]) - var/soft = href_list["stopic"] - var/datum/pai_software/S = software[soft] - if(S) - return S.Topic(href, href_list) + if("purchase") + var/soft = params["purchase"] + var/datum/pai_software/S = pai_software_by_key[soft] + if(S && (ram >= S.ram_cost)) + ram -= S.ram_cost + software[S.id] = S + return TRUE - else if(href_list["purchase"]) - var/soft = href_list["purchase"] - var/datum/pai_software/S = pai_software_by_key[soft] - if(S && (ram >= S.ram_cost)) - ram -= S.ram_cost - software[S.id] = S - return 1 - - else if(href_list["image"]) - var/img = text2num(href_list["image"]) - if(1 <= img && img <= (pai_emotions.len)) - card.setEmotion(img) - return 1 + if("image") + var/img = text2num(params["image"]) + if(1 <= img && img <= (pai_emotions.len)) + card.setEmotion(img) + return TRUE diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 8f7e8462de..e518e74a4a 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -12,14 +12,19 @@ // Whether pAIs should automatically receive this module at no cost var/default = 0 - proc/on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) - return +/datum/pai_software/proc/toggle(mob/living/silicon/pai/user) + return - proc/toggle(mob/living/silicon/pai/user) - return +/datum/pai_software/proc/is_active(mob/living/silicon/pai/user) + return 0 - proc/is_active(mob/living/silicon/pai/user) - return 0 +/datum/pai_software/tgui_state(mob/user) + return GLOB.tgui_always_state + +/datum/pai_software/tgui_status(mob/user) + if(!istype(user, /mob/living/silicon/pai)) + return STATUS_CLOSE + return ..() /datum/pai_software/directives name = "Directives" @@ -28,55 +33,58 @@ toggle = 0 default = 1 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/pai_software/directives/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIDirectives", name, parent_ui) + ui.open() - data["master"] = user.master - data["dna"] = user.master_dna - data["prime"] = user.pai_law0 - data["supplemental"] = user.pai_laws +/datum/pai_software/directives/tgui_data(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = list() - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_directives.tmpl", "pAI Directives", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + data["master"] = user.master + data["dna"] = user.master_dna + data["prime"] = user.pai_law0 + data["supplemental"] = user.pai_laws - Topic(href, href_list) - var/mob/living/silicon/pai/P = usr - if(!istype(P)) return + return data - if(href_list["getdna"]) - var/mob/living/M = P.loc - var/count = 0 +/datum/pai_software/directives/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + var/mob/living/silicon/pai/P = usr + if(!istype(P)) + return TRUE + if(..()) + return TRUE - // Find the carrier - while(!istype(M, /mob/living)) - if(!M || !M.loc || count > 6) - //For a runtime where M ends up in nullspace (similar to bluespace but less colourful) - to_chat(src, "You are not being carried by anyone!") - return 0 - M = M.loc - count++ + if(action == "getdna") + var/mob/living/M = P.loc - // Check the carrier - var/datum/gender/TM = gender_datums[M.get_visible_gender()] - var/answer = input(M, "[P] is requesting a DNA sample from you. Will you allow it to confirm your identity?", "[P] Check DNA", "No") in list("Yes", "No") - if(answer == "Yes") - var/turf/T = get_turf_or_move(P.loc) - for (var/mob/v in viewers(T)) - v.show_message("[M] presses [TM.his] thumb against [P].", 3, "[P] makes a sharp clicking sound as it extracts DNA material from [M].", 2) - var/datum/dna/dna = M.dna - to_chat(P, "
[M]'s UE string : [dna.unique_enzymes]
") - if(dna.unique_enzymes == P.master_dna) - to_chat(P, "DNA is a match to stored Master DNA.") - else - to_chat(P, "DNA does not match stored Master DNA.") + var/count = 0 + // Find the carrier + while(!istype(M, /mob/living)) + if(!M || !M.loc || count > 6) + //For a runtime where M ends up in nullspace (similar to bluespace but less colourful) + to_chat(src, "You are not being carried by anyone!") + return 0 + M = M.loc + count++ + + // Check the carrier + var/datum/gender/TM = gender_datums[M.get_visible_gender()] + var/answer = input(M, "[P] is requesting a DNA sample from you. Will you allow it to confirm your identity?", "[P] Check DNA", "No") in list("Yes", "No") + if(answer == "Yes") + var/turf/T = get_turf(P.loc) + for (var/mob/v in viewers(T)) + v.show_message("[M] presses [TM.his] thumb against [P].", 3, "[P] makes a sharp clicking sound as it extracts DNA material from [M].", 2) + var/datum/dna/dna = M.dna + to_chat(P, "[M]'s UE string : [dna.unique_enzymes]
") + if(dna.unique_enzymes == P.master_dna) + to_chat(P, "DNA is a match to stored Master DNA.") else - to_chat(P, "[M] does not seem like [TM.he] is going to provide a DNA sample willingly.") - return 1 + to_chat(P, "DNA does not match stored Master DNA.") + else + to_chat(P, "[M] does not seem like [TM.he] is going to provide a DNA sample willingly.") + return TRUE /datum/pai_software/radio_config name = "Radio Configuration" @@ -85,35 +93,8 @@ toggle = 0 default = 1 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui = null, force_open = 1) - var/data[0] - - data["listening"] = user.radio.broadcasting - data["frequency"] = format_frequency(user.radio.frequency) - - var/channels[0] - for(var/ch_name in user.radio.channels) - var/ch_stat = user.radio.channels[ch_name] - var/ch_dat[0] - ch_dat["name"] = ch_name - // FREQ_LISTENING is const in /obj/item/device/radio - ch_dat["listening"] = !!(ch_stat & user.radio.FREQ_LISTENING) - channels[++channels.len] = ch_dat - - data["channels"] = channels - - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - ui = new(user, user, id, "pai_radio.tmpl", "Radio Configuration", 300, 150) - ui.set_initial_data(data) - ui.open() - - Topic(href, href_list) - var/mob/living/silicon/pai/P = usr - if(!istype(P)) return - - P.radio.Topic(href, href_list) - return 1 +/datum/pai_software/radio_config/tgui_interact(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui/parent_ui) + return user.radio.tgui_interact(user, parent_ui = parent_ui) /datum/pai_software/crew_manifest name = "Crew Manifest" @@ -121,20 +102,18 @@ id = "manifest" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) +/datum/pai_software/crew_manifest/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "CrewManifest", name, parent_ui) + ui.open() + +/datum/pai_software/crew_manifest/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + if(data_core) data_core.get_manifest_list() - - var/data[0] - // This is dumb, but NanoUI breaks if it has no data to send - data["manifest"] = PDA_Manifest - - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "crew_manifest.tmpl", "Crew Manifest", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + data["manifest"] = PDA_Manifest + return data /datum/pai_software/messenger name = "Digital Messenger" @@ -142,75 +121,8 @@ id = "messenger" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) - var/data[0] - - data["receiver_off"] = user.pda.toff - data["ringer_off"] = user.pda.message_silent - data["current_ref"] = null - data["current_name"] = user.current_pda_messaging - - var/pdas[0] - if(!user.pda.toff) - for(var/obj/item/device/pda/P in sortAtom(PDAs)) - if(!P.owner || P.toff || P == user.pda || P.hidden) continue - var/pda[0] - pda["name"] = "[P]" - pda["owner"] = "[P.owner]" - pda["ref"] = "\ref[P]" - if(P.owner == user.current_pda_messaging) - data["current_ref"] = "\ref[P]" - pdas[++pdas.len] = pda - - data["pdas"] = pdas - - var/messages[0] - if(user.current_pda_messaging) - for(var/index in user.pda.tnote) - if(index["owner"] != user.current_pda_messaging) - continue - var/msg[0] - var/sent = index["sent"] - msg["sent"] = sent ? 1 : 0 - msg["target"] = index["owner"] - msg["message"] = index["message"] - messages[++messages.len] = msg - - data["messages"] = messages - - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_messenger.tmpl", "Digital Messenger", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) - - Topic(href, href_list) - var/mob/living/silicon/pai/P = usr - if(!istype(P)) return - - if(!isnull(P.pda)) - if(href_list["toggler"]) - P.pda.toff = href_list["toggler"] != "1" - return 1 - else if(href_list["ringer"]) - P.pda.message_silent = href_list["ringer"] != "1" - return 1 - else if(href_list["select"]) - var/s = href_list["select"] - if(s == "*NONE*") - P.current_pda_messaging = null - else - P.current_pda_messaging = s - return 1 - else if(href_list["target"]) - if(P.silence_time) - return alert("Communications circuits remain uninitialized.") - - var/target = locate(href_list["target"]) - P.pda.create_message(P, target, 1) - return 1 +/datum/pai_software/messenger/tgui_interact(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui/parent_ui) + return user.pda.tgui_interact(user, parent_ui = parent_ui) /datum/pai_software/med_records name = "Medical Records" @@ -218,53 +130,55 @@ id = "med_records" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/pai_software/med_records/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIMedrecords", name, parent_ui) + ui.open() - var/records[0] - for(var/datum/data/record/general in sortRecord(data_core.general)) - var/record[0] - record["name"] = general.fields["name"] - record["ref"] = "\ref[general]" - records[++records.len] = record +/datum/pai_software/med_records/tgui_data(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/list/records = list() + for(var/datum/data/record/general in sortRecord(data_core.general)) + var/list/record = list() + record["name"] = general.fields["name"] + record["ref"] = "\ref[general]" + records.Add(list(record)) - data["records"] = records + data["records"] = records - var/datum/data/record/G = user.medicalActive1 - var/datum/data/record/M = user.medicalActive2 - data["general"] = G ? G.fields : null - data["medical"] = M ? M.fields : null - data["could_not_find"] = user.medical_cannotfind + var/datum/data/record/G = user.medicalActive1 + var/datum/data/record/M = user.medicalActive2 + data["general"] = G ? G.fields : null + data["medical"] = M ? M.fields : null + data["could_not_find"] = user.medical_cannotfind - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_medrecords.tmpl", "Medical Records", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data - Topic(href, href_list) - var/mob/living/silicon/pai/P = usr - if(!istype(P)) return +/datum/pai_software/med_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + var/mob/living/silicon/pai/P = usr + if(!istype(P)) + return - if(href_list["select"]) - var/datum/data/record/record = locate(href_list["select"]) - if(record) - var/datum/data/record/R = record - var/datum/data/record/M = null - if (!( data_core.general.Find(R) )) - P.medical_cannotfind = 1 - else - P.medical_cannotfind = 0 - for(var/datum/data/record/E in data_core.medical) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - P.medicalActive1 = R - P.medicalActive2 = M - else + if(action == "select") + var/datum/data/record/record = locate(params["select"]) + if(record) + var/datum/data/record/R = record + var/datum/data/record/M = null + if (!( data_core.general.Find(R) )) P.medical_cannotfind = 1 - return 1 + else + P.medical_cannotfind = 0 + for(var/datum/data/record/E in data_core.medical) + if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + M = E + P.medicalActive1 = R + P.medicalActive2 = M + else + P.medical_cannotfind = 1 + return 1 /datum/pai_software/sec_records name = "Security Records" @@ -272,57 +186,59 @@ id = "sec_records" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/pai_software/sec_records/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAISecrecords", name, parent_ui) + ui.open() - var/records[0] - for(var/datum/data/record/general in sortRecord(data_core.general)) - var/record[0] - record["name"] = general.fields["name"] - record["ref"] = "\ref[general]" - records[++records.len] = record +/datum/pai_software/sec_records/tgui_data(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/list/records = list() + for(var/datum/data/record/general in sortRecord(data_core.general)) + var/list/record = list() + record["name"] = general.fields["name"] + record["ref"] = "\ref[general]" + records.Add(list(record)) - data["records"] = records + data["records"] = records - var/datum/data/record/G = user.securityActive1 - var/datum/data/record/S = user.securityActive2 - data["general"] = G ? G.fields : null - data["security"] = S ? S.fields : null - data["could_not_find"] = user.security_cannotfind + var/datum/data/record/G = user.securityActive1 + var/datum/data/record/S = user.securityActive2 + data["general"] = G ? G.fields : null + data["security"] = S ? S.fields : null + data["could_not_find"] = user.security_cannotfind - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_secrecords.tmpl", "Security Records", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data - Topic(href, href_list) - var/mob/living/silicon/pai/P = usr - if(!istype(P)) return +/datum/pai_software/sec_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + var/mob/living/silicon/pai/P = usr + if(!istype(P)) + return - if(href_list["select"]) - var/datum/data/record/record = locate(href_list["select"]) - if(record) - var/datum/data/record/R = record - var/datum/data/record/S = null - if (!( data_core.general.Find(R) )) - P.securityActive1 = null - P.securityActive2 = null - P.security_cannotfind = 1 - else - P.security_cannotfind = 0 - for(var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - S = E - P.securityActive1 = R - P.securityActive2 = S - else + if(action == "select") + var/datum/data/record/record = locate(params["select"]) + if(record) + var/datum/data/record/R = record + var/datum/data/record/S = null + if (!( data_core.general.Find(R) )) P.securityActive1 = null P.securityActive2 = null P.security_cannotfind = 1 - return 1 + else + P.security_cannotfind = 0 + for(var/datum/data/record/E in data_core.security) + if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + S = E + P.securityActive1 = R + P.securityActive2 = S + else + P.securityActive1 = null + P.securityActive2 = null + P.security_cannotfind = 1 + return TRUE /datum/pai_software/door_jack name = "Door Jack" @@ -330,47 +246,49 @@ id = "door_jack" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/pai_software/door_jack/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIDoorjack", "Door Jack", parent_ui) + ui.open() - data["cable"] = user.cable != null - data["machine"] = user.cable && (user.cable.machine != null) - data["inprogress"] = user.hackdoor != null - data["progress_a"] = round(user.hackprogress / 10) - data["progress_b"] = user.hackprogress % 10 - data["aborted"] = user.hack_aborted +/datum/pai_software/door_jack/tgui_data(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_doorjack.tmpl", "Door Jack", 300, 150) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + data["cable"] = user.cable != null + data["machine"] = user.cable && (user.cable.machine != null) + data["inprogress"] = user.hackdoor != null + data["progress_a"] = round(user.hackprogress / 10) + data["progress_b"] = user.hackprogress % 10 + data["aborted"] = user.hack_aborted - Topic(href, href_list) - var/mob/living/silicon/pai/P = usr - if(!istype(P)) return + return data - if(href_list["jack"]) +/datum/pai_software/door_jack/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + var/mob/living/silicon/pai/P = usr + if(!istype(P) || ..()) + return TRUE + + switch(action) + if("jack") if(P.cable && P.cable.machine) P.hackdoor = P.cable.machine P.hackloop() return 1 - else if(href_list["cancel"]) + if("cancel") P.hackdoor = null return 1 - else if(href_list["cable"]) - var/turf/T = get_turf_or_move(P.loc) + if("cable") + var/turf/T = get_turf(P) P.hack_aborted = 0 P.cable = new /obj/item/weapon/pai_cable(T) for(var/mob/M in viewers(T)) M.show_message("A port on [P] opens to reveal [P.cable], which promptly falls to the floor.", 3, - "You hear the soft click of something light and hard falling to the ground.", 2) + "You hear the soft click of something light and hard falling to the ground.", 2) return 1 /mob/living/silicon/pai/proc/hackloop() - var/turf/T = get_turf_or_move(src.loc) + var/turf/T = get_turf(src) for(var/mob/living/silicon/ai/AI in player_list) if(T.loc) to_chat(AI, "Network Alert: Brute-force encryption crack in progress in [T.loc].") @@ -404,134 +322,155 @@ id = "atmos_sense" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/pai_software/atmosphere_sensor/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIAtmos", name, parent_ui) + ui.open() - var/turf/T = get_turf_or_move(user.loc) - if(!T) - data["reading"] = 0 - data["pressure"] = 0 - data["temperature"] = 0 - data["temperatureC"] = 0 - data["gas"] = list() - else - var/datum/gas_mixture/env = T.return_air() - data["reading"] = 1 - var/pres = env.return_pressure() * 10 - data["pressure"] = "[round(pres/10)].[pres%10]" - data["temperature"] = round(env.temperature) - data["temperatureC"] = round(env.temperature-T0C) +/datum/pai_software/atmosphere_sensor/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() - var/t_moles = env.total_moles - var/gases[0] - for(var/g in env.gas) - var/gas[0] - gas["name"] = gas_data.name[g] - gas["percent"] = round((env.gas[g] / t_moles) * 100) - gases[++gases.len] = gas - data["gas"] = gases + var/list/results = list() + var/turf/T = get_turf(user) + if(!isnull(T)) + var/datum/gas_mixture/environment = T.return_air() + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles + if (total_moles) + var/o2_level = environment.gas["oxygen"]/total_moles + var/n2_level = environment.gas["nitrogen"]/total_moles + var/co2_level = environment.gas["carbon_dioxide"]/total_moles + var/phoron_level = environment.gas["phoron"]/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_atmosphere.tmpl", "Atmosphere Sensor", 350, 300) - ui.set_initial_data(data) - ui.open() + // entry is what the element is describing + // Type identifies which unit or other special characters to use + // Val is the information reported + // Bad_high/_low are the values outside of which the entry reports as dangerous + // Poor_high/_low are the values outside of which the entry reports as unideal + // Values were extracted from the template itself + results = list( + list("entry" = "Pressure", "units" = "kPa", "val" = "[round(pressure,0.1)]", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80), + list("entry" = "Temperature", "units" = "°C", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5), + list("entry" = "Oxygen", "units" = "kPa", "val" = "[round(o2_level*100,0.1)]", "bad_high" = 140, "poor_high" = 135, "poor_low" = 19, "bad_low" = 17), + list("entry" = "Nitrogen", "units" = "kPa", "val" = "[round(n2_level*100,0.1)]", "bad_high" = 105, "poor_high" = 85, "poor_low" = 50, "bad_low" = 40), + list("entry" = "Carbon Dioxide", "units" = "kPa", "val" = "[round(co2_level*100,0.1)]", "bad_high" = 10, "poor_high" = 5, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Phoron", "units" = "kPa", "val" = "[round(phoron_level*100,0.01)]", "bad_high" = 0.5, "poor_high" = 0, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Other", "units" = "kPa", "val" = "[round(unknown_level, 0.01)]", "bad_high" = 1, "poor_high" = 0.5, "poor_low" = 0, "bad_low" = 0) + ) + + if(isnull(results)) + results = list(list("entry" = "pressure", "units" = "kPa", "val" = "0", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80)) + + data["aircontents"] = results + + return data /datum/pai_software/sec_hud name = "Security HUD" ram_cost = 20 id = "sec_hud" - toggle(mob/living/silicon/pai/user) - user.secHUD = !user.secHUD - user.plane_holder.set_vis(VIS_CH_ID, user.secHUD) - user.plane_holder.set_vis(VIS_CH_WANTED, user.secHUD) - user.plane_holder.set_vis(VIS_CH_IMPTRACK, user.secHUD) - user.plane_holder.set_vis(VIS_CH_IMPLOYAL, user.secHUD) - user.plane_holder.set_vis(VIS_CH_IMPCHEM, user.secHUD) +/datum/pai_software/sec_hud/toggle(mob/living/silicon/pai/user) + user.secHUD = !user.secHUD + user.plane_holder.set_vis(VIS_CH_ID, user.secHUD) + user.plane_holder.set_vis(VIS_CH_WANTED, user.secHUD) + user.plane_holder.set_vis(VIS_CH_IMPTRACK, user.secHUD) + user.plane_holder.set_vis(VIS_CH_IMPLOYAL, user.secHUD) + user.plane_holder.set_vis(VIS_CH_IMPCHEM, user.secHUD) - is_active(mob/living/silicon/pai/user) - return user.secHUD +/datum/pai_software/sec_hud/is_active(mob/living/silicon/pai/user) + return user.secHUD /datum/pai_software/med_hud name = "Medical HUD" ram_cost = 20 id = "med_hud" - toggle(mob/living/silicon/pai/user) - user.medHUD = !user.medHUD - user.plane_holder.set_vis(VIS_CH_STATUS, user.medHUD) - user.plane_holder.set_vis(VIS_CH_HEALTH, user.medHUD) +/datum/pai_software/med_hud/toggle(mob/living/silicon/pai/user) + user.medHUD = !user.medHUD + user.plane_holder.set_vis(VIS_CH_STATUS, user.medHUD) + user.plane_holder.set_vis(VIS_CH_HEALTH, user.medHUD) - is_active(mob/living/silicon/pai/user) - return user.medHUD +/datum/pai_software/med_hud/is_active(mob/living/silicon/pai/user) + return user.medHUD /datum/pai_software/translator name = "Universal Translator" ram_cost = 35 id = "translator" - toggle(mob/living/silicon/pai/user) - // Sol Common, Tradeband, Terminus and Gutter are added with New() and are therefore the current default, always active languages - user.translator_on = !user.translator_on - if(user.translator_on) - user.add_language(LANGUAGE_UNATHI) - user.add_language(LANGUAGE_SIIK) - user.add_language(LANGUAGE_AKHANI) - user.add_language(LANGUAGE_SKRELLIAN) - user.add_language(LANGUAGE_ZADDAT) - user.add_language(LANGUAGE_SCHECHI) - else - user.remove_language(LANGUAGE_UNATHI) - user.remove_language(LANGUAGE_SIIK) - user.remove_language(LANGUAGE_AKHANI) - user.remove_language(LANGUAGE_SKRELLIAN) - user.remove_language(LANGUAGE_ZADDAT) - user.remove_language(LANGUAGE_SCHECHI) +/datum/pai_software/translator/toggle(mob/living/silicon/pai/user) + // Sol Common, Tradeband, Terminus and Gutter are added with New() and are therefore the current default, always active languages + user.translator_on = !user.translator_on + if(user.translator_on) + user.add_language(LANGUAGE_UNATHI) + user.add_language(LANGUAGE_SIIK) + user.add_language(LANGUAGE_AKHANI) + user.add_language(LANGUAGE_SKRELLIAN) + user.add_language(LANGUAGE_ZADDAT) + user.add_language(LANGUAGE_SCHECHI) + else + user.remove_language(LANGUAGE_UNATHI) + user.remove_language(LANGUAGE_SIIK) + user.remove_language(LANGUAGE_AKHANI) + user.remove_language(LANGUAGE_SKRELLIAN) + user.remove_language(LANGUAGE_ZADDAT) + user.remove_language(LANGUAGE_SCHECHI) - is_active(mob/living/silicon/pai/user) - return user.translator_on +/datum/pai_software/translator/is_active(mob/living/silicon/pai/user) + return user.translator_on /datum/pai_software/signaller - name = "Remote Signaller" + name = "Remote Signaler" ram_cost = 5 id = "signaller" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/pai_software/signaller/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Signaler", "Signaler", parent_ui) + ui.open() - data["frequency"] = format_frequency(user.sradio.frequency) - data["code"] = user.sradio.code +/datum/pai_software/signaller/tgui_data(mob/living/silicon/pai/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/obj/item/radio/integrated/signal/R = user.sradio - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_signaller.tmpl", "Signaller", 320, 150) - ui.set_initial_data(data) - ui.open() + data["frequency"] = R.frequency + data["minFrequency"] = RADIO_LOW_FREQ + data["maxFrequency"] = RADIO_HIGH_FREQ + data["code"] = R.code - Topic(href, href_list) - var/mob/living/silicon/pai/P = usr - if(!istype(P)) return + return data - if(href_list["send"]) - P.sradio.send_signal("ACTIVATE") - for(var/mob/O in hearers(1, P.loc)) - O.show_message("[bicon(P)] *beep* *beep*", 3, "*beep* *beep*", 2) - return 1 +/datum/pai_software/signaller/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE - else if(href_list["freq"]) - var/new_frequency = (P.sradio.frequency + text2num(href_list["freq"])) - if(new_frequency < PUBLIC_LOW_FREQ || new_frequency > PUBLIC_HIGH_FREQ) - new_frequency = sanitize_frequency(new_frequency) - P.sradio.set_frequency(new_frequency) - return 1 + var/mob/living/silicon/pai/user = usr + if(istype(user)) + var/obj/item/radio/integrated/signal/R = user.sradio - else if(href_list["code"]) - P.sradio.code += text2num(href_list["code"]) - P.sradio.code = round(P.sradio.code) - P.sradio.code = min(100, P.sradio.code) - P.sradio.code = max(1, P.sradio.code) - return 1 + switch(action) + if("signal") + spawn(0) + R.send_signal("ACTIVATE") + for(var/mob/O in hearers(1, R.loc)) + O.show_message("[bicon(R)] *beep* *beep*", 3, "*beep* *beep*", 2) + if("freq") + var/frequency = unformat_frequency(params["freq"]) + frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ) + R.set_frequency(frequency) + . = TRUE + if("code") + R.code = clamp(round(text2num(params["code"])), 1, 100) + . = TRUE + if("reset") + if(params["reset"] == "freq") + R.set_frequency(initial(R.frequency)) + else + R.code = initial(R.code) + . = TRUE diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index adc9b66a89..bb4bfc90fb 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -350,12 +350,6 @@ updatename() updateicon() -// this verb lets cyborgs see the stations manifest -/mob/living/silicon/robot/verb/cmd_station_manifest() - set category = "Robot Commands" - set name = "Show Crew Manifest" - show_station_manifest() - /mob/living/silicon/robot/proc/self_diagnosis() if(!is_component_functioning("diagnosis unit")) return null diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index d4a6a5d9aa..58a5027402 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -172,7 +172,8 @@ pto_type = PTO_SCIENCE vr_sprites = list( "Acheron" = "mechoid-Science", - "ZOOM-BA" = "zoomba-research" + "ZOOM-BA" = "zoomba-research", + "XI-GUS" = "spiderscience" ) /obj/item/weapon/robot_module/robot/security/combat diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm index fe05775c51..bc9b7367f2 100644 --- a/code/modules/mob/living/silicon/robot/robot_movement.dm +++ b/code/modules/mob/living/silicon/robot/robot_movement.dm @@ -1,16 +1,28 @@ +/mob/living/silicon/robot/get_jetpack() + if(module) + for(var/obj/item/weapon/tank/jetpack/J in module.modules) + return J + +/mob/living/silicon/robot/Check_Shoegrip() + return module && module.no_slip + /mob/living/silicon/robot/Process_Spaceslipping(var/prob_slip) + var/obj/item/weapon/tank/jetpack/thrust = get_jetpack() + if(thrust?.can_thrust(0.01)) + return 0 if(module && module.no_slip) return 0 ..(prob_slip) -/mob/living/silicon/robot/Process_Spacemove() - if(module) - for(var/obj/item/weapon/tank/jetpack/J in module.modules) - if(istype(J, /obj/item/weapon/tank/jetpack)) - if(J.allow_thrust(0.01)) - return 1 - if(..()) +/mob/living/silicon/robot/Process_Spacemove(var/check_drift = 0) + if(..())//Can move due to other reasons, don't use jetpack fuel return 1 + + var/obj/item/weapon/tank/jetpack/thrust = get_jetpack() + if(thrust && (!check_drift || (check_drift && thrust.stabilization_on)) && thrust.do_thrust(0.01)) + inertia_dir = 0 + return 1 + return 0 //No longer needed, but I'll leave it here incase we plan to re-use it. diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index 840026946f..21011e84c7 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -53,7 +53,8 @@ "zoomba-service", "zoomba-combat", "zoomba-combat-roll", - "zoomba-combat-shield" + "zoomba-combat-shield", + "spiderscience" ) //List of all used sprites that are in robots_vr.dmi diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index b6cf748fb8..b9c2c60c47 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -153,18 +153,6 @@ show_malf_ai() ..() -// this function displays the stations manifest in a separate window -/mob/living/silicon/proc/show_station_manifest() - var/dat = ""
- if(!data_core)
- to_chat(src, "There is no data to form a manifest with. Contact your Nanotrasen administrator.")
- return
- dat += data_core.get_manifest(1) //The 1 makes it monochrome.
-
- var/datum/browser/popup = new(src, "Crew Manifest", "Crew Manifest", 370, 420, src)
- popup.set_content(dat)
- popup.open()
-
//can't inject synths
/mob/living/silicon/can_inject(var/mob/user, var/error_msg)
if(error_msg)
diff --git a/code/modules/mob/living/silicon/subystems.dm b/code/modules/mob/living/silicon/subystems.dm
index be6a68591d..890f1a8b37 100644
--- a/code/modules/mob/living/silicon/subystems.dm
+++ b/code/modules/mob/living/silicon/subystems.dm
@@ -2,6 +2,7 @@
var/register_alarms = 1
var/datum/tgui_module/alarm_monitor/all/robot/alarm_monitor
var/datum/tgui_module/atmos_control/robot/atmos_control
+ var/datum/tgui_module/crew_manifest/robot/crew_manifest
var/datum/tgui_module/crew_monitor/robot/crew_monitor
var/datum/tgui_module/law_manager/robot/law_manager
var/datum/tgui_module/power_monitor/robot/power_monitor
@@ -10,6 +11,7 @@
/mob/living/silicon
var/list/silicon_subsystems = list(
/mob/living/silicon/proc/subsystem_alarm_monitor,
+ /mob/living/silicon/proc/subsystem_crew_manifest,
/mob/living/silicon/proc/subsystem_law_manager
)
@@ -17,6 +19,7 @@
silicon_subsystems = list(
/mob/living/silicon/proc/subsystem_alarm_monitor,
/mob/living/silicon/proc/subsystem_atmos_control,
+ /mob/living/silicon/proc/subsystem_crew_manifest,
/mob/living/silicon/proc/subsystem_crew_monitor,
/mob/living/silicon/proc/subsystem_law_manager,
/mob/living/silicon/proc/subsystem_power_monitor,
@@ -30,6 +33,7 @@
/mob/living/silicon/proc/init_subsystems()
alarm_monitor = new(src)
atmos_control = new(src)
+ crew_manifest = new(src)
crew_monitor = new(src)
law_manager = new(src)
power_monitor = new(src)
@@ -60,6 +64,15 @@
atmos_control.tgui_interact(usr)
+/********************
+* Crew Manifest *
+********************/
+/mob/living/silicon/proc/subsystem_crew_manifest()
+ set category = "Subystems"
+ set name = "Crew Manifest"
+
+ crew_manifest.tgui_interact(usr)
+
/********************
* Crew Monitor *
********************/
diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm
index 3a27d98d01..f3bf4543db 100644
--- a/code/modules/mob/living/simple_mob/simple_mob.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob.dm
@@ -271,18 +271,22 @@
// Harvest an animal's delicious byproducts
-/mob/living/simple_mob/proc/harvest(var/mob/user)
+/mob/living/simple_mob/proc/harvest(var/mob/user, var/invisible)
var/actual_meat_amount = max(1,(meat_amount/2))
+ var/attacker_name = user.name
+ if(invisible)
+ attacker_name = "someone"
+
if(meat_type && actual_meat_amount>0 && (stat == DEAD))
for(var/i=0;i[user] chops up \the [src]!")
+ user.visible_message("[attacker_name] chops up \the [src]!")
new/obj/effect/decal/cleanable/blood/splatter(get_turf(src))
qdel(src)
else
- user.visible_message("[user] butchers \the [src] messily!")
+ user.visible_message("[attacker_name] butchers \the [src] messily!")
gib()
diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
index 6b2d4bb6fe..ef631fa897 100644
--- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
@@ -244,17 +244,23 @@
"The stomach glorps and gurgles as it tries to work you into slop.")
/mob/living/simple_mob/Bumped(var/atom/movable/AM, yes)
- if(ismob(AM))
- var/mob/tmob = AM
- if(will_eat(tmob) && !istype(tmob, type) && prob(vore_bump_chance) && !ckey) //check if they decide to eat. Includes sanity check to prevent cannibalism.
- if(tmob.canmove && prob(vore_pounce_chance)) //if they'd pounce for other noms, pounce for these too, otherwise still try and eat them if they hold still
- tmob.Weaken(5)
- tmob.visible_message("\the [src] [vore_bump_emote] \the [tmob]!!")
- set_AI_busy(TRUE)
+ if(tryBumpNom(AM))
+ return
+ ..()
+
+/mob/living/simple_mob/proc/tryBumpNom(var/mob/tmob)
+ //returns TRUE if we actually start an attempt to bumpnom, FALSE if checks fail or the random bump nom chance fails
+ if(istype(tmob) && will_eat(tmob) && !istype(tmob, type) && prob(vore_bump_chance) && !ckey) //check if they decide to eat. Includes sanity check to prevent cannibalism.
+ if(tmob.canmove && prob(vore_pounce_chance)) //if they'd pounce for other noms, pounce for these too, otherwise still try and eat them if they hold still
+ tmob.Weaken(5)
+ tmob.visible_message("\the [src] [vore_bump_emote] \the [tmob]!!")
+ set_AI_busy(TRUE)
+ spawn()
animal_nom(tmob)
update_icon()
set_AI_busy(FALSE)
- ..()
+ return TRUE
+ return FALSE
// Checks to see if mob doesn't like this kind of turf
/mob/living/simple_mob/IMove(newloc)
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
index dbedc27aa0..d713ade614 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm
@@ -25,7 +25,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
say_list_type = /datum/say_list/chicken
meat_amount = 2
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken
var/eggsleft = 0
var/body_color
@@ -125,7 +125,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have?
say_list_type = /datum/say_list/chick
meat_amount = 1
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken
var/amount_grown = 0
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm
index 7abb7156d5..d51f6422fe 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/thermic.dm
@@ -28,6 +28,7 @@
melee_damage_lower = 10
melee_damage_upper = 25
+ attack_armor_pen = 15
heat_resist = 0.75
cold_resist = -0.50
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm
index 8d09b18fea..848fb7fafa 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/parrot.dm
@@ -1,252 +1,253 @@
-// Parrots can talk, and may repeat things it hears.
-/mob/living/simple_mob/animal/passive/bird/parrot
- name = "parrot"
- description_info = "You can give it a headset by clicking on it with a headset. \
- To remove it, click the bird while on grab intent."
- has_langs = list("Galactic Common", "Bird")
-
- ai_holder_type = /datum/ai_holder/simple_mob/passive/parrot
-
- // A headset, so that talking parrots can yell at the crew over comms.
- // If set to a type, on initialize it will be instantiated into that type.
- var/obj/item/device/radio/headset/my_headset = null
-
-// Say list
-/datum/say_list/bird/poly
- speak = list(
- "Poly wanna cracker!",
- "Check the singulo, you chucklefucks!",
- "Wire the solars, you lazy bums!",
- "WHO TOOK THE DAMN HARDSUITS?",
- "OH GOD ITS FREE CALL THE SHUTTLE",
- "Danger! Crystal hyperstructure instability!",
- "CRYSTAL DELAMINATION IMMINENT.",
- "Tweet tweet, I'm a Teshari.",
- "Chitters.",
- "Meteors have been detected on a collision course with the station!"
- )
-
-// Lets the AI use headsets.
-// Player-controlled parrots will need to do it manually.
-/mob/living/simple_mob/animal/passive/bird/parrot/ISay(message)
- if(my_headset && prob(50))
- var/list/keys = list()
- for(var/channel in my_headset.channels)
- var/key = get_radio_key_from_channel(channel)
- if(key)
- keys += key
- if(keys.len)
- var/key_used = pick(keys)
- return say("[key_used] [message]")
- return say(message)
-
-// Ugly saycode so parrots can use their headsets.
-/mob/living/simple_mob/animal/passive/bird/parrot/handle_message_mode(message_mode, message, verb, speaking, used_radios)
- ..()
- if(message_mode)
- if(my_headset && istype(my_headset, /obj/item/device/radio))
- my_headset.talk_into(src, message, message_mode, verb, speaking)
- used_radios += my_headset
-
-// Clicked on while holding an object.
-/mob/living/simple_mob/animal/passive/bird/parrot/attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/device/radio/headset))
- give_headset(I, user)
- return
- return ..()
-
-// Clicked on by empty hand.
-/mob/living/simple_mob/animal/passive/bird/parrot/attack_hand(mob/living/L)
- if(L.a_intent == I_GRAB && my_headset)
- remove_headset(L)
- else
- ..()
-
-
-/mob/living/simple_mob/animal/passive/bird/parrot/proc/give_headset(obj/item/device/radio/headset/new_headset, mob/living/user)
- if(!istype(new_headset))
- to_chat(user, span("warning", "\The [new_headset] isn't a headset."))
- return
- if(my_headset)
- to_chat(user, span("warning", "\The [src] is already wearing \a [my_headset]."))
- return
- else
- user.drop_item(new_headset)
- my_headset = new_headset
- new_headset.forceMove(src)
- to_chat(user, span("warning", "You place \a [new_headset] on \the [src]. You monster."))
- to_chat(src, span("notice", "\The [user] gives you \a [new_headset]. You should put it to good use immediately."))
- return
-
-/mob/living/simple_mob/animal/passive/bird/parrot/proc/remove_headset(mob/living/user)
- if(!my_headset)
- to_chat(user, "\The [src] doesn't have a headset to remove, thankfully.")
- else
- ISay("BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
- my_headset.forceMove(get_turf(src))
- user.put_in_hands(my_headset)
- to_chat(user, span("notice", "You take away \the [src]'s [my_headset.name]. Finally."))
- to_chat(src, span("warning", "\The [user] takes your [my_headset.name] away! How cruel!"))
- my_headset = null
-
-/mob/living/simple_mob/animal/passive/bird/parrot/examine(mob/user)
- . = ..()
- if(my_headset)
- . += "It is wearing \a [my_headset]."
-
-/mob/living/simple_mob/animal/passive/bird/parrot/Initialize()
- if(my_headset)
- my_headset = new my_headset(src)
- return ..()
-
-// Subtypes.
-
-// Best Bird
-/mob/living/simple_mob/animal/passive/bird/parrot/poly
- name = "Poly"
- desc = "It's a parrot. An expert on quantum cracker theory."
- icon_state = "poly"
- icon_rest = "poly-held"
- icon_dead = "poly-dead"
- tt_desc = "E Ara macao"
- //my_headset = /obj/item/device/radio/headset/headset_eng //VOREStation Removal
- say_list_type = /datum/say_list/bird/poly
-
-// Best Bird with best headset.
-/mob/living/simple_mob/animal/passive/bird/parrot/poly/ultimate
- my_headset = /obj/item/device/radio/headset/omni
-
-/mob/living/simple_mob/animal/passive/bird/parrot/kea
- name = "kea"
- desc = "A species of parrot. On Earth, they are unique among other parrots for residing in alpine climates. \
- They are known to be intelligent and curious, which has made some consider them a pest."
- icon_state = "kea"
- icon_rest = "kea-held"
- icon_dead = "kea-dead"
- tt_desc = "E Nestor notabilis"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/eclectus
- name = "eclectus"
- desc = "A species of parrot, this species features extreme sexual dimorphism in their plumage's colors. \
- A male eclectus has emerald green plumage, where as a female eclectus has red and purple plumage."
- icon_state = "eclectus"
- icon_rest = "eclectus-held"
- icon_dead = "eclectus-dead"
- tt_desc = "E Eclectus roratus"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/eclectus/Initialize()
- gender = pick(MALE, FEMALE)
- if(gender == FEMALE)
- icon_state = "eclectusf"
- icon_rest = "eclectusf-held"
- icon_dead = "eclectusf-dead"
- return ..()
-
-/mob/living/simple_mob/animal/passive/bird/parrot/grey_parrot
- name = "grey parrot"
- desc = "A species of parrot. This one is predominantly grey, but has red tail feathers."
- icon_state = "agrey"
- icon_rest = "agrey-held"
- icon_dead = "agrey-dead"
- tt_desc = "E Psittacus erithacus"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/black_headed_caique
- name = "black-headed caique"
- desc = "A species of parrot, these birds have a distinct black color on their heads, distinguishing them from their relative Caiques."
- icon_state = "bcaique"
- icon_rest = "bcaique-held"
- icon_dead = "bcaique-dead"
- tt_desc = "E Pionites melanocephalus"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/white_caique
- name = "white-bellied caique"
- desc = "A species of parrot, they are also known as the Green-Thighed Parrot."
- icon_state = "wcaique"
- icon_rest = "wcaique-held"
- icon_dead = "wcaique-dead"
- tt_desc = "E Pionites leucogaster"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/budgerigar
- name = "budgerigar"
- desc = "A species of parrot, they are also known as the common parakeet, or in some circles, the budgie. \
- This one is has its natural colors of green and yellow."
- icon_state = "gbudge"
- icon_rest = "gbudge-held"
- icon_dead = "gbudge-dead"
- tt_desc = "E Melopsittacus undulatus"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/budgerigar/blue
- icon_state = "bbudge"
- icon_rest = "bbudge-held"
- icon_dead = "bbudge-dead"
- desc = "A species of parrot, they are also known as the common parakeet, or in some circles, the budgie. \
- This one has a mutation which altered its color to be blue instead of green and yellow."
-
-/mob/living/simple_mob/animal/passive/bird/parrot/budgerigar/bluegreen
- icon_state = "bgbudge"
- icon_rest = "bgbudge-held"
- icon_dead = "bgbudge-dead"
- desc = "A species of parrot, they are also known as the common parakeet, or in some circles, the budgie. \
- This one has a mutation which altered its color to be a mix of blue and green."
-
-/mob/living/simple_mob/animal/passive/bird/parrot/cockatiel
- name = "cockatiel"
- desc = "A species of parrot. This one has a highly visible crest."
- icon_state = "tiel"
- icon_rest = "tiel-held"
- icon_dead = "tiel-dead"
- tt_desc = "E Nymphicus hollandicus"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/white
- icon_state = "wtiel"
- icon_rest = "wtiel-held"
- icon_dead = "wtiel-dead"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/yellowish
- icon_state = "luttiel"
- icon_rest = "luttiel-held"
- icon_dead = "luttiel-dead"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/grey
- icon_state = "blutiel" // idk why this is blu.
- icon_rest = "blutiel-held"
- icon_dead = "blutiel-dead"
-
-// This actually might be the yellow-crested cockatoo but idk.
-/mob/living/simple_mob/animal/passive/bird/parrot/sulphur_cockatoo
- name = "sulphur-crested cockatoo"
- desc = "A species of parrot. This one has an expressive yellow crest. Their underwing and tail feathers are also yellow."
- icon_state = "too"
- icon_rest = "too-held"
- icon_dead = "too-dead"
- tt_desc = "E Cacatua galerita"
-
-// This was originally called 'hooded_too', which might not mean the unbrella cockatoo but idk.
-/mob/living/simple_mob/animal/passive/bird/parrot/white_cockatoo
- name = "white cockatoo"
- desc = "A species of parrot. This one is also known as the Umbrella Cockatoo, due to the semicircular shape of its crest."
- icon_state = "utoo"
- icon_rest = "utoo-held"
- icon_dead = "utoo-dead"
- tt_desc = "E Cacatua alba"
-
-/mob/living/simple_mob/animal/passive/bird/parrot/pink_cockatoo
- name = "pink cockatoo"
- desc = "A species of parrot. This one is also known as Major Mitchell's cockatoo, \
- in honor of a human surveyor and explorer who existed before humans fully explored their home planet."
- icon_state = "mtoo"
- icon_rest = "mtoo-held"
- icon_dead = "mtoo-dead"
- tt_desc = "E Lophochroa leadbeateri"
-
-
-// AI
-/datum/ai_holder/simple_mob/passive/parrot
- speak_chance = 2
- base_wander_delay = 8
-
-/datum/ai_holder/simple_mob/passive/parrot/on_hear_say(mob/living/speaker, message)
- if(holder.stat || !holder.say_list || !message || speaker == holder)
- return
- var/datum/say_list/S = holder.say_list
- S.speak |= message
\ No newline at end of file
+// Parrots can talk, and may repeat things it hears.
+/mob/living/simple_mob/animal/passive/bird/parrot
+ name = "parrot"
+ description_info = "You can give it a headset by clicking on it with a headset. \
+ To remove it, click the bird while on grab intent."
+ has_langs = list("Galactic Common", "Bird")
+
+ ai_holder_type = /datum/ai_holder/simple_mob/passive/parrot
+
+ // A headset, so that talking parrots can yell at the crew over comms.
+ // If set to a type, on initialize it will be instantiated into that type.
+ var/obj/item/device/radio/headset/my_headset = null
+
+// Say list
+/datum/say_list/bird/poly
+ speak = list(
+ "Poly wanna cracker!",
+ "Check the singulo, you chucklefucks!",
+ "Wire the solars, you lazy bums!",
+ "WHO TOOK THE DAMN HARDSUITS?",
+ "OH GOD ITS FREE CALL THE SHUTTLE",
+ "Danger! Crystal hyperstructure instability!",
+ "CRYSTAL DELAMINATION IMMINENT.",
+ "Tweet tweet, I'm a Teshari.",
+ "Chitters.",
+ "Meteors have been detected on a collision course with the station!"
+ )
+
+// Lets the AI use headsets.
+// Player-controlled parrots will need to do it manually.
+/mob/living/simple_mob/animal/passive/bird/parrot/ISay(message)
+ if(my_headset && prob(50))
+ var/list/keys = list()
+ for(var/channel in my_headset.channels)
+ var/key = get_radio_key_from_channel(channel)
+ if(key)
+ keys += key
+ if(keys.len)
+ var/key_used = pick(keys)
+ return say("[key_used] [message]")
+ return say(message)
+
+// Ugly saycode so parrots can use their headsets.
+/mob/living/simple_mob/animal/passive/bird/parrot/handle_message_mode(message_mode, message, verb, speaking, used_radios)
+ ..()
+ if(message_mode)
+ if(my_headset && istype(my_headset, /obj/item/device/radio))
+ my_headset.talk_into(src, message, message_mode, verb, speaking)
+ used_radios += my_headset
+
+// Clicked on while holding an object.
+/mob/living/simple_mob/animal/passive/bird/parrot/attackby(obj/item/I, mob/user)
+ if(istype(I, /obj/item/device/radio/headset))
+ give_headset(I, user)
+ return
+ return ..()
+
+// Clicked on by empty hand.
+/mob/living/simple_mob/animal/passive/bird/parrot/attack_hand(mob/living/L)
+ if(L.a_intent == I_GRAB && my_headset)
+ remove_headset(L)
+ else
+ ..()
+
+
+/mob/living/simple_mob/animal/passive/bird/parrot/proc/give_headset(obj/item/device/radio/headset/new_headset, mob/living/user)
+ if(!istype(new_headset))
+ to_chat(user, span("warning", "\The [new_headset] isn't a headset."))
+ return
+ if(my_headset)
+ to_chat(user, span("warning", "\The [src] is already wearing \a [my_headset]."))
+ return
+ else
+ user.drop_item(new_headset)
+ my_headset = new_headset
+ new_headset.forceMove(src)
+ to_chat(user, span("warning", "You place \a [new_headset] on \the [src]. You monster."))
+ to_chat(src, span("notice", "\The [user] gives you \a [new_headset]. You should put it to good use immediately."))
+ return
+
+/mob/living/simple_mob/animal/passive/bird/parrot/proc/remove_headset(mob/living/user)
+ if(!my_headset)
+ to_chat(user, "\The [src] doesn't have a headset to remove, thankfully.")
+ else
+ ISay("BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
+ my_headset.forceMove(get_turf(src))
+ user.put_in_hands(my_headset)
+ to_chat(user, span("notice", "You take away \the [src]'s [my_headset.name]. Finally."))
+ to_chat(src, span("warning", "\The [user] takes your [my_headset.name] away! How cruel!"))
+ my_headset = null
+
+/mob/living/simple_mob/animal/passive/bird/parrot/examine(mob/user)
+ . = ..()
+ if(my_headset)
+ . += "It is wearing \a [my_headset]."
+
+/mob/living/simple_mob/animal/passive/bird/parrot/Initialize()
+ if(my_headset)
+ my_headset = new my_headset(src)
+ return ..()
+
+// Subtypes.
+
+// Best Bird
+/mob/living/simple_mob/animal/passive/bird/parrot/poly
+ name = "Poly"
+ desc = "It's a parrot. An expert on quantum cracker theory."
+ icon_state = "poly"
+ icon_rest = "poly-held"
+ icon_dead = "poly-dead"
+ tt_desc = "E Ara macao"
+ attack_armor_pen = 20 //HE HAS THE B E A K
+ my_headset = /obj/item/device/radio/headset/headset_eng
+ say_list_type = /datum/say_list/bird/poly
+
+// Best Bird with best headset.
+/mob/living/simple_mob/animal/passive/bird/parrot/poly/ultimate
+ my_headset = /obj/item/device/radio/headset/omni
+
+/mob/living/simple_mob/animal/passive/bird/parrot/kea
+ name = "kea"
+ desc = "A species of parrot. On Earth, they are unique among other parrots for residing in alpine climates. \
+ They are known to be intelligent and curious, which has made some consider them a pest."
+ icon_state = "kea"
+ icon_rest = "kea-held"
+ icon_dead = "kea-dead"
+ tt_desc = "E Nestor notabilis"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/eclectus
+ name = "eclectus"
+ desc = "A species of parrot, this species features extreme sexual dimorphism in their plumage's colors. \
+ A male eclectus has emerald green plumage, where as a female eclectus has red and purple plumage."
+ icon_state = "eclectus"
+ icon_rest = "eclectus-held"
+ icon_dead = "eclectus-dead"
+ tt_desc = "E Eclectus roratus"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/eclectus/Initialize()
+ gender = pick(MALE, FEMALE)
+ if(gender == FEMALE)
+ icon_state = "eclectusf"
+ icon_rest = "eclectusf-held"
+ icon_dead = "eclectusf-dead"
+ return ..()
+
+/mob/living/simple_mob/animal/passive/bird/parrot/grey_parrot
+ name = "grey parrot"
+ desc = "A species of parrot. This one is predominantly grey, but has red tail feathers."
+ icon_state = "agrey"
+ icon_rest = "agrey-held"
+ icon_dead = "agrey-dead"
+ tt_desc = "E Psittacus erithacus"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/black_headed_caique
+ name = "black-headed caique"
+ desc = "A species of parrot, these birds have a distinct black color on their heads, distinguishing them from their relative Caiques."
+ icon_state = "bcaique"
+ icon_rest = "bcaique-held"
+ icon_dead = "bcaique-dead"
+ tt_desc = "E Pionites melanocephalus"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/white_caique
+ name = "white-bellied caique"
+ desc = "A species of parrot, they are also known as the Green-Thighed Parrot."
+ icon_state = "wcaique"
+ icon_rest = "wcaique-held"
+ icon_dead = "wcaique-dead"
+ tt_desc = "E Pionites leucogaster"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/budgerigar
+ name = "budgerigar"
+ desc = "A species of parrot, they are also known as the common parakeet, or in some circles, the budgie. \
+ This one is has its natural colors of green and yellow."
+ icon_state = "gbudge"
+ icon_rest = "gbudge-held"
+ icon_dead = "gbudge-dead"
+ tt_desc = "E Melopsittacus undulatus"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/budgerigar/blue
+ icon_state = "bbudge"
+ icon_rest = "bbudge-held"
+ icon_dead = "bbudge-dead"
+ desc = "A species of parrot, they are also known as the common parakeet, or in some circles, the budgie. \
+ This one has a mutation which altered its color to be blue instead of green and yellow."
+
+/mob/living/simple_mob/animal/passive/bird/parrot/budgerigar/bluegreen
+ icon_state = "bgbudge"
+ icon_rest = "bgbudge-held"
+ icon_dead = "bgbudge-dead"
+ desc = "A species of parrot, they are also known as the common parakeet, or in some circles, the budgie. \
+ This one has a mutation which altered its color to be a mix of blue and green."
+
+/mob/living/simple_mob/animal/passive/bird/parrot/cockatiel
+ name = "cockatiel"
+ desc = "A species of parrot. This one has a highly visible crest."
+ icon_state = "tiel"
+ icon_rest = "tiel-held"
+ icon_dead = "tiel-dead"
+ tt_desc = "E Nymphicus hollandicus"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/white
+ icon_state = "wtiel"
+ icon_rest = "wtiel-held"
+ icon_dead = "wtiel-dead"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/yellowish
+ icon_state = "luttiel"
+ icon_rest = "luttiel-held"
+ icon_dead = "luttiel-dead"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/grey
+ icon_state = "blutiel" // idk why this is blu.
+ icon_rest = "blutiel-held"
+ icon_dead = "blutiel-dead"
+
+// This actually might be the yellow-crested cockatoo but idk.
+/mob/living/simple_mob/animal/passive/bird/parrot/sulphur_cockatoo
+ name = "sulphur-crested cockatoo"
+ desc = "A species of parrot. This one has an expressive yellow crest. Their underwing and tail feathers are also yellow."
+ icon_state = "too"
+ icon_rest = "too-held"
+ icon_dead = "too-dead"
+ tt_desc = "E Cacatua galerita"
+
+// This was originally called 'hooded_too', which might not mean the unbrella cockatoo but idk.
+/mob/living/simple_mob/animal/passive/bird/parrot/white_cockatoo
+ name = "white cockatoo"
+ desc = "A species of parrot. This one is also known as the Umbrella Cockatoo, due to the semicircular shape of its crest."
+ icon_state = "utoo"
+ icon_rest = "utoo-held"
+ icon_dead = "utoo-dead"
+ tt_desc = "E Cacatua alba"
+
+/mob/living/simple_mob/animal/passive/bird/parrot/pink_cockatoo
+ name = "pink cockatoo"
+ desc = "A species of parrot. This one is also known as Major Mitchell's cockatoo, \
+ in honor of a human surveyor and explorer who existed before humans fully explored their home planet."
+ icon_state = "mtoo"
+ icon_rest = "mtoo-held"
+ icon_dead = "mtoo-dead"
+ tt_desc = "E Lophochroa leadbeateri"
+
+
+// AI
+/datum/ai_holder/simple_mob/passive/parrot
+ speak_chance = 2
+ base_wander_delay = 8
+
+/datum/ai_holder/simple_mob/passive/parrot/on_hear_say(mob/living/speaker, message)
+ if(holder.stat || !holder.say_list || !message || speaker == holder)
+ return
+ var/datum/say_list/S = holder.say_list
+ S.speak |= message
diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm
index 9502940343..d3cda1f22b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm
@@ -18,10 +18,12 @@
maxHealth = 100
health = 100
+ see_in_dark = 7
harm_intent_damage = 5
melee_damage_lower = 25
melee_damage_upper = 25
+ attack_armor_pen = 15 //It's a freaking alien.
attack_sharp = TRUE
attack_edge = TRUE
@@ -121,4 +123,4 @@
/mob/living/simple_mob/animal/space/alien/death()
..()
visible_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...")
- playsound(src, 'sound/voice/hiss6.ogg', 100, 1)
\ No newline at end of file
+ playsound(src, 'sound/voice/hiss6.ogg', 100, 1)
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
index 59a4d1c8c8..2770d6ff98 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm
@@ -24,6 +24,7 @@
harm_intent_damage = 5
melee_damage_lower = 15 //Tac Knife damage
melee_damage_upper = 15
+ attack_armor_pen = 20
attack_sharp = 1
attack_edge = 1
attacktext = list("slashed", "stabbed")
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm
index cc16cebedc..3927b1dcf1 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/pirates.dm
@@ -15,7 +15,7 @@
harm_intent_damage = 5
melee_damage_lower = 30
melee_damage_upper = 30
- attack_armor_pen = 50
+ attack_armor_pen = 30
attack_sharp = 1
attack_edge = 1
diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm
index ce679f90de..121e112a7a 100644
--- a/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/russian.dm
@@ -14,6 +14,7 @@
response_harm = "hits"
harm_intent_damage = 5
+ attack_armor_pen = 15
melee_damage_lower = 15
melee_damage_upper = 15
attacktext = list("punched")
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
index 7c35258a7f..6766cd67d3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
@@ -34,9 +34,6 @@
desc = "An automated combat drone armed with state of the art weaponry and shielding."
catalogue_data = list(/datum/category_item/catalogue/technology/drone/combat_drone)
- icon = 'icons/mob/animal_vr64x64.dmi' //VOREStation Add
- pixel_x = -16 //VOREStation Add
- pixel_y = -16 //VOREStation Add
icon_state = "drone"
icon_living = "drone"
icon_dead = "drone_dead"
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone_vr.dm
new file mode 100644
index 0000000000..09956c1579
--- /dev/null
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone_vr.dm
@@ -0,0 +1,8 @@
+/mob/living/simple_mob/mechanical/combat_drone
+ icon = 'icons/mob/animal_vr64x64.dmi'
+
+ pixel_x = -16
+ default_pixel_x = -16
+ pixel_y = -16
+ default_pixel_y = -16
+
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm
index 808e5c6c38..5071f10b34 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/golem.dm
@@ -1,152 +1,153 @@
-// The GOLEM is a spell-flinging synthetic.
-
-/mob/living/simple_mob/mechanical/technomancer_golem
- name = "unknown synthetic"
- desc = "A rather unusual looking synthetic."
- icon = 'icons/mob/mob.dmi'
- icon_state = "golem"
- health = 300
- maxHealth = 300
-
- faction = "golem"
-
- response_help = "pets"
- response_disarm = "pushes away"
- response_harm = "punches"
- harm_intent_damage = 3
- friendly = "hugs"
-
- melee_damage_lower = 30 // It has a built in esword.
- melee_damage_upper = 30
- attack_sound = 'sound/weapons/blade1.ogg'
- attacktext = list("slashed")
- melee_attack_delay = 0.5 SECONDS // Even has custom attack animations.
- ranged_attack_delay = 0.5 SECONDS
- special_attack_delay = 1 SECOND
-
- special_attack_min_range = 0
- special_attack_max_range = 7
-
- ai_holder_type = /datum/ai_holder/simple_mob/melee
-
- var/obj/item/weapon/technomancer_core/golem/core = null
- var/obj/item/weapon/spell/active_spell = null // Shield and ranged spells
- var/mob/living/master = null
- var/casting = FALSE // Used to ensure the correct animation is played. Testing if a spell exists won't always work as some spells delete themselves upon use.
-
- var/list/known_spells = list(
- "beam" = /obj/item/weapon/spell/projectile/beam,
- "chain lightning" = /obj/item/weapon/spell/projectile/chain_lightning,
- "force missile" = /obj/item/weapon/spell/projectile/force_missile,
- "ionic bolt" = /obj/item/weapon/spell/projectile/ionic_bolt,
- "lightning" = /obj/item/weapon/spell/projectile/lightning,
- "blink" = /obj/item/weapon/spell/blink,
- "dispel" = /obj/item/weapon/spell/dispel,
- "oxygenate" = /obj/item/weapon/spell/oxygenate,
- "mend life" = /obj/item/weapon/spell/modifier/mend_life,
- "mend synthetic" = /obj/item/weapon/spell/modifier/mend_synthetic,
- "mend organs" = /obj/item/weapon/spell/mend_organs,
- "purify" = /obj/item/weapon/spell/modifier/purify,
- "resurrect" = /obj/item/weapon/spell/resurrect,
- "passwall" = /obj/item/weapon/spell/passwall,
- "repel missiles" = /obj/item/weapon/spell/modifier/repel_missiles,
- "corona" = /obj/item/weapon/spell/modifier/corona,
- "haste" = /obj/item/weapon/spell/modifier/haste
- )
-
-/mob/living/simple_mob/mechanical/technomancer_golem/Initialize()
- core = new(src)
- return ..()
-
-/mob/living/simple_mob/mechanical/technomancer_golem/Destroy()
- qdel(core)
- return ..()
-
-/mob/living/simple_mob/mechanical/technomancer_golem/unref_spell()
- active_spell = null
- return ..()
-
-/mob/living/simple_mob/mechanical/technomancer_golem/death()
- ..()
- visible_message("\The [src] disintegrates!")
- new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc)
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
- s.set_up(3, 1, src)
- s.start()
- qdel(src)
-
-/mob/living/simple_mob/mechanical/technomancer_golem/place_spell_in_hand(var/path)
- if(!path || !ispath(path))
- return FALSE
- if(active_spell)
- qdel(active_spell)
-
- active_spell = new path(src)
-
-/mob/living/simple_mob/mechanical/technomancer_golem/verb/test_giving_spells()
- var/choice = input(usr, "What spell?", "Give spell") as null|anything in known_spells
- if(choice)
- place_spell_in_hand(known_spells[choice])
- else
- qdel(active_spell)
-
-/mob/living/simple_mob/mechanical/technomancer_golem/get_technomancer_core()
- return core
-
-/mob/living/simple_mob/mechanical/technomancer_golem/can_special_attack(atom/A)
- if(active_spell) // Don't bother checking everything else if no spell is ready.
- return ..()
- return FALSE
-
-/mob/living/simple_mob/mechanical/technomancer_golem/should_special_attack(atom/A)
- return instability < 50 // Don't kill ourselves by casting everything.
-
-
-/mob/living/simple_mob/mechanical/technomancer_golem/do_special_attack(atom/A)
- var/proximity = Adjacent(A)
- if(active_spell)
- if(proximity && active_spell.cast_methods & CAST_MELEE) // Use melee method if available and close enough.
- return active_spell.on_melee_cast(A, src)
- else if(active_spell.cast_methods & CAST_RANGED) // Otherwise use ranged if possible. Will also work for point-blank range.
- return active_spell.on_ranged_cast(A, src)
- return ..()
-
-/mob/living/simple_mob/mechanical/technomancer_golem/melee_pre_animation(atom/A)
- if(active_spell && active_spell.cast_methods & CAST_MELEE|CAST_RANGED) // If they're trying to melee-cast a spell, use the special animation instead.
- special_pre_animation(A)
- return
-
- flick("golem_pre_melee", src) // To force the animation to restart.
- icon_living = "golem_pre_melee" // The animation will hold after this point until melee_post_animation() gets called.
- icon_state = "golem_pre_melee"
- setClickCooldown(2)
-
-/mob/living/simple_mob/mechanical/technomancer_golem/melee_post_animation(atom/A)
- if(casting) // Some spells delete themselves when used, so we use a different variable set earlier instead.
- special_post_animation(A)
- return
-
- flick("golem_post_melee", src)
- icon_living = "golem"
- icon_state = "golem"
- setClickCooldown(6)
-
-/mob/living/simple_mob/mechanical/technomancer_golem/ranged_pre_animation(atom/A)
- flick("golem_pre_ranged", src)
- icon_living = "golem_pre_ranged"
- icon_state = "golem_pre_ranged"
- setClickCooldown(5)
-
-/mob/living/simple_mob/mechanical/technomancer_golem/ranged_post_animation(atom/A)
- flick("golem_post_ranged", src)
- icon_living = "golem"
- icon_state = "golem"
- setClickCooldown(5)
-
-/mob/living/simple_mob/mechanical/technomancer_golem/special_pre_animation(atom/A)
- casting = TRUE
- ranged_pre_animation(A) // Both have the same animation.
-
-/mob/living/simple_mob/mechanical/technomancer_golem/special_post_animation(atom/A)
- casting = FALSE
- ranged_post_animation(A)
+// The GOLEM is a spell-flinging synthetic.
+
+/mob/living/simple_mob/mechanical/technomancer_golem
+ name = "unknown synthetic"
+ desc = "A rather unusual looking synthetic."
+ icon = 'icons/mob/mob.dmi'
+ icon_state = "golem"
+ health = 300
+ maxHealth = 300
+
+ faction = "golem"
+
+ response_help = "pets"
+ response_disarm = "pushes away"
+ response_harm = "punches"
+ harm_intent_damage = 3
+ friendly = "hugs"
+
+ melee_damage_lower = 30 // It has a built in esword.
+ melee_damage_upper = 30
+ attack_armor_pen = 20
+ attack_sound = 'sound/weapons/blade1.ogg'
+ attacktext = list("slashed")
+ melee_attack_delay = 0.5 SECONDS // Even has custom attack animations.
+ ranged_attack_delay = 0.5 SECONDS
+ special_attack_delay = 1 SECOND
+
+ special_attack_min_range = 0
+ special_attack_max_range = 7
+
+ ai_holder_type = /datum/ai_holder/simple_mob/melee
+
+ var/obj/item/weapon/technomancer_core/golem/core = null
+ var/obj/item/weapon/spell/active_spell = null // Shield and ranged spells
+ var/mob/living/master = null
+ var/casting = FALSE // Used to ensure the correct animation is played. Testing if a spell exists won't always work as some spells delete themselves upon use.
+
+ var/list/known_spells = list(
+ "beam" = /obj/item/weapon/spell/projectile/beam,
+ "chain lightning" = /obj/item/weapon/spell/projectile/chain_lightning,
+ "force missile" = /obj/item/weapon/spell/projectile/force_missile,
+ "ionic bolt" = /obj/item/weapon/spell/projectile/ionic_bolt,
+ "lightning" = /obj/item/weapon/spell/projectile/lightning,
+ "blink" = /obj/item/weapon/spell/blink,
+ "dispel" = /obj/item/weapon/spell/dispel,
+ "oxygenate" = /obj/item/weapon/spell/oxygenate,
+ "mend life" = /obj/item/weapon/spell/modifier/mend_life,
+ "mend synthetic" = /obj/item/weapon/spell/modifier/mend_synthetic,
+ "mend organs" = /obj/item/weapon/spell/mend_organs,
+ "purify" = /obj/item/weapon/spell/modifier/purify,
+ "resurrect" = /obj/item/weapon/spell/resurrect,
+ "passwall" = /obj/item/weapon/spell/passwall,
+ "repel missiles" = /obj/item/weapon/spell/modifier/repel_missiles,
+ "corona" = /obj/item/weapon/spell/modifier/corona,
+ "haste" = /obj/item/weapon/spell/modifier/haste
+ )
+
+/mob/living/simple_mob/mechanical/technomancer_golem/Initialize()
+ core = new(src)
+ return ..()
+
+/mob/living/simple_mob/mechanical/technomancer_golem/Destroy()
+ qdel(core)
+ return ..()
+
+/mob/living/simple_mob/mechanical/technomancer_golem/unref_spell()
+ active_spell = null
+ return ..()
+
+/mob/living/simple_mob/mechanical/technomancer_golem/death()
+ ..()
+ visible_message("\The [src] disintegrates!")
+ new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc)
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(3, 1, src)
+ s.start()
+ qdel(src)
+
+/mob/living/simple_mob/mechanical/technomancer_golem/place_spell_in_hand(var/path)
+ if(!path || !ispath(path))
+ return FALSE
+ if(active_spell)
+ qdel(active_spell)
+
+ active_spell = new path(src)
+
+/mob/living/simple_mob/mechanical/technomancer_golem/verb/test_giving_spells()
+ var/choice = input(usr, "What spell?", "Give spell") as null|anything in known_spells
+ if(choice)
+ place_spell_in_hand(known_spells[choice])
+ else
+ qdel(active_spell)
+
+/mob/living/simple_mob/mechanical/technomancer_golem/get_technomancer_core()
+ return core
+
+/mob/living/simple_mob/mechanical/technomancer_golem/can_special_attack(atom/A)
+ if(active_spell) // Don't bother checking everything else if no spell is ready.
+ return ..()
+ return FALSE
+
+/mob/living/simple_mob/mechanical/technomancer_golem/should_special_attack(atom/A)
+ return instability < 50 // Don't kill ourselves by casting everything.
+
+
+/mob/living/simple_mob/mechanical/technomancer_golem/do_special_attack(atom/A)
+ var/proximity = Adjacent(A)
+ if(active_spell)
+ if(proximity && active_spell.cast_methods & CAST_MELEE) // Use melee method if available and close enough.
+ return active_spell.on_melee_cast(A, src)
+ else if(active_spell.cast_methods & CAST_RANGED) // Otherwise use ranged if possible. Will also work for point-blank range.
+ return active_spell.on_ranged_cast(A, src)
+ return ..()
+
+/mob/living/simple_mob/mechanical/technomancer_golem/melee_pre_animation(atom/A)
+ if(active_spell && active_spell.cast_methods & CAST_MELEE|CAST_RANGED) // If they're trying to melee-cast a spell, use the special animation instead.
+ special_pre_animation(A)
+ return
+
+ flick("golem_pre_melee", src) // To force the animation to restart.
+ icon_living = "golem_pre_melee" // The animation will hold after this point until melee_post_animation() gets called.
+ icon_state = "golem_pre_melee"
+ setClickCooldown(2)
+
+/mob/living/simple_mob/mechanical/technomancer_golem/melee_post_animation(atom/A)
+ if(casting) // Some spells delete themselves when used, so we use a different variable set earlier instead.
+ special_post_animation(A)
+ return
+
+ flick("golem_post_melee", src)
+ icon_living = "golem"
+ icon_state = "golem"
+ setClickCooldown(6)
+
+/mob/living/simple_mob/mechanical/technomancer_golem/ranged_pre_animation(atom/A)
+ flick("golem_pre_ranged", src)
+ icon_living = "golem_pre_ranged"
+ icon_state = "golem_pre_ranged"
+ setClickCooldown(5)
+
+/mob/living/simple_mob/mechanical/technomancer_golem/ranged_post_animation(atom/A)
+ flick("golem_post_ranged", src)
+ icon_living = "golem"
+ icon_state = "golem"
+ setClickCooldown(5)
+
+/mob/living/simple_mob/mechanical/technomancer_golem/special_pre_animation(atom/A)
+ casting = TRUE
+ ranged_pre_animation(A) // Both have the same animation.
+
+/mob/living/simple_mob/mechanical/technomancer_golem/special_post_animation(atom/A)
+ casting = FALSE
+ ranged_post_animation(A)
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
index c90d0413be..667c514f0b 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
@@ -46,6 +46,7 @@
health = 1 LASERS_TO_KILL
melee_damage_lower = 8
melee_damage_upper = 8
+ attack_armor_pen = 5
/datum/ai_holder/simple_mob/hivebot
pointblank = TRUE
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
index 3ac368a7ee..31c9cdf10f 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage_vr.dm
@@ -1,4 +1,4 @@
-/datum/category_item/catalogue/technology/drone/hivebot/laser // Hivebot Scanner Data - This is for Laser Hivebots
+/datum/category_item/catalogue/technology/drone/hivebot/rapidfire // Hivebot Scanner Data - This is for Rapidfire Hivebots
name = "Drone - Rapidfire Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
rifle, built for high-rate fire. Other than that, it has similar yellowish color \
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm
index 0003b78124..434ce659e8 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/support_vr.dm
@@ -5,7 +5,7 @@
to the other hivebots. Other than that, it has similar yellowish color to regular hivebots."
value = CATALOGUER_REWARD_HARD
-/datum/category_item/catalogue/technology/drone/hivebot/logistics // Hivebot Scanner Data - This is for Commander Hivebots
+/datum/category_item/catalogue/technology/drone/hivebot/logistics // Hivebot Scanner Data - This is for Logistics Hivebots
name = "Drone - Logistics Hivebot"
desc = "A drone that walks on several legs, with yellow/gold armor plating. It appears to have some sort of \
ballistic weapon. It also appears to have supply deploying bays, and internal fabs to repair and buff their allies' special capabilities. \
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm
index 89281bf4fc..4545057bc6 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/viscerator.dm
@@ -87,3 +87,9 @@
if(istype(L, /mob/living/simple_mob/mechanical/ward/monitor/crew)) // Also ignore friendly monitor wards
return TRUE
return L.assess_perp(src, FALSE, FALSE, TRUE, FALSE) <= 3
+
+// Variant that has high armor pen. Slightly slower attack speed and movement. Meant to be dispersed in groups with other ones
+/mob/living/simple_mob/mechanical/viscerator/piercing
+ attack_armor_pen = 20
+ base_attack_cooldown = 10 // One attack a second or so.
+ movement_cooldown = 0.5
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
index f5004db3c1..7b2da46008 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
@@ -89,6 +89,10 @@
..()
/mob/living/simple_mob/vore/hostile/morph/proc/assume(atom/movable/target)
+ var/mob/living/carbon/human/humantarget = target
+ if(istype(humantarget) && humantarget.resleeve_lock && ckey != humantarget.resleeve_lock)
+ to_chat(src, "[target] cannot be impersonated!")
+ return
if(morphed)
to_chat(src, "You must restore to your original form first!")
return
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm
new file mode 100644
index 0000000000..c4163733bd
--- /dev/null
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/oregrub.dm
@@ -0,0 +1,173 @@
+/datum/category_item/catalogue/fauna/oregrub
+ name = "Oregrub"
+ desc = "Some form of mutated space larva, they seem to feed on minerals. This makes them the natural enemy of miners. \
+ To make matters worse, these creatures will flee when threatened. More than a few foolhardy miners have met their end chasing down oregrubs after some other hostile creature attacked them. \
+ Their guts tend to contain undigested minerals, so miners who are quick (and not afraid to get their hands dirty) can reap some rewards from these leathery lithovores."
+ value = CATALOGUER_REWARD_EASY
+
+/datum/category_item/catalogue/fauna/lavagrub
+ name = "Lavagrub"
+ desc = "Some form of mutated space larva, they seem to feed on minerals. This makes them the natural enemy of miners. \
+ To make matters worse, these creatures will flee when threatened. More than a few foolhardy miners have met their end chasing down oregrubs after some other hostile creature attacked them. \
+ This particular variant seems to be even tougher and faster than its common brown kin, and its hide is laced with silicates that make it more durable. \
+ On the plus side, it's sure to contain even more valuable minerals within its bowels, if you can catch up with it to crack it open..."
+ value = CATALOGUER_REWARD_MEDIUM
+
+/datum/ai_holder/simple_mob/oregrub
+ hostile = FALSE //docile, unless you hit them
+ retaliate = TRUE //they *may* bite you...
+ can_flee = TRUE //but they'd rather run away
+ dying_threshold = 1 //and ideally, we flee as soon as possible
+ flee_when_outmatched = TRUE //especially when outmatched
+ outmatched_threshold = 25 //and we're outmatched by... basically everything!
+
+/datum/ai_holder/simple_mob/oregrub/lava
+ outmatched_threshold = 15
+
+/mob/living/simple_mob/vore/oregrub
+ name = "juvenile oregrub"
+ desc = "A young, leathery oregrub."
+ catalogue_data = list(/datum/category_item/catalogue/fauna/oregrub)
+ icon = 'icons/mob/vore.dmi' //all of these are placeholders
+ icon_state = "oregrub"
+ icon_living = "oregrub"
+ icon_dead = "oregrub-dead"
+
+ faction = "grubs"
+ maxHealth = 50 //oregrubs are quite hardy
+ health = 50
+
+ melee_damage_lower = 1
+ melee_damage_upper = 3 //low damage, they prefer to flee
+
+ movement_cooldown = 8
+
+ meat_type = /obj/item/weapon/ore/coal
+
+ response_help = "pokes"
+ response_disarm = "pushes"
+ response_harm = "roughly pushes"
+
+ ai_holder_type = /datum/ai_holder/simple_mob/oregrub
+ say_list_type = /datum/say_list/oregrub
+
+ var/poison_per_bite = 2.5
+ var/poison_type = "thermite_v" //burn baby burn
+ var/poison_chance = 50
+
+ var/min_ore = 4
+ var/max_ore = 7
+
+ vore_bump_chance = 0 //disabled for now
+ vore_bump_emote = "applies minimal effort to try and slurp up"
+ vore_active = 0 //disabled for now
+ vore_capacity = 1
+ vore_pounce_chance = 0 //grubs only eat incapacitated targets
+ vore_default_mode = DM_DIGEST
+
+ min_oxy = 0
+ max_oxy = 0
+ min_tox = 0
+ max_tox = 0
+ min_co2 = 0
+ max_co2 = 0
+ min_n2 = 0
+ max_n2 = 0
+ minbodytemp = 0
+ maxbodytemp = 1000
+ poison_resist = 1.0
+
+ //these things are resilient, on account of being infused with all the minerals they eat
+ armor = list(
+ "melee" = 25,
+ "bullet" = 15,
+ "laser" = 15,
+ "energy" = 0,
+ "bomb" = 25,
+ "bio" = 100,
+ "rad" = 100
+ )
+
+/mob/living/simple_mob/vore/oregrub/lava
+ name = "mature lavagrub"
+ desc = "A mature, rocky lavagrub"
+ catalogue_data = list(/datum/category_item/catalogue/fauna/lavagrub)
+ icon_state = "lavagrub"
+ icon_living = "lavagrub"
+ icon_dead = "lavagrub-dead"
+
+ movement_cooldown = 5
+ maxHealth = 75 //lavagrubs are really hardy
+ health = 75
+ ai_holder_type = /datum/ai_holder/simple_mob/oregrub/lava
+ //lavagrubs have even more armor than oregrubs
+ armor = list(
+ "melee" = 50,
+ "bullet" = 25,
+ "laser" = 25,
+ "energy" = 0,
+ "bomb" = 50,
+ "bio" = 100,
+ "rad" = 100
+ )
+
+ var/lava_min_ore = 6
+ var/lava_max_ore = 10
+
+ poison_per_bite = 5
+ poison_chance = 66
+
+/datum/say_list/oregrub
+ emote_see = list("burbles", "chitters", "snuffles around for fresh ore")
+
+/mob/living/simple_mob/vore/oregrub/apply_melee_effects(var/atom/A)
+ if(isliving(A))
+ var/mob/living/L = A
+ var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD)
+ if(L.can_inject(src, null, target_zone))
+ inject_poison(L, target_zone)
+
+/mob/living/simple_mob/vore/oregrub/death()
+ visible_message("\The [src] shudders and collapses, expelling the ores it had devoured!")
+ var/i = rand(min_ore,max_ore)
+ while(i>1)
+ var/ore = pick(/obj/item/weapon/ore/glass,/obj/item/weapon/ore/coal,/obj/item/weapon/ore/iron,/obj/item/weapon/ore/lead,/obj/item/weapon/ore/marble,/obj/item/weapon/ore/phoron,/obj/item/weapon/ore/silver,/obj/item/weapon/ore/gold)
+ new ore(src.loc)
+ i--
+ ..()
+
+/mob/living/simple_mob/vore/oregrub/lava/handle_light()
+ . = ..()
+ if(. == 0 && !is_dead())
+ set_light(2.5, 1, COLOR_ORANGE)
+ return 1
+
+/mob/living/simple_mob/vore/oregrub/lava/death()
+ set_light(0)
+ var/p = rand(lava_min_ore,lava_max_ore)
+ while(p>1)
+ var/ore = pick(/obj/item/weapon/ore/osmium,/obj/item/weapon/ore/uranium,/obj/item/weapon/ore/hydrogen,/obj/item/weapon/ore/diamond,/obj/item/weapon/ore/verdantium)
+ new ore(src.loc)
+ p--
+ ..()
+
+// Does actual poison injection, after all checks passed.
+/mob/living/simple_mob/vore/oregrub/proc/inject_poison(mob/living/L, target_zone)
+ if(prob(poison_chance))
+ to_chat(L, "You feel fire running through your veins!")
+ L.reagents.add_reagent(poison_type, poison_per_bite)
+
+//I'm no good at writing this stuff, so I've just left it as placeholders and disabled the chances of them eating you.
+/*
+/mob/living/simple_mob/vore/oregrub/init_vore()
+ ..()
+ var/obj/belly/B = vore_selected
+ B.name = "stomach"
+ B.desc = "PLACEHOLDER!"
+
+ B.emote_lists[DM_HOLD] = list(
+ "PLACEHOLDER!")
+
+ B.emote_lists[DM_DIGEST] = list(
+ "PLACEHOLDER!")
+*/
\ No newline at end of file
diff --git a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm
index ffaeef3c09..d965956dfe 100644
--- a/code/modules/mob/logout.dm
+++ b/code/modules/mob/logout.dm
@@ -1,5 +1,4 @@
/mob/Logout()
- SSnanoui.user_logout(src) // this is used to clean up (remove) this user's Nano UIs
SStgui.on_logout(src) // Cleanup any TGUIs the user has open
player_list -= src
disconnect_time = world.realtime //VOREStation Addition: logging when we disappear.
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 680021de9f..4d9a2e774a 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -84,7 +84,7 @@
else
exclude_mobs = list(src)
src.show_message(self_message, 1, blind_message, 2)
- . = ..()
+ . = ..(message, blind_message, exclude_mobs)
// Returns an amount of power drawn from the object (-1 if it's not viable).
// If drain_check is set it will not actually drain power, just return a value.
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 7be3255cbd..c5066adb7c 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -202,7 +202,7 @@
var/mob/teleop = null
var/turf/listed_turf = null //the current turf being examined in the stat panel
- var/list/shouldnt_see = list() //list of objects that this mob shouldn't see in the stat panel. this silliness is needed because of AI alt+click and cult blood runes
+ var/list/shouldnt_see = list(/mob/observer/eye) //list of objects that this mob shouldn't see in the stat panel. this silliness is needed because of AI alt+click and cult blood runes
var/list/active_genes=list()
var/mob_size = MOB_MEDIUM
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 92856d72c8..75b2ccd07f 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -390,6 +390,9 @@
/mob/proc/Post_Incorpmove()
return
+/mob/proc/get_jetpack()
+ return
+
///Process_Spacemove
///Called by /client/Move()
///For moving in space
diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm
index 959e25505d..233c5a14f1 100644
--- a/code/modules/mob/new_player/sprite_accessories_vr.dm
+++ b/code/modules/mob/new_player/sprite_accessories_vr.dm
@@ -240,13 +240,6 @@
icon_state = "hair_fingerwave"
species_allowed = list(SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_TAJ, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_PROTEAN)
- teshari_fluffymohawk
- name = "Teshari Fluffy Mohawk"
- icon = 'icons/mob/human_face_vr.dmi'
- icon_add = 'icons/mob/human_face_vr_add.dmi'
- icon_state = "teshari_fluffymohawk"
- species_allowed = list(SPECIES_TESHARI)
-
//Teshari things
teshari
icon_add = 'icons/mob/human_face_vr_add.dmi'
@@ -290,6 +283,22 @@
teshari_mushroom
icon_add = 'icons/mob/human_face_vr_add.dmi'
+ teshari_twies
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+ teshari_backstrafe
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+ teshari_longway
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+ teshari_tree
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
+
+ teshari_fluffymohawk
+ icon = 'icons/mob/human_face_vr.dmi'
+ icon_add = 'icons/mob/human_face_vr_add.dmi'
+
//Skrell 'hairstyles' - these were requested for a chimera and screw it, if one wants to eat seafood, go nuts
skr_tentacle_veryshort
name = "Skrell Very Short Tentacles"
@@ -1166,3 +1175,8 @@
icon_state = "dnose"
color_blend_mode = ICON_MULTIPLY
body_parts = list(BP_HEAD)
+
+ bee_stripes
+ name = "bee stripes"
+ icon_state = "beestripes"
+ body_parts = list(BP_TORSO,BP_GROIN)
\ No newline at end of file
diff --git a/code/modules/modular_computers/NTNet/NTNet.dm b/code/modules/modular_computers/NTNet/NTNet.dm
index 8370683522..6479f92a21 100644
--- a/code/modules/modular_computers/NTNet/NTNet.dm
+++ b/code/modules/modular_computers/NTNet/NTNet.dm
@@ -181,5 +181,8 @@ var/global/datum/ntnet/ntnet_global = new()
return 1
return 0
-
+/datum/ntnet/proc/get_chat_channel_by_id(id)
+ for(var/datum/ntnet_conversation/chan in chat_channels)
+ if(chan.id == id)
+ return chan
diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm
index 97b4cfe851..d4b311e8e2 100644
--- a/code/modules/modular_computers/computers/modular_computer/core.dm
+++ b/code/modules/modular_computers/computers/modular_computer/core.dm
@@ -42,6 +42,8 @@
return 1
/obj/item/modular_computer/Initialize()
+ if(!overlay_icon)
+ overlay_icon = icon
START_PROCESSING(SSobj, src)
install_default_hardware()
if(hard_drive)
@@ -72,20 +74,20 @@
overlays.Cut()
if(bsod)
- overlays.Add("bsod")
+ overlays += image(icon = overlay_icon, icon_state = "bsod")
return
if(!enabled)
if(icon_state_screensaver)
- overlays.Add(icon_state_screensaver)
+ overlays += image(icon = overlay_icon, icon_state = icon_state_screensaver)
set_light(0)
return
set_light(light_strength)
if(active_program)
- overlays.Add(active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu)
+ overlays += image(icon = overlay_icon, icon_state = active_program.program_icon_state ? active_program.program_icon_state : icon_state_menu)
if(active_program.program_key_state)
- overlays.Add(active_program.program_key_state)
+ overlays += image(icon = overlay_icon, icon_state = active_program.program_key_state)
else
- overlays.Add(icon_state_menu)
+ overlays += image(icon = overlay_icon, icon_state = icon_state_menu)
/obj/item/modular_computer/proc/turn_on(var/mob/user)
if(bsod)
@@ -119,7 +121,7 @@
active_program = null
var/mob/user = usr
if(user && istype(user))
- ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+ tgui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
update_icon()
// Returns 0 for No Signal, 1 for Low Signal and 2 for Good Signal. 3 is for wired connection (always-on)
@@ -154,7 +156,7 @@
run_program(autorun.stored_data)
if(user)
- ui_interact(user)
+ tgui_interact(user)
/obj/item/modular_computer/proc/minimize_program(mob/user)
if(!active_program || !processor_unit)
@@ -162,12 +164,11 @@
idle_threads.Add(active_program)
active_program.program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs
- SSnanoui.close_uis(active_program.NM ? active_program.NM : active_program)
SStgui.close_uis(active_program.TM ? active_program.TM : active_program)
active_program = null
update_icon()
if(istype(user))
- ui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+ tgui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
/obj/item/modular_computer/proc/run_program(prog)
@@ -207,12 +208,12 @@
return 1
/obj/item/modular_computer/proc/update_uis()
- if(active_program) //Should we update program ui or computer ui?
- SSnanoui.update_uis(active_program)
- if(active_program.NM)
- SSnanoui.update_uis(active_program.NM)
+ if(active_program)
+ SStgui.update_uis(active_program)
+ if(active_program.TM)
+ SStgui.update_uis(active_program.TM)
else
- SSnanoui.update_uis(src)
+ SStgui.update_uis(src)
/obj/item/modular_computer/proc/check_update_ui_need()
var/ui_update_needed = 0
diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm
index c9ee11a77e..24c02c1add 100644
--- a/code/modules/modular_computers/computers/modular_computer/interaction.dm
+++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm
@@ -99,7 +99,7 @@
/obj/item/modular_computer/attack_ghost(var/mob/observer/ghost/user)
if(enabled)
- ui_interact(user)
+ tgui_interact(user)
else if(check_rights(R_ADMIN|R_EVENT, 0, user))
var/response = alert(user, "This computer is turned off. Would you like to turn it on?", "Admin Override", "Yes", "No")
if(response == "Yes")
@@ -116,7 +116,7 @@
// On-click handling. Turns on the computer if it's off and opens the GUI.
/obj/item/modular_computer/attack_self(var/mob/user)
if(enabled && screen_on)
- ui_interact(user)
+ tgui_interact(user)
else if(!enabled && screen_on)
turn_on(user)
diff --git a/code/modules/modular_computers/computers/modular_computer/ui.dm b/code/modules/modular_computers/computers/modular_computer/ui.dm
index 81081c0cb1..5166d0d777 100644
--- a/code/modules/modular_computers/computers/modular_computer/ui.dm
+++ b/code/modules/modular_computers/computers/modular_computer/ui.dm
@@ -1,5 +1,10 @@
-// Operates NanoUI
-/obj/item/modular_computer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+// Operates TGUI
+/obj/item/modular_computer/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/simple/headers)
+ )
+
+/obj/item/modular_computer/tgui_interact(mob/user, datum/tgui/ui)
if(!screen_on || !enabled)
if(ui)
ui.close()
@@ -13,7 +18,7 @@
if(active_program)
if(ui) // This is the main laptop screen. Since we are switching to program's UI close it for now.
ui.close()
- active_program.ui_interact(user)
+ active_program.tgui_interact(user)
return
// We are still here, that means there is no program loaded. Load the BIOS/ROM/OS/whatever you want to call it.
@@ -22,80 +27,100 @@
visible_message("\The [src] beeps three times, it's screen displaying \"DISK ERROR\" warning.")
return // No HDD, No HDD files list or no stored files. Something is very broken.
- var/datum/computer_file/data/autorun = hard_drive.find_file_by_name("autorun")
-
- var/list/data = get_header_data()
-
- var/list/programs = list()
- for(var/datum/computer_file/program/P in hard_drive.stored_files)
- var/list/program = list()
- program["name"] = P.filename
- program["desc"] = P.filedesc
- program["icon"] = P.program_menu_icon
- program["autorun"] = (istype(autorun) && (autorun.stored_data == P.filename)) ? 1 : 0
- if(P in idle_threads)
- program["running"] = 1
- programs.Add(list(program))
-
- data["programs"] = programs
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "laptop_mainscreen.tmpl", "NTOS Main Menu", 400, 500)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "NtosMain")
+ ui.set_autoupdate(TRUE)
ui.open()
- ui.set_auto_update(1)
+
+/obj/item/modular_computer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
+ var/list/data = get_header_data()
+ data["device_theme"] = device_theme
+
+ data["login"] = list()
+ var/obj/item/weapon/computer_hardware/card_slot/cardholder = card_slot
+ if(cardholder)
+ var/obj/item/weapon/card/id/stored_card = cardholder.stored_card
+ if(stored_card)
+ var/stored_name = stored_card.registered_name
+ var/stored_title = stored_card.assignment
+ if(!stored_name)
+ stored_name = "Unknown"
+ if(!stored_title)
+ stored_title = "Unknown"
+ data["login"] = list(
+ IDName = stored_name,
+ IDJob = stored_title,
+ )
+
+ data["removable_media"] = list()
+
+ var/datum/computer_file/data/autorun = hard_drive.find_file_by_name("autorun")
+ data["programs"] = list()
+ for(var/datum/computer_file/program/P in hard_drive.stored_files)
+ var/running = FALSE
+ if(P in idle_threads)
+ running = TRUE
+
+ data["programs"] += list(list(
+ "name" = P.filename,
+ "desc" = P.filedesc,
+ "icon" = P.program_menu_icon,
+ "running" = running,
+ "autorun" = (istype(autorun) && (autorun.stored_data == P.filename)) ? 1 : 0
+ ))
+
+ data["has_light"] = FALSE // has_light
+ data["light_on"] = FALSE // light_on
+ data["comp_light_color"] = null // comp_light_color
+
+ return data
// Handles user's GUI input
-/obj/item/modular_computer/Topic(href, href_list)
+/obj/item/modular_computer/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
if(..())
- return 1
- if( href_list["PC_exit"] )
- kill_program()
- return 1
- if( href_list["PC_enable_component"] )
- var/obj/item/weapon/computer_hardware/H = find_hardware_by_name(href_list["PC_enable_component"])
- if(H && istype(H) && !H.enabled)
- H.enabled = 1
- . = 1
- if( href_list["PC_disable_component"] )
- var/obj/item/weapon/computer_hardware/H = find_hardware_by_name(href_list["PC_disable_component"])
- if(H && istype(H) && H.enabled)
- H.enabled = 0
- . = 1
- if( href_list["PC_shutdown"] )
- shutdown_computer()
- return 1
- if( href_list["PC_minimize"] )
- var/mob/user = usr
- minimize_program(user)
+ return TRUE
+
+ switch(action)
+ if("PC_exit")
+ kill_program()
+ return TRUE
+ if("PC_shutdown")
+ shutdown_computer()
+ return TRUE
+ if("PC_minimize")
+ var/mob/user = usr
+ minimize_program(user)
+ if("PC_killprogram")
+ var/prog = params["name"]
+ var/datum/computer_file/program/P = null
+ var/mob/user = usr
+ if(hard_drive)
+ P = hard_drive.find_file_by_name(prog)
- if( href_list["PC_killprogram"] )
- var/prog = href_list["PC_killprogram"]
- var/datum/computer_file/program/P = null
- var/mob/user = usr
- if(hard_drive)
- P = hard_drive.find_file_by_name(prog)
+ if(!istype(P) || P.program_state == PROGRAM_STATE_KILLED)
+ return
- if(!istype(P) || P.program_state == PROGRAM_STATE_KILLED)
+ P.kill_program(1)
+ to_chat(user, "Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.")
+ return TRUE
+ if("PC_runprogram")
+ return run_program(params["name"])
+ if("PC_setautorun")
+ if(!hard_drive)
+ return
+ set_autorun(params["name"])
+ return TRUE
+ if("PC_Eject_Disk")
+ var/param = params["name"]
+ switch(param)
+ if("ID")
+ proc_eject_id(usr)
+ return TRUE
+ else
return
- P.kill_program(1)
- update_uis()
- to_chat(user, "Program [P.filename].[P.filetype] with PID [rand(100,999)] has been killed.")
-
- if( href_list["PC_runprogram"] )
- return run_program(href_list["PC_runprogram"])
-
- if( href_list["PC_setautorun"] )
- if(!hard_drive)
- return
- set_autorun(href_list["PC_setautorun"])
-
- if(.)
- update_uis()
-
-// Function used by NanoUI's to obtain data for header. All relevant entries begin with "PC_"
+// Function used by TGUI's to obtain data for header. All relevant entries begin with "PC_"
/obj/item/modular_computer/proc/get_header_data()
var/list/data = list()
@@ -152,4 +177,4 @@
data["PC_stationtime"] = stationtime2text()
data["PC_hasheader"] = 1
data["PC_showexitprogram"] = active_program ? 1 : 0 // Hides "Exit Program" button on mainscreen
- return data
\ No newline at end of file
+ return data
diff --git a/code/modules/modular_computers/computers/modular_computer/variables.dm b/code/modules/modular_computers/computers/modular_computer/variables.dm
index 8a1641a125..373d2ad3e1 100644
--- a/code/modules/modular_computers/computers/modular_computer/variables.dm
+++ b/code/modules/modular_computers/computers/modular_computer/variables.dm
@@ -6,6 +6,7 @@
var/enabled = 0 // Whether the computer is turned on.
var/screen_on = 1 // Whether the computer is active/opened/it's screen is on.
+ var/device_theme = "ntos" // Sets the theme for the main menu, hardware config, and file browser apps. Overridden by certain non-NT devices.
var/datum/computer_file/program/active_program = null // A currently active program running on the computer.
var/hardware_flag = 0 // A flag that describes this device type
var/last_power_usage = 0 // Last tick power usage of this computer
@@ -23,6 +24,7 @@
// If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example.
icon = null // This thing isn't meant to be used on it's own. Subtypes should supply their own icon.
+ var/overlay_icon = null // Icon file used for overlays
icon_state = null
center_of_mass = null // No pixelshifting by placing on tables, etc.
randpixel = 0 // And no random pixelshifting on-creation either.
diff --git a/code/modules/modular_computers/file_system/news_article.dm b/code/modules/modular_computers/file_system/news_article.dm
index 88497ee706..0b327f8218 100644
--- a/code/modules/modular_computers/file_system/news_article.dm
+++ b/code/modules/modular_computers/file_system/news_article.dm
@@ -17,7 +17,7 @@
// NEWS DEFINITIONS BELOW THIS LINE
-/* KEPT HERE AS AN EXAMPLE
+/*
/datum/computer_file/data/news_article/space/vol_one
filename = "SPACE Magazine vol. 1"
server_file_path = 'news_articles/space_magazine_1.html'
diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm
index 08589fb13c..d5e55940d0 100644
--- a/code/modules/modular_computers/file_system/program.dm
+++ b/code/modules/modular_computers/file_system/program.dm
@@ -5,9 +5,6 @@
var/required_access = null // List of required accesses to run/download the program.
var/requires_access_to_run = 1 // Whether the program checks for required_access when run.
var/requires_access_to_download = 1 // Whether the program checks for required_access when downloading.
- // NanoModule
- var/datum/nano_module/NM = null // If the program uses NanoModule, put it here and it will be automagically opened. Otherwise implement ui_interact.
- var/nanomodule_path = null // Path to nanomodule, make sure to set this if implementing new program.
// TGUIModule
var/datum/tgui_module/TM = null // If the program uses TGUIModule, put it here and it will be automagically opened. Otherwise implement tgui_interact.
var/tguimodule_path = null // Path to tguimodule, make sure to set this if implementing new program.
@@ -29,6 +26,8 @@
var/computer_emagged = 0 // Set to 1 if computer that's running us was emagged. Computer updates this every Process() tick
var/ui_header = null // Example: "something.gif" - a header image that will be rendered in computer's UI when this program is running at background. Images are taken from /nano/images/status_icons. Be careful not to use too large images!
var/ntnet_speed = 0 // GQ/s - current network connectivity transfer rate
+ /// Name of the tgui interface
+ var/tgui_id
/datum/computer_file/program/New(var/obj/item/modular_computer/comp = null)
..()
@@ -39,16 +38,12 @@
computer = null
. = ..()
-/datum/computer_file/program/nano_host()
- return computer.nano_host()
-
/datum/computer_file/program/tgui_host()
return computer.tgui_host()
/datum/computer_file/program/clone()
var/datum/computer_file/program/temp = ..()
temp.required_access = required_access
- temp.nanomodule_path = nanomodule_path
temp.filedesc = filedesc
temp.program_icon_state = program_icon_state
temp.requires_ntnet = requires_ntnet
@@ -134,13 +129,9 @@
/datum/computer_file/program/proc/run_program(var/mob/living/user)
if(can_run(user, 1) || !requires_access_to_run)
computer.active_program = src
- if(nanomodule_path)
- NM = new nanomodule_path(src, new /datum/topic_manager/program(src), src)
- NM.using_access = user.GetAccess()
if(tguimodule_path)
TM = new tguimodule_path(src)
TM.using_access = user.GetAccess()
- TM.tgui_interact(user)
if(requires_ntnet && network_destination)
generate_network_log("Connection opened to [network_destination].")
program_state = PROGRAM_STATE_ACTIVE
@@ -152,26 +143,28 @@
program_state = PROGRAM_STATE_KILLED
if(network_destination)
generate_network_log("Connection to [network_destination] closed.")
- QDEL_NULL(NM)
if(TM)
SStgui.close_uis(TM)
- qdel(TM)
- TM = null
+ QDEL_NULL(TM)
return 1
-// This is called every tick when the program is enabled. Ensure you do parent call if you override it. If parent returns 1 continue with UI initialisation.
-// It returns 0 if it can't run or if NanoModule was used instead. I suggest using NanoModules where applicable.
-/datum/computer_file/program/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- if(program_state != PROGRAM_STATE_ACTIVE) // Our program was closed. Close the ui if it exists.
+/datum/computer_file/program/ui_assets(mob/user)
+ return list(
+ get_asset_datum(/datum/asset/simple/headers)
+ )
+
+/datum/computer_file/program/tgui_interact(mob/user, datum/tgui/ui)
+ if(program_state != PROGRAM_STATE_ACTIVE)
if(ui)
ui.close()
- return computer.ui_interact(user)
- if(istype(NM))
- NM.ui_interact(user, ui_key, null, force_open)
- return 0
+ return computer.tgui_interact(user)
if(istype(TM))
TM.tgui_interact(user)
return 0
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui && tgui_id)
+ ui = new(user, src, tgui_id, filedesc)
+ ui.open()
return 1
// CONVENTIONS, READ THIS WHEN CREATING NEW PROGRAM AND OVERRIDING THIS PROC:
@@ -185,49 +178,56 @@
if(computer)
return computer.Topic(href, href_list)
+// CONVENTIONS, READ THIS WHEN CREATING NEW PROGRAM AND OVERRIDING THIS PROC:
+// Topic calls are automagically forwarded from NanoModule this program contains.
+// Calls beginning with "PRG_" are reserved for programs handling.
+// Calls beginning with "PC_" are reserved for computer handling (by whatever runs the program)
+// ALWAYS INCLUDE PARENT CALL ..() OR DIE IN FIRE.
+/datum/computer_file/program/tgui_act(action,list/params, datum/tgui/ui)
+ if(..())
+ return 1
+ if(computer)
+ switch(action)
+ if("PC_exit")
+ computer.kill_program()
+ ui.close()
+ return 1
+ if("PC_shutdown")
+ computer.shutdown_computer()
+ ui.close()
+ return 1
+ if("PC_minimize")
+ var/mob/user = usr
+ if(!computer.active_program)
+ return
+
+ computer.idle_threads.Add(computer.active_program)
+ program_state = PROGRAM_STATE_BACKGROUND // Should close any existing UIs
+
+ computer.active_program = null
+ computer.update_icon()
+ ui.close()
+
+ if(user && istype(user))
+ computer.tgui_interact(user) // Re-open the UI on this computer. It should show the main screen now.
+
+
+
// Relays the call to nano module, if we have one
/datum/computer_file/program/proc/check_eye(var/mob/user)
- if(NM)
- return NM.check_eye(user)
if(TM)
return TM.check_eye(user)
else
return -1
-/obj/item/modular_computer/initial_data()
- return get_header_data()
-
-/obj/item/modular_computer/update_layout()
- return TRUE
-
-/datum/nano_module/program
- //available_to_ai = FALSE
- var/datum/computer_file/program/program = null // Program-Based computer program that runs this nano module. Defaults to null.
-
-/datum/nano_module/program/New(var/host, var/topic_manager, var/program)
- ..()
- src.program = program
-
-/datum/topic_manager/program
- var/datum/program
-
-/datum/topic_manager/program/New(var/datum/program)
- ..()
- src.program = program
-
-// Calls forwarded to PROGRAM itself should begin with "PRG_"
-// Calls forwarded to COMPUTER running the program should begin with "PC_"
-/datum/topic_manager/program/Topic(href, href_list)
- return program && program.Topic(href, href_list)
-
/datum/computer_file/program/apply_visual(mob/M)
- if(NM)
- return NM.apply_visual(M)
+ if(TM)
+ return TM.apply_visual(M)
/datum/computer_file/program/remove_visual(mob/M)
- if(NM)
- return NM.remove_visual(M)
+ if(TM)
+ return TM.remove_visual(M)
/datum/computer_file/program/proc/relaymove(var/mob/M, direction)
- if(NM)
- return NM.relaymove(M, direction)
\ No newline at end of file
+ if(TM)
+ return TM.relaymove(M, direction)
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
index 04bf931593..11547e3426 100644
--- a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
+++ b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm
@@ -6,15 +6,17 @@
program_menu_icon = "unlocked"
extended_desc = "This highly advanced script can very slowly decrypt operational codes used in almost any network. These codes can be downloaded to an ID card to expand the available access. The system administrator will probably notice this."
size = 34
- requires_ntnet = 1
- available_on_ntnet = 0
- available_on_syndinet = 1
- nanomodule_path = /datum/nano_module/program/access_decrypter/
+ requires_ntnet = TRUE
+ available_on_ntnet = FALSE
+ available_on_syndinet = TRUE
+ tgui_id = "NtosAccessDecrypter"
+
var/message = ""
var/running = FALSE
var/progress = 0
var/target_progress = 300
var/datum/access/target_access = null
+ var/list/restricted_access_codes = list(access_change_ids, access_network) // access codes that are not hackable due to balance reasons
/datum/computer_file/program/access_decrypter/kill_program(var/forced)
reset()
@@ -48,82 +50,63 @@
message = "Successfully decrypted and saved operational key codes. Downloaded access codes for: [target_access.desc]"
target_access = null
-/datum/computer_file/program/access_decrypter/Topic(href, href_list)
+/datum/computer_file/program/access_decrypter/tgui_act(action, list/params, datum/tgui/ui)
if(..())
- return 1
- if(href_list["PRG_reset"])
- reset()
- return 1
- if(href_list["PRG_execute"])
- if(running)
- return 1
- if(text2num(href_list["allowed"]))
- return 1
- var/obj/item/weapon/computer_hardware/processor_unit/CPU = computer.processor_unit
- var/obj/item/weapon/computer_hardware/card_slot/RFID = computer.card_slot
- if(!istype(CPU) || !CPU.check_functionality() || !istype(RFID) || !RFID.check_functionality())
- message = "A fatal hardware error has been detected."
- return
- if(!istype(RFID.stored_card))
- message = "RFID card is not present in the device. Operation aborted."
- return
- running = TRUE
- target_access = get_access_by_id(href_list["PRG_execute"])
- if(ntnet_global.intrusion_detection_enabled)
- ntnet_global.add_log("IDS WARNING - Unauthorised access attempt to primary keycode database from device: [computer.network_card.get_network_tag()]")
- ntnet_global.intrusion_detection_alarm = 1
- return 1
+ return TRUE
+ switch(action)
+ if("PRG_reset")
+ reset()
+ return TRUE
+ if("PRG_execute")
+ if(running)
+ return TRUE
+ if(text2num(params["allowed"]))
+ return TRUE
+ var/obj/item/weapon/computer_hardware/processor_unit/CPU = computer.processor_unit
+ var/obj/item/weapon/computer_hardware/card_slot/RFID = computer.card_slot
+ if(!istype(CPU) || !CPU.check_functionality() || !istype(RFID) || !RFID.check_functionality())
+ message = "A fatal hardware error has been detected."
+ return
+ if(!istype(RFID.stored_card))
+ message = "RFID card is not present in the device. Operation aborted."
+ return
+ running = TRUE
+ target_access = get_access_by_id("[params["access_target"]]")
+ if(ntnet_global.intrusion_detection_enabled)
+ ntnet_global.add_log("IDS WARNING - Unauthorised access attempt to primary keycode database from device: [computer.network_card.get_network_tag()]")
+ ntnet_global.intrusion_detection_alarm = TRUE
+ return TRUE
-/datum/nano_module/program/access_decrypter
- name = "NTNet Access Decrypter"
- var/list/restricted_access_codes = list(access_change_ids, access_network) // access codes that are not hackable due to balance reasons
-
-/datum/nano_module/program/access_decrypter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
+/datum/computer_file/program/access_decrypter/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
if(!ntnet_global)
return
- var/datum/computer_file/program/access_decrypter/PRG = program
- var/list/data = list()
- if(!istype(PRG))
- return
- data = PRG.get_header_data()
+ var/list/data = get_header_data()
- if(PRG.message)
- data["message"] = PRG.message
- else if(PRG.running)
+ var/list/regions = list()
+ data["message"] = null
+ data["running"] = running
+ if(message)
+ data["message"] = message
+ else if(running)
data["running"] = 1
- data["rate"] = PRG.computer.processor_unit.max_idle_programs
-
- // Stolen from DOS traffic generator, generates strings of 1s and 0s
- var/percentage = (PRG.progress / PRG.target_progress) * 100
- var/list/strings[0]
- for(var/j, j<10, j++)
- var/string = ""
- for(var/i, i<20, i++)
- string = "[string][prob(percentage)]"
- strings.Add(string)
- data["dos_strings"] = strings
- else if(program.computer.card_slot && program.computer.card_slot.stored_card)
- var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
- var/list/regions = list()
+ data["rate"] = computer.processor_unit.max_idle_programs
+ data["factor"] = (progress / target_progress)
+ else if(computer?.card_slot?.stored_card)
+ var/obj/item/weapon/card/id/id_card = computer.card_slot.stored_card
for(var/i = 1; i <= 7; i++)
var/list/accesses = list()
for(var/access in get_region_accesses(i))
- if (get_access_desc(access))
+ if(get_access_desc(access) && !(access in restricted_access_codes))
accesses.Add(list(list(
- "desc" = replacetext(get_access_desc(access), " ", " "),
+ "desc" = replacetext(get_access_desc(access), " ", " "),
"ref" = access,
- "allowed" = (access in id_card.access) ? 1 : 0,
- "blocked" = (access in restricted_access_codes) ? 1 : 0)))
+ "allowed" = (access in id_card.access) ? 1 : 0
+ )))
regions.Add(list(list(
"name" = get_region_accesses_name(i),
- "accesses" = accesses)))
- data["regions"] = regions
+ "accesses" = accesses
+ )))
+ data["regions"] = regions
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "access_decrypter.tmpl", "NTNet Access Decrypter", 550, 400, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
- ui.set_auto_update(1)
\ No newline at end of file
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm
index 0e0a1381bd..e1fa0cfa8a 100644
--- a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm
+++ b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm
@@ -6,10 +6,11 @@
program_menu_icon = "arrow-4-diag"
extended_desc = "This advanced script can perform denial of service attacks against NTNet quantum relays. The system administrator will probably notice this. Multiple devices can run this program together against same relay for increased effect"
size = 20
- requires_ntnet = 1
- available_on_ntnet = 0
- available_on_syndinet = 1
- nanomodule_path = /datum/nano_module/program/computer_dos/
+ requires_ntnet = TRUE
+ available_on_ntnet = FALSE
+ available_on_syndinet = TRUE
+ tgui_id = "NtosNetDos"
+
var/obj/machinery/ntnet_relay/target = null
var/dos_speed = 0
var/error = ""
@@ -39,70 +40,51 @@
..(forced)
-/datum/nano_module/program/computer_dos
- name = "DoS Traffic Generator"
-
-/datum/nano_module/program/computer_dos/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
+/datum/computer_file/program/ntnet_dos/tgui_data(mob/user)
if(!ntnet_global)
return
- var/datum/computer_file/program/ntnet_dos/PRG = program
- var/list/data = list()
- if(!istype(PRG))
- return
- data = PRG.get_header_data()
- if(PRG.error)
- data["error"] = PRG.error
- else if(PRG.target && PRG.executed)
- data["target"] = 1
- data["speed"] = PRG.dos_speed
+ var/list/data = get_header_data()
- // This is mostly visual, generate some strings of 1s and 0s
- // Probability of 1 is equal of completion percentage of DoS attack on this relay.
- // Combined with UI updates this adds quite nice effect to the UI
- var/percentage = PRG.target.dos_overload * 100 / PRG.target.dos_capacity
- var/list/strings[0]
- for(var/j, j<10, j++)
- var/string = ""
- for(var/i, i<20, i++)
- string = "[string][prob(percentage)]"
- strings.Add(string)
- data["dos_strings"] = strings
+ data["error"] = error
+ if(target && executed)
+ data["target"] = TRUE
+ data["speed"] = dos_speed
+
+ data["overload"] = target.dos_overload
+ data["capacity"] = target.dos_capacity
else
- var/list/relays[0]
+ data["target"] = FALSE
+ data["relays"] = list()
for(var/obj/machinery/ntnet_relay/R in ntnet_global.relays)
- relays.Add(R.uid)
- data["relays"] = relays
- data["focus"] = PRG.target ? PRG.target.uid : null
+ data["relays"] += list(list("id" = R.uid))
+ data["focus"] = target ? target.uid : null
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "ntnet_dos.tmpl", "DoS Traffic Generator", 400, 250, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
- ui.set_auto_update(1)
+ return data
-/datum/computer_file/program/ntnet_dos/Topic(href, href_list)
+/datum/computer_file/program/ntnet_dos/tgui_act(action, params)
if(..())
- return 1
- if(href_list["PRG_target_relay"])
- for(var/obj/machinery/ntnet_relay/R in ntnet_global.relays)
- if("[R.uid]" == href_list["PRG_target_relay"])
- target = R
- return 1
- if(href_list["PRG_reset"])
- if(target)
- target.dos_sources.Remove(src)
- target = null
- executed = 0
- error = ""
- return 1
- if(href_list["PRG_execute"])
- if(target)
- executed = 1
- target.dos_sources.Add(src)
- if(ntnet_global.intrusion_detection_enabled)
- ntnet_global.add_log("IDS WARNING - Excess traffic flood targeting relay [target.uid] detected from device: [computer.network_card.get_network_tag()]")
- ntnet_global.intrusion_detection_alarm = 1
- return 1
+ return TRUE
+ switch(action)
+ if("PRG_target_relay")
+ for(var/obj/machinery/ntnet_relay/R in ntnet_global.relays)
+ if(R.uid == text2num(params["targid"]))
+ target = R
+ break
+ return TRUE
+ if("PRG_reset")
+ if(target)
+ target.dos_sources.Remove(src)
+ target = null
+ executed = FALSE
+ error = ""
+ return TRUE
+ if("PRG_execute")
+ if(target)
+ executed = TRUE
+ target.dos_sources.Add(src)
+ if(ntnet_global.intrusion_detection_enabled)
+ var/obj/item/weapon/computer_hardware/network_card/network_card = computer.network_card
+ ntnet_global.add_log("IDS WARNING - Excess traffic flood targeting relay [target.uid] detected from device: [network_card.get_network_tag()]")
+ ntnet_global.intrusion_detection_alarm = TRUE
+ return TRUE
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
index 17199c3b18..5d0e291336 100644
--- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
+++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
@@ -6,10 +6,10 @@
program_menu_icon = "home"
extended_desc = "This virus can destroy hard drive of system it is executed on. It may be obfuscated to look like another non-malicious program. Once armed, it will destroy the system upon next execution."
size = 13
- requires_ntnet = 0
- available_on_ntnet = 0
- available_on_syndinet = 1
- nanomodule_path = /datum/nano_module/program/revelation/
+ requires_ntnet = FALSE
+ available_on_ntnet = FALSE
+ available_on_syndinet = TRUE
+ tgui_id = "NtosRevelation"
var/armed = 0
/datum/computer_file/program/revelation/run_program(var/mob/living/user)
@@ -37,48 +37,31 @@
if(computer.tesla_link && prob(50))
qdel(computer.tesla_link)
-/datum/computer_file/program/revelation/Topic(href, href_list)
+/datum/computer_file/program/revelation/tgui_act(action, params)
if(..())
- return 1
- else if(href_list["PRG_arm"])
- armed = !armed
- else if(href_list["PRG_activate"])
- activate()
- else if(href_list["PRG_obfuscate"])
- var/mob/living/user = usr
- var/newname = sanitize(input(user, "Enter new program name: "))
- if(!newname)
- return
- filedesc = newname
- for(var/datum/computer_file/program/P in ntnet_global.available_station_software)
- if(filedesc == P.filedesc)
- program_menu_icon = P.program_menu_icon
- break
- return 1
+ return
+ switch(action)
+ if("PRG_arm")
+ armed = !armed
+ return TRUE
+ if("PRG_activate")
+ activate()
+ return TRUE
+ if("PRG_obfuscate")
+ var/newname = params["new_name"]
+ if(!newname)
+ return
+ filedesc = newname
+ return TRUE
/datum/computer_file/program/revelation/clone()
var/datum/computer_file/program/revelation/temp = ..()
temp.armed = armed
return temp
-/datum/nano_module/program/revelation
- name = "Revelation Virus"
+/datum/computer_file/program/revelation/tgui_data(mob/user)
+ var/list/data = get_header_data()
-/datum/nano_module/program/revelation/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
- var/list/data = list()
- var/datum/computer_file/program/revelation/PRG = program
- if(!istype(PRG))
- return
-
- data = PRG.get_header_data()
-
- data["armed"] = PRG.armed
-
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "revelation.tmpl", "Revelation Virus", 400, 250, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
- ui.set_auto_update(1)
+ data["armed"] = armed
+ return data
\ No newline at end of file
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 aa122c0abf..47fe4ea2b3 100644
--- a/code/modules/modular_computers/file_system/programs/command/card.dm
+++ b/code/modules/modular_computers/file_system/programs/command/card.dm
@@ -1,7 +1,7 @@
/datum/computer_file/program/card_mod
filename = "cardmod"
filedesc = "ID card modification program"
- nanomodule_path = /datum/nano_module/program/card_mod
+ tguimodule_path = /datum/tgui_module/cardmod
program_icon_state = "id"
program_key_state = "id_key"
program_menu_icon = "key"
@@ -9,220 +9,3 @@
required_access = access_change_ids
requires_ntnet = 0
size = 8
-
-/datum/nano_module/program/card_mod
- name = "ID card modification program"
- var/mod_mode = 1
- var/is_centcom = 0
- var/show_assignments = 0
-
-/datum/nano_module/program/card_mod/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
- var/list/data = host.initial_data()
-
- data["src"] = "\ref[src]"
- data["station_name"] = station_name()
- data["manifest"] = data_core ? data_core.get_manifest(0) : null
- data["assignments"] = show_assignments
- if(program && program.computer)
- data["have_id_slot"] = !!program.computer.card_slot
- data["have_printer"] = !!program.computer.nano_printer
- data["authenticated"] = program.can_run(user)
- if(!program.computer.card_slot)
- mod_mode = 0 //We can't modify IDs when there is no card reader
- else
- data["have_id_slot"] = 0
- data["have_printer"] = 0
- data["authenticated"] = 0
- data["mmode"] = mod_mode
- data["centcom_access"] = is_centcom
-
- if(program && program.computer && program.computer.card_slot)
- var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
- data["has_id"] = !!id_card
- data["id_account_number"] = id_card ? id_card.associated_account_number : null
- data["id_rank"] = id_card && id_card.assignment ? id_card.assignment : "Unassigned"
- data["id_owner"] = id_card && id_card.registered_name ? id_card.registered_name : "-----"
- data["id_name"] = id_card ? id_card.name : "-----"
-
- var/list/departments = list()
- for(var/D in SSjob.get_all_department_datums())
- var/datum/department/dept = D
- if(!dept.assignable) // No AI ID cards for you.
- continue
- if(dept.centcom_only && !is_centcom)
- continue
- departments[++departments.len] = list("department_name" = dept.name, "jobs" = format_jobs(SSjob.get_job_titles_in_department(dept.name)) )
-
- data["departments"] = departments
-
- data["all_centcom_access"] = is_centcom ? get_accesses(1) : null
- data["regions"] = get_accesses()
-
- if(program.computer.card_slot && program.computer.card_slot.stored_card)
- var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card
- if(is_centcom)
- var/list/all_centcom_access = list()
- for(var/access in get_all_centcom_access())
- all_centcom_access.Add(list(list(
- "desc" = replacetext(get_centcom_access_desc(access), " ", " "),
- "ref" = access,
- "allowed" = (access in id_card.access) ? 1 : 0)))
- data["all_centcom_access"] = all_centcom_access
- else
- var/list/regions = list()
- for(var/i = 1; i <= 7; i++)
- var/list/accesses = list()
- for(var/access in get_region_accesses(i))
- if (get_access_desc(access))
- accesses.Add(list(list(
- "desc" = replacetext(get_access_desc(access), " ", " "),
- "ref" = access,
- "allowed" = (access in id_card.access) ? 1 : 0)))
-
- regions.Add(list(list(
- "name" = get_region_accesses_name(i),
- "accesses" = accesses)))
- data["regions"] = regions
-
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "mod_identification_computer.tmpl", name, 600, 700, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
-
-/datum/nano_module/program/card_mod/proc/format_jobs(list/jobs)
- var/obj/item/weapon/card/id/id_card = program.computer.card_slot ? program.computer.card_slot.stored_card : null
- 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)))
-
- return formatted
-
-/datum/nano_module/program/card_mod/proc/get_accesses(var/is_centcom = 0)
- return null
-
-
-/datum/computer_file/program/card_mod/Topic(href, href_list)
- if(..())
- return 1
-
- var/mob/user = usr
- var/obj/item/weapon/card/id/user_id_card = user.GetIdCard()
- var/obj/item/weapon/card/id/id_card
- if (computer.card_slot)
- id_card = computer.card_slot.stored_card
-
- var/datum/nano_module/program/card_mod/module = NM
- switch(href_list["action"])
- if("switchm")
- if(href_list["target"] == "mod")
- module.mod_mode = 1
- else if (href_list["target"] == "manifest")
- module.mod_mode = 0
- if("togglea")
- if(module.show_assignments)
- module.show_assignments = 0
- else
- module.show_assignments = 1
- if("print")
- if(computer && computer.nano_printer) //This option should never be called if there is no printer
- if(module.mod_mode)
- if(can_run(user, 1))
- var/contents = {"
- For: [id_card.registered_name ? id_card.registered_name : "Unregistered"]
-
- Assignment: [id_card.assignment]
- Account Number: #[id_card.associated_account_number]
- Blood Type: [id_card.blood_type]
- Access:
- "} - - var/known_access_rights = get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM) - for(var/A in id_card.access) - if(A in known_access_rights) - contents += " [get_access_desc(A)]" - - if(!computer.nano_printer.print_text(contents,"access report")) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") - return - else - computer.visible_message("\The [computer] prints out paper.") - else - var/contents = {"
- [data_core ? data_core.get_manifest(0) : ""] - "} - if(!computer.nano_printer.print_text(contents,text("crew manifest ([])", stationtime2text()))) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") - return - else - computer.visible_message("\The [computer] prints out paper.") - if("eject") - if(computer && computer.card_slot) - if(id_card) - data_core.manifest_modify(id_card.registered_name, id_card.assignment) - computer.proc_eject_id(user) - if("terminate") - if(computer && can_run(user, 1)) - id_card.assignment = "Dismissed" //VOREStation Edit: setting adjustment - id_card.access = list() - callHook("terminate_employee", list(id_card)) - if("edit") - if(computer && can_run(user, 1)) - if(href_list["name"]) - var/temp_name = sanitizeName(input("Enter name.", "Name", id_card.registered_name),allow_numbers=TRUE) - if(temp_name) - id_card.registered_name = temp_name - else - computer.visible_message("[computer] buzzes rudely.") - else if(href_list["account"]) - var/account_num = text2num(input("Enter account number.", "Account", id_card.associated_account_number)) - id_card.associated_account_number = account_num - if("assign") - if(computer && can_run(user, 1) && id_card) - var/t1 = href_list["assign_target"] - if(t1 == "Custom") - var/temp_t = sanitize(input("Enter a custom job assignment.","Assignment", id_card.assignment), 45) - //let custom jobs function as an impromptu alt title, mainly for sechuds - if(temp_t) - id_card.assignment = temp_t - else - var/list/access = list() - if(module.is_centcom) - access = get_centcom_access(t1) - else - var/datum/job/jobdatum - for(var/jobtype in typesof(/datum/job)) - var/datum/job/J = new jobtype - if(ckey(J.title) == ckey(t1)) - jobdatum = J - break - if(!jobdatum) - to_chat(usr, "No log exists for this job: [t1]") - return - - access = jobdatum.get_access() - - id_card.access = access - id_card.assignment = t1 - id_card.rank = t1 - - callHook("reassign_employee", list(id_card)) - if("access") - if(href_list["allowed"] && computer && can_run(user, 1)) - var/access_type = text2num(href_list["access_target"]) - var/access_allowed = text2num(href_list["allowed"]) - if(access_type in get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM)) - id_card.access -= access_type - if(!access_allowed) - id_card.access += access_type - if(id_card) - id_card.name = text("[id_card.registered_name]'s ID Card ([id_card.assignment])") - - SSnanoui.update_uis(NM) - return 1 diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index fc2efa8820..a2079ad494 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -9,7 +9,7 @@ program_icon_state = "comm" program_key_state = "med_key" program_menu_icon = "flag" - nanomodule_path = /datum/nano_module/program/comm + tguimodule_path = /datum/tgui_module/communications/ntos extended_desc = "Used to command and control. Can relay long-range communications. This program can not be run on tablet computers." required_access = access_heads requires_ntnet = 1 @@ -24,269 +24,6 @@ temp.message_core.messages = message_core.messages.Copy() return temp -/datum/nano_module/program/comm - name = "Command and Communications Program" - //available_to_ai = TRUE - var/current_status = STATE_DEFAULT - var/msg_line1 = "" - var/msg_line2 = "" - var/centcomm_message_cooldown = 0 - var/announcment_cooldown = 0 - var/datum/announcement/priority/crew_announcement = new - var/current_viewing_message_id = 0 - var/current_viewing_message = null - -/datum/nano_module/program/comm/New() - ..() - crew_announcement.newscast = 1 - -/datum/nano_module/program/comm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - var/list/data = host.initial_data() - - if(program) - data["emagged"] = program.computer_emagged - data["net_comms"] = !!program.get_signal(NTNET_COMMUNICATION) //Double !! is needed to get 1 or 0 answer - data["net_syscont"] = !!program.get_signal(NTNET_SYSTEMCONTROL) - if(program.computer) - data["have_printer"] = !!program.computer.nano_printer - else - data["have_printer"] = 0 - else - data["emagged"] = 0 - data["net_comms"] = 1 - data["net_syscont"] = 1 - data["have_printer"] = 0 - - data["message_line1"] = msg_line1 - data["message_line2"] = msg_line2 - data["state"] = current_status - data["isAI"] = issilicon(usr) - data["authenticated"] = get_authentication_level(user) - data["current_security_level"] = security_level - data["current_security_level_title"] = num2seclevel(security_level) - - data["def_SEC_LEVEL_DELTA"] = SEC_LEVEL_DELTA - data["def_SEC_LEVEL_YELLOW"] = SEC_LEVEL_YELLOW - data["def_SEC_LEVEL_ORANGE"] = SEC_LEVEL_ORANGE - data["def_SEC_LEVEL_VIOLET"] = SEC_LEVEL_VIOLET - data["def_SEC_LEVEL_BLUE"] = SEC_LEVEL_BLUE - data["def_SEC_LEVEL_GREEN"] = SEC_LEVEL_GREEN - - var/datum/comm_message_listener/l = obtain_message_listener() - data["messages"] = l.messages - data["message_deletion_allowed"] = l != global_message_listener - data["message_current_id"] = current_viewing_message_id - if(current_viewing_message) - data["message_current"] = current_viewing_message - - if(emergency_shuttle.location()) - data["have_shuttle"] = 1 - if(emergency_shuttle.online()) - data["have_shuttle_called"] = 1 - else - data["have_shuttle_called"] = 0 - else - data["have_shuttle"] = 0 - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if(!ui) - ui = new(user, src, ui_key, "mod_communication.tmpl", name, 550, 420, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - -/datum/nano_module/program/comm/proc/get_authentication_level(var/mob/user) - if(program) - if(program.can_run(user, 0, access_captain)) - return 2 - else - return program.can_run(user) - return 1 - -/datum/nano_module/program/comm/proc/obtain_message_listener() - if(program) - var/datum/computer_file/program/comm/P = program - return P.message_core - return global_message_listener - -/datum/nano_module/program/comm/Topic(href, href_list) - if(..()) - return 1 - var/mob/user = usr - var/ntn_comm = program ? !!program.get_signal(NTNET_COMMUNICATION) : 1 - var/ntn_cont = program ? !!program.get_signal(NTNET_SYSTEMCONTROL) : 1 - var/datum/comm_message_listener/l = obtain_message_listener() - switch(href_list["action"]) - if("sw_menu") - . = 1 - current_status = text2num(href_list["target"]) - if("announce") - . = 1 - if(get_authentication_level(user) == 2 && !issilicon(usr) && ntn_comm) - if(user) - var/obj/item/weapon/card/id/id_card = user.GetIdCard() - crew_announcement.announcer = GetNameAndAssignmentFromId(id_card) - else - crew_announcement.announcer = "Unknown" - if(announcment_cooldown) - to_chat(usr, "Please allow at least one minute to pass between announcements") - return TRUE - var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") as null|message - if(!input || !can_still_topic()) - return 1 - crew_announcement.Announce(input) - announcment_cooldown = 1 - spawn(600)//One minute cooldown - announcment_cooldown = 0 - if("message") - . = 1 - if(href_list["target"] == "emagged") - if(program) - if(get_authentication_level(user) == 2 && program.computer_emagged && !issilicon(usr) && ntn_comm) - if(centcomm_message_cooldown) - to_chat(usr, "Arrays recycling. Please stand by.") - SSnanoui.update_uis(src) - return - var/input = sanitize(input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") as null|text) - if(!input || !can_still_topic()) - return 1 - Syndicate_announce(input, usr) - to_chat(usr, "Message transmitted.") - log_say("[key_name(usr)] has made an illegal announcement: [input]") - centcomm_message_cooldown = 1 - spawn(300)//30 second cooldown - centcomm_message_cooldown = 0 - else if(href_list["target"] == "regular") - if(get_authentication_level(user) == 2 && !issilicon(usr) && ntn_comm) - if(centcomm_message_cooldown) - to_chat(usr, "Arrays recycling. Please stand by.") - SSnanoui.update_uis(src) - return - if(!is_relay_online())//Contact Centcom has a check, Syndie doesn't to allow for Traitor funs. - to_chat(usr, "No Emergency Bluespace Relay detected. Unable to transmit message.") - return 1 - var/input = sanitize(input("Please choose a message to transmit to Centcomm via quantum entanglement. \ - Please be aware that this process is very expensive, and abuse will lead to... termination. \ - Transmission does not guarantee a response. There is a 30 second delay before you may send another message, \ - be clear, full and concise.", "Central Command Quantum Messaging") as null|message) - if(!input || !can_still_topic()) - return 1 - CentCom_announce(input, usr) - to_chat(usr, "Message transmitted.") - log_say("[key_name(usr)] has made an IA Centcomm announcement: [input]") - centcomm_message_cooldown = 1 - spawn(300) //30 second cooldown - centcomm_message_cooldown = 0 - if("shuttle") - . = 1 - if(get_authentication_level(user) && ntn_cont) - if(href_list["target"] == "call") - var/confirm = alert("Are you sure you want to call the shuttle?", name, "No", "Yes") - if(confirm == "Yes" && can_still_topic()) - call_shuttle_proc(usr) - - if(href_list["target"] == "cancel" && !issilicon(usr)) - var/confirm = alert("Are you sure you want to cancel the shuttle?", name, "No", "Yes") - if(confirm == "Yes" && can_still_topic()) - cancel_call_proc(usr) - if("setstatus") - . = 1 - if(get_authentication_level(user) && ntn_cont) - switch(href_list["target"]) - if("line1") - var/linput = reject_bad_text(sanitize(input("Line 1", "Enter Message Text", msg_line1) as text|null, 40), 40) - if(can_still_topic()) - msg_line1 = linput - if("line2") - var/linput = reject_bad_text(sanitize(input("Line 2", "Enter Message Text", msg_line2) as text|null, 40), 40) - if(can_still_topic()) - msg_line2 = linput - if("message") - post_status("message", msg_line1, msg_line2) - if("alert") - post_status("alert", href_list["alert"]) - else - post_status(href_list["target"]) - if("setalert") - . = 1 - if(get_authentication_level(user) && !issilicon(usr) && ntn_cont && ntn_comm) - var/current_level = text2num(href_list["target"]) - var/confirm = alert("Are you sure you want to change alert level to [num2seclevel(current_level)]?", name, "No", "Yes") - if(confirm == "Yes" && can_still_topic()) - var/old_level = security_level - if(!current_level) current_level = SEC_LEVEL_GREEN - if(current_level < SEC_LEVEL_GREEN) current_level = SEC_LEVEL_GREEN - if(current_level > SEC_LEVEL_BLUE) current_level = SEC_LEVEL_BLUE //Cannot engage delta with this - set_security_level(current_level) - if(security_level != old_level) - log_game("[key_name(usr)] has changed the security level to [get_security_level()].") - message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") - switch(security_level) - if(SEC_LEVEL_GREEN) - feedback_inc("alert_comms_green",1) - if(SEC_LEVEL_YELLOW) - feedback_inc("alert_comms_yellow",1) - if(SEC_LEVEL_ORANGE) - feedback_inc("alert_comms_orange",1) - if(SEC_LEVEL_VIOLET) - feedback_inc("alert_comms_violet",1) - if(SEC_LEVEL_BLUE) - feedback_inc("alert_comms_blue",1) - else - to_chat(usr, "You press button, but red light flashes and nothing happens.")//This should never happen - - current_status = STATE_DEFAULT - if("viewmessage") - . = 1 - if(get_authentication_level(user) && ntn_comm) - current_viewing_message_id = text2num(href_list["target"]) - for(var/list/m in l.messages) - if(m["id"] == current_viewing_message_id) - current_viewing_message = m - current_status = STATE_VIEWMESSAGE - if("delmessage") - . = 1 - if(get_authentication_level(user) && ntn_comm && l != global_message_listener) - l.Remove(current_viewing_message) - current_status = STATE_MESSAGELIST - if("printmessage") - . = 1 - if(get_authentication_level(user) && ntn_comm) - if(program && program.computer && program.computer.nano_printer) - if(!program.computer.nano_printer.print_text(current_viewing_message["contents"],current_viewing_message["title"])) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") - else - program.computer.visible_message("\The [program.computer] prints out paper.") - - -/datum/nano_module/program/comm/proc/post_status(var/command, var/data1, var/data2) - - var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) - - if(!frequency) return - - - var/datum/signal/status_signal = new - status_signal.source = src - status_signal.transmission_method = TRANSMISSION_RADIO - status_signal.data["command"] = command - - switch(command) - if("message") - status_signal.data["msg1"] = data1 - status_signal.data["msg2"] = data2 - log_admin("STATUS: [key_name(usr)] set status screen message with [src]: [data1] [data2]") - if("alert") - status_signal.data["picture_state"] = data1 - - frequency.post_signal(src, status_signal) - -#undef STATE_DEFAULT -#undef STATE_MESSAGELIST -#undef STATE_VIEWMESSAGE -#undef STATE_STATUSDISPLAY -#undef STATE_ALERT_LEVEL - /* General message handling stuff */ @@ -304,19 +41,9 @@ proc/post_comm_message(var/message_title, var/message_text) message["title"] = message_title message["contents"] = message_text - for (var/datum/comm_message_listener/l in comm_message_listeners) + for(var/datum/comm_message_listener/l in comm_message_listeners) l.Add(message) - //Old console support - for (var/obj/machinery/computer/communications/comm in machines) - if (!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept) - var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc ) - intercept.name = message_title - intercept.info = message_text - - comm.messagetitle.Add(message_title) - comm.messagetext.Add(message_text) - /datum/comm_message_listener var/list/messages diff --git a/code/modules/modular_computers/file_system/programs/generic/configurator.dm b/code/modules/modular_computers/file_system/programs/generic/configurator.dm index c3ce1e358a..2d660c8b7e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/configurator.dm +++ b/code/modules/modular_computers/file_system/programs/generic/configurator.dm @@ -14,51 +14,4 @@ size = 4 available_on_ntnet = 0 requires_ntnet = 0 - nanomodule_path = /datum/nano_module/program/computer_configurator/ - -/datum/nano_module/program/computer_configurator - name = "NTOS Computer Configuration Tool" - var/obj/item/modular_computer/movable = null - -/datum/nano_module/program/computer_configurator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - if(program) - movable = program.computer - if(!istype(movable)) - movable = null - - // No computer connection, we can't get data from that. - if(!movable) - return 0 - - var/list/data = list() - - if(program) - data = program.get_header_data() - - var/list/hardware = movable.get_all_components() - - data["disk_size"] = movable.hard_drive.max_capacity - data["disk_used"] = movable.hard_drive.used_capacity - data["power_usage"] = movable.last_power_usage - data["battery_exists"] = movable.battery_module ? 1 : 0 - if(movable.battery_module) - data["battery_rating"] = movable.battery_module.battery.maxcharge - data["battery_percent"] = round(movable.battery_module.battery.percent()) - - var/list/all_entries[0] - for(var/obj/item/weapon/computer_hardware/H in hardware) - all_entries.Add(list(list( - "name" = H.name, - "desc" = H.desc, - "enabled" = H.enabled, - "critical" = H.critical, - "powerusage" = H.power_usage - ))) - - data["hardware"] = all_entries - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "laptop_configuration.tmpl", "NTOS Configuration Utility", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() \ No newline at end of file + tguimodule_path = /datum/tgui_module/computer_configurator diff --git a/code/modules/modular_computers/file_system/programs/generic/email_client.dm b/code/modules/modular_computers/file_system/programs/generic/email_client.dm index 3e2f979bb5..32d635fef4 100644 --- a/code/modules/modular_computers/file_system/programs/generic/email_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/email_client.dm @@ -11,15 +11,15 @@ var/stored_login = "" var/stored_password = "" - nanomodule_path = /datum/nano_module/email_client + tguimodule_path = /datum/tgui_module/email_client // Persistency. Unless you log out, or unless your password changes, this will pre-fill the login data when restarting the program /datum/computer_file/program/email_client/kill_program() - if(NM) - var/datum/nano_module/email_client/NME = NM - if(NME.current_account) - stored_login = NME.stored_login - stored_password = NME.stored_password + if(TM) + var/datum/tgui_module/email_client/TME = TM + if(TME.current_account) + stored_login = TME.stored_login + stored_password = TME.stored_password else stored_login = "" stored_password = "" @@ -27,473 +27,31 @@ /datum/computer_file/program/email_client/run_program() . = ..() - if(NM) - var/datum/nano_module/email_client/NME = NM - NME.stored_login = stored_login - NME.stored_password = stored_password - NME.log_in() - NME.error = "" - NME.check_for_new_messages(1) + if(TM) + var/datum/tgui_module/email_client/TME = TM + TME.stored_login = stored_login + TME.stored_password = stored_password + TME.log_in() + TME.error = "" + TME.check_for_new_messages(1) /datum/computer_file/program/email_client/proc/new_mail_notify() - computer.visible_message("\The [computer] beeps softly, indicating a new email has been received.", 1) + var/turf/T = get_turf(computer) // Because visible_message is being a butt + if(T) + T.visible_message("[computer] beeps softly, indicating a new email has been received.") + playsound(computer, 'sound/misc/server-ready.ogg', 100, 0) /datum/computer_file/program/email_client/process_tick() ..() - var/datum/nano_module/email_client/NME = NM - if(!istype(NME)) + var/datum/tgui_module/email_client/TME = TM + if(!istype(TME)) return - NME.relayed_process(ntnet_speed) + TME.relayed_process(ntnet_speed) - var/check_count = NME.check_for_new_messages() + var/check_count = TME.check_for_new_messages() if(check_count) if(check_count == 2) new_mail_notify() ui_header = "ntnrc_new.gif" else ui_header = "ntnrc_idle.gif" - -/datum/nano_module/email_client/ - name = "Email Client" - var/stored_login = "" - var/stored_password = "" - var/error = "" - - var/msg_title = "" - var/msg_body = "" - var/msg_recipient = "" - var/datum/computer_file/msg_attachment = null - var/folder = "Inbox" - var/addressbook = FALSE - var/new_message = FALSE - - var/last_message_count = 0 // How many messages were there during last check. - var/read_message_count = 0 // How many messages were there when user has last accessed the UI. - - var/datum/computer_file/downloading = null - var/download_progress = 0 - var/download_speed = 0 - - var/datum/computer_file/data/email_account/current_account = null - var/datum/computer_file/data/email_message/current_message = null - -/datum/nano_module/email_client/proc/log_in() - for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts) - if(!account.can_login) - continue - if(account.login == stored_login) - if(account.password == stored_password) - if(account.suspended) - error = "This account has been suspended. Please contact the system administrator for assistance." - return 0 - current_account = account - return 1 - else - error = "Invalid Password" - return 0 - error = "Invalid Login" - return 0 - -// Returns 0 if no new messages were received, 1 if there is an unread message but notification has already been sent. -// and 2 if there is a new message that appeared in this tick (and therefore notification should be sent by the program). -/datum/nano_module/email_client/proc/check_for_new_messages(var/messages_read = FALSE) - if(!current_account) - return 0 - - var/list/allmails = current_account.all_emails() - - if(allmails.len > last_message_count) - . = 2 - else if(allmails.len > read_message_count) - . = 1 - else - . = 0 - - last_message_count = allmails.len - if(messages_read) - read_message_count = allmails.len - - -/datum/nano_module/email_client/proc/log_out() - current_account = null - downloading = null - download_progress = 0 - last_message_count = 0 - read_message_count = 0 - -/datum/nano_module/email_client/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - var/list/data = host.initial_data() - - // Password has been changed by other client connected to this email account - if(current_account) - if(current_account.password != stored_password) - log_out() - error = "Invalid Password" - // Banned. - if(current_account.suspended) - log_out() - error = "This account has been suspended. Please contact the system administrator for assistance." - - if(error) - data["error"] = error - else if(downloading) - data["downloading"] = 1 - data["down_filename"] = "[downloading.filename].[downloading.filetype]" - data["down_progress"] = download_progress - data["down_size"] = downloading.size - data["down_speed"] = download_speed - - else if(istype(current_account)) - data["current_account"] = current_account.login - if(addressbook) - var/list/all_accounts = list() - for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts) - if(!account.can_login) - continue - all_accounts.Add(list(list( - "login" = account.login - ))) - data["addressbook"] = 1 - data["accounts"] = all_accounts - else if(new_message) - data["new_message"] = 1 - data["msg_title"] = msg_title - data["msg_body"] = pencode2html(msg_body) - data["msg_recipient"] = msg_recipient - if(msg_attachment) - data["msg_hasattachment"] = 1 - data["msg_attachment_filename"] = "[msg_attachment.filename].[msg_attachment.filetype]" - data["msg_attachment_size"] = msg_attachment.size - else if (current_message) - data["cur_title"] = current_message.title - data["cur_body"] = pencode2html(current_message.stored_data) - data["cur_timestamp"] = current_message.timestamp - data["cur_source"] = current_message.source - data["cur_uid"] = current_message.uid - if(istype(current_message.attachment)) - data["cur_hasattachment"] = 1 - data["cur_attachment_filename"] = "[current_message.attachment.filename].[current_message.attachment.filetype]" - data["cur_attachment_size"] = current_message.attachment.size - else - data["label_inbox"] = "Inbox ([current_account.inbox.len])" - data["label_spam"] = "Spam ([current_account.spam.len])" - data["label_deleted"] = "Deleted ([current_account.deleted.len])" - var/list/message_source - if(folder == "Inbox") - message_source = current_account.inbox - else if(folder == "Spam") - message_source = current_account.spam - else if(folder == "Deleted") - message_source = current_account.deleted - - if(message_source) - data["folder"] = folder - var/list/all_messages = list() - for(var/datum/computer_file/data/email_message/message in message_source) - all_messages.Add(list(list( - "title" = message.title, - "body" = pencode2html(message.stored_data), - "source" = message.source, - "timestamp" = message.timestamp, - "uid" = message.uid - ))) - data["messages"] = all_messages - data["messagecount"] = all_messages.len - else - data["stored_login"] = stored_login - data["stored_password"] = stars(stored_password, 0) - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "email_client.tmpl", "Email Client", 600, 450, state = state) - if(host.update_layout()) - ui.auto_update_layout = 1 - ui.set_auto_update(1) - ui.set_initial_data(data) - ui.open() - -/datum/nano_module/email_client/proc/find_message_by_fuid(var/fuid) - if(!istype(current_account)) - return - - // href_list works with strings, so this makes it a bit easier for us - if(istext(fuid)) - fuid = text2num(fuid) - - for(var/datum/computer_file/data/email_message/message in current_account.all_emails()) - if(message.uid == fuid) - return message - -/datum/nano_module/email_client/proc/clear_message() - new_message = FALSE - msg_title = "" - msg_body = "" - msg_recipient = "" - msg_attachment = null - current_message = null - -/datum/nano_module/email_client/proc/relayed_process(var/netspeed) - download_speed = netspeed - if(!downloading) - return - download_progress = min(download_progress + netspeed, downloading.size) - if(download_progress >= downloading.size) - var/obj/item/modular_computer/MC = nano_host() - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" - downloading = null - download_progress = 0 - return 1 - - if(MC.hard_drive.store_file(downloading)) - error = "File successfully downloaded to local device." - else - error = "Error saving file: I/O Error: The hard drive may be full or nonfunctional." - downloading = null - download_progress = 0 - return 1 - - -/datum/nano_module/email_client/Topic(href, href_list) - if(..()) - return 1 - var/mob/living/user = usr - check_for_new_messages(1) // Any actual interaction (button pressing) is considered as acknowledging received message, for the purpose of notification icons. - if(href_list["login"]) - log_in() - return 1 - - if(href_list["logout"]) - log_out() - return 1 - - if(href_list["reset"]) - error = "" - return 1 - - if(href_list["new_message"]) - new_message = TRUE - return 1 - - if(href_list["cancel"]) - if(addressbook) - addressbook = FALSE - else - clear_message() - return 1 - - if(href_list["addressbook"]) - addressbook = TRUE - return 1 - - if(href_list["set_recipient"]) - msg_recipient = sanitize(href_list["set_recipient"]) - addressbook = FALSE - return 1 - - if(href_list["edit_title"]) - var/newtitle = sanitize(input(user,"Enter title for your message:", "Message title", msg_title), 100) - if(newtitle) - msg_title = newtitle - return 1 - - // This uses similar editing mechanism as the FileManager program, therefore it supports various paper tags and remembers formatting. - if(href_list["edit_body"]) - var/oldtext = html_decode(msg_body) - oldtext = replacetext(oldtext, "\[editorbr\]", "\n") - - var/newtext = sanitize(replacetext(input(usr, "Enter your message. You may use most tags from paper formatting", "Message Editor", oldtext) as message|null, "\n", "\[editorbr\]"), 20000) - if(newtext) - msg_body = newtext - return 1 - - if(href_list["edit_recipient"]) - var/newrecipient = sanitize(input(user,"Enter recipient's email address:", "Recipient", msg_recipient), 100) - if(newrecipient) - msg_recipient = newrecipient - return 1 - - if(href_list["edit_login"]) - var/newlogin = sanitize(input(user,"Enter login", "Login", stored_login), 100) - if(newlogin) - stored_login = newlogin - return 1 - - if(href_list["edit_password"]) - var/newpass = sanitize(input(user,"Enter password", "Password"), 100) - if(newpass) - stored_password = newpass - return 1 - - if(href_list["delete"]) - if(!istype(current_account)) - return 1 - var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["delete"]) - if(!istype(M)) - return 1 - if(folder == "Deleted") - current_account.deleted.Remove(M) - qdel(M) - else - current_account.deleted.Add(M) - current_account.inbox.Remove(M) - current_account.spam.Remove(M) - if(current_message == M) - current_message = null - return 1 - - if(href_list["send"]) - if(!current_account) - return 1 - if((msg_title == "") || (msg_body == "") || (msg_recipient == "")) - error = "Error sending mail: Title or message body is empty!" - return 1 - - var/datum/computer_file/data/email_message/message = new() - message.title = msg_title - message.stored_data = msg_body - message.source = current_account.login - message.attachment = msg_attachment - if(!current_account.send_mail(msg_recipient, message)) - error = "Error sending email: this address doesn't exist." - return 1 - else - error = "Email successfully sent." - clear_message() - return 1 - - if(href_list["set_folder"]) - folder = href_list["set_folder"] - return 1 - - if(href_list["reply"]) - var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["reply"]) - if(!istype(M)) - return 1 - - new_message = TRUE - msg_recipient = M.source - msg_title = "Re: [M.title]" - msg_body = "\[editorbr\]\[editorbr\]\[editorbr\]\[br\]==============================\[br\]\[editorbr\]" - msg_body += "Received by [current_account.login] at [M.timestamp]\[br\]\[editorbr\][M.stored_data]" - return 1 - - if(href_list["view"]) - var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["view"]) - if(istype(M)) - current_message = M - return 1 - - if(href_list["changepassword"]) - var/oldpassword = sanitize(input(user,"Please enter your old password:", "Password Change"), 100) - if(!oldpassword) - return 1 - var/newpassword1 = sanitize(input(user,"Please enter your new password:", "Password Change"), 100) - if(!newpassword1) - return 1 - var/newpassword2 = sanitize(input(user,"Please re-enter your new password:", "Password Change"), 100) - if(!newpassword2) - return 1 - - if(!istype(current_account)) - error = "Please log in before proceeding." - return 1 - - if(current_account.password != oldpassword) - error = "Incorrect original password" - return 1 - - if(newpassword1 != newpassword2) - error = "The entered passwords do not match." - return 1 - - current_account.password = newpassword1 - stored_password = newpassword1 - error = "Your password has been successfully changed!" - return 1 - - // The following entries are Modular Computer framework only, and therefore won't do anything in other cases (like AI View) - - if(href_list["save"]) - // Fully dependant on modular computers here. - var/obj/item/modular_computer/MC = nano_host() - - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error exporting file. Are you using a functional and NTOS-compliant device?" - return 1 - - var/filename = sanitize(input(user,"Please specify file name:", "Message export"), 100) - if(!filename) - return 1 - - var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["save"]) - var/datum/computer_file/data/mail = istype(M) ? M.export() : null - if(!istype(mail)) - return 1 - mail.filename = filename - if(!MC.hard_drive || !MC.hard_drive.store_file(mail)) - error = "Internal I/O error when writing file, the hard drive may be full." - else - error = "Email exported successfully" - return 1 - - if(href_list["addattachment"]) - var/obj/item/modular_computer/MC = nano_host() - msg_attachment = null - - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" - return 1 - - var/list/filenames = list() - for(var/datum/computer_file/CF in MC.hard_drive.stored_files) - if(CF.unsendable) - continue - filenames.Add(CF.filename) - var/picked_file = input(user, "Please pick a file to send as attachment (max 32GQ)") as null|anything in filenames - - if(!picked_file) - return 1 - - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" - return 1 - - for(var/datum/computer_file/CF in MC.hard_drive.stored_files) - if(CF.unsendable) - continue - if(CF.filename == picked_file) - msg_attachment = CF.clone() - break - if(!istype(msg_attachment)) - msg_attachment = null - error = "Unknown error when uploading attachment." - return 1 - - if(msg_attachment.size > 32) - error = "Error uploading attachment: File exceeds maximal permitted file size of 32GQ." - msg_attachment = null - else - error = "File [msg_attachment.filename].[msg_attachment.filetype] has been successfully uploaded." - return 1 - - if(href_list["downloadattachment"]) - if(!current_account || !current_message || !current_message.attachment) - return 1 - var/obj/item/modular_computer/MC = nano_host() - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error downloading file. Are you using a functional and NTOSv2-compliant device?" - return 1 - - downloading = current_message.attachment.clone() - download_progress = 0 - return 1 - - if(href_list["canceldownload"]) - downloading = null - download_progress = 0 - return 1 - - if(href_list["remove_attachment"]) - msg_attachment = null - return 1 \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm index 42dfdd622d..13a137993e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm @@ -6,202 +6,190 @@ program_key_state = "generic_key" program_menu_icon = "folder-collapsed" size = 8 - requires_ntnet = 0 - available_on_ntnet = 0 - undeletable = 1 - nanomodule_path = /datum/nano_module/program/computer_filemanager/ + requires_ntnet = FALSE + available_on_ntnet = FALSE + undeletable = TRUE + tgui_id = "NtosFileManager" + var/open_file var/error -/datum/computer_file/program/filemanager/Topic(href, href_list) +/datum/computer_file/program/filemanager/tgui_act(action, list/params, datum/tgui/ui) if(..()) - return 1 + return TRUE - if(href_list["PRG_openfile"]) - . = 1 - open_file = href_list["PRG_openfile"] - if(href_list["PRG_newtextfile"]) - . = 1 - var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename")) - if(!newname) - return 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/data/F = new/datum/computer_file/data() - F.filename = newname - F.filetype = "TXT" - HDD.store_file(F) - if(href_list["PRG_deletefile"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_deletefile"]) - if(!file || file.undeletable) - return 1 - HDD.remove_file(file) - if(href_list["PRG_usbdeletefile"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive - if(!RHDD) - return 1 - var/datum/computer_file/file = RHDD.find_file_by_name(href_list["PRG_usbdeletefile"]) - if(!file || file.undeletable) - return 1 - RHDD.remove_file(file) - if(href_list["PRG_closefile"]) - . = 1 - open_file = null - error = null - if(href_list["PRG_clone"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_clone"]) - if(!F || !istype(F)) - return 1 - var/datum/computer_file/C = F.clone(1) - HDD.store_file(C) - if(href_list["PRG_rename"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_rename"]) - if(!file || !istype(file)) - return 1 - var/newname = sanitize(input(usr, "Enter new file name:", "File rename", file.filename)) - if(file && newname) + var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive + + switch(action) + if("PRG_openfile") + open_file = params["name"] + return TRUE + if("PRG_newtextfile") + if(!HDD) + return + var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename")) + if(!newname) + return + var/datum/computer_file/data/F = new/datum/computer_file/data() + F.filename = newname + F.filetype = "TXT" + HDD.store_file(F) + return TRUE + if("PRG_closefile") + open_file = null + error = null + return TRUE + if("PRG_clone") + if(!HDD) + return + var/datum/computer_file/F = HDD.find_file_by_name(params["name"]) + if(!F || !istype(F)) + return + var/datum/computer_file/C = F.clone(1) + HDD.store_file(C) + return TRUE + if("PRG_edit") + if(!HDD) + return + if(!open_file) + return + var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) + if(!F || !istype(F)) + return + if(F.do_not_edit && (alert("WARNING: This file is not compatible with editor. Editing it may result in permanently corrupted formatting or damaged data consistency. Edit anyway?", "Incompatible File", "No", "Yes") == "No")) + return + + var/oldtext = html_decode(F.stored_data) + oldtext = replacetext(oldtext, "\[br\]", "\n") + + var/newtext = sanitize(replacetext(input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", oldtext) as message|null, "\n", "\[br\]"), MAX_TEXTFILE_LENGTH) + if(!newtext) + return + + if(F) + var/datum/computer_file/data/backup = F.clone() + HDD.remove_file(F) + F.stored_data = newtext + F.calculate_size() + // We can't store the updated file, it's probably too large. Print an error and restore backed up version. + // This is mostly intended to prevent people from losing texts they spent lot of time working on due to running out of space. + // They will be able to copy-paste the text from error screen and store it in notepad or something. + if(!HDD.store_file(F)) + error = "I/O error: Unable to overwrite file. Hard drive is probably full. You may want to backup your changes before closing this window:
[html_decode(F.stored_data)]
" + HDD.store_file(backup) + return TRUE + if("PRG_printfile") + if(!HDD) + return + if(!open_file) + return + var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) + if(!F || !istype(F)) + return + if(!computer.nano_printer) + error = "Missing Hardware: Your computer does not have required hardware to complete this operation." + return + if(!computer.nano_printer.print_text(pencode2html(F.stored_data))) + error = "Hardware error: Printer was unable to print the file. It may be out of paper." + return + return TRUE + if("PRG_deletefile") + if(!HDD) + return + var/datum/computer_file/file = HDD.find_file_by_name(params["name"]) + if(!file || file.undeletable) + return + HDD.remove_file(file) + return TRUE + if("PRG_usbdeletefile") + if(!RHDD) + return + var/datum/computer_file/file = RHDD.find_file_by_name(params["name"]) + if(!file || file.undeletable) + return + RHDD.remove_file(file) + return TRUE + if("PRG_rename") + if(!HDD) + return + var/datum/computer_file/file = HDD.find_file_by_name(params["name"]) + if(!file) + return + var/newname = params["new_name"] + if(!newname) + return file.filename = newname - if(href_list["PRG_edit"]) - . = 1 - if(!open_file) - return 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) - if(!F || !istype(F)) - return 1 - if(F.do_not_edit && (alert("WARNING: This file is not compatible with editor. Editing it may result in permanently corrupted formatting or damaged data consistency. Edit anyway?", "Incompatible File", "No", "Yes") == "No")) - return 1 + return TRUE + if("PRG_copytousb") + if(!HDD || !RHDD) + return + var/datum/computer_file/F = HDD.find_file_by_name(params["name"]) + if(!F) + return + var/datum/computer_file/C = F.clone(FALSE) + RHDD.store_file(C) + return TRUE + if("PRG_copyfromusb") + if(!HDD || !RHDD) + return + var/datum/computer_file/F = RHDD.find_file_by_name(params["name"]) + if(!F || !istype(F)) + return + var/datum/computer_file/C = F.clone(FALSE) + HDD.store_file(C) + return TRUE - var/oldtext = html_decode(F.stored_data) - oldtext = replacetext(oldtext, "\[br\]", "\n") +/datum/computer_file/program/filemanager/tgui_data(mob/user) + var/list/data = get_header_data() - var/newtext = sanitize(replacetext(input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", oldtext) as message|null, "\n", "\[br\]"), MAX_TEXTFILE_LENGTH) - if(!newtext) - return + var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive - if(F) - var/datum/computer_file/data/backup = F.clone() - HDD.remove_file(F) - F.stored_data = newtext - F.calculate_size() - // We can't store the updated file, it's probably too large. Print an error and restore backed up version. - // This is mostly intended to prevent people from losing texts they spent lot of time working on due to running out of space. - // They will be able to copy-paste the text from error screen and store it in notepad or something. - if(!HDD.store_file(F)) - error = "I/O error: Unable to overwrite file. Hard drive is probably full. You may want to backup your changes before closing this window:
[html_decode(F.stored_data)]
" - HDD.store_file(backup) - if(href_list["PRG_printfile"]) - . = 1 - if(!open_file) - return 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) - if(!F || !istype(F)) - return 1 - if(!computer.nano_printer) - error = "Missing Hardware: Your computer does not have required hardware to complete this operation." - return 1 - if(!computer.nano_printer.print_text(pencode2html(F.stored_data))) - error = "Hardware error: Printer was unable to print the file. It may be out of paper." - return 1 - if(href_list["PRG_copytousb"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive - if(!HDD || !RHDD) - return 1 - var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_copytousb"]) - if(!F || !istype(F)) - return 1 - var/datum/computer_file/C = F.clone(0) - RHDD.store_file(C) - if(href_list["PRG_copyfromusb"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive - if(!HDD || !RHDD) - return 1 - var/datum/computer_file/F = RHDD.find_file_by_name(href_list["PRG_copyfromusb"]) - if(!F || !istype(F)) - return 1 - var/datum/computer_file/C = F.clone(0) - HDD.store_file(C) - if(.) - SSnanoui.update_uis(NM) + data["error"] = null + if(error) + data["error"] = error + if(!computer || !HDD) + data["error"] = "I/O ERROR: Unable to access hard drive." + + data["filedata"] = null + data["filename"] = null + data["files"] = list() + data["usbconnected"] = FALSE + data["usbfiles"] = list() -/datum/nano_module/program/computer_filemanager - name = "NTOS File Manager" - -/datum/nano_module/program/computer_filemanager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - var/list/data = host.initial_data() - var/datum/computer_file/program/filemanager/PRG - PRG = program - - var/obj/item/weapon/computer_hardware/hard_drive/HDD - var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD - if(PRG.error) - data["error"] = PRG.error - if(PRG.open_file) + if(open_file) var/datum/computer_file/data/file - if(!PRG.computer || !PRG.computer.hard_drive) + if(!computer || !computer.hard_drive) data["error"] = "I/O ERROR: Unable to access hard drive." else - HDD = PRG.computer.hard_drive - file = HDD.find_file_by_name(PRG.open_file) + file = HDD.find_file_by_name(open_file) if(!istype(file)) data["error"] = "I/O ERROR: Unable to open file." else data["filedata"] = pencode2html(file.stored_data) data["filename"] = "[file.filename].[file.filetype]" else - if(!PRG.computer || !PRG.computer.hard_drive) - data["error"] = "I/O ERROR: Unable to access hard drive." - else - HDD = PRG.computer.hard_drive - RHDD = PRG.computer.portable_drive - var/list/files[0] - for(var/datum/computer_file/F in HDD.stored_files) - files.Add(list(list( + var/list/files = list() + for(var/datum/computer_file/F in HDD.stored_files) + files += list(list( + "name" = F.filename, + "type" = F.filetype, + "size" = F.size, + "undeletable" = F.undeletable + )) + data["files"] = files + if(RHDD) + data["usbconnected"] = TRUE + var/list/usbfiles = list() + for(var/datum/computer_file/F in RHDD.stored_files) + usbfiles += list(list( "name" = F.filename, "type" = F.filetype, "size" = F.size, "undeletable" = F.undeletable - ))) - data["files"] = files - if(RHDD) - data["usbconnected"] = 1 - var/list/usbfiles[0] - for(var/datum/computer_file/F in RHDD.stored_files) - usbfiles.Add(list(list( - "name" = F.filename, - "type" = F.filetype, - "size" = F.size, - "undeletable" = F.undeletable - ))) - data["usbfiles"] = usbfiles + )) + data["usbfiles"] = usbfiles - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "file_manager.tmpl", "NTOS File Manager", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() \ No newline at end of file + return data diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index b4c0688c29..4d21095f9d 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -1,152 +1,188 @@ // This file is used as a reference for Modular Computers Development guide on the wiki. It contains a lot of excess comments, as it is intended as explanation // for someone who may not be as experienced in coding. When making changes, please try to keep it this way. -// An actual program definition. /datum/computer_file/program/game - filename = "arcadec" // File name, as shown in the file browser program. - filedesc = "Unknown Game" // User-Friendly name. In this case, we will generate a random name in constructor. - program_icon_state = "game" // Icon state of this program's screen. - program_menu_icon = "script" - extended_desc = "Fun for the whole family! Probably not an AAA title, but at least you can download it on the corporate network.." // A nice description. - size = 5 // Size in GQ. Integers only. Smaller sizes should be used for utility/low use programs (like this one), while large sizes are for important programs. - requires_ntnet = 0 // This particular program does not require NTNet network conectivity... - available_on_ntnet = 1 // ... but we want it to be available for download. - nanomodule_path = /datum/nano_module/arcade_classic/ // Path of relevant nano module. The nano module is defined further in the file. - var/picked_enemy_name + filename = "dsarcade" // File name, as shown in the file browser program. + filedesc = "Donksoft Micro Arcade" // User-Friendly name. + program_icon_state = "arcade" // Icon state of this program's screen. + extended_desc = "This is a port of the classic game 'Outbomb Cuban Pete', redesigned to run on tablets; Now with thrilling graphics and chilling storytelling." // A nice description. + size = 6 // Size in GQ. Integers only. Smaller sizes should be used for utility/low use programs (like this one), while large sizes are for important programs. + requires_ntnet = FALSE // This particular program does not require NTNet network conectivity... + available_on_ntnet = TRUE // ... but we want it to be available for download. + tgui_id = "NtosArcade" // Path of relevant tgui template.js file. -// Blatantly stolen and shortened version from arcade machines. Generates a random enemy name -/datum/computer_file/program/game/proc/random_enemy_name() - var/name_part1 = pick("the Automatic ", "Farmer ", "Lord ", "Professor ", "the Cuban ", "the Evil ", "the Dread King ", "the Space ", "Lord ", "the Great ", "Duke ", "General ") - var/name_part2 = pick("Melonoid", "Murdertron", "Sorcerer", "Ruin", "Jeff", "Ectoplasm", "Crushulon", "Uhangoid", "Vhakoid", "Peteoid", "Slime", "Lizard Man", "Unicorn") - return "[name_part1] [name_part2]" + ///Returns TRUE if the game is being played. + var/game_active = TRUE + ///This disables buttom actions from having any impact if TRUE. Resets to FALSE when the player is allowed to make an action again. + var/pause_state = FALSE + var/boss_hp = 45 + var/boss_mp = 15 + var/player_hp = 30 + var/player_mp = 10 + var/ticket_count = 0 + ///Shows what text is shown on the app, usually showing the log of combat actions taken by the player. + var/heads_up = "Nanotrasen says, winners make us money." + var/boss_name = "Cuban Pete's Minion" + ///Determines which boss image to use on the UI. + var/boss_id = 1 -// When the program is first created, we generate a new enemy name and name ourselves accordingly. -/datum/computer_file/program/game/New() - ..() - picked_enemy_name = random_enemy_name() - filedesc = "Defeat [picked_enemy_name]" +// This is the primary game loop, which handles the logic of being defeated or winning. +/datum/computer_file/program/game/proc/game_check(mob/user) + sleep(5) + if(boss_hp <= 0) + heads_up = "You have crushed [boss_name]! Rejoice!" + playsound(computer.loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3, falloff = 10) + game_active = FALSE + program_icon_state = "arcade_off" + if(istype(computer)) + computer.update_icon() + ticket_count += 1 + // user?.mind?.adjust_experience(/datum/skill/gaming, 50) + sleep(10) + else if(player_hp <= 0 || player_mp <= 0) + heads_up = "You have been defeated... how will the station survive?" + playsound(computer.loc, 'sound/arcade/lose.ogg', 50, TRUE, extrarange = -3, falloff = 10) + game_active = FALSE + program_icon_state = "arcade_off" + if(istype(computer)) + computer.update_icon() + // user?.mind?.adjust_experience(/datum/skill/gaming, 10) + sleep(10) -// Important in order to ensure that copied versions will have the same enemy name. -/datum/computer_file/program/game/clone() - var/datum/computer_file/program/game/G = ..() - G.picked_enemy_name = picked_enemy_name - return G - -// When running the program, we also want to pass our enemy name to the nano module. -/datum/computer_file/program/game/run_program() - . = ..() - if(. && NM) - var/datum/nano_module/arcade_classic/NMC = NM - NMC.enemy_name = picked_enemy_name - - -// Nano module the program uses. -// This can be either /datum/nano_module/ or /datum/nano_module/program. The latter is intended for nano modules that are suposed to be exclusively used with modular computers, -// and should generally not be used, as such nano modules are hard to use on other places. -/datum/nano_module/arcade_classic/ - name = "Classic Arcade" - var/player_mana // Various variables specific to the nano module. In this case, the nano module is a simple arcade game, so the variables store health and other stats. - var/player_health - var/enemy_mana - var/enemy_health - var/enemy_name = "Greytide Horde" - var/gameover - var/information - -/datum/nano_module/arcade_classic/New() - ..() - new_game() - -// ui_interact handles transfer of data to NanoUI. Keep in mind that data you pass from here is actually sent to the client. In other words, don't send anything you don't want a client -// to see, and don't send unnecessarily large amounts of data (due to laginess). -/datum/nano_module/arcade_classic/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - var/list/data = host.initial_data() - - data["player_health"] = player_health - data["player_mana"] = player_mana - data["enemy_health"] = enemy_health - data["enemy_mana"] = enemy_mana - data["enemy_name"] = enemy_name - data["gameover"] = gameover - data["information"] = information - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "arcade_classic.tmpl", "Defeat [enemy_name]", 500, 350, state = state) - if(host.update_layout()) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - -// Three helper procs i've created. These are unique to this particular nano module. If you are creating your own nano module, you'll most likely create similar procs too. -/datum/nano_module/arcade_classic/proc/enemy_play() - if((enemy_mana < 5) && prob(60)) - var/steal = rand(2, 3) - player_mana -= steal - enemy_mana += steal - information += "[enemy_name] steals [steal] of your power!" - else if((enemy_health < 15) && (enemy_mana > 3) && prob(80)) - var/healamt = min(rand(3, 5), enemy_mana) - enemy_mana -= healamt - enemy_health += healamt - information += "[enemy_name] heals for [healamt] health!" +// This handles the boss "AI". +/datum/computer_file/program/game/proc/enemy_check(mob/user) + var/boss_attackamt = 0 //Spam protection from boss attacks as well. + var/boss_mpamt = 0 + var/bossheal = 0 + if(pause_state == TRUE) + boss_attackamt = rand(3,6) + boss_mpamt = rand (2,4) + bossheal = rand (4,6) + if(game_active == FALSE) + return + if(boss_mp <= 5) + heads_up = "[boss_mpamt] magic power has been stolen from you!" + playsound(computer.loc, 'sound/arcade/steal.ogg', 50, TRUE, extrarange = -3, falloff = 10) + player_mp -= boss_mpamt + boss_mp += boss_mpamt + else if(boss_mp > 5 && boss_hp <12) + heads_up = "[boss_name] heals for [bossheal] health!" + playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10) + boss_hp += bossheal + boss_mp -= boss_mpamt else - var/dam = rand(3,6) - player_health -= dam - information += "[enemy_name] attacks for [dam] damage!" + heads_up = "[boss_name] attacks you for [boss_attackamt] damage!" + playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10) + player_hp -= boss_attackamt -/datum/nano_module/arcade_classic/proc/check_gameover() - if((player_health <= 0) || player_mana <= 0) - if(enemy_health <= 0) - information += "You have defeated [enemy_name], but you have died in the fight!" - else - information += "You have been defeated by [enemy_name]!" - gameover = 1 + pause_state = FALSE + game_check() + +/** + * UI assets define a list of asset datums to be sent with the UI. + * In this case, it's a bunch of cute enemy sprites. + */ +/datum/computer_file/program/game/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/simple/arcade), + ) + +/** + * This provides all of the relevant data to the UI in a list(). + */ +/datum/computer_file/program/game/tgui_data(mob/user) + var/list/data = get_header_data() + data["Hitpoints"] = boss_hp + data["PlayerHitpoints"] = player_hp + data["PlayerMP"] = player_mp + data["TicketCount"] = ticket_count + data["GameActive"] = game_active + data["PauseState"] = pause_state + data["Status"] = heads_up + data["BossID"] = "boss[boss_id].gif" + return data + +/** + * This is tgui's replacement for Topic(). It handles any user input from the UI. + */ +/datum/computer_file/program/game/tgui_act(action, list/params) + if(..()) // Always call parent in tgui_act, it handles making sure the user is allowed to interact with the UI. return TRUE - else if(enemy_health <= 0) - gameover = 1 - information += "Congratulations! You have defeated [enemy_name]!" - return TRUE - return FALSE -/datum/nano_module/arcade_classic/proc/new_game() - player_mana = 10 - player_health = 30 - enemy_mana = 20 - enemy_health = 45 - gameover = FALSE - information = "A new game has started!" + var/obj/item/weapon/computer_hardware/nano_printer/printer + if(computer) + printer = computer.nano_printer - - -/datum/nano_module/arcade_classic/Topic(href, href_list) - if(..()) // Always begin your Topic() calls with a parent call! - return 1 - if(href_list["new_game"]) - new_game() - return 1 // Returning 1 (TRUE) in Topic automatically handles UI updates. - if(gameover) // If the game has already ended, we don't want the following three topic calls to be processed at all. - return 1 // Instead of adding checks into each of those three, we can easily add this one check here to reduce on code copy-paste. - if(href_list["attack"]) - var/damage = rand(2, 6) - information = "You attack for [damage] damage." - enemy_health -= damage - enemy_play() - check_gameover() - return 1 - if(href_list["heal"]) - var/healfor = rand(6, 8) - var/cost = rand(1, 3) - information = "You heal yourself for [healfor] damage, using [cost] energy in the process." - player_health += healfor - player_mana -= cost - enemy_play() - check_gameover() - return 1 - if(href_list["regain_mana"]) - var/regen = rand(4, 7) - information = "You rest of a while, regaining [regen] energy." - player_mana += regen - enemy_play() - check_gameover() - return 1 \ No newline at end of file + // var/gamerSkillLevel = usr.mind?.get_skill_level(/datum/skill/gaming) + // var/gamerSkill = usr.mind?.get_skill_modifier(/datum/skill/gaming, SKILL_RANDS_MODIFIER) + switch(action) + if("Attack") + var/attackamt = 0 //Spam prevention. + if(pause_state == FALSE) + attackamt = rand(2,6) // + rand(0, gamerSkill) + pause_state = TRUE + heads_up = "You attack for [attackamt] damage." + playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10) + boss_hp -= attackamt + sleep(10) + game_check() + enemy_check() + return TRUE + if("Heal") + var/healamt = 0 //More Spam Prevention. + var/healcost = 0 + if(pause_state == FALSE) + healamt = rand(6,8) // + rand(0, gamerSkill) + var/maxPointCost = 3 + // if(gamerSkillLevel >= SKILL_LEVEL_JOURNEYMAN) + // maxPointCost = 2 + healcost = rand(1, maxPointCost) + pause_state = TRUE + heads_up = "You heal for [healamt] damage." + playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10) + player_hp += healamt + player_mp -= healcost + sleep(10) + game_check() + enemy_check() + return TRUE + if("Recharge_Power") + var/rechargeamt = 0 //As above. + if(pause_state == FALSE) + rechargeamt = rand(4,7) // + rand(0, gamerSkill) + pause_state = TRUE + heads_up = "You regain [rechargeamt] magic power." + playsound(computer.loc, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3, falloff = 10) + player_mp += rechargeamt + sleep(10) + game_check() + enemy_check() + return TRUE + if("Dispense_Tickets") + if(!printer) + to_chat(usr, "Hardware error: A printer is required to redeem tickets.") + return + if(printer.stored_paper <= 0) + to_chat(usr, "Hardware error: Printer is out of paper.") + return + else + computer.visible_message("\The [computer] prints out paper.") + if(ticket_count >= 1) + new /obj/item/stack/arcadeticket((get_turf(computer)), 1) + to_chat(usr, "[src] dispenses a ticket!") + ticket_count -= 1 + printer.stored_paper -= 1 + else + to_chat(usr, "You don't have any stored tickets!") + return TRUE + if("Start_Game") + game_active = TRUE + boss_hp = 45 + player_hp = 30 + player_mp = 10 + heads_up = "You stand before [boss_name]! Prepare for battle!" + program_icon_state = "arcade" + boss_id = rand(1,6) + pause_state = FALSE + if(istype(computer)) + computer.update_icon() diff --git a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm index 1d4da6d4d5..e72e30fd38 100644 --- a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm @@ -6,16 +6,17 @@ program_key_state = "generic_key" program_menu_icon = "contact" size = 4 - requires_ntnet = 1 - available_on_ntnet = 1 + requires_ntnet = TRUE + available_on_ntnet = TRUE + + tgui_id = "NtosNewsBrowser" - nanomodule_path = /datum/nano_module/program/computer_newsbrowser/ var/datum/computer_file/data/news_article/loaded_article var/download_progress = 0 var/download_netspeed = 0 - var/downloading = 0 + var/downloading = FALSE var/message = "" - var/show_archived = 0 + var/show_archived = FALSE /datum/computer_file/program/newsbrowser/process_tick() if(!downloading) @@ -33,86 +34,31 @@ if(download_progress >= loaded_article.size) downloading = 0 requires_ntnet = 0 // Turn off NTNet requirement as we already loaded the file into local memory. - SSnanoui.update_uis(NM) + SStgui.update_uis(src) -/datum/computer_file/program/newsbrowser/kill_program() - ..() - requires_ntnet = 1 - loaded_article = null - download_progress = 0 - downloading = 0 - show_archived = 0 +/datum/computer_file/program/newsbrowser/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = get_header_data() -/datum/computer_file/program/newsbrowser/Topic(href, href_list) - if(..()) - return 1 - if(href_list["PRG_openarticle"]) - . = 1 - if(downloading || loaded_article) - return 1 - - for(var/datum/computer_file/data/news_article/N in ntnet_global.available_news) - if(N.uid == text2num(href_list["PRG_openarticle"])) - loaded_article = N.clone() - downloading = 1 - break - if(href_list["PRG_reset"]) - . = 1 - downloading = 0 - download_progress = 0 - requires_ntnet = 1 - loaded_article = null - if(href_list["PRG_clearmessage"]) - . = 1 - message = "" - if(href_list["PRG_savearticle"]) - . = 1 - if(downloading || !loaded_article) - return - - var/savename = sanitize(input(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename)) - if(!savename) - return 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/data/news_article/N = loaded_article.clone() - N.filename = savename - HDD.store_file(N) - if(href_list["PRG_toggle_archived"]) - . = 1 - show_archived = !show_archived - if(.) - SSnanoui.update_uis(NM) - - -/datum/nano_module/program/computer_newsbrowser - name = "NTNet/ExoNet News Browser" - -/datum/nano_module/program/computer_newsbrowser/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - - var/datum/computer_file/program/newsbrowser/PRG - var/list/data = list() - if(program) - data = program.get_header_data() - PRG = program - else - return - - data["message"] = PRG.message - if(PRG.loaded_article && !PRG.downloading) // Viewing an article. - data["title"] = PRG.loaded_article.filename - data["cover"] = PRG.loaded_article.cover - data["article"] = PRG.loaded_article.stored_data - else if(PRG.downloading) // Downloading an article. - data["download_running"] = 1 - data["download_progress"] = PRG.download_progress - data["download_maxprogress"] = PRG.loaded_article.size - data["download_rate"] = PRG.download_netspeed + var/list/all_articles = list() + data["message"] = message + data["showing_archived"] = show_archived + data["download"] = null + data["article"] = null + if(loaded_article && !downloading) // Viewing an article. + data["article"] = list( + "title" = loaded_article.filename, + "cover" = loaded_article.cover, + "content" = loaded_article.stored_data, + ) + else if(downloading) // Downloading an article. + data["download"] = list( + "download_progress" = download_progress, + "download_maxprogress" = loaded_article.size, + "download_rate" = download_netspeed + ) else // Viewing list of articles - var/list/all_articles[0] for(var/datum/computer_file/data/news_article/F in ntnet_global.available_news) - if(!PRG.show_archived && F.archived) + if(!show_archived && F.archived) continue all_articles.Add(list(list( "name" = F.filename, @@ -120,12 +66,56 @@ "uid" = F.uid, "archived" = F.archived ))) - data["all_articles"] = all_articles - data["showing_archived"] = PRG.show_archived + data["all_articles"] = all_articles + + return data + +/datum/computer_file/program/newsbrowser/kill_program() + ..() + requires_ntnet = TRUE + loaded_article = null + download_progress = 0 + downloading = FALSE + show_archived = FALSE + +/datum/computer_file/program/newsbrowser/tgui_act(action, list/params, datum/tgui/ui) + if(..()) + return TRUE + switch(action) + if("PRG_openarticle") + . = TRUE + if(downloading || loaded_article) + return TRUE + + for(var/datum/computer_file/data/news_article/N in ntnet_global.available_news) + if(N.uid == text2num(params["uid"])) + loaded_article = N.clone() + downloading = 1 + break + if("PRG_reset") + . = TRUE + downloading = 0 + download_progress = 0 + requires_ntnet = 1 + loaded_article = null + if("PRG_clearmessage") + . = TRUE + message = "" + if("PRG_savearticle") + . = TRUE + if(downloading || !loaded_article) + return + + var/savename = sanitize(input(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename)) + if(!savename) + return TRUE + var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + if(!HDD) + return TRUE + var/datum/computer_file/data/news_article/N = loaded_article.clone() + N.filename = savename + HDD.store_file(N) + if("PRG_toggle_archived") + . = TRUE + show_archived = !show_archived - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "news_browser.tmpl", "NTNet/ExoNet News Browser", 575, 750, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() diff --git a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm index a0b2194168..14e2343e66 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm @@ -5,29 +5,26 @@ program_key_state = "generic_key" program_menu_icon = "arrowthickstop-1-s" extended_desc = "This program allows downloads of software from official NT repositories" - unsendable = 1 - undeletable = 1 + unsendable = TRUE + undeletable = TRUE size = 4 - requires_ntnet = 1 + requires_ntnet = TRUE requires_ntnet_feature = NTNET_SOFTWAREDOWNLOAD - available_on_ntnet = 0 - nanomodule_path = /datum/nano_module/program/computer_ntnetdownload/ + available_on_ntnet = FALSE ui_header = "downloader_finished.gif" + tgui_id = "NtosNetDownloader" + var/datum/computer_file/program/downloaded_file = null var/hacked_download = 0 var/download_completion = 0 //GQ of downloaded data. var/download_netspeed = 0 var/downloaderror = "" + var/obj/item/modular_computer/my_computer = null var/list/downloads_queue[0] /datum/computer_file/program/ntnetdownload/kill_program() ..() - downloaded_file = null - download_completion = 0 - download_netspeed = 0 - downloaderror = "" - ui_header = "downloader_finished.gif" - + abort_file_download() /datum/computer_file/program/ntnetdownload/proc/begin_file_download(var/filename) if(downloaded_file) @@ -108,93 +105,85 @@ download_netspeed = NTNETSPEED_ETHERNET download_completion += download_netspeed -/datum/computer_file/program/ntnetdownload/Topic(href, href_list) +/datum/computer_file/program/ntnetdownload/tgui_act(action, params) if(..()) - return 1 - if(href_list["PRG_downloadfile"]) - if(!downloaded_file) - begin_file_download(href_list["PRG_downloadfile"]) - else if(check_file_download(href_list["PRG_downloadfile"]) && !downloads_queue.Find(href_list["PRG_downloadfile"]) && downloaded_file.filename != href_list["PRG_downloadfile"]) - downloads_queue += href_list["PRG_downloadfile"] - return 1 - if(href_list["PRG_removequeued"]) - downloads_queue.Remove(href_list["PRG_removequeued"]) - return 1 - if(href_list["PRG_reseterror"]) - if(downloaderror) - download_completion = 0 - download_netspeed = 0 - downloaded_file = null - downloaderror = "" - return 1 - return 0 - -/datum/nano_module/program/computer_ntnetdownload - name = "Network Downloader" - var/obj/item/modular_computer/my_computer = null - -/datum/nano_module/program/computer_ntnetdownload/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - if(program) - my_computer = program.computer + return TRUE + switch(action) + if("PRG_downloadfile") + if(!downloaded_file) + begin_file_download(params["filename"]) + else if(check_file_download(params["filename"]) && !downloads_queue.Find(params["filename"]) && downloaded_file.filename != params["filename"]) + downloads_queue += params["filename"] + return TRUE + if("PRG_removequeued") + downloads_queue.Remove(params["filename"]) + return TRUE + if("PRG_reseterror") + if(downloaderror) + download_completion = 0 + download_netspeed = 0 + downloaded_file = null + downloaderror = "" + return TRUE + return FALSE +/datum/computer_file/program/ntnetdownload/tgui_data(mob/user) + my_computer = computer if(!istype(my_computer)) return - var/list/data = list() - var/datum/computer_file/program/ntnetdownload/prog = program - // For now limited to execution by the downloader program - if(!prog || !istype(prog)) - return - if(program) - data = program.get_header_data() + var/list/data = get_header_data() - // This IF cuts on data transferred to client, so i guess it's worth it. - if(prog.downloaderror) // Download errored. Wait until user resets the program. - data["error"] = prog.downloaderror - if(prog.downloaded_file) // Download running. Wait please.. - data["downloadname"] = prog.downloaded_file.filename - data["downloaddesc"] = prog.downloaded_file.filedesc - data["downloadsize"] = prog.downloaded_file.size - data["downloadspeed"] = prog.download_netspeed - data["downloadcompletion"] = round(prog.download_completion, 0.1) + data["downloading"] = !!downloaded_file + data["error"] = downloaderror || FALSE + + if(downloaded_file) // Download running. Wait please.. + data["downloadname"] = downloaded_file.filename + data["downloaddesc"] = downloaded_file.filedesc + data["downloadsize"] = downloaded_file.size + data["downloadspeed"] = download_netspeed + data["downloadcompletion"] = round(download_completion, 0.1) data["disk_size"] = my_computer.hard_drive.max_capacity data["disk_used"] = my_computer.hard_drive.used_capacity var/list/all_entries[0] for(var/datum/computer_file/program/P in ntnet_global.available_station_software) // Only those programs our user can run will show in the list - if(!P.can_run(user) && P.requires_access_to_download) + if(!P.can_run(user) && P.requires_access_to_download || my_computer.hard_drive.find_file_by_name(P.filename)) continue all_entries.Add(list(list( - "filename" = P.filename, - "filedesc" = P.filedesc, - "fileinfo" = P.extended_desc, - "size" = P.size, - "icon" = P.program_menu_icon - ))) - data["hackedavailable"] = 0 - if(prog.computer_emagged) // If we are running on emagged computer we have access to some "bonus" software - var/list/hacked_programs[0] - for(var/datum/computer_file/program/P in ntnet_global.available_antag_software) - data["hackedavailable"] = 1 - hacked_programs.Add(list(list( "filename" = P.filename, "filedesc" = P.filedesc, "fileinfo" = P.extended_desc, + "compatibility" = check_compatibility(P), "size" = P.size, "icon" = P.program_menu_icon + ))) + data["hackedavailable"] = FALSE + if(computer_emagged) // If we are running on emagged computer we have access to some "bonus" software + var/list/hacked_programs[0] + for(var/datum/computer_file/program/P in ntnet_global.available_antag_software) + if(my_computer.hard_drive.find_file_by_name(P.filename)) + continue + data["hackedavailable"] = TRUE + hacked_programs.Add(list(list( + "filename" = P.filename, + "filedesc" = P.filedesc, + "fileinfo" = P.extended_desc, + "compatibility" = check_compatibility(P), + "size" = P.size, + "icon" = P.program_menu_icon ))) data["hacked_programs"] = hacked_programs data["downloadable_programs"] = all_entries + data["downloads_queue"] = downloads_queue - if(prog.downloads_queue.len > 0) - data["downloads_queue"] = prog.downloads_queue + return data - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "ntnet_downloader.tmpl", "NTNet Download Program", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) +/datum/computer_file/program/ntnetdownload/proc/check_compatibility(datum/computer_file/program/P) + var/hardflag = computer.hardware_flag + + if(P && P.is_supported_by_hardware(hardflag,0)) + return "Compatible" + return "Incompatible!" diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm index 6c67c02c0d..f2466213f3 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -11,222 +11,220 @@ network_destination = "NTNRC server" ui_header = "ntnrc_idle.gif" available_on_ntnet = 1 - nanomodule_path = /datum/nano_module/program/computer_chatclient/ - var/last_message = null // Used to generate the toolbar icon + tgui_id = "NtosNetChat" + var/last_message // Used to generate the toolbar icon var/username - var/datum/ntnet_conversation/channel = null - var/operator_mode = 0 // Channel operator mode - var/netadmin_mode = 0 // Administrator mode (invisible to other users + bypasses passwords) + var/active_channel + var/list/channel_history = list() + var/operator_mode = FALSE // Channel operator mode + var/netadmin_mode = FALSE // Administrator mode (invisible to other users + bypasses passwords) /datum/computer_file/program/chatclient/New() username = "DefaultUser[rand(100, 999)]" -/datum/computer_file/program/chatclient/Topic(href, href_list) +/datum/computer_file/program/chatclient/tgui_act(action, params) if(..()) - return 1 + return - if(href_list["PRG_speak"]) - . = 1 - if(!channel) - return 1 - var/mob/living/user = usr - var/message = sanitize(input(user, "Enter message or leave blank to cancel: "), 512) - if(!message || !channel) - return - channel.add_message(message, username) + var/datum/ntnet_conversation/channel = ntnet_global.get_chat_channel_by_id(active_channel) + var/authed = FALSE + if(channel && ((channel.operator == src) || netadmin_mode)) + authed = TRUE + switch(action) + if("PRG_speak") + if(!channel || isnull(active_channel)) + return + var/message = reject_bad_text(params["message"]) + if(!message) + return + if(channel.password && !(src in channel.clients)) + if(channel.password == message) + channel.add_client(src) + return TRUE - if(href_list["PRG_joinchannel"]) - . = 1 - var/datum/ntnet_conversation/C - for(var/datum/ntnet_conversation/chan in ntnet_global.chat_channels) - if(chan.id == text2num(href_list["PRG_joinchannel"])) - C = chan - break + channel.add_message(message, username) + // var/mob/living/user = usr + // user.log_talk(message, LOG_CHAT, tag="as [username] to channel [channel.title]") + return TRUE + if("PRG_joinchannel") + var/new_target = text2num(params["id"]) + if(isnull(new_target) || new_target == active_channel) + return - if(!C) - return 1 + if(netadmin_mode) + active_channel = new_target // Bypasses normal leave/join and passwords. Technically makes the user invisible to others. + return TRUE - if(netadmin_mode) - channel = C // Bypasses normal leave/join and passwords. Technically makes the user invisible to others. - return 1 - - if(C.password) + active_channel = new_target + channel = ntnet_global.get_chat_channel_by_id(new_target) + if(!(src in channel.clients) && !channel.password) + channel.add_client(src) + return TRUE + if("PRG_leavechannel") + if(channel) + channel.remove_client(src) + active_channel = null + return TRUE + if("PRG_newchannel") + var/channel_title = reject_bad_text(params["new_channel_name"]) + if(!channel_title) + return + var/datum/ntnet_conversation/C = new /datum/ntnet_conversation() + C.add_client(src) + C.operator = src + C.title = channel_title + active_channel = C.id + return TRUE + if("PRG_toggleadmin") + if(netadmin_mode) + netadmin_mode = FALSE + if(channel) + channel.remove_client(src) // We shouldn't be in channel's user list, but just in case... + return TRUE var/mob/living/user = usr - var/password = sanitize(input(user,"Access Denied. Enter password:")) - if(C && (password == C.password)) - C.add_client(src) - channel = C - return 1 - C.add_client(src) - channel = C - if(href_list["PRG_leavechannel"]) - . = 1 - if(channel) - channel.remove_client(src) - channel = null - if(href_list["PRG_newchannel"]) - . = 1 - var/mob/living/user = usr - var/channel_title = sanitizeSafe(input(user,"Enter channel name or leave blank to cancel:"), 64) - if(!channel_title) - return - var/datum/ntnet_conversation/C = new/datum/ntnet_conversation() - C.add_client(src) - C.operator = src - channel = C - C.title = channel_title - if(href_list["PRG_toggleadmin"]) - . = 1 - if(netadmin_mode) - netadmin_mode = 0 - if(channel) - channel.remove_client(src) // We shouldn't be in channel's user list, but just in case... - channel = null - return 1 - var/mob/living/user = usr - if(can_run(usr, 1, access_network)) - if(channel) - var/response = alert(user, "Really engage admin-mode? You will be disconnected from your current channel!", "NTNRC Admin mode", "Yes", "No") - if(response == "Yes") - if(channel) - channel.remove_client(src) - channel = null - else - return - netadmin_mode = 1 - if(href_list["PRG_changename"]) - . = 1 - var/mob/living/user = usr - var/newname = sanitize(input(user,"Enter new nickname or leave blank to cancel:"), 20) - if(!newname) - return 1 - if(channel) - channel.add_status_message("[username] is now known as [newname].") - username = newname + if(can_run(user, TRUE, access_network)) + for(var/C in ntnet_global.chat_channels) + var/datum/ntnet_conversation/chan = C + chan.remove_client(src) + netadmin_mode = TRUE + return TRUE + if("PRG_changename") + var/newname = sanitize(params["new_name"]) + if(!newname) + return + for(var/C in ntnet_global.chat_channels) + var/datum/ntnet_conversation/chan = C + if(src in chan.clients) + chan.add_status_message("[username] is now known as [newname].") + username = newname + return TRUE + if("PRG_savelog") + if(!channel) + return + var/logname = stripped_input(params["log_name"]) + if(!logname) + return + var/datum/computer_file/data/logfile = new /datum/computer_file/data/logfile() + // Now we will generate HTML-compliant file that can actually be viewed/printed. + logfile.filename = logname + logfile.stored_data = "\[b\]Logfile dump from NTNRC channel [channel.title]\[/b\]\[BR\]" + for(var/logstring in channel.messages) + logfile.stored_data = "[logfile.stored_data][logstring]\[BR\]" + logfile.stored_data = "[logfile.stored_data]\[b\]Logfile dump completed.\[/b\]" + logfile.calculate_size() + if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(logfile)) + if(!computer) + // This program shouldn't even be runnable without computer. + CRASH("Var computer is null!") + if(!computer.hard_drive) + computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.") + else // In 99.9% cases this will mean our HDD is full + computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.") + return TRUE + if("PRG_renamechannel") + if(!authed) + return + var/newname = reject_bad_text(params["new_name"]) + if(!newname || !channel) + return + channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.") + channel.title = newname + return TRUE + if("PRG_deletechannel") + if(authed) + qdel(channel) + active_channel = null + return TRUE + if("PRG_setpassword") + if(!authed) + return - if(href_list["PRG_savelog"]) - . = 1 - if(!channel) - return - var/mob/living/user = usr - var/logname = input(user,"Enter desired logfile name (.log) or leave blank to cancel:") - if(!logname || !channel) - return 1 - var/datum/computer_file/data/logfile = new/datum/computer_file/data/logfile() - // Now we will generate HTML-compliant file that can actually be viewed/printed. - logfile.filename = logname - logfile.stored_data = "\[b\]Logfile dump from NTNRC channel [channel.title]\[/b\]\[BR\]" - for(var/logstring in channel.messages) - logfile.stored_data += "[logstring]\[BR\]" - logfile.stored_data += "\[b\]Logfile dump completed.\[/b\]" - logfile.calculate_size() - if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(logfile)) - if(!computer) - // This program shouldn't even be runnable without computer. - CRASH("Var computer is null!") - return 1 - if(!computer.hard_drive) - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.") - else // In 99.9% cases this will mean our HDD is full - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.") - if(href_list["PRG_renamechannel"]) - . = 1 - if(!operator_mode || !channel) - return 1 - var/mob/living/user = usr - var/newname = sanitize(input(user, "Enter new channel name or leave blank to cancel:"), 64) - if(!newname || !channel) - return - channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.") - channel.title = newname - if(href_list["PRG_deletechannel"]) - . = 1 - if(channel && ((channel.operator == src) || netadmin_mode)) - qdel(channel) - channel = null - if(href_list["PRG_setpassword"]) - . = 1 - if(!channel || ((channel.operator != src) && !netadmin_mode)) - return 1 + var/new_password = sanitize(params["new_password"]) + if(!authed) + return - var/mob/living/user = usr - var/newpassword = sanitize(input(user, "Enter new password for this channel. Leave blank to cancel, enter 'nopassword' to remove password completely:")) - if(!channel || !newpassword || ((channel.operator != src) && !netadmin_mode)) - return 1 - - if(newpassword == "nopassword") - channel.password = "" - else - channel.password = newpassword + channel.password = new_password + return TRUE /datum/computer_file/program/chatclient/process_tick() ..() + var/datum/ntnet_conversation/channel = ntnet_global.get_chat_channel_by_id(active_channel) if(program_state != PROGRAM_STATE_KILLED) ui_header = "ntnrc_idle.gif" if(channel) // Remember the last message. If there is no message in the channel remember null. - last_message = channel.messages.len ? channel.messages[channel.messages.len - 1] : null + last_message = length(channel.messages) ? channel.messages[channel.messages.len - 1] : null else last_message = null return 1 - if(channel && channel.messages && channel.messages.len) + if(channel?.messages?.len) ui_header = last_message == channel.messages[channel.messages.len - 1] ? "ntnrc_idle.gif" : "ntnrc_new.gif" else ui_header = "ntnrc_idle.gif" -/datum/computer_file/program/chatclient/kill_program(var/forced = 0) - if(channel) +/datum/computer_file/program/chatclient/kill_program(forced = FALSE) + for(var/C in ntnet_global.chat_channels) + var/datum/ntnet_conversation/channel = C channel.remove_client(src) - channel = null - ..(forced) - -/datum/nano_module/program/computer_chatclient - name = "NTNet Relay Chat Client" - -/datum/nano_module/program/computer_chatclient/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - if(!ntnet_global || !ntnet_global.chat_channels) - return + ..() +/datum/computer_file/program/chatclient/tgui_static_data(mob/user) var/list/data = list() - if(program) - data = program.get_header_data() + data["can_admin"] = can_run(user, FALSE, access_network) + return data + +/datum/computer_file/program/chatclient/tgui_data(mob/user) + if(!ntnet_global || !ntnet_global.chat_channels) + return list() - var/datum/computer_file/program/chatclient/C = program - if(!istype(C)) - return + var/list/data = get_header_data() - data["adminmode"] = C.netadmin_mode - if(C.channel) - data["title"] = C.channel.title - var/list/messages[0] - for(var/M in C.channel.messages) - messages.Add(list(list( - "msg" = M + var/list/all_channels = list() + for(var/C in ntnet_global.chat_channels) + var/datum/ntnet_conversation/conv = C + if(conv && conv.title) + all_channels.Add(list(list( + "chan" = conv.title, + "id" = conv.id ))) - data["messages"] = messages - var/list/clients[0] - for(var/datum/computer_file/program/chatclient/cl in C.channel.clients) + data["all_channels"] = all_channels + + data["active_channel"] = active_channel + data["username"] = username + data["adminmode"] = netadmin_mode + var/datum/ntnet_conversation/channel = ntnet_global.get_chat_channel_by_id(active_channel) + if(channel) + data["title"] = channel.title + var/authed = FALSE + if(!channel.password) + authed = TRUE + if(netadmin_mode) + authed = TRUE + var/list/clients = list() + for(var/C in channel.clients) + if(C == src) + authed = TRUE + var/datum/computer_file/program/chatclient/cl = C clients.Add(list(list( "name" = cl.username ))) - data["clients"] = clients - C.operator_mode = (C.channel.operator == C) ? 1 : 0 - data["is_operator"] = C.operator_mode || C.netadmin_mode - - else // Channel selection screen - var/list/all_channels[0] - for(var/datum/ntnet_conversation/conv in ntnet_global.chat_channels) - if(conv && conv.title) - all_channels.Add(list(list( - "chan" = conv.title, - "id" = conv.id + data["authed"] = authed + //no fishing for ui data allowed + if(authed) + data["clients"] = clients + var/list/messages = list() + for(var/M in channel.messages) + messages.Add(list(list( + "msg" = M ))) - data["all_channels"] = all_channels + data["messages"] = messages + data["is_operator"] = (channel.operator == src) || netadmin_mode + else + data["clients"] = list() + data["messages"] = list() + else + data["clients"] = list() + data["authed"] = FALSE + data["messages"] = list() - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "ntnet_chat.tmpl", "NTNet Relay Chat Client", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm index 0efed986ae..ea88d3597e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm +++ b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm @@ -12,7 +12,7 @@ var/global/nttransfer_uid = 0 requires_ntnet_feature = NTNET_PEERTOPEER network_destination = "other device via P2P tunnel" available_on_ntnet = 1 - nanomodule_path = /datum/nano_module/program/computer_nttransfer/ + tgui_id = "NtosNetTransfer" var/error = "" // Error screen var/server_password = "" // Optional password to download the file. @@ -75,111 +75,101 @@ var/global/nttransfer_uid = 0 remote = null download_completion = 0 +/datum/computer_file/program/nttransfer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = get_header_data() -/datum/nano_module/program/computer_nttransfer - name = "NTNet P2P Transfer Client" + data["error"] = error -/datum/nano_module/program/computer_nttransfer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - if(!program) - return - var/datum/computer_file/program/nttransfer/PRG = program - if(!istype(PRG)) - return - - var/list/data = program.get_header_data() - - if(PRG.error) - data["error"] = PRG.error - else if(PRG.downloaded_file) - data["downloading"] = 1 - data["download_size"] = PRG.downloaded_file.size - data["download_progress"] = PRG.download_completion - data["download_netspeed"] = PRG.actual_netspeed - data["download_name"] = "[PRG.downloaded_file.filename].[PRG.downloaded_file.filetype]" - else if (PRG.provided_file) - data["uploading"] = 1 - data["upload_uid"] = PRG.unique_token - data["upload_clients"] = PRG.connected_clients.len - data["upload_haspassword"] = PRG.server_password ? 1 : 0 - data["upload_filename"] = "[PRG.provided_file.filename].[PRG.provided_file.filetype]" - else if (PRG.upload_menu) - var/list/all_files[0] - for(var/datum/computer_file/F in PRG.computer.hard_drive.stored_files) + data["downloading"] = !!downloaded_file + if(downloaded_file) + data["download_size"] = downloaded_file.size + data["download_progress"] = download_completion + data["download_netspeed"] = actual_netspeed + data["download_name"] = "[downloaded_file.filename].[downloaded_file.filetype]" + + data["uploading"] = !!provided_file + if(provided_file) + data["upload_uid"] = unique_token + data["upload_clients"] = connected_clients.len + data["upload_haspassword"] = server_password ? 1 : 0 + data["upload_filename"] = "[provided_file.filename].[provided_file.filetype]" + + data["upload_filelist"] = list() + if(upload_menu) + var/list/all_files = list() + for(var/datum/computer_file/F in computer.hard_drive.stored_files) all_files.Add(list(list( "uid" = F.uid, "filename" = "[F.filename].[F.filetype]", "size" = F.size ))) data["upload_filelist"] = all_files - else - var/list/all_servers[0] + + data["servers"] = list() + if(!(downloaded_file || provided_file || upload_menu)) + var/list/all_servers = list() for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers) if(!P.provided_file) continue all_servers.Add(list(list( - "uid" = P.unique_token, - "filename" = "[P.provided_file.filename].[P.provided_file.filetype]", - "size" = P.provided_file.size, - "haspassword" = P.server_password ? 1 : 0 + "uid" = P.unique_token, + "filename" = "[P.provided_file.filename].[P.provided_file.filetype]", + "size" = P.provided_file.size, + "haspassword" = P.server_password ? 1 : 0 ))) data["servers"] = all_servers - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "ntnet_transfer.tmpl", "NTNet P2P Transfer Client", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data -/datum/computer_file/program/nttransfer/Topic(href, href_list) +/datum/computer_file/program/nttransfer/tgui_act(action, list/params, datum/tgui/ui) if(..()) - return 1 - if(href_list["PRG_downloadfile"]) - for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers) - if("[P.unique_token]" == href_list["PRG_downloadfile"]) - remote = P - break - if(!remote || !remote.provided_file) - return - if(remote.server_password) - var/pass = sanitize(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required")) - if(pass != remote.server_password) - error = "Incorrect Password" + return TRUE + switch(action) + if("PRG_downloadfile") + for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers) + if(P.unique_token == text2num(params["uid"])) + remote = P + break + if(!remote || !remote.provided_file) return - downloaded_file = remote.provided_file.clone() - remote.connected_clients.Add(src) - return 1 - if(href_list["PRG_reset"]) - error = "" - upload_menu = 0 - finalize_download() - if(src in ntnet_global.fileservers) - ntnet_global.fileservers.Remove(src) - for(var/datum/computer_file/program/nttransfer/T in connected_clients) - T.crash_download("Remote server has forcibly closed the connection") - provided_file = null - return 1 - if(href_list["PRG_setpassword"]) - var/pass = sanitize(input(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none")) - if(!pass) - return - if(pass == "none") - server_password = "" - return - server_password = pass - return 1 - if(href_list["PRG_uploadfile"]) - for(var/datum/computer_file/F in computer.hard_drive.stored_files) - if("[F.uid]" == href_list["PRG_uploadfile"]) - if(F.unsendable) - error = "I/O Error: File locked." + if(remote.server_password) + var/pass = sanitize(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required")) + if(pass != remote.server_password) + error = "Incorrect Password" return - provided_file = F - ntnet_global.fileservers.Add(src) + downloaded_file = remote.provided_file.clone() + remote.connected_clients.Add(src) + return TRUE + if("PRG_reset") + error = "" + upload_menu = 0 + finalize_download() + if(src in ntnet_global.fileservers) + ntnet_global.fileservers.Remove(src) + for(var/datum/computer_file/program/nttransfer/T in connected_clients) + T.crash_download("Remote server has forcibly closed the connection") + provided_file = null + return TRUE + if("PRG_setpassword") + var/pass = sanitize(input(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none")) + if(!pass) return - error = "I/O Error: Unable to locate file on hard drive." - return 1 - if(href_list["PRG_uploadmenu"]) - upload_menu = 1 - return 0 + if(pass == "none") + server_password = "" + return + server_password = pass + return TRUE + if("PRG_uploadfile") + for(var/datum/computer_file/F in computer.hard_drive.stored_files) + if(F.uid == text2num(params["uid"])) + if(F.unsendable) + error = "I/O Error: File locked." + return + provided_file = F + ntnet_global.fileservers |= src + return + error = "I/O Error: Unable to locate file on hard drive." + return TRUE + if("PRG_uploadmenu") + upload_menu = 1 + return TRUE diff --git a/code/modules/modular_computers/file_system/programs/generic/uav.dm b/code/modules/modular_computers/file_system/programs/generic/uav.dm index 0e98d0e0ea..24d677b679 100644 --- a/code/modules/modular_computers/file_system/programs/generic/uav.dm +++ b/code/modules/modular_computers/file_system/programs/generic/uav.dm @@ -4,7 +4,7 @@ /datum/computer_file/program/uav filename = "rigger" filedesc = "UAV Control" - nanomodule_path = /datum/nano_module/uav + tguimodule_path = /datum/tgui_module/uav program_icon_state = "comm_monitor" program_key_state = "generic_key" program_menu_icon = "link" @@ -12,255 +12,3 @@ size = 12 available_on_ntnet = 1 //requires_ntnet = 1 - -/datum/nano_module/uav - name = "UAV Control program" - var/obj/item/device/uav/current_uav = null //The UAV we're watching - var/signal_strength = 0 //Our last signal strength report (cached for a few seconds) - var/signal_test_counter = 0 //How long until next signal strength check - var/list/viewers //Who's viewing a UAV through us - var/adhoc_range = 30 //How far we can operate on a UAV without NTnet - -/datum/nano_module/uav/Destroy() - if(LAZYLEN(viewers)) - for(var/weakref/W in viewers) - var/M = W.resolve() - if(M) - unlook(M) - . = ..() - -/datum/nano_module/uav/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = default_state) - var/list/data = host.initial_data() - - if(current_uav) - if(QDELETED(current_uav)) - set_current(null) - else if(signal_test_counter-- <= 0) - signal_strength = get_signal_to(current_uav) - if(!signal_strength) - set_current(null) - else // Don't reset counter until we find a UAV that's actually in range we can stay connected to - signal_test_counter = 20 - - data["current_uav"] = null - if(current_uav) - data["current_uav"] = list("status" = current_uav.get_status_string(), "power" = current_uav.state == 1 ? 1 : null) - data["signal_strength"] = signal_strength ? signal_strength >= 2 ? "High" : "Low" : "None" - data["in_use"] = LAZYLEN(viewers) - - var/list/paired_map = list() - var/obj/item/modular_computer/mc_host = nano_host() - if(istype(mc_host)) - for(var/puav in mc_host.paired_uavs) - var/weakref/wr = puav - var/obj/item/device/uav/U = wr.resolve() - paired_map[++paired_map.len] = list("name" = "[U ? U.nickname : "!!Missing!!"]", "uavref" = "\ref[U]") - - data["paired_uavs"] = paired_map - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "mod_uav.tmpl", "UAV Control", 600, 500, state = state) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) - -/datum/nano_module/uav/Topic(var/href, var/href_list = list(), var/datum/topic_state/state) - if((. = ..())) - return - state = state || DefaultTopicState() || global.default_state - if(CanUseTopic(usr, state, href_list) == STATUS_INTERACTIVE) - CouldUseTopic(usr) - return OnTopic(usr, href_list, state) - CouldNotUseTopic(usr) - return TRUE - -/datum/nano_module/uav/proc/OnTopic(var/mob/user, var/list/href_list) - if(href_list["switch_uav"]) - var/obj/item/device/uav/U = locate(href_list["switch_uav"]) //This is a \ref to the UAV itself - if(!istype(U)) - to_chat(usr,"Something is blocking the connection to that UAV. In-person investigation is required.") - return TOPIC_NOACTION - - if(!get_signal_to(U)) - to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") - return TOPIC_NOACTION - - set_current(U) - return TOPIC_REFRESH - - if(href_list["del_uav"]) - var/refstring = href_list["del_uav"] //This is a \ref to the UAV itself - var/obj/item/modular_computer/mc_host = nano_host() - //This is so we can really scrape up any weakrefs that can't resolve - for(var/weakref/wr in mc_host.paired_uavs) - if(wr.ref == refstring) - if(current_uav?.weakref == wr) - set_current(null) - LAZYREMOVE(mc_host.paired_uavs, wr) - - else if(href_list["view_uav"]) - if(!current_uav) - return TOPIC_NOACTION - - if(current_uav.check_eye(user) < 0) - to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") - else - viewing_uav(user) ? unlook(user) : look(user) - return TOPIC_NOACTION - - else if(href_list["power_uav"]) - if(!current_uav) - return TOPIC_NOACTION - else if(current_uav.toggle_power()) - //Clean up viewers faster - if(LAZYLEN(viewers)) - for(var/weakref/W in viewers) - var/M = W.resolve() - if(M) - unlook(M) - return TOPIC_REFRESH - -/datum/nano_module/uav/proc/DefaultTopicState() - return global.default_state - -/datum/nano_module/uav/proc/CouldNotUseTopic(mob/user) - . = ..() - unlook(user) - -/datum/nano_module/uav/proc/CouldUseTopic(mob/user) - . = ..() - if(viewing_uav(user)) - look(user) - -/datum/nano_module/uav/proc/set_current(var/obj/item/device/uav/U) - if(current_uav == U) - return - - signal_strength = 0 - current_uav = U - - if(LAZYLEN(viewers)) - for(var/weakref/W in viewers) - var/M = W.resolve() - if(M) - if(current_uav) - to_chat(M, "You're disconnected from the UAV's camera!") - unlook(M) - else - look(M) - -//// -//// Finding signal strength between us and the UAV -//// -/datum/nano_module/uav/proc/get_signal_to(var/atom/movable/AM) - // Following roughly the ntnet signal levels - // 0 is none - // 1 is weak - // 2 is strong - var/obj/item/modular_computer/host = nano_host() //Better not add this to anything other than modular computers. - if(!istype(host)) - return - var/our_signal = host.get_ntnet_status() //1 low, 2 good, 3 wired, 0 none - var/their_z = get_z(AM) - - //If we have no NTnet connection don't bother getting theirs - if(!our_signal) - if(get_z(host) == their_z && (get_dist(host, AM) < adhoc_range)) - return 1 //We can connect (with weak signal) in same z without ntnet, within 30 turfs - else - return 0 - - var/list/zlevels_in_range = using_map.get_map_levels(their_z, FALSE) - var/list/zlevels_in_long_range = using_map.get_map_levels(their_z, TRUE, om_range = DEFAULT_OVERMAP_RANGE) - zlevels_in_range - var/their_signal = 0 - for(var/relay in ntnet_global.relays) - var/obj/machinery/ntnet_relay/R = relay - if(!R.operable()) - continue - if(R.z == their_z) - their_signal = 2 - break - if(R.z in zlevels_in_range) - their_signal = 2 - break - if(R.z in zlevels_in_long_range) - their_signal = 1 - break - - if(!their_signal) //They have no NTnet at all - if(get_z(host) == their_z && (get_dist(host, AM) < adhoc_range)) - return 1 //We can connect (with weak signal) in same z without ntnet, within 30 turfs - else - return 0 - else - return max(our_signal, their_signal) - -//// -//// UAV viewer handling -//// -/datum/nano_module/uav/proc/viewing_uav(mob/user) - return (weakref(user) in viewers) - -/datum/nano_module/uav/proc/look(var/mob/user) - if(issilicon(user)) //Too complicated for me to want to mess with at the moment - to_chat(user, "Regulations prevent you from controlling several corporeal forms at the same time!") - return - - if(!current_uav) - return - - user.set_machine(nano_host()) - user.reset_view(current_uav) - current_uav.add_master(user) - LAZYDISTINCTADD(viewers, weakref(user)) - -/datum/nano_module/uav/proc/unlook(var/mob/user) - user.unset_machine() - user.reset_view() - if(current_uav) - current_uav.remove_master(user) - LAZYREMOVE(viewers, weakref(user)) - -/datum/nano_module/uav/check_eye(var/mob/user) - if(get_dist(user, nano_host()) > 1 || user.blinded || !current_uav) - unlook(user) - return -1 - - var/viewflag = current_uav.check_eye(user) - if (viewflag < 0) //camera doesn't work - unlook(user) - return -1 - - return viewflag - -//// -//// Relaying movements to the UAV -//// -/datum/nano_module/uav/relaymove(var/mob/user, direction) - if(current_uav) - return current_uav.relaymove(user, direction, signal_strength) - -//// -//// The effects when looking through a UAV -//// -/datum/nano_module/uav/apply_visual(var/mob/M) - if(!M.client) - return - if(weakref(M) in viewers) - M.overlay_fullscreen("fishbed",/obj/screen/fullscreen/fishbed) - M.overlay_fullscreen("scanlines",/obj/screen/fullscreen/scanline) - - if(signal_strength <= 1) - M.overlay_fullscreen("whitenoise",/obj/screen/fullscreen/noise) - else - M.clear_fullscreen("whitenoise", 0) - else - remove_visual(M) - -/datum/nano_module/uav/remove_visual(mob/M) - if(!M.client) - return - M.clear_fullscreen("fishbed",0) - M.clear_fullscreen("scanlines",0) - M.clear_fullscreen("whitenoise",0) diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm index 1a4d7a1871..61f3b43da8 100644 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -5,9 +5,10 @@ program_icon_state = "word" program_key_state = "atmos_key" size = 4 - requires_ntnet = 0 - available_on_ntnet = 1 - nanomodule_path = /datum/nano_module/program/computer_wordprocessor/ + requires_ntnet = FALSE + available_on_ntnet = TRUE + tgui_id = "NtosWordProcessor" + var/browsing var/open_file var/loaded_data @@ -28,7 +29,7 @@ if(F) open_file = F.filename loaded_data = F.stored_data - return 1 + return TRUE /datum/computer_file/program/wordprocessor/proc/save_file(var/filename) var/datum/computer_file/data/F = get_file(filename) @@ -46,7 +47,7 @@ HDD.store_file(backup) return 0 is_edited = 0 - return 1 + return TRUE /datum/computer_file/program/wordprocessor/proc/create_file(var/newname, var/data = "") if(!newname) @@ -64,142 +65,144 @@ if(HDD.store_file(F)) return F -/datum/computer_file/program/wordprocessor/Topic(href, href_list) +/datum/computer_file/program/wordprocessor/tgui_act(action, list/params, datum/tgui/ui) if(..()) - return 1 + return TRUE - if(href_list["PRG_txtrpeview"]) - show_browser(usr,"[open_file] [pencode2html(loaded_data)]", "window=[open_file]")
- return 1
+ switch(action)
+ if("PRG_txtrpeview")
+ show_browser(usr,"[open_file] [pencode2html(loaded_data)]", "window=[open_file]")
+ return TRUE
- if(href_list["PRG_taghelp"])
- to_chat(usr, "The hologram of a googly-eyed paper clip helpfully tells you:")
- var/help = {"
- \[br\] : Creates a linebreak.
- \[center\] - \[/center\] : Centers the text.
- \[h1\] - \[/h1\] : First level heading.
- \[h2\] - \[/h2\] : Second level heading.
- \[h3\] - \[/h3\] : Third level heading.
- \[b\] - \[/b\] : Bold.
- \[i\] - \[/i\] : Italic.
- \[u\] - \[/u\] : Underlined.
- \[small\] - \[/small\] : Decreases the size of the text.
- \[large\] - \[/large\] : Increases the size of the text.
- \[field\] : Inserts a blank text field, which can be filled later. Useful for forms.
- \[date\] : Current station date.
- \[time\] : Current station time.
- \[list\] - \[/list\] : Begins and ends a list.
- \[*\] : A list item.
- \[hr\] : Horizontal rule.
- \[table\] - \[/table\] : Creates table using \[row\] and \[cell\] tags.
- \[grid\] - \[/grid\] : Table without visible borders, for layouts.
- \[row\] - New table row.
- \[cell\] - New table cell.
- \[logo\] - Inserts NT logo image.
- \[redlogo\] - Inserts red NT logo image.
- \[sglogo\] - Inserts Solgov insignia image."}
+ if("PRG_taghelp")
+ to_chat(usr, "The hologram of a googly-eyed paper clip helpfully tells you:")
+ var/help = {"
+ \[br\] : Creates a linebreak.
+ \[center\] - \[/center\] : Centers the text.
+ \[h1\] - \[/h1\] : First level heading.
+ \[h2\] - \[/h2\] : Second level heading.
+ \[h3\] - \[/h3\] : Third level heading.
+ \[b\] - \[/b\] : Bold.
+ \[i\] - \[/i\] : Italic.
+ \[u\] - \[/u\] : Underlined.
+ \[small\] - \[/small\] : Decreases the size of the text.
+ \[large\] - \[/large\] : Increases the size of the text.
+ \[field\] : Inserts a blank text field, which can be filled later. Useful for forms.
+ \[date\] : Current station date.
+ \[time\] : Current station time.
+ \[list\] - \[/list\] : Begins and ends a list.
+ \[*\] : A list item.
+ \[hr\] : Horizontal rule.
+ \[table\] - \[/table\] : Creates table using \[row\] and \[cell\] tags.
+ \[grid\] - \[/grid\] : Table without visible borders, for layouts.
+ \[row\] - New table row.
+ \[cell\] - New table cell.
+ \[logo\] - Inserts NT logo image.
+ \[redlogo\] - Inserts red NT logo image.
+ \[sglogo\] - Inserts Solgov insignia image."}
- to_chat(usr, help)
- return 1
+ to_chat(usr, help)
+ return TRUE
- if(href_list["PRG_closebrowser"])
- browsing = 0
- return 1
+ if("PRG_closebrowser")
+ browsing = 0
+ return TRUE
- if(href_list["PRG_backtomenu"])
- error = null
- return 1
+ if("PRG_backtomenu")
+ error = null
+ return TRUE
- if(href_list["PRG_loadmenu"])
- browsing = 1
- return 1
+ if("PRG_loadmenu")
+ browsing = 1
+ return TRUE
- if(href_list["PRG_openfile"])
- . = 1
- if(is_edited)
- if(alert("Would you like to save your changes first?",,"Yes","No") == "Yes")
- save_file(open_file)
- browsing = 0
- if(!open_file(href_list["PRG_openfile"]))
- error = "I/O error: Unable to open file '[href_list["PRG_openfile"]]'."
+ if("PRG_openfile")
+ if(is_edited)
+ if(alert("Would you like to save your changes first?",,"Yes","No") == "Yes")
+ save_file(open_file)
+ browsing = 0
+ if(!open_file(params["PRG_openfile"]))
+ error = "I/O error: Unable to open file '[params["PRG_openfile"]]'."
+ return TRUE
- if(href_list["PRG_newfile"])
- . = 1
- if(is_edited)
- if(alert("Would you like to save your changes first?",,"Yes","No") == "Yes")
- save_file(open_file)
+ if("PRG_newfile")
+ if(is_edited)
+ if(alert("Would you like to save your changes first?",,"Yes","No") == "Yes")
+ save_file(open_file)
- var/newname = sanitize(input(usr, "Enter file name:", "New File") as text|null)
- if(!newname)
- return 1
- var/datum/computer_file/data/F = create_file(newname)
- if(F)
- open_file = F.filename
- loaded_data = ""
- return 1
- else
- error = "I/O error: Unable to create file '[href_list["PRG_saveasfile"]]'."
+ var/newname = sanitize(input(usr, "Enter file name:", "New File") as text|null)
+ if(!newname)
+ return TRUE
+ var/datum/computer_file/data/F = create_file(newname)
+ if(F)
+ open_file = F.filename
+ loaded_data = ""
+ return TRUE
+ else
+ error = "I/O error: Unable to create file '[params["PRG_saveasfile"]]'."
+ return TRUE
- if(href_list["PRG_saveasfile"])
- . = 1
- var/newname = sanitize(input(usr, "Enter file name:", "Save As") as text|null)
- if(!newname)
- return 1
- var/datum/computer_file/data/F = create_file(newname, loaded_data)
- if(F)
- open_file = F.filename
- else
- error = "I/O error: Unable to create file '[href_list["PRG_saveasfile"]]'."
- return 1
+ if("PRG_saveasfile")
+ var/newname = sanitize(input(usr, "Enter file name:", "Save As") as text|null)
+ if(!newname)
+ return TRUE
+ var/datum/computer_file/data/F = create_file(newname, loaded_data)
+ if(F)
+ open_file = F.filename
+ else
+ error = "I/O error: Unable to create file '[params["PRG_saveasfile"]]'."
+ return TRUE
- if(href_list["PRG_savefile"])
- . = 1
- if(!open_file)
- open_file = sanitize(input(usr, "Enter file name:", "Save As") as text|null)
+ if("PRG_savefile")
if(!open_file)
- return 0
- if(!save_file(open_file))
- error = "I/O error: Unable to save file '[open_file]'."
- return 1
+ open_file = sanitize(input(usr, "Enter file name:", "Save As") as text|null)
+ if(!open_file)
+ return 0
+ if(!save_file(open_file))
+ error = "I/O error: Unable to save file '[open_file]'."
+ return TRUE
- if(href_list["PRG_editfile"])
- var/oldtext = html_decode(loaded_data)
- oldtext = replacetext(oldtext, "\[br\]", "\n")
+ if("PRG_editfile")
+ var/oldtext = html_decode(loaded_data)
+ oldtext = replacetext(oldtext, "\[br\]", "\n")
- var/newtext = sanitize(replacetext(input(usr, "Editing file '[open_file]'. You may use most tags used in paper formatting:", "Text Editor", oldtext) as message|null, "\n", "\[br\]"), MAX_TEXTFILE_LENGTH)
- if(!newtext)
- return
- loaded_data = newtext
- is_edited = 1
- return 1
+ var/newtext = sanitize(replacetext(input(usr, "Editing file '[open_file]'. You may use most tags used in paper formatting:", "Text Editor", oldtext) as message|null, "\n", "\[br\]"), MAX_TEXTFILE_LENGTH)
+ if(!newtext)
+ return
+ loaded_data = newtext
+ is_edited = 1
+ return TRUE
- if(href_list["PRG_printfile"])
- . = 1
- if(!computer.nano_printer)
- error = "Missing Hardware: Your computer does not have the required hardware to complete this operation."
- return 1
- if(!computer.nano_printer.print_text(pencode2html(loaded_data)))
- error = "Hardware error: Printer was unable to print the file. It may be out of paper."
- return 1
+ if("PRG_printfile")
+ if(!computer.nano_printer)
+ error = "Missing Hardware: Your computer does not have the required hardware to complete this operation."
+ return TRUE
+ if(!computer.nano_printer.print_text(pencode2html(loaded_data)))
+ error = "Hardware error: Printer was unable to print the file. It may be out of paper."
+ return TRUE
+ return TRUE
-/datum/nano_module/program/computer_wordprocessor
- name = "Word Processor"
+/datum/computer_file/program/wordprocessor/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
+ var/list/data = get_header_data()
-/datum/nano_module/program/computer_wordprocessor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
- var/list/data = host.initial_data()
- var/datum/computer_file/program/wordprocessor/PRG
- PRG = program
+ var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive
+ var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive
+ data["error"] = null
+ if(error)
+ data["error"] = error
- var/obj/item/weapon/computer_hardware/hard_drive/HDD
- var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD
- if(PRG.error)
- data["error"] = PRG.error
- if(PRG.browsing)
- data["browsing"] = PRG.browsing
- if(!PRG.computer || !PRG.computer.hard_drive)
+ data["browsing"] = null
+ data["files"] = list()
+ data["usbconnected"] = FALSE
+ data["usbfiles"] = list()
+ data["filedata"] = null
+ data["filename"] = null
+
+ if(browsing)
+ data["browsing"] = browsing
+ if(!computer || !HDD)
data["error"] = "I/O ERROR: Unable to access hard drive."
else
- HDD = PRG.computer.hard_drive
var/list/files[0]
for(var/datum/computer_file/F in HDD.stored_files)
if(F.filetype == "TXT")
@@ -209,7 +212,6 @@
)))
data["files"] = files
- RHDD = PRG.computer.portable_drive
if(RHDD)
data["usbconnected"] = 1
var/list/usbfiles[0]
@@ -220,16 +222,11 @@
"size" = F.size,
)))
data["usbfiles"] = usbfiles
- else if(PRG.open_file)
- data["filedata"] = pencode2html(PRG.loaded_data)
- data["filename"] = PRG.is_edited ? "[PRG.open_file]*" : PRG.open_file
+ else if(open_file)
+ data["filedata"] = pencode2html(loaded_data)
+ data["filename"] = is_edited ? "[open_file]*" : open_file
else
- data["filedata"] = pencode2html(PRG.loaded_data)
+ data["filedata"] = pencode2html(loaded_data)
data["filename"] = "UNNAMED"
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "word_processor.tmpl", "Word Processor", 575, 700, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
\ No newline at end of file
+ return data
\ No newline at end of file
diff --git a/code/modules/modular_computers/file_system/programs/research/email_administration.dm b/code/modules/modular_computers/file_system/programs/research/email_administration.dm
index 93ba0bded3..eb9dfd71a6 100644
--- a/code/modules/modular_computers/file_system/programs/research/email_administration.dm
+++ b/code/modules/modular_computers/file_system/programs/research/email_administration.dm
@@ -8,29 +8,34 @@
size = 12
requires_ntnet = 1
available_on_ntnet = 1
- nanomodule_path = /datum/nano_module/email_administration
+ tgui_id = "NtosEmailAdministration"
required_access = access_network
-
-
-
-/datum/nano_module/email_administration/
- name = "Email Client"
var/datum/computer_file/data/email_account/current_account = null
var/datum/computer_file/data/email_message/current_message = null
var/error = ""
-/datum/nano_module/email_administration/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
- var/list/data = host.initial_data()
+/datum/computer_file/program/email_administration/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
+ var/list/data = get_header_data()
- if(error)
- data["error"] = error
- else if(istype(current_message))
- data["msg_title"] = current_message.title
- data["msg_body"] = pencode2html(current_message.stored_data)
- data["msg_timestamp"] = current_message.timestamp
- data["msg_source"] = current_message.source
- else if(istype(current_account))
+ data["error"] = error
+
+ data["cur_title"] = null
+ data["cur_body"] = null
+ data["cur_timestamp"] = null
+ data["cur_source"] = null
+
+ if(istype(current_message))
+ data["cur_title"] = current_message.title
+ data["cur_body"] = pencode2html(current_message.stored_data)
+ data["cur_timestamp"] = current_message.timestamp
+ data["cur_source"] = current_message.source
+
+ data["current_account"] = null
+ data["cur_suspended"] = null
+ data["messages"] = null
+
+ if(istype(current_account))
data["current_account"] = current_account.login
data["cur_suspended"] = current_account.suspended
var/list/all_messages = list()
@@ -42,103 +47,90 @@
"uid" = message.uid
)))
data["messages"] = all_messages
- data["messagecount"] = all_messages.len
- else
- var/list/all_accounts = list()
- for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts)
- if(!account.can_login)
- continue
- all_accounts.Add(list(list(
- "login" = account.login,
- "uid" = account.uid
- )))
- data["accounts"] = all_accounts
- data["accountcount"] = all_accounts.len
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "email_administration.tmpl", "Email Administration Utility", 600, 450, state = state)
- if(host.update_layout())
- ui.auto_update_layout = 1
- ui.set_auto_update(1)
- ui.set_initial_data(data)
- ui.open()
+ var/list/all_accounts = list()
+ for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts)
+ if(!account.can_login)
+ continue
+ all_accounts.Add(list(list(
+ "login" = account.login,
+ "uid" = account.uid
+ )))
+ data["accounts"] = all_accounts
+ return data
-/datum/nano_module/email_administration/Topic(href, href_list)
+/datum/computer_file/program/email_administration/tgui_act(action, list/params, datum/tgui/ui)
if(..())
- return 1
-
- var/mob/user = usr
- if(!istype(user))
- return 1
+ return TRUE
// High security - can only be operated when the user has an ID with access on them.
- var/obj/item/weapon/card/id/I = user.GetIdCard()
+ var/obj/item/weapon/card/id/I = usr.GetIdCard()
if(!istype(I) || !(access_network in I.access))
- return 1
+ return TRUE
- if(href_list["back"])
- if(error)
- error = ""
- else if(current_message)
- current_message = null
- else
- current_account = null
- return 1
+ switch(action)
+ if("back")
+ if(error)
+ error = ""
+ else if(current_message)
+ current_message = null
+ else
+ current_account = null
+ return TRUE
- if(href_list["ban"])
- if(!current_account)
- return 1
+ if("ban")
+ if(!current_account)
+ return TRUE
- current_account.suspended = !current_account.suspended
- ntnet_global.add_log_with_ids_check("EMAIL LOG: SA-EDIT Account [current_account.login] has been [current_account.suspended ? "" : "un" ]suspended by SA [I.registered_name] ([I.assignment]).")
- error = "Account [current_account.login] has been [current_account.suspended ? "" : "un" ]suspended."
- return 1
+ current_account.suspended = !current_account.suspended
+ ntnet_global.add_log_with_ids_check("EMAIL LOG: SA-EDIT Account [current_account.login] has been [current_account.suspended ? "" : "un" ]suspended by SA [I.registered_name] ([I.assignment]).")
+ error = "Account [current_account.login] has been [current_account.suspended ? "" : "un" ]suspended."
+ return TRUE
- if(href_list["changepass"])
- if(!current_account)
- return 1
+ if("changepass")
+ if(!current_account)
+ return TRUE
- var/newpass = sanitize(input(user,"Enter new password for account [current_account.login]", "Password"), 100)
- if(!newpass)
- return 1
- current_account.password = newpass
- ntnet_global.add_log_with_ids_check("EMAIL LOG: SA-EDIT Password for account [current_account.login] has been changed by SA [I.registered_name] ([I.assignment]).")
- return 1
+ var/newpass = sanitize(input(usr,"Enter new password for account [current_account.login]", "Password"), 100)
+ if(!newpass)
+ return TRUE
+ current_account.password = newpass
+ ntnet_global.add_log_with_ids_check("EMAIL LOG: SA-EDIT Password for account [current_account.login] has been changed by SA [I.registered_name] ([I.assignment]).")
+ return TRUE
- if(href_list["viewmail"])
- if(!current_account)
- return 1
+ if("viewmail")
+ if(!current_account)
+ return TRUE
- for(var/datum/computer_file/data/email_message/received_message in (current_account.inbox | current_account.spam | current_account.deleted))
- if(received_message.uid == text2num(href_list["viewmail"]))
- current_message = received_message
- break
- return 1
+ for(var/datum/computer_file/data/email_message/received_message in (current_account.inbox | current_account.spam | current_account.deleted))
+ if(received_message.uid == text2num(params["viewmail"]))
+ current_message = received_message
+ break
+ return TRUE
- if(href_list["viewaccount"])
- for(var/datum/computer_file/data/email_account/email_account in ntnet_global.email_accounts)
- if(email_account.uid == text2num(href_list["viewaccount"]))
- current_account = email_account
- break
- return 1
+ if("viewaccount")
+ for(var/datum/computer_file/data/email_account/email_account in ntnet_global.email_accounts)
+ if(email_account.uid == text2num(params["viewaccount"]))
+ current_account = email_account
+ break
+ return TRUE
- if(href_list["newaccount"])
- var/newdomain = sanitize(input(user,"Pick domain:", "Domain name") as null|anything in using_map.usable_email_tlds)
- if(!newdomain)
- return 1
- var/newlogin = sanitize(input(user,"Pick account name (@[newdomain]):", "Account name"), 100)
- if(!newlogin)
- return 1
+ if("newaccount")
+ var/newdomain = sanitize(input(usr,"Pick domain:", "Domain name") as null|anything in using_map.usable_email_tlds)
+ if(!newdomain)
+ return TRUE
+ var/newlogin = sanitize(input(usr,"Pick account name (@[newdomain]):", "Account name"), 100)
+ if(!newlogin)
+ return TRUE
- var/complete_login = "[newlogin]@[newdomain]"
- if(ntnet_global.does_email_exist(complete_login))
- error = "Error creating account: An account with same address already exists."
- return 1
+ var/complete_login = "[newlogin]@[newdomain]"
+ if(ntnet_global.does_email_exist(complete_login))
+ error = "Error creating account: An account with same address already exists."
+ return TRUE
- var/datum/computer_file/data/email_account/new_account = new/datum/computer_file/data/email_account()
- new_account.login = complete_login
- new_account.password = GenerateKey()
- error = "Email [new_account.login] has been created, with generated password [new_account.password]"
- return 1
+ var/datum/computer_file/data/email_account/new_account = new/datum/computer_file/data/email_account()
+ new_account.login = complete_login
+ new_account.password = GenerateKey()
+ error = "Email [new_account.login] has been created, with generated password [new_account.password]"
+ return TRUE
diff --git a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm
index 590837f2b5..0ce6dd5c49 100644
--- a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm
@@ -6,19 +6,15 @@
program_menu_icon = "wrench"
extended_desc = "This program monitors the local NTNet network, provides access to logging systems, and allows for configuration changes"
size = 12
- requires_ntnet = 1
+ requires_ntnet = TRUE
required_access = access_network
- available_on_ntnet = 1
- nanomodule_path = /datum/nano_module/computer_ntnetmonitor/
+ available_on_ntnet = TRUE
+ tgui_id = "NtosNetMonitor"
-/datum/nano_module/computer_ntnetmonitor
- name = "NTNet Diagnostics and Monitoring"
- //available_to_ai = TRUE
-
-/datum/nano_module/computer_ntnetmonitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
+/datum/computer_file/program/ntnetmonitor/tgui_data(mob/user)
if(!ntnet_global)
return
- var/list/data = host.initial_data()
+ var/list/data = get_header_data()
data["ntnetstatus"] = ntnet_global.check_function()
data["ntnetrelays"] = ntnet_global.relays.len
@@ -30,73 +26,68 @@
data["config_communication"] = ntnet_global.setting_communication
data["config_systemcontrol"] = ntnet_global.setting_systemcontrol
- data["ntnetlogs"] = ntnet_global.logs
- data["ntnetmaxlogs"] = ntnet_global.setting_maxlogcount
+ data["ntnetlogs"] = list()
+ data["minlogs"] = MIN_NTNET_LOGS
+ data["maxlogs"] = MAX_NTNET_LOGS
data["banned_nids"] = list(ntnet_global.banned_nids)
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "ntnet_monitor.tmpl", "NTNet Diagnostics and Monitoring Tool", 575, 700, state = state)
- if(host.update_layout())
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
- ui.set_auto_update(1)
+ for(var/i in ntnet_global.logs)
+ data["ntnetlogs"] += list(list("entry" = i))
+ data["ntnetmaxlogs"] = ntnet_global.setting_maxlogcount
-/datum/nano_module/computer_ntnetmonitor/Topic(href, href_list, state)
- var/mob/user = usr
+ return data
+
+/datum/computer_file/program/ntnetmonitor/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
if(..())
- return 1
- if(href_list["resetIDS"])
- if(ntnet_global)
- ntnet_global.resetIDS()
- return 1
- if(href_list["toggleIDS"])
- if(ntnet_global)
- ntnet_global.toggleIDS()
- return 1
- if(href_list["toggleWireless"])
- if(!ntnet_global)
- return 1
+ return
+ switch(action)
+ if("resetIDS")
+ if(ntnet_global)
+ ntnet_global.resetIDS()
+ return TRUE
+ if("toggleIDS")
+ if(ntnet_global)
+ ntnet_global.toggleIDS()
+ return TRUE
+ if("toggleWireless")
+ if(!ntnet_global)
+ return
- // NTNet is disabled. Enabling can be done without user prompt
- if(ntnet_global.setting_disabled)
- ntnet_global.setting_disabled = 0
- return 1
+ // NTNet is disabled. Enabling can be done without user prompt
+ if(ntnet_global.setting_disabled)
+ ntnet_global.setting_disabled = FALSE
+ return TRUE
- // NTNet is enabled and user is about to shut it down. Let's ask them if they really want to do it, as wirelessly connected computers won't connect without NTNet being enabled (which may prevent people from turning it back on)
- if(!user)
- return 1
- var/response = alert(user, "Really disable NTNet wireless? If your computer is connected wirelessly you won't be able to turn it back on! This will affect all connected wireless devices.", "NTNet shutdown", "Yes", "No")
- if(response == "Yes")
- ntnet_global.setting_disabled = 1
- return 1
- if(href_list["purgelogs"])
- if(ntnet_global)
- ntnet_global.purge_logs()
- return 1
- if(href_list["updatemaxlogs"])
- var/logcount = text2num(input(user,"Enter amount of logs to keep in memory ([MIN_NTNET_LOGS]-[MAX_NTNET_LOGS]):"))
- if(ntnet_global)
- ntnet_global.update_max_log_count(logcount)
- return 1
- if(href_list["toggle_function"])
- if(!ntnet_global)
- return 1
- ntnet_global.toggle_function(href_list["toggle_function"])
- return 1
- if(href_list["ban_nid"])
- if(!ntnet_global)
- return 1
- var/nid = input(user,"Enter NID of device which you want to block from the network:", "Enter NID") as null|num
- if(nid && CanUseTopic(user, state))
- ntnet_global.banned_nids |= nid
- return 1
- if(href_list["unban_nid"])
- if(!ntnet_global)
- return 1
- var/nid = input(user,"Enter NID of device which you want to unblock from the network:", "Enter NID") as null|num
- if(nid && CanUseTopic(user, state))
- ntnet_global.banned_nids -= nid
- return 1
+ var/response = alert(usr, "Really disable NTNet wireless? If your computer is connected wirelessly you won't be able to turn it back on! This will affect all connected wireless devices.", "NTNet shutdown", "Yes", "No")
+ if(response == "Yes" && tgui_status(usr, state) == STATUS_INTERACTIVE)
+ ntnet_global.setting_disabled = TRUE
+ return TRUE
+ if("purgelogs")
+ if(ntnet_global)
+ ntnet_global.purge_logs()
+ return TRUE
+ if("updatemaxlogs")
+ var/logcount = params["new_number"]
+ if(ntnet_global)
+ ntnet_global.update_max_log_count(logcount)
+ return TRUE
+ if("toggle_function")
+ if(!ntnet_global)
+ return
+ ntnet_global.toggle_function(text2num(params["id"]))
+ return TRUE
+ if("ban_nid")
+ if(!ntnet_global)
+ return
+ var/nid = input(usr,"Enter NID of device which you want to block from the network:", "Enter NID") as null|num
+ if(nid && tgui_status(usr, state) == STATUS_INTERACTIVE)
+ ntnet_global.banned_nids |= nid
+ return TRUE
+ if("unban_nid")
+ if(!ntnet_global)
+ return
+ var/nid = input(usr,"Enter NID of device which you want to unblock from the network:", "Enter NID") as null|num
+ if(nid && tgui_status(usr, state) == STATUS_INTERACTIVE)
+ ntnet_global.banned_nids -= nid
+ return TRUE
diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
index 597065d27b..9cac7c920c 100644
--- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
+++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm
@@ -1,5 +1,7 @@
var/warrant_uid = 0
-/datum/datacore/var/list/warrants[] = list()
+/datum/datacore
+ var/list/warrants = list()
+
/datum/data/record/warrant
var/warrant_id
@@ -7,7 +9,6 @@ var/warrant_uid = 0
..()
warrant_id = warrant_uid++
-
/datum/computer_file/program/digitalwarrant
filename = "digitalwarrant"
filedesc = "Warrant Assistant"
@@ -20,126 +21,119 @@ var/warrant_uid = 0
available_on_ntnet = 1
required_access = access_security
usage_flags = PROGRAM_ALL
- nanomodule_path = /datum/nano_module/program/digitalwarrant/
+ tgui_id = "NtosDigitalWarrant"
-/datum/nano_module/program/digitalwarrant/
- name = "Warrant Assistant"
var/datum/data/record/warrant/activewarrant
-/datum/nano_module/program/digitalwarrant/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
- var/list/data = host.initial_data()
+/datum/computer_file/program/digitalwarrant/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
+ var/list/data = get_header_data()
+
+ data["warrantname"] = null
+ data["warrantcharges"] = null
+ data["warrantauth"] = null
+ data["type"] = null
if(activewarrant)
data["warrantname"] = activewarrant.fields["namewarrant"]
data["warrantcharges"] = activewarrant.fields["charges"]
data["warrantauth"] = activewarrant.fields["auth"]
data["type"] = activewarrant.fields["arrestsearch"]
- else
- var/list/allwarrants = list()
- for(var/datum/data/record/warrant/W in data_core.warrants)
- allwarrants.Add(list(list(
+
+ var/list/allwarrants = list()
+ for(var/datum/data/record/warrant/W in data_core.warrants)
+ allwarrants.Add(list(list(
"warrantname" = W.fields["namewarrant"],
"charges" = "[copytext(W.fields["charges"],1,min(length(W.fields["charges"]) + 1, 50))]...",
"auth" = W.fields["auth"],
"id" = W.warrant_id,
"arrestsearch" = W.fields["arrestsearch"]
)))
- data["allwarrants"] = allwarrants
+ data["allwarrants"] = allwarrants
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "digitalwarrant.tmpl", name, 500, 350, state = state)
- ui.auto_update_layout = 1
- ui.set_initial_data(data)
- ui.open()
+ return data
-/datum/nano_module/program/digitalwarrant/Topic(href, href_list)
+/datum/computer_file/program/digitalwarrant/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
if(..())
- return 1
+ return TRUE
- if(href_list["sw_menu"])
- activewarrant = null
+ switch(action)
+ if("back")
+ . = TRUE
+ activewarrant = null
- if(href_list["editwarrant"])
- . = 1
- for(var/datum/data/record/warrant/W in data_core.warrants)
- if(W.warrant_id == text2num(href_list["editwarrant"]))
- activewarrant = W
- break
+ if("editwarrant")
+ . = TRUE
+ for(var/datum/data/record/warrant/W in data_core.warrants)
+ if(W.warrant_id == text2num(params["id"]))
+ activewarrant = W
+ break
// The following actions will only be possible if the user has an ID with security access equipped. This is in line with modular computer framework's authentication methods,
// which also use RFID scanning to allow or disallow access to some functions. Anyone can view warrants, editing requires ID. This also prevents situations where you show a tablet
// to someone who is to be arrested, which allows them to change the stuff there.
-
- var/mob/user = usr
- if(!istype(user))
- return
- var/obj/item/weapon/card/id/I = user.GetIdCard()
+ var/obj/item/weapon/card/id/I = usr.GetIdCard()
if(!istype(I) || !I.registered_name || !(access_security in I.access))
- to_chat(user, "Authentication error: Unable to locate ID with apropriate access to allow this operation.")
+ to_chat(usr, "Authentication error: Unable to locate ID with appropriate access to allow this operation.")
return
- if(href_list["addwarrant"])
- . = 1
- var/datum/data/record/warrant/W = new()
- var/temp = sanitize(input(usr, "Do you want to create a search-, or an arrest warrant?") as null|anything in list("search","arrest"))
- if(CanInteract(user, default_state))
- if(temp == "arrest")
- W.fields["namewarrant"] = "Unknown"
- W.fields["charges"] = "No charges present"
- W.fields["auth"] = "Unauthorized"
- W.fields["arrestsearch"] = "arrest"
- if(temp == "search")
- W.fields["namewarrant"] = "No suspect/location given" // VOREStation edit
- W.fields["charges"] = "No reason given"
- W.fields["auth"] = "Unauthorized"
- W.fields["arrestsearch"] = "search"
- activewarrant = W
+ switch(action)
+ if("addwarrant")
+ . = TRUE
+ var/datum/data/record/warrant/W = new()
+ var/temp = sanitize(input(usr, "Do you want to create a search-, or an arrest warrant?") as null|anything in list("search","arrest"))
+ if(tgui_status(usr, state) == STATUS_INTERACTIVE)
+ if(temp == "arrest")
+ W.fields["namewarrant"] = "Unknown"
+ W.fields["charges"] = "No charges present"
+ W.fields["auth"] = "Unauthorized"
+ W.fields["arrestsearch"] = "arrest"
+ if(temp == "search")
+ W.fields["namewarrant"] = "No suspect/location given" // VOREStation edit
+ W.fields["charges"] = "No reason given"
+ W.fields["auth"] = "Unauthorized"
+ W.fields["arrestsearch"] = "search"
+ activewarrant = W
- if(href_list["savewarrant"])
- . = 1
- data_core.warrants |= activewarrant
- activewarrant = null
+ if("savewarrant")
+ . = TRUE
+ data_core.warrants |= activewarrant
+ activewarrant = null
- if(href_list["deletewarrant"])
- . = 1
- data_core.warrants -= activewarrant
- activewarrant = null
+ if("deletewarrant")
+ . = TRUE
+ data_core.warrants -= activewarrant
+ activewarrant = null
- if(href_list["editwarrantname"])
- . = 1
- var/namelist = list()
- for(var/datum/data/record/t in data_core.general)
- namelist += t.fields["name"]
- var/new_name = sanitize(input(usr, "Please input name") as null|anything in namelist)
- if(CanInteract(user, default_state))
- if (!new_name)
- return
- activewarrant.fields["namewarrant"] = new_name
+ if("editwarrantname")
+ . = TRUE
+ var/namelist = list()
+ for(var/datum/data/record/t in data_core.general)
+ namelist += t.fields["name"]
+ var/new_name = sanitize(input(usr, "Please input name") as null|anything in namelist)
+ if(tgui_status(usr, state) == STATUS_INTERACTIVE)
+ if (!new_name)
+ return
+ activewarrant.fields["namewarrant"] = new_name
- if(href_list["editwarrantnamecustom"])
- . = 1
- var/new_name = sanitize(input("Please input name") as null|text)
- if(CanInteract(user, default_state))
- if (!new_name)
- return
- activewarrant.fields["namewarrant"] = new_name
+ if("editwarrantnamecustom")
+ . = TRUE
+ var/new_name = sanitize(input("Please input name") as null|text)
+ if(tgui_status(usr, state) == STATUS_INTERACTIVE)
+ if (!new_name)
+ return
+ activewarrant.fields["namewarrant"] = new_name
- if(href_list["editwarrantcharges"])
- . = 1
- var/new_charges = sanitize(input("Please input charges", "Charges", activewarrant.fields["charges"]) as null|text)
- if(CanInteract(user, default_state))
- if (!new_charges)
- return
- activewarrant.fields["charges"] = new_charges
+ if("editwarrantcharges")
+ . = TRUE
+ var/new_charges = sanitize(input("Please input charges", "Charges", activewarrant.fields["charges"]) as null|text)
+ if(tgui_status(usr, state) == STATUS_INTERACTIVE)
+ if (!new_charges)
+ return
+ activewarrant.fields["charges"] = new_charges
- if(href_list["editwarrantauth"])
- . = 1
- if(!(access_hos in I.access)) // VOREStation edit begin
- to_chat(user, "You don't have the access to do this!")
- return // VOREStation edit end
- activewarrant.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]"
-
- if(href_list["back"])
- . = 1
- activewarrant = null
+ if("editwarrantauth")
+ . = TRUE
+ if(!(access_hos in I.access)) // VOREStation edit begin
+ to_chat(usr, "You don't have the access to do this!")
+ return // VOREStation edit end
+ activewarrant.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]"
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
index ab60291f55..0f67e3b604 100644
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ b/code/modules/modular_computers/laptop_vendor.dm
@@ -6,8 +6,8 @@
icon = 'icons/obj/vending.dmi'
icon_state = "robotics"
layer = OBJ_LAYER - 0.1
- anchored = 1
- density = 1
+ anchored = TRUE
+ density = TRUE
// The actual laptop/tablet
var/obj/item/modular_computer/laptop/fabricated_laptop = null
@@ -160,70 +160,77 @@
return total_price
return 0
-
-
-
-
-/obj/machinery/lapvend/Topic(href, href_list)
+/obj/machinery/lapvend/tgui_act(action, params)
if(..())
- return 1
+ return TRUE
- if(href_list["pick_device"])
- if(state) // We've already picked a device type
- return 0
- devtype = text2num(href_list["pick_device"])
- state = 1
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["clean_order"])
- reset_order()
- return 1
+ switch(action)
+ if("pick_device")
+ if(state) // We've already picked a device type
+ return FALSE
+ devtype = text2num(params["pick"])
+ state = 1
+ fabricate_and_recalc_price(FALSE)
+ return TRUE
+ if("clean_order")
+ reset_order()
+ return TRUE
if((state != 1) && devtype) // Following IFs should only be usable when in the Select Loadout mode
- return 0
- if(href_list["confirm_order"])
- state = 2 // Wait for ID swipe for payment processing
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_cpu"])
- dev_cpu = text2num(href_list["hw_cpu"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_battery"])
- dev_battery = text2num(href_list["hw_battery"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_disk"])
- dev_disk = text2num(href_list["hw_disk"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_netcard"])
- dev_netcard = text2num(href_list["hw_netcard"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_tesla"])
- dev_tesla = text2num(href_list["hw_tesla"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_nanoprint"])
- dev_nanoprint = text2num(href_list["hw_nanoprint"])
- fabricate_and_recalc_price(0)
- return 1
- if(href_list["hw_card"])
- dev_card = text2num(href_list["hw_card"])
- fabricate_and_recalc_price(0)
- return 1
- return 0
+ return FALSE
+ switch(action)
+ if("confirm_order")
+ state = 2 // Wait for ID swipe for payment processing
+ fabricate_and_recalc_price(FALSE)
+ return TRUE
+ if("hw_cpu")
+ dev_cpu = text2num(params["cpu"])
+ fabricate_and_recalc_price(FALSE)
+ return TRUE
+ if("hw_battery")
+ dev_battery = text2num(params["battery"])
+ fabricate_and_recalc_price(FALSE)
+ return TRUE
+ if("hw_disk")
+ dev_disk = text2num(params["disk"])
+ fabricate_and_recalc_price(FALSE)
+ return TRUE
+ if("hw_netcard")
+ dev_netcard = text2num(params["netcard"])
+ fabricate_and_recalc_price(FALSE)
+ return TRUE
+ if("hw_tesla")
+ dev_tesla = text2num(params["tesla"])
+ fabricate_and_recalc_price(FALSE)
+ return TRUE
+ if("hw_nanoprint")
+ dev_nanoprint = text2num(params["print"])
+ fabricate_and_recalc_price(FALSE)
+ return TRUE
+ if("hw_card")
+ dev_card = text2num(params["card"])
+ fabricate_and_recalc_price(FALSE)
+ return TRUE
+ return FALSE
+
+
/obj/machinery/lapvend/attack_hand(var/mob/user)
- ui_interact(user)
+ tgui_interact(user)
-/obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/lapvend/tgui_interact(mob/user, datum/tgui/ui)
if(stat & (BROKEN | NOPOWER | MAINT))
if(ui)
ui.close()
- return 0
+ return FALSE
+
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "ComputerFabricator")
+ ui.open()
+
+/obj/machinery/lapvend/tgui_data(mob/user)
+ var/list/data = list()
- var/list/data[0]
data["state"] = state
if(state == 1)
data["devtype"] = devtype
@@ -237,13 +244,7 @@
if(state == 1 || state == 2)
data["totalprice"] = total_price
- ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
- if (!ui)
- ui = new(user, src, ui_key, "computer_fabricator.tmpl", "Personal Computer Vendor", 500, 400)
- ui.set_initial_data(data)
- ui.open()
- ui.set_auto_update(1)
-
+ return data
obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob)
var/obj/item/weapon/card/id/I = W.GetID()
@@ -272,7 +273,6 @@ obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob)
return 0
return ..()
-
// Simplified payment processing, returns 1 on success.
/obj/machinery/lapvend/proc/process_payment(var/obj/item/weapon/card/id/I, var/obj/item/ID_container)
if(I==ID_container || ID_container == null)
@@ -305,4 +305,4 @@ obj/machinery/lapvend/attackby(obj/item/weapon/W as obj, mob/user as mob)
T.date = current_date_string
T.time = stationtime2text()
customer_account.transaction_log.Add(T)
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/multiz/ladder_assembly_vr.dm b/code/modules/multiz/ladder_assembly_vr.dm
index e46bdca799..4decbdd47d 100644
--- a/code/modules/multiz/ladder_assembly_vr.dm
+++ b/code/modules/multiz/ladder_assembly_vr.dm
@@ -125,7 +125,7 @@
qdel(above)
// Make them constructable in hand
-/material/steel/generate_recipes()
+/datum/material/steel/generate_recipes()
..()
recipes += new/datum/stack_recipe("ladder assembly", /obj/structure/ladder_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1)
diff --git a/code/modules/nano/interaction/admin.dm b/code/modules/nano/interaction/admin.dm
index dd4ce6ad17..7ddb165f70 100644
--- a/code/modules/nano/interaction/admin.dm
+++ b/code/modules/nano/interaction/admin.dm
@@ -1,7 +1,7 @@
-/*
- This state checks that the user is an admin, end of story
-*/
-/var/global/datum/topic_state/admin_state/admin_state = new()
-
-/datum/topic_state/admin_state/can_use_topic(var/src_object, var/mob/user)
- return check_rights(R_ADMIN|R_EVENT, 0, user) ? STATUS_INTERACTIVE : STATUS_CLOSE
+/*
+ This state checks that the user is an admin, end of story
+*/
+/var/global/datum/topic_state/admin_state/admin_state = new()
+
+/datum/topic_state/admin_state/can_use_topic(var/src_object, var/mob/user)
+ return check_rights(R_ADMIN|R_EVENT, 0, user) ? STATUS_INTERACTIVE : STATUS_CLOSE
diff --git a/code/modules/nano/interaction/base.dm b/code/modules/nano/interaction/base.dm
index eb3e9ae5c1..8245ee04ed 100644
--- a/code/modules/nano/interaction/base.dm
+++ b/code/modules/nano/interaction/base.dm
@@ -1,37 +1,37 @@
-/datum/proc/nano_host()
- return src
-
-/datum/proc/nano_container()
- return src
-
-/datum/proc/CanUseTopic(var/mob/user, var/datum/topic_state/state)
- var/src_object = nano_host()
- return state.can_use_topic(src_object, user)
-
-/datum/topic_state/proc/href_list(var/mob/user)
- return list()
-
-/datum/topic_state/proc/can_use_topic(var/src_object, var/mob/user)
- return STATUS_CLOSE
-
-/mob/proc/shared_nano_interaction()
- if (src.stat || !client)
- return STATUS_CLOSE // no updates, close the interface
- else if (incapacitated())
- return STATUS_UPDATE // update only (orange visibility)
- return STATUS_INTERACTIVE
-
-/mob/living/silicon/ai/shared_nano_interaction()
- if(lacks_power())
- return STATUS_CLOSE
- if (check_unable(1, 0))
- return STATUS_CLOSE
- return ..()
-
-/mob/living/silicon/robot/shared_nano_interaction()
- . = STATUS_INTERACTIVE
- if(!has_power)
- return STATUS_CLOSE
- if(lockdown)
- . = STATUS_DISABLED
- return min(., ..())
+/datum/proc/nano_host()
+ return src
+
+/datum/proc/nano_container()
+ return src
+
+/datum/proc/CanUseTopic(var/mob/user, var/datum/topic_state/state)
+ var/src_object = nano_host()
+ return state.can_use_topic(src_object, user)
+
+/datum/topic_state/proc/href_list(var/mob/user)
+ return list()
+
+/datum/topic_state/proc/can_use_topic(var/src_object, var/mob/user)
+ return STATUS_CLOSE
+
+/mob/proc/shared_nano_interaction()
+ if (src.stat || !client)
+ return STATUS_CLOSE // no updates, close the interface
+ else if (incapacitated())
+ return STATUS_UPDATE // update only (orange visibility)
+ return STATUS_INTERACTIVE
+
+/mob/living/silicon/ai/shared_nano_interaction()
+ if(lacks_power())
+ return STATUS_CLOSE
+ if (check_unable(1, 0))
+ return STATUS_CLOSE
+ return ..()
+
+/mob/living/silicon/robot/shared_nano_interaction()
+ . = STATUS_INTERACTIVE
+ if(!has_power)
+ return STATUS_CLOSE
+ if(lockdown)
+ . = STATUS_DISABLED
+ return min(., ..())
diff --git a/code/modules/nano/interaction/contained.dm b/code/modules/nano/interaction/contained.dm
index 9ef595d020..3c84734104 100644
--- a/code/modules/nano/interaction/contained.dm
+++ b/code/modules/nano/interaction/contained.dm
@@ -1,18 +1,18 @@
-/*
- This state checks if user is somewhere within src_object, as well as the default NanoUI interaction.
-*/
-/var/global/datum/topic_state/contained_state/contained_state = new()
-
-/datum/topic_state/contained_state/can_use_topic(var/atom/src_object, var/mob/user)
- if(!src_object.contains(user))
- return STATUS_CLOSE
-
- return user.shared_nano_interaction()
-
-/atom/proc/contains(var/atom/location)
- if(!location)
- return 0
- if(location == src)
- return 1
-
- return contains(location.loc)
+/*
+ This state checks if user is somewhere within src_object, as well as the default NanoUI interaction.
+*/
+/var/global/datum/topic_state/contained_state/contained_state = new()
+
+/datum/topic_state/contained_state/can_use_topic(var/atom/src_object, var/mob/user)
+ if(!src_object.contains(user))
+ return STATUS_CLOSE
+
+ return user.shared_nano_interaction()
+
+/atom/proc/contains(var/atom/location)
+ if(!location)
+ return 0
+ if(location == src)
+ return 1
+
+ return contains(location.loc)
diff --git a/code/modules/nano/interaction/default.dm b/code/modules/nano/interaction/default.dm
index dbb0781d33..812ed40eb5 100644
--- a/code/modules/nano/interaction/default.dm
+++ b/code/modules/nano/interaction/default.dm
@@ -1,91 +1,91 @@
-/var/global/datum/topic_state/default/default_state = new()
-
-/datum/topic_state/default/href_list(var/mob/user)
- return list()
-
-/datum/topic_state/default/can_use_topic(var/src_object, var/mob/user)
- return user.default_can_use_topic(src_object)
-
-/mob/proc/default_can_use_topic(var/src_object)
- return STATUS_CLOSE // By default no mob can do anything with NanoUI
-
-/mob/observer/dead/default_can_use_topic(var/src_object)
- if(can_admin_interact())
- return STATUS_INTERACTIVE // Admins are more equal
- if(!client || get_dist(src_object, src) > client.view) // Preventing ghosts from having a million windows open by limiting to objects in range
- return STATUS_CLOSE
- return STATUS_UPDATE // Ghosts can view updates
-
-/mob/living/silicon/pai/default_can_use_topic(var/src_object)
- if((src_object == src || src_object == radio || src_object == communicator) && !stat)
- return STATUS_INTERACTIVE
- else
- return ..()
-
-/mob/living/silicon/robot/default_can_use_topic(var/src_object)
- . = shared_nano_interaction()
- if(. <= STATUS_DISABLED)
- return
-
- // robots can interact with things they can see within their view range
- if((src_object in view(src)) && get_dist(src_object, src) <= src.client.view)
- return STATUS_INTERACTIVE // interactive (green visibility)
- return STATUS_DISABLED // no updates, completely disabled (red visibility)
-
-/mob/living/silicon/ai/default_can_use_topic(var/src_object)
- . = shared_nano_interaction()
- if(. != STATUS_INTERACTIVE)
- return
-
- // Prevents the AI from using Topic on admin levels (by for example viewing through the court/thunderdome cameras)
- // unless it's on the same level as the object it's interacting with.
- var/turf/T = get_turf(src_object)
- if(!T || !(z == T.z || (T.z in using_map.player_levels)))
- return STATUS_CLOSE
-
- // If an object is in view then we can interact with it
- if(src_object in view(client.view, src))
- return STATUS_INTERACTIVE
-
- // If we're installed in a chassi, rather than transfered to an inteliCard or other container, then check if we have camera view
- if(is_in_chassis())
- //stop AIs from leaving windows open and using then after they lose vision
- if(cameranet && !cameranet.checkTurfVis(get_turf(src_object)))
- return STATUS_CLOSE
- return STATUS_INTERACTIVE
- else if(get_dist(src_object, src) <= client.view) // View does not return what one would expect while installed in an inteliCard
- return STATUS_INTERACTIVE
-
- return STATUS_CLOSE
-
-//Some atoms such as vehicles might have special rules for how mobs inside them interact with NanoUI.
-/atom/proc/contents_nano_distance(var/src_object, var/mob/living/user)
- return user.shared_living_nano_distance(src_object)
-
-/mob/living/proc/shared_living_nano_distance(var/atom/movable/src_object)
- if (!(src_object in view(4, src))) // If the src object is not in visable, disable updates
- return STATUS_CLOSE
-
- var/dist = get_dist(src_object, src)
- if (dist <= 1)
- return STATUS_INTERACTIVE // interactive (green visibility)
- else if (dist <= 2)
- return STATUS_UPDATE // update only (orange visibility)
- else if (dist <= 4)
- return STATUS_DISABLED // no updates, completely disabled (red visibility)
- return STATUS_CLOSE
-
-/mob/living/default_can_use_topic(var/src_object)
- . = shared_nano_interaction(src_object)
- if(. != STATUS_CLOSE)
- if(loc)
- . = min(., loc.contents_nano_distance(src_object, src))
- if(STATUS_INTERACTIVE)
- return STATUS_UPDATE
-
-/mob/living/carbon/human/default_can_use_topic(var/src_object)
- . = shared_nano_interaction(src_object)
- if(. != STATUS_CLOSE)
- . = min(., shared_living_nano_distance(src_object))
- if(. == STATUS_UPDATE && (TK in mutations)) // If we have telekinesis and remain close enough, allow interaction.
- return STATUS_INTERACTIVE
+/var/global/datum/topic_state/default/default_state = new()
+
+/datum/topic_state/default/href_list(var/mob/user)
+ return list()
+
+/datum/topic_state/default/can_use_topic(var/src_object, var/mob/user)
+ return user.default_can_use_topic(src_object)
+
+/mob/proc/default_can_use_topic(var/src_object)
+ return STATUS_CLOSE // By default no mob can do anything with NanoUI
+
+/mob/observer/dead/default_can_use_topic(var/src_object)
+ if(can_admin_interact())
+ return STATUS_INTERACTIVE // Admins are more equal
+ if(!client || get_dist(src_object, src) > client.view) // Preventing ghosts from having a million windows open by limiting to objects in range
+ return STATUS_CLOSE
+ return STATUS_UPDATE // Ghosts can view updates
+
+/mob/living/silicon/pai/default_can_use_topic(var/src_object)
+ if((src_object == src || src_object == radio || src_object == communicator) && !stat)
+ return STATUS_INTERACTIVE
+ else
+ return ..()
+
+/mob/living/silicon/robot/default_can_use_topic(var/src_object)
+ . = shared_nano_interaction()
+ if(. <= STATUS_DISABLED)
+ return
+
+ // robots can interact with things they can see within their view range
+ if((src_object in view(src)) && get_dist(src_object, src) <= src.client.view)
+ return STATUS_INTERACTIVE // interactive (green visibility)
+ return STATUS_DISABLED // no updates, completely disabled (red visibility)
+
+/mob/living/silicon/ai/default_can_use_topic(var/src_object)
+ . = shared_nano_interaction()
+ if(. != STATUS_INTERACTIVE)
+ return
+
+ // Prevents the AI from using Topic on admin levels (by for example viewing through the court/thunderdome cameras)
+ // unless it's on the same level as the object it's interacting with.
+ var/turf/T = get_turf(src_object)
+ if(!T || !(z == T.z || (T.z in using_map.player_levels)))
+ return STATUS_CLOSE
+
+ // If an object is in view then we can interact with it
+ if(src_object in view(client.view, src))
+ return STATUS_INTERACTIVE
+
+ // If we're installed in a chassi, rather than transfered to an inteliCard or other container, then check if we have camera view
+ if(is_in_chassis())
+ //stop AIs from leaving windows open and using then after they lose vision
+ if(cameranet && !cameranet.checkTurfVis(get_turf(src_object)))
+ return STATUS_CLOSE
+ return STATUS_INTERACTIVE
+ else if(get_dist(src_object, src) <= client.view) // View does not return what one would expect while installed in an inteliCard
+ return STATUS_INTERACTIVE
+
+ return STATUS_CLOSE
+
+//Some atoms such as vehicles might have special rules for how mobs inside them interact with NanoUI.
+/atom/proc/contents_nano_distance(var/src_object, var/mob/living/user)
+ return user.shared_living_nano_distance(src_object)
+
+/mob/living/proc/shared_living_nano_distance(var/atom/movable/src_object)
+ if (!(src_object in view(4, src))) // If the src object is not in visable, disable updates
+ return STATUS_CLOSE
+
+ var/dist = get_dist(src_object, src)
+ if (dist <= 1)
+ return STATUS_INTERACTIVE // interactive (green visibility)
+ else if (dist <= 2)
+ return STATUS_UPDATE // update only (orange visibility)
+ else if (dist <= 4)
+ return STATUS_DISABLED // no updates, completely disabled (red visibility)
+ return STATUS_CLOSE
+
+/mob/living/default_can_use_topic(var/src_object)
+ . = shared_nano_interaction(src_object)
+ if(. != STATUS_CLOSE)
+ if(loc)
+ . = min(., loc.contents_nano_distance(src_object, src))
+ if(STATUS_INTERACTIVE)
+ return STATUS_UPDATE
+
+/mob/living/carbon/human/default_can_use_topic(var/src_object)
+ . = shared_nano_interaction(src_object)
+ if(. != STATUS_CLOSE)
+ . = min(., shared_living_nano_distance(src_object))
+ if(. == STATUS_UPDATE && (TK in mutations)) // If we have telekinesis and remain close enough, allow interaction.
+ return STATUS_INTERACTIVE
diff --git a/code/modules/nano/interaction/inventory.dm b/code/modules/nano/interaction/inventory.dm
index dd320f2bb2..40e5bcb0e0 100644
--- a/code/modules/nano/interaction/inventory.dm
+++ b/code/modules/nano/interaction/inventory.dm
@@ -1,11 +1,11 @@
-/*
- This state checks that the src_object is somewhere in the user's first-level inventory (in hands, on ear, etc.), but not further down (such as in bags).
-*/
-/var/global/datum/topic_state/inventory_state/inventory_state = new()
-
-/datum/topic_state/inventory_state/can_use_topic(var/src_object, var/mob/user)
- if(!(src_object in user))
- return STATUS_CLOSE
-
-
- return user.shared_nano_interaction()
+/*
+ This state checks that the src_object is somewhere in the user's first-level inventory (in hands, on ear, etc.), but not further down (such as in bags).
+*/
+/var/global/datum/topic_state/inventory_state/inventory_state = new()
+
+/datum/topic_state/inventory_state/can_use_topic(var/src_object, var/mob/user)
+ if(!(src_object in user))
+ return STATUS_CLOSE
+
+
+ return user.shared_nano_interaction()
diff --git a/code/modules/nano/interaction/inventory_deep.dm b/code/modules/nano/interaction/inventory_deep.dm
index 9637c4df75..98078c02c1 100644
--- a/code/modules/nano/interaction/inventory_deep.dm
+++ b/code/modules/nano/interaction/inventory_deep.dm
@@ -1,10 +1,10 @@
-/*
- This state checks if src_object is contained anywhere in the user's inventory, including bags, etc.
-*/
-/var/global/datum/topic_state/deep_inventory_state/deep_inventory_state = new()
-
-/datum/topic_state/deep_inventory_state/can_use_topic(var/src_object, var/mob/user)
- if(!user.contains(src_object))
- return STATUS_CLOSE
-
- return user.shared_nano_interaction()
+/*
+ This state checks if src_object is contained anywhere in the user's inventory, including bags, etc.
+*/
+/var/global/datum/topic_state/deep_inventory_state/deep_inventory_state = new()
+
+/datum/topic_state/deep_inventory_state/can_use_topic(var/src_object, var/mob/user)
+ if(!user.contains(src_object))
+ return STATUS_CLOSE
+
+ return user.shared_nano_interaction()
diff --git a/code/modules/nano/interaction/physical.dm b/code/modules/nano/interaction/physical.dm
index 0571008481..5c59029f23 100644
--- a/code/modules/nano/interaction/physical.dm
+++ b/code/modules/nano/interaction/physical.dm
@@ -1,18 +1,18 @@
-/var/global/datum/topic_state/physical/physical_state = new()
-
-/datum/topic_state/physical/can_use_topic(var/src_object, var/mob/user)
- . = user.shared_nano_interaction(src_object)
- if(. > STATUS_CLOSE)
- return min(., user.check_physical_distance(src_object))
-
-/mob/proc/check_physical_distance(var/src_object)
- return STATUS_CLOSE
-
-/mob/observer/dead/check_physical_distance(var/src_object)
- return default_can_use_topic(src_object)
-
-/mob/living/check_physical_distance(var/src_object)
- return shared_living_nano_distance(src_object)
-
-/mob/living/silicon/check_physical_distance(var/src_object)
- return max(STATUS_UPDATE, shared_living_nano_distance(src_object))
+/var/global/datum/topic_state/physical/physical_state = new()
+
+/datum/topic_state/physical/can_use_topic(var/src_object, var/mob/user)
+ . = user.shared_nano_interaction(src_object)
+ if(. > STATUS_CLOSE)
+ return min(., user.check_physical_distance(src_object))
+
+/mob/proc/check_physical_distance(var/src_object)
+ return STATUS_CLOSE
+
+/mob/observer/dead/check_physical_distance(var/src_object)
+ return default_can_use_topic(src_object)
+
+/mob/living/check_physical_distance(var/src_object)
+ return shared_living_nano_distance(src_object)
+
+/mob/living/silicon/check_physical_distance(var/src_object)
+ return max(STATUS_UPDATE, shared_living_nano_distance(src_object))
diff --git a/code/modules/nano/interaction/self.dm b/code/modules/nano/interaction/self.dm
index 639e50e161..a4ae505034 100644
--- a/code/modules/nano/interaction/self.dm
+++ b/code/modules/nano/interaction/self.dm
@@ -1,9 +1,9 @@
-/*
- This state checks that the src_object is the same the as user
-*/
-/var/global/datum/topic_state/self_state/self_state = new()
-
-/datum/topic_state/self_state/can_use_topic(var/src_object, var/mob/user)
- if(src_object != user)
- return STATUS_CLOSE
- return user.shared_nano_interaction()
+/*
+ This state checks that the src_object is the same the as user
+*/
+/var/global/datum/topic_state/self_state/self_state = new()
+
+/datum/topic_state/self_state/can_use_topic(var/src_object, var/mob/user)
+ if(src_object != user)
+ return STATUS_CLOSE
+ return user.shared_nano_interaction()
diff --git a/code/modules/nano/interaction/zlevel.dm b/code/modules/nano/interaction/zlevel.dm
index 80d4c2e601..15052bc663 100644
--- a/code/modules/nano/interaction/zlevel.dm
+++ b/code/modules/nano/interaction/zlevel.dm
@@ -1,13 +1,13 @@
-/*
- This state checks that the user is on the same Z-level as src_object
-*/
-
-/var/global/datum/topic_state/z_state/z_state = new()
-
-/datum/topic_state/z_state/can_use_topic(var/src_object, var/mob/user)
- var/turf/turf_obj = get_turf(src_object)
- var/turf/turf_usr = get_turf(user)
- if(!turf_obj || !turf_usr)
- return STATUS_CLOSE
-
- return turf_obj.z == turf_usr.z ? STATUS_INTERACTIVE : STATUS_CLOSE
+/*
+ This state checks that the user is on the same Z-level as src_object
+*/
+
+/var/global/datum/topic_state/z_state/z_state = new()
+
+/datum/topic_state/z_state/can_use_topic(var/src_object, var/mob/user)
+ var/turf/turf_obj = get_turf(src_object)
+ var/turf/turf_usr = get_turf(user)
+ if(!turf_obj || !turf_usr)
+ return STATUS_CLOSE
+
+ return turf_obj.z == turf_usr.z ? STATUS_INTERACTIVE : STATUS_CLOSE
diff --git a/code/modules/nano/modules/nano_module.dm b/code/modules/nano/modules/nano_module.dm
deleted file mode 100644
index 75c38c9ed3..0000000000
--- a/code/modules/nano/modules/nano_module.dm
+++ /dev/null
@@ -1,67 +0,0 @@
-/datum/nano_module
- var/name
- var/datum/host
- var/datum/topic_manager/topic_manager
- var/list/using_access
-
-/datum/nano_module/New(var/datum/host, var/topic_manager)
- ..()
- src.host = host.nano_host()
- src.topic_manager = topic_manager
-
-/datum/nano_module/nano_host()
- return host ? host : src
-
-/datum/nano_module/proc/can_still_topic(var/datum/topic_state/state = default_state)
- return CanUseTopic(usr, state) == STATUS_INTERACTIVE
-
-/datum/nano_module/proc/check_eye(var/mob/user)
- return -1
-
-/datum/nano_module/proc/check_access(var/mob/user, var/access)
- if(!access)
- return 1
-
- if(using_access)
- if(access in using_access)
- return 1
- else
- return 0
-
- if(!istype(user))
- return 0
-
- var/obj/item/weapon/card/id/I = user.GetIdCard()
- if(!I)
- return 0
-
- if(access in I.access)
- return 1
-
- return 0
-
-/datum/nano_module/Topic(href, href_list)
- if(topic_manager && topic_manager.Topic(href, href_list))
- return TRUE
- . = ..()
-
-/datum/nano_module/proc/print_text(var/text, var/mob/user)
- var/obj/item/modular_computer/MC = nano_host()
- if(istype(MC))
- if(!MC.nano_printer)
- to_chat(user, "Error: No printer detected. Unable to print document.")
- return
-
- if(!MC.nano_printer.print_text(text))
- to_chat(user, "Error: Printer was unable to print the document. It may be out of paper.")
- else
- to_chat(user, "Error: Unable to detect compatible printer interface. Are you running NTOSv2 compatible system?")
-
-/datum/proc/initial_data()
- return list()
-
-/datum/proc/update_layout()
- return FALSE
-
-/datum/nano_module/proc/relaymove(var/mob/user, direction)
- return FALSE
diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm
index 69b0e7b77e..6e1bc749a4 100644
--- a/code/modules/nano/nanomanager.dm
+++ b/code/modules/nano/nanomanager.dm
@@ -1,224 +1,224 @@
-
- /**
- * Get an open /nanoui ui for the current user, src_object and ui_key and try to update it with data
- *
- * @param user /mob The mob who opened/owns the ui
- * @param src_object /obj|/mob The obj or mob which the ui belongs to
- * @param ui_key string A string key used for the ui
- * @param ui /datum/nanoui An existing instance of the ui (can be null)
- * @param data list The data to be passed to the ui, if it exists
- * @param force_open boolean The ui is being forced to (re)open, so close ui if it exists (instead of updating)
- *
- * @return /nanoui Returns the found ui, for null if none exists
- */
-/datum/controller/subsystem/nanoui/proc/try_update_ui(var/mob/user, src_object, ui_key, var/datum/nanoui/ui, data, var/force_open = 0)
- if (isnull(ui)) // no ui has been passed, so we'll search for one
- {
- ui = get_open_ui(user, src_object, ui_key)
- }
- if (!isnull(ui))
- // The UI is already open
- if (!force_open)
- ui.push_data(data)
- return ui
- else
- ui.reinitialise(new_initial_data=data)
- return ui
-
- return null
-
- /**
- * Get an open /nanoui ui for the current user, src_object and ui_key
- *
- * @param user /mob The mob who opened/owns the ui
- * @param src_object /obj|/mob The obj or mob which the ui belongs to
- * @param ui_key string A string key used for the ui
- *
- * @return /nanoui Returns the found ui, or null if none exists
- */
-/datum/controller/subsystem/nanoui/proc/get_open_ui(var/mob/user, src_object, ui_key)
- var/src_object_key = "\ref[src_object]"
- if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
- //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open")
- return null
- else if (isnull(open_uis[src_object_key][ui_key]) || !istype(open_uis[src_object_key][ui_key], /list))
- //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open for this object")
- return null
-
- for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
- if (ui.user == user)
- return ui
-
- //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - ui not found")
- return null
-
- /**
- * Update all /nanoui uis attached to src_object
- *
- * @param src_object /obj|/mob The obj or mob which the uis are attached to
- *
- * @return int The number of uis updated
- */
-/datum/controller/subsystem/nanoui/proc/update_uis(src_object)
- var/src_object_key = "\ref[src_object]"
- if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
- return 0
-
- var/update_count = 0
- for (var/ui_key in open_uis[src_object_key])
- for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.nano_host())
- ui.process(1)
- update_count++
- return update_count
-
- /**
- * Close all /nanoui uis attached to src_object
- *
- * @param src_object /obj|/mob The obj or mob which the uis are attached to
- *
- * @return int The number of uis close
- */
-/datum/controller/subsystem/nanoui/proc/close_uis(src_object)
- var/src_object_key = "\ref[src_object]"
- if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
- return 0
-
- var/close_count = 0
- for (var/ui_key in open_uis[src_object_key])
- for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
- if(ui && ui.src_object && ui.user && ui.src_object.nano_host())
- ui.close()
- close_count++
- return close_count
-
- /**
- * Update /nanoui uis belonging to user
- *
- * @param user /mob The mob who owns the uis
- * @param src_object /obj|/mob If src_object is provided, only update uis which are attached to src_object (optional)
- * @param ui_key string If ui_key is provided, only update uis with a matching ui_key (optional)
- *
- * @return int The number of uis updated
- */
-/datum/controller/subsystem/nanoui/proc/update_user_uis(var/mob/user, src_object = null, ui_key = null)
- if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
- return 0 // has no open uis
-
- var/update_count = 0
- for (var/datum/nanoui/ui in user.open_uis)
- if ((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
- ui.process(1)
- update_count++
-
- return update_count
-
- /**
- * Close /nanoui uis belonging to user
- *
- * @param user /mob The mob who owns the uis
- * @param src_object /obj|/mob If src_object is provided, only close uis which are attached to src_object (optional)
- * @param ui_key string If ui_key is provided, only close uis with a matching ui_key (optional)
- *
- * @return int The number of uis closed
- */
-/datum/controller/subsystem/nanoui/proc/close_user_uis(var/mob/user, src_object = null, ui_key = null)
- if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
- //testing("nanomanager/close_user_uis mob [user.name] has no open uis")
- return 0 // has no open uis
-
- var/close_count = 0
- for (var/datum/nanoui/ui in user.open_uis)
- if ((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
- ui.close()
- close_count++
-
- //testing("nanomanager/close_user_uis mob [user.name] closed [open_uis.len] of [close_count] uis")
-
- return close_count
-
- /**
- * Add a /nanoui ui to the list of open uis
- * This is called by the /nanoui open() proc
- *
- * @param ui /nanoui The ui to add
- *
- * @return nothing
- */
-/datum/controller/subsystem/nanoui/proc/ui_opened(var/datum/nanoui/ui)
- var/src_object_key = "\ref[ui.src_object]"
- if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
- open_uis[src_object_key] = list(ui.ui_key = list())
- else if (isnull(open_uis[src_object_key][ui.ui_key]) || !istype(open_uis[src_object_key][ui.ui_key], /list))
- open_uis[src_object_key][ui.ui_key] = list();
-
- ui.user.open_uis |= ui
- var/list/uis = open_uis[src_object_key][ui.ui_key]
- uis |= ui
- processing_uis |= ui
- //testing("nanomanager/ui_opened mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]")
-
- /**
- * Remove a /nanoui ui from the list of open uis
- * This is called by the /nanoui close() proc
- *
- * @param ui /nanoui The ui to remove
- *
- * @return int 0 if no ui was removed, 1 if removed successfully
- */
-/datum/controller/subsystem/nanoui/proc/ui_closed(var/datum/nanoui/ui)
- var/src_object_key = "\ref[ui.src_object]"
- if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
- return 0 // wasn't open
- else if (isnull(open_uis[src_object_key][ui.ui_key]) || !istype(open_uis[src_object_key][ui.ui_key], /list))
- return 0 // wasn't open
-
- processing_uis.Remove(ui)
- if(ui.user) // Sanity check in case a user has been deleted (say a blown up borg watching the alarm interface)
- ui.user.open_uis.Remove(ui)
- var/list/uis = open_uis[src_object_key][ui.ui_key]
- uis.Remove(ui)
-
- //testing("nanomanager/ui_closed mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]")
-
- return 1
-
- /**
- * This is called on user logout
- * Closes/clears all uis attached to the user's /mob
- *
- * @param user /mob The user's mob
- *
- * @return nothing
- */
-
-//
-/datum/controller/subsystem/nanoui/proc/user_logout(var/mob/user)
- //testing("nanomanager/user_logout user [user.name]")
- return close_user_uis(user)
-
- /**
- * This is called when a player transfers from one mob to another
- * Transfers all open UIs to the new mob
- *
- * @param oldMob /mob The user's old mob
- * @param newMob /mob The user's new mob
- *
- * @return nothing
- */
-/datum/controller/subsystem/nanoui/proc/user_transferred(var/mob/oldMob, var/mob/newMob)
- //testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]")
- if (!oldMob || isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0)
- //testing("nanomanager/user_transferred mob [oldMob.name] has no open uis")
- return 0 // has no open uis
-
- if (isnull(newMob.open_uis) || !istype(newMob.open_uis, /list))
- newMob.open_uis = list()
-
- for (var/datum/nanoui/ui in oldMob.open_uis)
- ui.user = newMob
- newMob.open_uis.Add(ui)
-
- oldMob.open_uis.Cut()
-
+
+ /**
+ * Get an open /nanoui ui for the current user, src_object and ui_key and try to update it with data
+ *
+ * @param user /mob The mob who opened/owns the ui
+ * @param src_object /obj|/mob The obj or mob which the ui belongs to
+ * @param ui_key string A string key used for the ui
+ * @param ui /datum/nanoui An existing instance of the ui (can be null)
+ * @param data list The data to be passed to the ui, if it exists
+ * @param force_open boolean The ui is being forced to (re)open, so close ui if it exists (instead of updating)
+ *
+ * @return /nanoui Returns the found ui, for null if none exists
+ */
+/datum/controller/subsystem/nanoui/proc/try_update_ui(var/mob/user, src_object, ui_key, var/datum/nanoui/ui, data, var/force_open = 0)
+ if (isnull(ui)) // no ui has been passed, so we'll search for one
+ {
+ ui = get_open_ui(user, src_object, ui_key)
+ }
+ if (!isnull(ui))
+ // The UI is already open
+ if (!force_open)
+ ui.push_data(data)
+ return ui
+ else
+ ui.reinitialise(new_initial_data=data)
+ return ui
+
+ return null
+
+ /**
+ * Get an open /nanoui ui for the current user, src_object and ui_key
+ *
+ * @param user /mob The mob who opened/owns the ui
+ * @param src_object /obj|/mob The obj or mob which the ui belongs to
+ * @param ui_key string A string key used for the ui
+ *
+ * @return /nanoui Returns the found ui, or null if none exists
+ */
+/datum/controller/subsystem/nanoui/proc/get_open_ui(var/mob/user, src_object, ui_key)
+ var/src_object_key = "\ref[src_object]"
+ if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+ //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open")
+ return null
+ else if (isnull(open_uis[src_object_key][ui_key]) || !istype(open_uis[src_object_key][ui_key], /list))
+ //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - there are no uis open for this object")
+ return null
+
+ for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
+ if (ui.user == user)
+ return ui
+
+ //testing("nanomanager/get_open_ui mob [user.name] [src_object:name] [ui_key] - ui not found")
+ return null
+
+ /**
+ * Update all /nanoui uis attached to src_object
+ *
+ * @param src_object /obj|/mob The obj or mob which the uis are attached to
+ *
+ * @return int The number of uis updated
+ */
+/datum/controller/subsystem/nanoui/proc/update_uis(src_object)
+ var/src_object_key = "\ref[src_object]"
+ if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+ return 0
+
+ var/update_count = 0
+ for (var/ui_key in open_uis[src_object_key])
+ for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
+ if(ui && ui.src_object && ui.user && ui.src_object.nano_host())
+ ui.process(1)
+ update_count++
+ return update_count
+
+ /**
+ * Close all /nanoui uis attached to src_object
+ *
+ * @param src_object /obj|/mob The obj or mob which the uis are attached to
+ *
+ * @return int The number of uis close
+ */
+/datum/controller/subsystem/nanoui/proc/close_uis(src_object)
+ var/src_object_key = "\ref[src_object]"
+ if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+ return 0
+
+ var/close_count = 0
+ for (var/ui_key in open_uis[src_object_key])
+ for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key])
+ if(ui && ui.src_object && ui.user && ui.src_object.nano_host())
+ ui.close()
+ close_count++
+ return close_count
+
+ /**
+ * Update /nanoui uis belonging to user
+ *
+ * @param user /mob The mob who owns the uis
+ * @param src_object /obj|/mob If src_object is provided, only update uis which are attached to src_object (optional)
+ * @param ui_key string If ui_key is provided, only update uis with a matching ui_key (optional)
+ *
+ * @return int The number of uis updated
+ */
+/datum/controller/subsystem/nanoui/proc/update_user_uis(var/mob/user, src_object = null, ui_key = null)
+ if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
+ return 0 // has no open uis
+
+ var/update_count = 0
+ for (var/datum/nanoui/ui in user.open_uis)
+ if ((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
+ ui.process(1)
+ update_count++
+
+ return update_count
+
+ /**
+ * Close /nanoui uis belonging to user
+ *
+ * @param user /mob The mob who owns the uis
+ * @param src_object /obj|/mob If src_object is provided, only close uis which are attached to src_object (optional)
+ * @param ui_key string If ui_key is provided, only close uis with a matching ui_key (optional)
+ *
+ * @return int The number of uis closed
+ */
+/datum/controller/subsystem/nanoui/proc/close_user_uis(var/mob/user, src_object = null, ui_key = null)
+ if (isnull(user.open_uis) || !istype(user.open_uis, /list) || open_uis.len == 0)
+ //testing("nanomanager/close_user_uis mob [user.name] has no open uis")
+ return 0 // has no open uis
+
+ var/close_count = 0
+ for (var/datum/nanoui/ui in user.open_uis)
+ if ((isnull(src_object) || !isnull(src_object) && ui.src_object == src_object) && (isnull(ui_key) || !isnull(ui_key) && ui.ui_key == ui_key))
+ ui.close()
+ close_count++
+
+ //testing("nanomanager/close_user_uis mob [user.name] closed [open_uis.len] of [close_count] uis")
+
+ return close_count
+
+ /**
+ * Add a /nanoui ui to the list of open uis
+ * This is called by the /nanoui open() proc
+ *
+ * @param ui /nanoui The ui to add
+ *
+ * @return nothing
+ */
+/datum/controller/subsystem/nanoui/proc/ui_opened(var/datum/nanoui/ui)
+ var/src_object_key = "\ref[ui.src_object]"
+ if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+ open_uis[src_object_key] = list(ui.ui_key = list())
+ else if (isnull(open_uis[src_object_key][ui.ui_key]) || !istype(open_uis[src_object_key][ui.ui_key], /list))
+ open_uis[src_object_key][ui.ui_key] = list();
+
+ ui.user.open_uis |= ui
+ var/list/uis = open_uis[src_object_key][ui.ui_key]
+ uis |= ui
+ processing_uis |= ui
+ //testing("nanomanager/ui_opened mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]")
+
+ /**
+ * Remove a /nanoui ui from the list of open uis
+ * This is called by the /nanoui close() proc
+ *
+ * @param ui /nanoui The ui to remove
+ *
+ * @return int 0 if no ui was removed, 1 if removed successfully
+ */
+/datum/controller/subsystem/nanoui/proc/ui_closed(var/datum/nanoui/ui)
+ var/src_object_key = "\ref[ui.src_object]"
+ if (isnull(open_uis[src_object_key]) || !istype(open_uis[src_object_key], /list))
+ return 0 // wasn't open
+ else if (isnull(open_uis[src_object_key][ui.ui_key]) || !istype(open_uis[src_object_key][ui.ui_key], /list))
+ return 0 // wasn't open
+
+ processing_uis.Remove(ui)
+ if(ui.user) // Sanity check in case a user has been deleted (say a blown up borg watching the alarm interface)
+ ui.user.open_uis.Remove(ui)
+ var/list/uis = open_uis[src_object_key][ui.ui_key]
+ uis.Remove(ui)
+
+ //testing("nanomanager/ui_closed mob [ui.user.name] [ui.src_object:name] [ui.ui_key] - user.open_uis [ui.user.open_uis.len] | uis [uis.len] | processing_uis [processing_uis.len]")
+
+ return 1
+
+ /**
+ * This is called on user logout
+ * Closes/clears all uis attached to the user's /mob
+ *
+ * @param user /mob The user's mob
+ *
+ * @return nothing
+ */
+
+//
+/datum/controller/subsystem/nanoui/proc/user_logout(var/mob/user)
+ //testing("nanomanager/user_logout user [user.name]")
+ return close_user_uis(user)
+
+ /**
+ * This is called when a player transfers from one mob to another
+ * Transfers all open UIs to the new mob
+ *
+ * @param oldMob /mob The user's old mob
+ * @param newMob /mob The user's new mob
+ *
+ * @return nothing
+ */
+/datum/controller/subsystem/nanoui/proc/user_transferred(var/mob/oldMob, var/mob/newMob)
+ //testing("nanomanager/user_transferred from mob [oldMob.name] to mob [newMob.name]")
+ if (!oldMob || isnull(oldMob.open_uis) || !istype(oldMob.open_uis, /list) || open_uis.len == 0)
+ //testing("nanomanager/user_transferred mob [oldMob.name] has no open uis")
+ return 0 // has no open uis
+
+ if (isnull(newMob.open_uis) || !istype(newMob.open_uis, /list))
+ newMob.open_uis = list()
+
+ for (var/datum/nanoui/ui in oldMob.open_uis)
+ ui.user = newMob
+ newMob.open_uis.Add(ui)
+
+ oldMob.open_uis.Cut()
+
return 1 // success
\ No newline at end of file
diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm
index ff392d42a9..9ac7925090 100644
--- a/code/modules/nifsoft/nif.dm
+++ b/code/modules/nifsoft/nif.dm
@@ -101,6 +101,9 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
//Draw me yo.
update_icon()
+ if(!our_statclick)
+ our_statclick = new(null, "Open", src)
+
//Destructor cleans up references
/obj/item/device/nif/Destroy()
human = null
@@ -356,6 +359,8 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
/obj/item/device/nif/proc/notify(var/message,var/alert = 0)
if(!human || stat == NIF_TEMPFAIL) return
+ last_notification = message // TGUI Hook
+
to_chat(human,"\[[bicon(src.big_icon)]NIF\] displays, \"[message]\"")
if(prob(1)) human.visible_message("\The [human] [pick(look_messages)].")
if(alert)
@@ -379,6 +384,29 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable
human.adjust_nutrition(-use_charge)
return TRUE
+// This operates on a nifsoft *path*, not an instantiation.
+// It tells the nifsoft shop if it's installation will succeed, to prevent it
+// from charging the user for incompatible software.
+/obj/item/device/nif/proc/can_install(var/datum/nifsoft/path)
+ if(stat == NIF_TEMPFAIL)
+ return FALSE
+
+ if(nifsofts[initial(path.list_pos)])
+ notify("The software \"[initial(path.name)]\" is already installed.", TRUE)
+ return FALSE
+
+ if(human)
+ var/applies_to = initial(path.applies_to)
+ var/synth = human.isSynthetic()
+ if(synth && !(applies_to & NIF_SYNTHETIC))
+ notify("The software \"[initial(path.name)]\" is not supported on your chassis type.",TRUE)
+ return FALSE
+ if(!synth && !(applies_to & NIF_ORGANIC))
+ notify("The software \"[initial(path.name)]\" is not supported in organic life.",TRUE)
+ return FALSE
+
+ return TRUE
+
//Install a piece of software
/obj/item/device/nif/proc/install(var/datum/nifsoft/new_soft)
if(stat == NIF_TEMPFAIL) return FALSE
diff --git a/code/modules/nifsoft/nif_softshop.dm b/code/modules/nifsoft/nif_softshop.dm
index d802abde4c..5cfae594c4 100644
--- a/code/modules/nifsoft/nif_softshop.dm
+++ b/code/modules/nifsoft/nif_softshop.dm
@@ -25,6 +25,10 @@
wires = new /datum/wires/vending/no_contraband(src) //These wires can't be hacked for contraband.
entopic = new(aholder = src, aicon = icon, aicon_state = "beacon")
+/obj/machinery/vending/nifsoft_shop/tgui_data(mob/user)
+ . = ..()
+ .["chargesMoney"] = TRUE
+
/obj/machinery/vending/nifsoft_shop/Destroy()
QDEL_NULL(entopic)
return ..()
@@ -93,95 +97,39 @@
product_records.Add(product)
-/obj/machinery/vending/nifsoft_shop/allowed(mob/user)
- if(!ishuman(user))
- return FALSE
+/obj/machinery/vending/nifsoft_shop/can_buy(datum/stored_item/vending_product/R, mob/user)
+ . = ..()
+ if(.)
+ var/datum/nifsoft/path = R.item_path
+ if(!ishuman(user))
+ return FALSE
+
+ var/mob/living/carbon/human/H = user
+ if(!H.nif || !H.nif.stat == NIF_WORKING)
+ to_chat(H, "[src] seems unable to connect to your NIF...")
+ return FALSE
- var/mob/living/carbon/human/H = user
- if(!H.nif || !H.nif.stat == NIF_WORKING)
- to_chat(H, "[src] seems unable to connect to your NIF...")
- flick("[icon_state]-deny",entopic.my_image)
- return FALSE
-
- return ..()
-
-//Had to override this too
-/obj/machinery/vending/nifsoft_shop/Topic(href, href_list)
- if(stat & (BROKEN|NOPOWER))
- return
- if(usr.stat || usr.restrained())
- return
-
- if(href_list["remove_coin"] && !istype(usr,/mob/living/silicon))
- if(!coin)
- to_chat(usr, "There is no coin in this machine.")
- return
-
- coin.forceMove(src.loc)
- if(!usr.get_active_hand())
- usr.put_in_hands(coin)
- to_chat(usr, "You remove \the [coin] from \the [src]")
- coin = null
- categories &= ~CAT_COIN
-
- if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
- if((href_list["vend"]) && (vend_ready) && (!currently_vending))
- if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
- to_chat(usr, "Access denied.") //Unless emagged of course
- flick("[icon_state]-deny",entopic.my_image)
- return
-
- var/key = text2num(href_list["vend"])
- var/datum/stored_item/vending_product/R = product_records[key]
-
- // This should not happen unless the request from NanoUI was bad
- if(!(R.category & categories))
- return
-
- //Specific soft access checking
- var/datum/nifsoft/path = R.item_path
- if(initial(path.access))
- var/list/soft_access = list(initial(path.access))
- var/list/usr_access = usr.GetAccess()
- if(scan_id && !has_access(soft_access, list(), usr_access) && !emagged)
- to_chat(usr, "You aren't authorized to buy [initial(path.name)].")
- flick("[icon_state]-deny",entopic.my_image)
- return
-
- if(R.price <= 0)
- vend(R, usr)
- else if(istype(usr,/mob/living/silicon)) //If the item is not free, provide feedback if a synth is trying to buy something.
- to_chat(usr, "Artificial unit recognized. Artificial units cannot complete this transaction. Purchase canceled.")
- return
- else
- currently_vending = R
- if(!vendor_account || vendor_account.suspended)
- status_message = "This machine is currently unable to process payments due to problems with the associated account."
- status_error = 1
- else
- status_message = "[initial(path.desc)]
Please swipe a card or insert cash to pay for the item." - status_error = 0 - - else if(href_list["cancelpurchase"]) - currently_vending = null - - else if((href_list["togglevoice"]) && (panel_open)) - shut_up = !shut_up - - add_fingerprint(usr) - SSnanoui.update_uis(src) + if(!H.nif.can_install(path)) + flick("[icon_state]-deny", entopic.my_image) + return FALSE + + if(initial(path.access)) + var/list/soft_access = list(initial(path.access)) + var/list/usr_access = user.GetAccess() + if(scan_id && !has_access(soft_access, list(), usr_access) && !emagged) + to_chat(user, "You aren't authorized to buy [initial(path.name)].") + flick("[icon_state]-deny", entopic.my_image) + return FALSE // Also special treatment! /obj/machinery/vending/nifsoft_shop/vend(datum/stored_item/vending_product/R, mob/user) var/mob/living/carbon/human/H = user - if((!allowed(usr)) && !emagged && scan_id && istype(H)) //For SECURE VENDING MACHINES YEAH - to_chat(usr, "Purchase not allowed.") //Unless emagged of course + if(!can_buy(R, user)) //For SECURE VENDING MACHINES YEAH + to_chat(user, "Purchase not allowed.") //Unless emagged of course flick("[icon_state]-deny",entopic.my_image) return vend_ready = 0 //One thing at a time!! - status_message = "Installing..." - status_error = 0 - SSnanoui.update_uis(src) + SStgui.update_uis(src) if(R.category & CAT_COIN) if(!coin) @@ -209,15 +157,14 @@ spawn(vend_delay) R.amount-- new R.item_path(H.nif) + H.nif.notify("New software installed: [R.item_name]") flick("[icon_state]-vend",entopic.my_image) if(has_logs) do_logging(R, user, 1) - status_message = "" - status_error = 0 vend_ready = 1 currently_vending = null - SSnanoui.update_uis(src) + SStgui.update_uis(src) return 1 //Can't throw intangible software at people. diff --git a/code/modules/nifsoft/nif_statpanel.dm b/code/modules/nifsoft/nif_statpanel.dm index 0cf2307b65..00e928429f 100644 --- a/code/modules/nifsoft/nif_statpanel.dm +++ b/code/modules/nifsoft/nif_statpanel.dm @@ -22,6 +22,7 @@ nif_status = "Unknown - Error" nif_status += " (Condition: [nif_percent]%)" stat("NIF Status", nif_status) + stat("UI", nif.our_statclick) // TGUI Hook if(nif.stat == NIF_WORKING) stat("- Modules -", "LMB: Toggle, Shift+LMB: Info/Uninstall") diff --git a/code/modules/nifsoft/nif_tgui.dm b/code/modules/nifsoft/nif_tgui.dm new file mode 100644 index 0000000000..23d8102f79 --- /dev/null +++ b/code/modules/nifsoft/nif_tgui.dm @@ -0,0 +1,114 @@ +/************************************************************************\ + * This module controls everything to do with the NIF's tgui interface. * +\************************************************************************/ +/** + * Etc variables on the NIF to keep this self contained + */ +/obj/item/device/nif + var/static/list/valid_ui_themes = list( + "abductor", + "cardtable", + "hackerman", + "malfunction", + "ntos", + "paper", + "retro", + "syndicate" + ) + var/tmp/obj/effect/statclick/nif_open/our_statclick + var/tmp/last_notification + +/** + * Special stat button for the interface + */ +/obj/effect/statclick/nif_open +/obj/effect/statclick/nif_open/Click(location, control, params) + var/obj/item/device/nif/N = target + if(istype(N)) + N.tgui_interact(usr) + +/** + * The NIF State ensures that only our authorized implanted user can touch us. + */ +/obj/item/device/nif/tgui_state(mob/user) + return GLOB.tgui_nif_main_state + +/** + * Standard TGUI stub to open the NIF.js template. + */ +/obj/item/device/nif/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "NIF", name) + ui.open() + +/** + * tgui_data gives the UI any relevant data it needs. + * In our case, that's basically everything from our statpanel. + */ +/obj/item/device/nif/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + data["theme"] = save_data["ui_theme"] + data["last_notification"] = last_notification + + // Random biometric information + data["nutrition"] = human.nutrition + data["isSynthetic"] = human.isSynthetic() + + data["nif_percent"] = round((durability/initial(durability))*100) + data["nif_stat"] = stat + + data["modules"] = list() + if(stat == NIF_WORKING) + for(var/nifsoft in nifsofts) + if(!nifsoft) + continue + var/datum/nifsoft/NS = nifsoft + data["modules"].Add(list(list( + "name" = NS.name, + "desc" = NS.desc, + "p_drain" = NS.p_drain, + "a_drain" = NS.a_drain, + "illegal" = NS.illegal, + "wear" = NS.wear, + "cost" = NS.cost, + "activates" = NS.activates, + "active" = NS.active, + "stat_text" = NS.stat_text(), + "ref" = REF(NS), + ))) + + return data + +/** + * tgui_act handles all user input in the UI. + */ +/obj/item/device/nif/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + switch(action) + if("setTheme") + if((params["theme"] in valid_ui_themes) || params["theme"] == null) + save_data["ui_theme"] = params["theme"] + return TRUE + if("toggle_module") + var/datum/nifsoft/NS = locate(params["module"]) in nifsofts + if(!istype(NS)) + return + if(NS.activates) + if(NS.active) + NS.deactivate() + else + NS.activate() + return TRUE + if("uninstall") + var/datum/nifsoft/NS = locate(params["module"]) in nifsofts + if(!istype(NS)) + return + NS.uninstall() + return TRUE + if("dismissNotification") + last_notification = null + return TRUE \ No newline at end of file diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index 0df241799f..ca1d0199a6 100644 --- a/code/modules/nifsoft/nifsoft.dm +++ b/code/modules/nifsoft/nifsoft.dm @@ -269,7 +269,8 @@ /obj/item/weapon/storage/box/nifsofts_security name = "security nifsoft uploaders" desc = "A box of free nifsofts for security employees." - icon_state = "disk_kit" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "nifsoft_kit_sec" /obj/item/weapon/storage/box/nifsofts_security/New() ..() @@ -293,7 +294,8 @@ /obj/item/weapon/storage/box/nifsofts_engineering name = "engineering nifsoft uploaders" desc = "A box of free nifsofts for engineering employees." - icon_state = "disk_kit" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "nifsoft_kit_eng" /obj/item/weapon/storage/box/nifsofts_engineering/New() ..() @@ -316,7 +318,8 @@ /obj/item/weapon/storage/box/nifsofts_medical name = "medical nifsoft uploaders" desc = "A box of free nifsofts for medical employees." - icon_state = "disk_kit" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "nifsoft_kit_med" /obj/item/weapon/storage/box/nifsofts_medical/New() ..() @@ -340,7 +343,8 @@ /obj/item/weapon/storage/box/nifsofts_mining name = "mining nifsoft uploaders" desc = "A box of free nifsofts for mining employees." - icon_state = "disk_kit" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "nifsoft_kit_mining" /obj/item/weapon/storage/box/nifsofts_mining/New() ..() diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm index 7c7ca02079..7a792009f4 100644 --- a/code/modules/nifsoft/software/01_vision.dm +++ b/code/modules/nifsoft/software/01_vision.dm @@ -106,12 +106,12 @@ vision_flags = (NIF_V_MESONS) incompatible_with = list(NIF_MATERIAL,NIF_THERMALS,NIF_NIGHTVIS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.sight |= SEE_TURFS - if(H.client) - H.client.screen |= global_hud.meson +/datum/nifsoft/mesons/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.sight |= SEE_TURFS + if(H.client) + H.client.screen |= global_hud.meson /datum/nifsoft/material name = "Material Scanner" @@ -125,12 +125,12 @@ vision_flags = (NIF_V_MATERIAL) incompatible_with = list(NIF_MESONS,NIF_THERMALS,NIF_NIGHTVIS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.sight |= SEE_OBJS - if(H.client) - H.client.screen |= global_hud.material +/datum/nifsoft/material/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.sight |= SEE_OBJS + if(H.client) + H.client.screen |= global_hud.material /datum/nifsoft/thermals name = "Thermal Scanner" @@ -145,12 +145,12 @@ vision_flags = (NIF_V_THERMALS) incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_NIGHTVIS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.sight |= SEE_MOBS - if(H.client) - H.client.screen |= global_hud.thermal +/datum/nifsoft/thermals/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.sight |= SEE_MOBS + if(H.client) + H.client.screen |= global_hud.thermal /datum/nifsoft/nightvis name = "Low-Light Amp" @@ -164,9 +164,9 @@ vision_flags = (NIF_V_NIGHTVIS) incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_THERMALS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.see_in_dark += 7 - if(H.client) - H.client.screen |= global_hud.nvg +/datum/nifsoft/nightvis/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.see_in_dark += 7 + if(H.client) + H.client.screen |= global_hud.nvg diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm index 8ea4ef90c5..dfab36df3e 100644 --- a/code/modules/nifsoft/software/05_health.dm +++ b/code/modules/nifsoft/software/05_health.dm @@ -13,63 +13,63 @@ health_flags = (NIF_H_ORGREPAIR) //These self-activate on their own, these aren't user-settable to on/off. - activate() - if((. = ..())) - mode = 1 +/datum/nifsoft/medichines_org/activate() + if((. = ..())) + mode = 1 - deactivate() - if((. = ..())) - a_drain = initial(a_drain) - mode = initial(mode) - nif.human.Stasis(0) +/datum/nifsoft/medichines_org/deactivate() + if((. = ..())) + a_drain = initial(a_drain) + mode = initial(mode) + nif.human.Stasis(0) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - var/HP_percent = H.health/H.getMaxHealth() +/datum/nifsoft/medichines_org/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + var/HP_percent = H.health/H.getMaxHealth() - //Mode changing state machine - if(HP_percent >= 0.9) - if(mode) - nif.notify("User Status: NORMAL. Medichines deactivating.") - deactivate() - return TRUE - else if(!mode && HP_percent < 0.8) - nif.notify("User Status: INJURED. Commencing medichine routines.",TRUE) - activate() - else if(mode == 1 && HP_percent < 0.2) - nif.notify("User Status: DANGER. Seek medical attention!",TRUE) - mode = 2 - else if(mode == 2 && HP_percent < -0.4) - nif.notify("User Status: CRITICAL. Notifying medical, and starting emergency stasis!",TRUE) - mode = 3 - if(!isbelly(H.loc)) //Not notified in case of vore, for gameplay purposes. - var/turf/T = get_turf(H) - var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) - a.autosay("[H.real_name] has been put in emergency stasis, located at ([T.x],[T.y],[T.z])!", "[H.real_name]'s NIF", "Medical") - qdel(a) - - //Handle the actions in each mode - - //Injured but not critical + //Mode changing state machine + if(HP_percent >= 0.9) if(mode) - H.adjustToxLoss(-0.1 * mode) - H.adjustBruteLoss(-0.1 * mode) - H.adjustFireLoss(-0.1 * mode) - - if(mode >= 2) - nif.use_charge(a_drain) //A second drain if we're in level 2+ - - //Patient critical - emergency stasis - if(mode >= 3) - if(HP_percent <= 0) - H.Stasis(3) - if(HP_percent > 0.2) - H.Stasis(0) - nif.notify("Ending emergency stasis.",TRUE) - mode = 2 - + nif.notify("User Status: NORMAL. Medichines deactivating.") + deactivate() return TRUE + else if(!mode && HP_percent < 0.8) + nif.notify("User Status: INJURED. Commencing medichine routines.",TRUE) + activate() + else if(mode == 1 && HP_percent < 0.2) + nif.notify("User Status: DANGER. Seek medical attention!",TRUE) + mode = 2 + else if(mode == 2 && HP_percent < -0.4) + nif.notify("User Status: CRITICAL. Notifying medical, and starting emergency stasis!",TRUE) + mode = 3 + if(!isbelly(H.loc)) //Not notified in case of vore, for gameplay purposes. + var/turf/T = get_turf(H) + var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) + a.autosay("[H.real_name] has been put in emergency stasis, located at ([T.x],[T.y],[T.z])!", "[H.real_name]'s NIF", "Medical") + qdel(a) + + //Handle the actions in each mode + + //Injured but not critical + if(mode) + H.adjustToxLoss(-0.1 * mode) + H.adjustBruteLoss(-0.1 * mode) + H.adjustFireLoss(-0.1 * mode) + + if(mode >= 2) + nif.use_charge(a_drain) //A second drain if we're in level 2+ + + //Patient critical - emergency stasis + if(mode >= 3) + if(HP_percent <= 0) + H.Stasis(3) + if(HP_percent > 0.2) + H.Stasis(0) + nif.notify("Ending emergency stasis.",TRUE) + mode = 2 + + return TRUE /datum/nifsoft/medichines_syn name = "Medichines" @@ -86,44 +86,44 @@ health_flags = (NIF_H_SYNTHREPAIR) //These self-activate on their own, these aren't user-settable to on/off. - activate() - if((. = ..())) - mode = 1 +/datum/nifsoft/medichines_syn/activate() + if((. = ..())) + mode = 1 - deactivate() - if((. = ..())) - mode = 0 - - life() - if((. = ..())) - //We're good! - if(!nif.human.bad_external_organs.len) - if(mode || active) - nif.notify("User Status: NORMAL. Medichines deactivating.") - deactivate() - return TRUE - - if(!mode && !active) - nif.notify("User Status: DAMAGED. Medichines performing minor repairs.",TRUE) - activate() - - for(var/eo in nif.human.bad_external_organs) - var/obj/item/organ/external/EO = eo - for(var/w in EO.wounds) - var/datum/wound/W = w - if(W.damage <= 5) - W.heal_damage(0.1) - EO.update_damages() - if(EO.update_icon()) - nif.human.UpdateDamageIcon(1) - nif.use_charge(0.1) - return TRUE //Return entirely, we only heal one at a time. - else if(mode == 1) - mode = 2 - nif.notify("Medichines unable to repair all damage. Perform manual repairs.",TRUE) +/datum/nifsoft/medichines_syn/deactivate() + if((. = ..())) + mode = 0 +/datum/nifsoft/medichines_syn/life() + if((. = ..())) + //We're good! + if(!nif.human.bad_external_organs.len) + if(mode || active) + nif.notify("User Status: NORMAL. Medichines deactivating.") + deactivate() return TRUE + if(!mode && !active) + nif.notify("User Status: DAMAGED. Medichines performing minor repairs.",TRUE) + activate() + + for(var/eo in nif.human.bad_external_organs) + var/obj/item/organ/external/EO = eo + for(var/w in EO.wounds) + var/datum/wound/W = w + if(W.damage <= 5) + W.heal_damage(0.1) + EO.update_damages() + if(EO.update_icon()) + nif.human.UpdateDamageIcon(1) + nif.use_charge(0.1) + return TRUE //Return entirely, we only heal one at a time. + else if(mode == 1) + mode = 2 + nif.notify("Medichines unable to repair all damage. Perform manual repairs.",TRUE) + + return TRUE + /datum/nifsoft/spare_breath name = "Respirocytes" desc = "Nanites simulating red blood cells will filter and recycle oxygen for a short time, preventing suffocation in hostile environments. NOTE: Only capable of supplying OXYGEN." @@ -137,47 +137,47 @@ var/filled = 100 //Tracks the internal tank 'refilling', which still uses power health_flags = (NIF_H_SPAREBREATH) - activate() - if(!(filled > 50)) - nif.notify("Respirocytes not saturated!",TRUE) - return FALSE - if((. = ..())) - nif.notify("Now taking air from reserves.") +/datum/nifsoft/spare_breath/activate() + if(!(filled > 50)) + nif.notify("Respirocytes not saturated!",TRUE) + return FALSE + if((. = ..())) + nif.notify("Now taking air from reserves.") - deactivate() - if((. = ..())) - nif.notify("Now taking air from environment and refilling reserves.") +/datum/nifsoft/spare_breath/deactivate() + if((. = ..())) + nif.notify("Now taking air from environment and refilling reserves.") - life() - if((. = ..())) - if(active) //Supplying air, not recharging it - switch(filled) //Text warnings - if(75) - nif.notify("Respirocytes at 75% saturation.",TRUE) - if(50) - nif.notify("Respirocytes at 50% saturation!",TRUE) - if(25) - nif.notify("Respirocytes at 25% saturation, seek a habitable environment!",TRUE) - if(5) - nif.notify("Respirocytes at 5% saturation! Failure imminent!",TRUE) +/datum/nifsoft/spare_breath/life() + if((. = ..())) + if(active) //Supplying air, not recharging it + switch(filled) //Text warnings + if(75) + nif.notify("Respirocytes at 75% saturation.",TRUE) + if(50) + nif.notify("Respirocytes at 50% saturation!",TRUE) + if(25) + nif.notify("Respirocytes at 25% saturation, seek a habitable environment!",TRUE) + if(5) + nif.notify("Respirocytes at 5% saturation! Failure imminent!",TRUE) - if(filled == 0) //Ran out - deactivate() - else //Drain a little - filled-- + if(filled == 0) //Ran out + deactivate() + else //Drain a little + filled-- - else //Recharging air, not supplying it - if(filled == 100) - return TRUE - else if(nif.use_charge(0.1) && ++filled == 100) - nif.notify("Respirocytes now fully saturated.") + else //Recharging air, not supplying it + if(filled == 100) + return TRUE + else if(nif.use_charge(0.1) && ++filled == 100) + nif.notify("Respirocytes now fully saturated.") - proc/resp_breath() - if(!active) return null - var/datum/gas_mixture/breath = new(BREATH_VOLUME) - breath.adjust_gas("oxygen", BREATH_MOLES) - breath.temperature = T20C - return breath +/datum/nifsoft/spare_breath/proc/resp_breath() + if(!active) return null + var/datum/gas_mixture/breath = new(BREATH_VOLUME) + breath.adjust_gas("oxygen", BREATH_MOLES) + breath.temperature = T20C + return breath /datum/nifsoft/mindbackup name = "Mind Backup" @@ -185,19 +185,19 @@ list_pos = NIF_BACKUP cost = 125 - activate() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - SStranscore.m_backup(H.mind,H.nif,one_time = TRUE) - persist_nif_data(H) - nif.notify("Mind backed up!") - nif.use_charge(0.1) - deactivate() - return TRUE +/datum/nifsoft/mindbackup/activate() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + SStranscore.m_backup(H.mind,H.nif,one_time = TRUE) + persist_nif_data(H) + nif.notify("Mind backed up!") + nif.use_charge(0.1) + deactivate() + return TRUE - deactivate() - if((. = ..())) - return TRUE +/datum/nifsoft/mindbackup/deactivate() + if((. = ..())) + return TRUE - stat_text() - return "Store Backup" +/datum/nifsoft/mindbackup/stat_text() + return "Store Backup" diff --git a/code/modules/nifsoft/software/06_screens.dm b/code/modules/nifsoft/software/06_screens.dm index 8dadc88192..253ed17c8d 100644 --- a/code/modules/nifsoft/software/06_screens.dm +++ b/code/modules/nifsoft/software/06_screens.dm @@ -7,25 +7,25 @@ p_drain = 0.025 var/datum/tgui_module/crew_monitor/nif/arscreen - New() - ..() - arscreen = new(nif) +/datum/nifsoft/crewmonitor/New() + ..() + arscreen = new(nif) - Destroy() - QDEL_NULL(arscreen) - return ..() +/datum/nifsoft/crewmonitor/Destroy() + QDEL_NULL(arscreen) + return ..() - activate() - if((. = ..())) - arscreen.tgui_interact(nif.human) - return TRUE +/datum/nifsoft/crewmonitor/activate() + if((. = ..())) + arscreen.tgui_interact(nif.human) + return TRUE - deactivate() - if((. = ..())) - return TRUE +/datum/nifsoft/crewmonitor/deactivate() + if((. = ..())) + return TRUE - stat_text() - return "Show Monitor" +/datum/nifsoft/crewmonitor/stat_text() + return "Show Monitor" /datum/nifsoft/alarmmonitor name = "Alarm Monitor" @@ -36,22 +36,22 @@ p_drain = 0.025 var/datum/tgui_module/alarm_monitor/engineering/nif/tgarscreen - New() - ..() - tgarscreen = new(nif) +/datum/nifsoft/alarmmonitor/New() + ..() + tgarscreen = new(nif) - Destroy() - QDEL_NULL(tgarscreen) - return ..() +/datum/nifsoft/alarmmonitor/Destroy() + QDEL_NULL(tgarscreen) + return ..() - activate() - if((. = ..())) - tgarscreen.tgui_interact(nif.human) - return TRUE +/datum/nifsoft/alarmmonitor/activate() + if((. = ..())) + tgarscreen.tgui_interact(nif.human) + return TRUE - deactivate() - if((. = ..())) - return TRUE +/datum/nifsoft/alarmmonitor/deactivate() + if((. = ..())) + return TRUE - stat_text() - return "Show Monitor" +/datum/nifsoft/alarmmonitor/stat_text() + return "Show Monitor" diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm index a4af60ae6e..a63e323792 100644 --- a/code/modules/nifsoft/software/10_combat.dm +++ b/code/modules/nifsoft/software/10_combat.dm @@ -34,10 +34,10 @@ tick_flags = NIF_ACTIVETICK combat_flags = (NIF_C_PAINKILLERS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.bloodstr.add_reagent("numbenzyme",0.5) +/datum/nifsoft/painkillers/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.bloodstr.add_reagent("numbenzyme",0.5) /datum/nifsoft/hardclaws name = "Bloodletters" @@ -74,25 +74,25 @@ var/global/datum/unarmed_attack/hardclaws/unarmed_hardclaws = new() var/used = FALSE combat_flags = (NIF_C_HIDELASER) - activate() - if((. = ..())) - if(used) - nif.notify("You do not have a hidden weapon to deploy anymore!",TRUE) - deactivate() - return FALSE - if(!nif.use_charge(50)) - nif.notify("Insufficient energy to deploy weapon!",TRUE) - deactivate() - return FALSE +/datum/nifsoft/hidelaser/activate() + if((. = ..())) + if(used) + nif.notify("You do not have a hidden weapon to deploy anymore!",TRUE) + deactivate() + return FALSE + if(!nif.use_charge(50)) + nif.notify("Insufficient energy to deploy weapon!",TRUE) + deactivate() + return FALSE - var/mob/living/carbon/human/H = nif.human - H.adjustHalLoss(30) - var/obj/item/weapon/gun/energy/gun/martin/dazzle/dgun = new(get_turf(H)) - H.put_in_hands(dgun) - nif.notify("Weapon deployed!",TRUE) - used = TRUE - spawn(0) - uninstall() + var/mob/living/carbon/human/H = nif.human + H.adjustHalLoss(30) + var/obj/item/weapon/gun/energy/gun/martin/dazzle/dgun = new(get_turf(H)) + H.put_in_hands(dgun) + nif.notify("Weapon deployed!",TRUE) + used = TRUE + spawn(0) + uninstall() //The gun to go with this implant /obj/item/weapon/gun/energy/gun/martin/dazzle diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index 4cc7210bd4..c1de085532 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -21,243 +21,243 @@ var/list/brainmobs = list() var/inside_flavor = "A small completely white room with a couch, and a window to what seems to be the outside world. A small sign in the corner says 'Configure Me'." - New() - ..() - load_settings() +/datum/nifsoft/soulcatcher/New() + ..() + load_settings() - Destroy() - QDEL_LIST_NULL(brainmobs) - return ..() +/datum/nifsoft/soulcatcher/Destroy() + QDEL_LIST_NULL(brainmobs) + return ..() - activate() - if((. = ..())) - show_settings(nif.human) - spawn(0) - deactivate() +/datum/nifsoft/soulcatcher/activate() + if((. = ..())) + show_settings(nif.human) + spawn(0) + deactivate() - deactivate() - if((. = ..())) - return TRUE - - stat_text() - return "Change Settings ([brainmobs.len] minds)" - - install() - if((. = ..())) - nif.set_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) //Required on install, because other_flags aren't sufficient for our complicated settings. - nif.human.verbs |= /mob/living/carbon/human/proc/nsay - nif.human.verbs |= /mob/living/carbon/human/proc/nme - - uninstall() - QDEL_LIST_NULL(brainmobs) - if((. = ..()) && nif && nif.human) //Sometimes NIFs are deleted outside of a human - nif.human.verbs -= /mob/living/carbon/human/proc/nsay - nif.human.verbs -= /mob/living/carbon/human/proc/nme - - proc/save_settings() - if(!nif) - return - nif.save_data["[list_pos]"] = inside_flavor +/datum/nifsoft/soulcatcher/deactivate() + if((. = ..())) return TRUE - proc/load_settings() - if(!nif) - return - var/load = nif.save_data["[list_pos]"] - if(load) - inside_flavor = load - return TRUE +/datum/nifsoft/soulcatcher/stat_text() + return "Change Settings ([brainmobs.len] minds)" - proc/notify_into(var/message) - var/sound = nif.good_sound +/datum/nifsoft/soulcatcher/install() + if((. = ..())) + nif.set_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) //Required on install, because other_flags aren't sufficient for our complicated settings. + nif.human.verbs |= /mob/living/carbon/human/proc/nsay + nif.human.verbs |= /mob/living/carbon/human/proc/nme - to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") - nif.human << sound +/datum/nifsoft/soulcatcher/uninstall() + QDEL_LIST_NULL(brainmobs) + if((. = ..()) && nif && nif.human) //Sometimes NIFs are deleted outside of a human + nif.human.verbs -= /mob/living/carbon/human/proc/nsay + nif.human.verbs -= /mob/living/carbon/human/proc/nme +/datum/nifsoft/soulcatcher/proc/save_settings() + if(!nif) + return + nif.save_data["[list_pos]"] = inside_flavor + return TRUE + +/datum/nifsoft/soulcatcher/proc/load_settings() + if(!nif) + return + var/load = nif.save_data["[list_pos]"] + if(load) + inside_flavor = load + return TRUE + +/datum/nifsoft/soulcatcher/proc/notify_into(var/message) + var/sound = nif.good_sound + + to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") + nif.human << sound + + for(var/brainmob in brainmobs) + var/mob/living/carbon/brain/caught_soul/CS = brainmob + to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") + brainmob << sound + +/datum/nifsoft/soulcatcher/proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj) + var/sender_name = eyeobj ? eyeobj.name : sender.name + + //AR Projecting + if(eyeobj) + sender.eyeobj.visible_message("[sender_name] says, \"[message]\"") + + //Not AR Projecting + else + to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") for(var/brainmob in brainmobs) var/mob/living/carbon/brain/caught_soul/CS = brainmob - to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") - brainmob << sound + to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") - proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj) - var/sender_name = eyeobj ? eyeobj.name : sender.name + log_nsay(message,nif.human.real_name,sender) - //AR Projecting - if(eyeobj) - sender.eyeobj.visible_message("[sender_name] says, \"[message]\"") +/datum/nifsoft/soulcatcher/proc/emote_into(var/message, var/mob/living/sender, var/mob/eyeobj) + var/sender_name = eyeobj ? eyeobj.name : sender.name - //Not AR Projecting - else - to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") - for(var/brainmob in brainmobs) - var/mob/living/carbon/brain/caught_soul/CS = brainmob - to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") + //AR Projecting + if(eyeobj) + sender.eyeobj.visible_message("[sender_name] [message]") - log_nsay(message,nif.human.real_name,sender) + //Not AR Projecting + else + to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] [sender_name] [message]") + for(var/brainmob in brainmobs) + var/mob/living/carbon/brain/caught_soul/CS = brainmob + to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] [sender_name] [message]") - proc/emote_into(var/message, var/mob/living/sender, var/mob/eyeobj) - var/sender_name = eyeobj ? eyeobj.name : sender.name + log_nme(message,nif.human.real_name,sender) - //AR Projecting - if(eyeobj) - sender.eyeobj.visible_message("[sender_name] [message]") +/datum/nifsoft/soulcatcher/proc/show_settings(var/mob/living/carbon/human/H) + set waitfor = FALSE + var/settings_list = list( + "Catching You \[[setting_flags & NIF_SC_CATCHING_ME ? "Enabled" : "Disabled"]\]" = NIF_SC_CATCHING_ME, + "Catching Prey \[[setting_flags & NIF_SC_CATCHING_OTHERS ? "Enabled" : "Disabled"]\]" = NIF_SC_CATCHING_OTHERS, + "Ext. Hearing \[[setting_flags & NIF_SC_ALLOW_EARS ? "Enabled" : "Disabled"]\]" = NIF_SC_ALLOW_EARS, + "Ext. Vision \[[setting_flags & NIF_SC_ALLOW_EYES ? "Enabled" : "Disabled"]\]" = NIF_SC_ALLOW_EYES, + "Mind Backups \[[setting_flags & NIF_SC_BACKUPS ? "Enabled" : "Disabled"]\]" = NIF_SC_BACKUPS, + "AR Projecting \[[setting_flags & NIF_SC_PROJECTING ? "Enabled" : "Disabled"]\]" = NIF_SC_PROJECTING, + "Design Inside", + "Erase Contents") + var/choice = input(nif.human,"Select a setting to modify:","Soulcatcher NIFSoft") as null|anything in settings_list + if(choice in settings_list) + switch(choice) - //Not AR Projecting - else - to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] [sender_name] [message]") - for(var/brainmob in brainmobs) - var/mob/living/carbon/brain/caught_soul/CS = brainmob - to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] [sender_name] [message]") + if("Design Inside") + var/new_flavor = input(nif.human, "Type what the prey sees after being 'caught'. This will be \ + printed after an intro ending with: \"Around you, you see...\" to the prey. If you already \ + have prey, this will be printed to them after \"Your surroundings change to...\". Limit 2048 char.", \ + "VR Environment", html_decode(inside_flavor)) as message + new_flavor = sanitize(new_flavor, MAX_MESSAGE_LEN*2) + inside_flavor = new_flavor + nif.notify("Updating VR environment...") + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/CS = brain + to_chat(CS,"Your surroundings change to...\n[inside_flavor]") + save_settings() + return TRUE - log_nme(message,nif.human.real_name,sender) + if("Erase Contents") + var/mob/living/carbon/brain/caught_soul/brainpick = input(nif.human,"Select a mind to delete:","Erase Mind") as null|anything in brainmobs - proc/show_settings(var/mob/living/carbon/human/H) - set waitfor = FALSE - var/settings_list = list( - "Catching You \[[setting_flags & NIF_SC_CATCHING_ME ? "Enabled" : "Disabled"]\]" = NIF_SC_CATCHING_ME, - "Catching Prey \[[setting_flags & NIF_SC_CATCHING_OTHERS ? "Enabled" : "Disabled"]\]" = NIF_SC_CATCHING_OTHERS, - "Ext. Hearing \[[setting_flags & NIF_SC_ALLOW_EARS ? "Enabled" : "Disabled"]\]" = NIF_SC_ALLOW_EARS, - "Ext. Vision \[[setting_flags & NIF_SC_ALLOW_EYES ? "Enabled" : "Disabled"]\]" = NIF_SC_ALLOW_EYES, - "Mind Backups \[[setting_flags & NIF_SC_BACKUPS ? "Enabled" : "Disabled"]\]" = NIF_SC_BACKUPS, - "AR Projecting \[[setting_flags & NIF_SC_PROJECTING ? "Enabled" : "Disabled"]\]" = NIF_SC_PROJECTING, - "Design Inside", - "Erase Contents") - var/choice = input(nif.human,"Select a setting to modify:","Soulcatcher NIFSoft") as null|anything in settings_list - if(choice in settings_list) - switch(choice) + var/warning = alert(nif.human,"Are you SURE you want to erase \"[brainpick]\"?","Erase Mind","CANCEL","DELETE","CANCEL") + if(warning == "DELETE") + brainmobs -= brainpick + qdel(brainpick) + return TRUE - if("Design Inside") - var/new_flavor = input(nif.human, "Type what the prey sees after being 'caught'. This will be \ - printed after an intro ending with: \"Around you, you see...\" to the prey. If you already \ - have prey, this will be printed to them after \"Your surroundings change to...\". Limit 2048 char.", \ - "VR Environment", html_decode(inside_flavor)) as message - new_flavor = sanitize(new_flavor, MAX_MESSAGE_LEN*2) - inside_flavor = new_flavor - nif.notify("Updating VR environment...") - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/CS = brain - to_chat(CS,"Your surroundings change to...\n[inside_flavor]") - save_settings() - return TRUE + //Must just be a flag without special handling then. + else + var/flag = settings_list[choice] + return toggle_setting(flag) - if("Erase Contents") - var/mob/living/carbon/brain/caught_soul/brainpick = input(nif.human,"Select a mind to delete:","Erase Mind") as null|anything in brainmobs +/datum/nifsoft/soulcatcher/proc/toggle_setting(var/flag) + setting_flags ^= flag - var/warning = alert(nif.human,"Are you SURE you want to erase \"[brainpick]\"?","Erase Mind","CANCEL","DELETE","CANCEL") - if(warning == "DELETE") - brainmobs -= brainpick - qdel(brainpick) - return TRUE + var/notify_message + //Special treatment + switch(flag) + if(NIF_SC_BACKUPS) + if(setting_flags & NIF_SC_BACKUPS) + notify_message = "Mind backup system enabled." + else + notify_message = "Mind backup system disabled." - //Must just be a flag without special handling then. - else - var/flag = settings_list[choice] - return toggle_setting(flag) + if(NIF_SC_CATCHING_ME) + if(setting_flags & NIF_SC_CATCHING_ME) + nif.set_flag(NIF_O_SCMYSELF,NIF_FLAGS_OTHER) + else + nif.clear_flag(NIF_O_SCMYSELF,NIF_FLAGS_OTHER) + if(NIF_SC_CATCHING_OTHERS) + if(setting_flags & NIF_SC_CATCHING_OTHERS) + nif.set_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) + else + nif.clear_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) + if(NIF_SC_ALLOW_EARS) + if(setting_flags & NIF_SC_ALLOW_EARS) + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/brainmob = brain + brainmob.ext_deaf = FALSE + notify_message = "External audio input enabled." + else + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/brainmob = brain + brainmob.ext_deaf = TRUE + notify_message = "External audio input disabled." + if(NIF_SC_ALLOW_EYES) + if(setting_flags & NIF_SC_ALLOW_EYES) + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/brainmob = brain + brainmob.ext_blind = FALSE + notify_message = "External video input enabled." + else + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/brainmob = brain + brainmob.ext_blind = TRUE + notify_message = "External video input disabled." - proc/toggle_setting(var/flag) - setting_flags ^= flag + if(notify_message) + notify_into(notify_message) - var/notify_message - //Special treatment - switch(flag) - if(NIF_SC_BACKUPS) - if(setting_flags & NIF_SC_BACKUPS) - notify_message = "Mind backup system enabled." - else - notify_message = "Mind backup system disabled." + return TRUE - if(NIF_SC_CATCHING_ME) - if(setting_flags & NIF_SC_CATCHING_ME) - nif.set_flag(NIF_O_SCMYSELF,NIF_FLAGS_OTHER) - else - nif.clear_flag(NIF_O_SCMYSELF,NIF_FLAGS_OTHER) - if(NIF_SC_CATCHING_OTHERS) - if(setting_flags & NIF_SC_CATCHING_OTHERS) - nif.set_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) - else - nif.clear_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) - if(NIF_SC_ALLOW_EARS) - if(setting_flags & NIF_SC_ALLOW_EARS) - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/brainmob = brain - brainmob.ext_deaf = FALSE - notify_message = "External audio input enabled." - else - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/brainmob = brain - brainmob.ext_deaf = TRUE - notify_message = "External audio input disabled." - if(NIF_SC_ALLOW_EYES) - if(setting_flags & NIF_SC_ALLOW_EYES) - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/brainmob = brain - brainmob.ext_blind = FALSE - notify_message = "External video input enabled." - else - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/brainmob = brain - brainmob.ext_blind = TRUE - notify_message = "External video input disabled." +//Complex version for catching in-round characters +/datum/nifsoft/soulcatcher/proc/catch_mob(var/mob/M) + if(!M.mind) return - if(notify_message) - notify_into(notify_message) + //Create a new brain mob + var/mob/living/carbon/brain/caught_soul/brainmob = new(nif) + brainmob.nif = nif + brainmob.soulcatcher = src + brainmob.container = src + brainmob.stat = 0 + brainmob.silent = FALSE + dead_mob_list -= brainmob + brainmob.add_language(LANGUAGE_GALCOM) + brainmobs |= brainmob - return TRUE + //Put the mind and player into the mob + M.mind.transfer_to(brainmob) + brainmob.name = brainmob.mind.name + brainmob.real_name = brainmob.mind.name - //Complex version for catching in-round characters - proc/catch_mob(var/mob/M) - if(!M.mind) return + //If we caught our owner, special settings. + if(M == nif.human) + brainmob.ext_deaf = FALSE + brainmob.ext_blind = FALSE + brainmob.parent_mob = TRUE - //Create a new brain mob - var/mob/living/carbon/brain/caught_soul/brainmob = new(nif) - brainmob.nif = nif - brainmob.soulcatcher = src - brainmob.container = src - brainmob.stat = 0 - brainmob.silent = FALSE - dead_mob_list -= brainmob - brainmob.add_language(LANGUAGE_GALCOM) - brainmobs |= brainmob + //If they have these values, apply them + if(ishuman(M)) + var/mob/living/carbon/human/H = M + brainmob.dna = H.dna + brainmob.ooc_notes = H.ooc_notes + brainmob.timeofhostdeath = H.timeofdeath + SStranscore.m_backup(brainmob.mind,0) //It does ONE, so medical will hear about it. - //Put the mind and player into the mob - M.mind.transfer_to(brainmob) - brainmob.name = brainmob.mind.name - brainmob.real_name = brainmob.mind.name + //Else maybe they're a joining ghost + else if(isobserver(M)) + brainmob.transient = TRUE + qdel(M) //Bye ghost - //If we caught our owner, special settings. - if(M == nif.human) - brainmob.ext_deaf = FALSE - brainmob.ext_blind = FALSE - brainmob.parent_mob = TRUE + //Give them a flavortext message + var/message = "Your vision fades in a haze of static, before returning.\n\ + Around you, you see...\n\ + [inside_flavor]" - //If they have these values, apply them - if(ishuman(M)) - var/mob/living/carbon/human/H = M - brainmob.dna = H.dna - brainmob.ooc_notes = H.ooc_notes - brainmob.timeofhostdeath = H.timeofdeath - SStranscore.m_backup(brainmob.mind,0) //It does ONE, so medical will hear about it. + to_chat(brainmob,message) - //Else maybe they're a joining ghost - else if(isobserver(M)) - brainmob.transient = TRUE - qdel(M) //Bye ghost + //Reminder on how this works to host + if(brainmobs.len == 1) //Only spam this on the first one + to_chat(nif.human,"Your occupant's messages/actions can only be seen by you, and you can \ + send messages that only they can hear/see by using the NSay and NMe verbs (or the *nsay and *nme emotes).") - //Give them a flavortext message - var/message = "Your vision fades in a haze of static, before returning.\n\ - Around you, you see...\n\ - [inside_flavor]" - - to_chat(brainmob,message) - - //Reminder on how this works to host - if(brainmobs.len == 1) //Only spam this on the first one - to_chat(nif.human,"Your occupant's messages/actions can only be seen by you, and you can \ - send messages that only they can hear/see by using the NSay and NMe verbs (or the *nsay and *nme emotes).") - - //Announce to host and other minds - notify_into("New mind loaded: [brainmob.name]") - return TRUE + //Announce to host and other minds + notify_into("New mind loaded: [brainmob.name]") + return TRUE //////////////// //The caught mob diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm index f156e3ffb5..26539f20f2 100644 --- a/code/modules/nifsoft/software/14_commlink.dm +++ b/code/modules/nifsoft/software/14_commlink.dm @@ -9,24 +9,24 @@ p_drain = 0.01 other_flags = (NIF_O_COMMLINK) - install() - if((. = ..())) - nif.comm = new(nif,src) +/datum/nifsoft/commlink/install() + if((. = ..())) + nif.comm = new(nif,src) - uninstall() - var/obj/item/device/nif/lnif = nif //Awkward. Parent clears it in an attempt to clean up. - if((. = ..()) && lnif) - QDEL_NULL(lnif.comm) +/datum/nifsoft/commlink/uninstall() + var/obj/item/device/nif/lnif = nif //Awkward. Parent clears it in an attempt to clean up. + if((. = ..()) && lnif) + QDEL_NULL(lnif.comm) - activate() - if((. = ..())) - nif.comm.initialize_exonet(nif.human) - nif.comm.ui_interact(nif.human,key_state = commlink_state) - spawn(0) - deactivate() +/datum/nifsoft/commlink/activate() + if((. = ..())) + nif.comm.initialize_exonet(nif.human) + nif.comm.tgui_interact(nif.human, custom_state = GLOB.tgui_commlink_state) + spawn(0) + deactivate() - stat_text() - return "Show Commlink" +/datum/nifsoft/commlink/stat_text() + return "Show Commlink" /datum/nifsoft/commlink/Topic(href, href_list) if(href_list["open"]) @@ -39,18 +39,18 @@ var/obj/item/device/nif/nif var/datum/nifsoft/commlink/nifsoft - New(var/newloc,var/soft) - ..() - nif = newloc - nifsoft = soft - QDEL_NULL(camera) //Not supported on internal one. +/obj/item/device/communicator/commlink/New(var/newloc,var/soft) + ..() + nif = newloc + nifsoft = soft + QDEL_NULL(camera) //Not supported on internal one. - Destroy() - if(nif) - nif.comm = null - nif = null - nifsoft = null - return ..() +/obj/item/device/communicator/commlink/Destroy() + if(nif) + nif.comm = null + nif = null + nifsoft = null + return ..() /obj/item/device/communicator/commlink/register_device(var/new_name) owner = new_name diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index f6406ed186..7cdd364b16 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -9,36 +9,36 @@ var/obj/machinery/power/apc/apc other_flags = (NIF_O_APCCHARGE) - activate() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - apc = locate(/obj/machinery/power/apc) in get_step(H,H.dir) - if(!apc) - apc = locate(/obj/machinery/power/apc) in get_step(H,0) - if(!apc) - nif.notify("You must be facing an APC to connect to.",TRUE) - spawn(0) - deactivate() - return FALSE - - H.visible_message("Thin snakelike tendrils grow from [H] and connect to \the [apc].","Thin snakelike tendrils grow from you and connect to \the [apc].") - - deactivate() - if((. = ..())) - apc = null - - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - if(apc && (get_dist(H,apc) <= 1) && H.nutrition < 440) // 440 vs 450, life() happens before we get here so it'll never be EXACTLY 450 - H.nutrition = min(H.nutrition+10, 450) - apc.drain_power(7000/450*10) //This is from the large rechargers. No idea what the math is. - return TRUE - else - nif.notify("APC charging has ended.") - H.visible_message("[H]'s snakelike tendrils whip back into their body from \the [apc].","The APC connector tendrils return to your body.") +/datum/nifsoft/apc_recharge/activate() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + apc = locate(/obj/machinery/power/apc) in get_step(H,H.dir) + if(!apc) + apc = locate(/obj/machinery/power/apc) in get_step(H,0) + if(!apc) + nif.notify("You must be facing an APC to connect to.",TRUE) + spawn(0) deactivate() - return FALSE + return FALSE + + H.visible_message("Thin snakelike tendrils grow from [H] and connect to \the [apc].","Thin snakelike tendrils grow from you and connect to \the [apc].") + +/datum/nifsoft/apc_recharge/deactivate() + if((. = ..())) + apc = null + +/datum/nifsoft/apc_recharge/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + if(apc && (get_dist(H,apc) <= 1) && H.nutrition < 440) // 440 vs 450, life() happens before we get here so it'll never be EXACTLY 450 + H.nutrition = min(H.nutrition+10, 450) + apc.drain_power(7000/450*10) //This is from the large rechargers. No idea what the math is. + return TRUE + else + nif.notify("APC charging has ended.") + H.visible_message("[H]'s snakelike tendrils whip back into their body from \the [apc].","The APC connector tendrils return to your body.") + deactivate() + return FALSE /datum/nifsoft/pressure name = "Pressure Seals" @@ -62,31 +62,31 @@ applies_to = NIF_SYNTHETIC other_flags = (NIF_O_HEATSINKS) - activate() - if((. = ..())) - if(used >= 1500) - nif.notify("Heat sinks not safe to operate again yet! Max 75% on activation.",TRUE) - spawn(0) - deactivate() - return FALSE - - stat_text() - return "[active ? "Active" : "Disabled"] (Stored Heat: [FLOOR((used/20), 1)]%)" - - life() - if((. = ..())) - //Not being used, all clean. - if(!active && !used) - return TRUE - - //Being used, and running out. - else if(active && ++used == 2000) - nif.notify("Heat sinks overloaded! Shutting down!",TRUE) +/datum/nifsoft/heatsinks/activate() + if((. = ..())) + if(used >= 1500) + nif.notify("Heat sinks not safe to operate again yet! Max 75% on activation.",TRUE) + spawn(0) deactivate() + return FALSE - //Being cleaned, and finishing empty. - else if(!active && --used == 0) - nif.notify("Heat sinks re-chilled.") +/datum/nifsoft/heatsinks/stat_text() + return "[active ? "Active" : "Disabled"] (Stored Heat: [FLOOR((used/20), 1)]%)" + +/datum/nifsoft/heatsinks/life() + if((. = ..())) + //Not being used, all clean. + if(!active && !used) + return TRUE + + //Being used, and running out. + else if(active && ++used == 2000) + nif.notify("Heat sinks overloaded! Shutting down!",TRUE) + deactivate() + + //Being cleaned, and finishing empty. + else if(!active && --used == 0) + nif.notify("Heat sinks re-chilled.") /datum/nifsoft/compliance name = "Compliance Module" @@ -99,24 +99,24 @@ access = 999 //Prevents anyone from buying it without an emag. var/laws = "Be nice to people!" - New(var/newloc,var/newlaws) - laws = newlaws //Sanitize before this (the disk does) - ..(newloc) +/datum/nifsoft/compliance/New(var/newloc,var/newlaws) + laws = newlaws //Sanitize before this (the disk does) + ..(newloc) - activate() - if((. = ..())) - to_chat(nif.human,"You are compelled to follow these rules: \n[laws]") +/datum/nifsoft/compliance/activate() + if((. = ..())) + to_chat(nif.human,"You are compelled to follow these rules: \n[laws]") - install() - if((. = ..())) - to_chat(nif.human,"You feel suddenly compelled to follow these rules: \n[laws]") +/datum/nifsoft/compliance/install() + if((. = ..())) + to_chat(nif.human,"You feel suddenly compelled to follow these rules: \n[laws]") - uninstall() - nif.notify("ERROR! Unable to comply!",TRUE) - return FALSE //NOPE. +/datum/nifsoft/compliance/uninstall() + nif.notify("ERROR! Unable to comply!",TRUE) + return FALSE //NOPE. - stat_text() - return "Show Laws" +/datum/nifsoft/compliance/stat_text() + return "Show Laws" /datum/nifsoft/sizechange name = "Mass Alteration" @@ -125,28 +125,28 @@ cost = 375 wear = 6 - activate() - if((. = ..())) - var/new_size = input("Put the desired size (25-200%)", "Set Size", 200) as num +/datum/nifsoft/sizechange/activate() + if((. = ..())) + var/new_size = input("Put the desired size (25-200%)", "Set Size", 200) as num - if (!ISINRANGE(new_size,25,200)) - to_chat(nif.human,"The safety features of the NIF Program prevent you from choosing this size.") - return - else - nif.human.resize(new_size/100) - to_chat(nif.human,"You set the size to [new_size]%") + if (!ISINRANGE(new_size,25,200)) + to_chat(nif.human,"The safety features of the NIF Program prevent you from choosing this size.") + return + else + nif.human.resize(new_size/100) + to_chat(nif.human,"You set the size to [new_size]%") - nif.human.visible_message("Swirling grey mist envelops [nif.human] as they change size!","Swirling streams of nanites wrap around you as you change size!") + nif.human.visible_message("Swirling grey mist envelops [nif.human] as they change size!","Swirling streams of nanites wrap around you as you change size!") - spawn(0) - deactivate() + spawn(0) + deactivate() - deactivate() - if((. = ..())) - return TRUE +/datum/nifsoft/sizechange/deactivate() + if((. = ..())) + return TRUE - stat_text() - return "Change Size" +/datum/nifsoft/sizechange/stat_text() + return "Change Size" /datum/nifsoft/worldbend name = "World Bender" @@ -155,22 +155,22 @@ cost = 100 a_drain = 0.01 - activate() - if((. = ..())) - var/list/justme = list(nif.human) - for(var/human in human_mob_list) - if(human == nif.human) - continue - var/mob/living/carbon/human/H = human - H.display_alt_appearance("animals", justme) - alt_farmanimals += nif.human +/datum/nifsoft/worldbend/activate() + if((. = ..())) + var/list/justme = list(nif.human) + for(var/human in human_mob_list) + if(human == nif.human) + continue + var/mob/living/carbon/human/H = human + H.display_alt_appearance("animals", justme) + alt_farmanimals += nif.human - deactivate() - if((. = ..())) - var/list/justme = list(nif.human) - for(var/human in human_mob_list) - if(human == nif.human) - continue - var/mob/living/carbon/human/H = human - H.hide_alt_appearance("animals", justme) - alt_farmanimals -= nif.human +/datum/nifsoft/worldbend/deactivate() + if((. = ..())) + var/list/justme = list(nif.human) + for(var/human in human_mob_list) + if(human == nif.human) + continue + var/mob/living/carbon/human/H = human + H.hide_alt_appearance("animals", justme) + alt_farmanimals -= nif.human diff --git a/code/modules/organs/internal/augment/armmounted.dm b/code/modules/organs/internal/augment/armmounted.dm index 73751be0d9..4131955e15 100644 --- a/code/modules/organs/internal/augment/armmounted.dm +++ b/code/modules/organs/internal/augment/armmounted.dm @@ -86,6 +86,13 @@ integrated_object_type = /obj/item/weapon/melee/energy/sword +/obj/item/organ/internal/augment/armmounted/hand/blade + name = "handblade implant" + desc = "A small implant that fits neatly into the hand. It deploys a small, but dangerous blade." + icon_state = "augment_handblade" + + integrated_object_type = /obj/item/weapon/melee/augment/blade + /* * Shoulder augment. */ @@ -136,6 +143,14 @@ if(istype(owner, /mob/living/carbon/human)) var/mob/living/carbon/human/H = owner H.add_modifier(/datum/modifier/melee_surge, 0.75 MINUTES) + +/obj/item/organ/internal/augment/armmounted/shoulder/blade + name = "armblade implant" + desc = "A large implant that fits into a subject's arm. It deploys a large metal blade by some painful means." + + icon_state = "augment_armblade" + + integrated_object_type = /obj/item/weapon/melee/augment/blade/arm // The toolkit / multi-tool implant. diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm index c8e90d9f78..31adb758ae 100644 --- a/code/modules/organs/internal/stomach.dm +++ b/code/modules/organs/internal/stomach.dm @@ -64,4 +64,10 @@ if(owner && owner.stat != DEAD) owner.bodytemperature += round(owner.robobody_count * 0.25, 0.1) + if(ishuman(owner)) + var/mob/living/carbon/human/H = owner + + if(H.ingested?.total_volume && H.bloodstr) + H.ingested.trans_to_holder(H.bloodstr, rand(2,5)) + return diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 79aae1a776..ffc3d56d1d 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -1135,6 +1135,8 @@ Note that amputating the affected organ does in fact remove the infection from t remove_splint() get_icon() unmutate() + drop_sound = 'sound/items/drop/weldingtool.ogg' + pickup_sound = 'sound/items/pickup/weldingtool.ogg' for(var/obj/item/organ/external/T in children) T.robotize(company, keep_organs = keep_organs) diff --git a/code/modules/overmap/overmap_shuttle.dm b/code/modules/overmap/overmap_shuttle.dm index bdbe6bf382..86ee893f1e 100644 --- a/code/modules/overmap/overmap_shuttle.dm +++ b/code/modules/overmap/overmap_shuttle.dm @@ -133,10 +133,20 @@ var/icon_full = "fuel_port_full" var/opened = 0 var/parent_shuttle + var/base_tank = /obj/item/weapon/tank/phoron /obj/structure/fuel_port/Initialize() . = ..() - new /obj/item/weapon/tank/phoron(src) + if(base_tank) + new base_tank(src) + +/obj/structure/fuel_port/heavy + base_tank = /obj/item/weapon/tank/phoron/pressurized + +/obj/structure/fuel_port/empty + base_tank = null //oops, no gas! + opened = 1 //shows open so you can diagnose 'oops, no gas' easily + icon_state = "fuel_port_empty" //set the default state just to be safe /obj/structure/fuel_port/attack_hand(mob/user as mob) if(!opened) diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index f0d54125ae..5c886fb55a 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -70,6 +70,10 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov apply_visual(user) user.reset_view(linked) user.set_machine(src) + if(isliving(user)) + var/mob/living/L = user + L.looking_elsewhere = 1 + L.handle_vision() user.set_viewsize(world.view + extra_view) GLOB.moved_event.register(user, src, /obj/machinery/computer/ship/proc/unlook) // TODO GLOB.stat_set_event.register(user, src, /obj/machinery/computer/ship/proc/unlook) @@ -77,6 +81,10 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov /obj/machinery/computer/ship/proc/unlook(var/mob/user) user.reset_view() + if(isliving(user)) + var/mob/living/L = user + L.looking_elsewhere = 0 + L.handle_vision() user.set_viewsize() // reset to default GLOB.moved_event.unregister(user, src, /obj/machinery/computer/ship/proc/unlook) // TODO GLOB.stat_set_event.unregister(user, src, /obj/machinery/computer/ship/proc/unlook) @@ -112,4 +120,4 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov var/M = W.resolve() if(M) unlook(M) - . = ..() \ No newline at end of file + . = ..() diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm index f51587d594..76c0d3e6d1 100644 --- a/code/modules/overmap/ships/computers/shuttle.dm +++ b/code/modules/overmap/ships/computers/shuttle.dm @@ -47,6 +47,6 @@ else to_chat(usr,"No valid landing sites in range.") possible_d = shuttle.get_possible_destinations() - if(CanInteract(usr, global.default_state) && (D in possible_d)) + if(CanInteract(usr, GLOB.tgui_default_state) && (D in possible_d)) shuttle.set_destination(possible_d[D]) return TRUE diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm index ac5846202a..8bae95434a 100644 --- a/code/modules/overmap/spacetravel.dm +++ b/code/modules/overmap/spacetravel.dm @@ -47,13 +47,35 @@ proc/get_deepspace(x,y) for(var/atom/movable/AM in contents) if(!AM.lost_in_space()) return FALSE + if(has_buckled_mobs()) + for(var/mob/M in buckled_mobs) + if(!M.lost_in_space()) + return FALSE + return TRUE +/obj/item/device/uav/lost_in_space() + if(state == 1) + return FALSE + return ..() + +/obj/machinery/power/supermatter/lost_in_space() + return FALSE + +/obj/singularity/lost_in_space() + return FALSE + +/obj/vehicle/lost_in_space() + if(load && !load.lost_in_space()) + return FALSE + return ..() + /mob/lost_in_space() return isnull(client) -/mob/living/carbon/human/lost_in_space() - return isnull(client) && !key && stat == DEAD +/mob/living/lost_in_space() + return FALSE + // return isnull(client) && !key && stat == DEAD // Allows bodies that players have ghosted from to be deleted - Ater proc/overmap_spacetravel(var/turf/space/T, var/atom/movable/A) if (!T || !A) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 85ac6d5770..d67ee7b496 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -17,8 +17,10 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins active_power_usage = 200 circuit = /obj/item/weapon/circuitboard/fax - var/obj/item/weapon/card/id/scan = null // identification - var/authenticated = 0 + var/obj/item/weapon/card/id/scan = null + var/authenticated = null + var/rank = null + var/sendcooldown = 0 // to avoid spamming fax messages var/department = "Unknown" // our department var/destination = null // the department we're sending to @@ -33,95 +35,105 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins /obj/machinery/photocopier/faxmachine/attack_hand(mob/user as mob) // CH edit begins here; this allows borgs to use fax machines, meant for the Unity and Clerical modules. user.set_machine(src) - if(issilicon(usr)) // Normally, you have to insert an ID. Borgs, obviously, cannot do this, so it skips the ID process completely. + if(issilicon(usr)) authenticated = 1 - ui_interact(user) + tgui_interact(user) else - ui_interact(user) // CH edit ends here + tgui_interact(user) -/** - * Display the NanoUI window for the fax machine. - * - * See NanoUI documentation for details. - */ -/obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - user.set_machine(src) +/obj/machinery/photocopier/faxmachine/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Fax", name) + ui.open() - var/list/data = list() - if(scan) - data["scanName"] = scan.name - else - data["scanName"] = null - data["bossName"] = using_map.boss_name +/obj/machinery/photocopier/faxmachine/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + data["scan"] = scan ? scan.name : null data["authenticated"] = authenticated + data["rank"] = rank + data["isAI"] = isAI(user) + data["isRobot"] = isrobot(user) + + data["bossName"] = using_map.boss_name data["copyItem"] = copyitem - if(copyitem) - data["copyItemName"] = copyitem.name - else - data["copyItemName"] = null data["cooldown"] = sendcooldown data["destination"] = destination - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "fax.tmpl", src.name, 500, 500) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(10) //this machine is so unimportant let's not have it update that often. + return data -/obj/machinery/photocopier/faxmachine/Topic(href, href_list) - if(href_list["send"]) - if(copyitem) - if (destination in admin_departments) - send_admin_fax(usr, destination) - else - sendfax(destination) +/obj/machinery/photocopier/faxmachine/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE - if (sendcooldown) - spawn(sendcooldown) // cooldown time - sendcooldown = 0 - - else if(href_list["remove"]) - if(copyitem) - if(get_dist(usr, src) >= 2) - to_chat(usr, "\The [copyitem] is too far away for you to remove it.") - return - copyitem.loc = usr.loc - usr.put_in_hands(copyitem) - to_chat(usr, "You take \the [copyitem] out of \the [src].") - copyitem = null - - if(href_list["scan"]) - if (scan) - if(ishuman(usr)) - scan.loc = usr.loc - if(!usr.get_active_hand()) + switch(action) + if("scan") + if(scan) + scan.forceMove(loc) + if(ishuman(usr) && !usr.get_active_hand()) usr.put_in_hands(scan) scan = null else - scan.loc = src.loc + var/obj/item/I = usr.get_active_hand() + if(istype(I, /obj/item/weapon/card/id)) + usr.drop_item() + I.forceMove(src) + scan = I + return TRUE + if("login") + var/login_type = text2num(params["login_type"]) + if(login_type == LOGIN_TYPE_NORMAL && istype(scan)) + if(check_access(scan)) + authenticated = scan.registered_name + rank = scan.assignment + else if(login_type == LOGIN_TYPE_AI && isAI(usr)) + authenticated = usr.name + rank = "AI" + else if(login_type == LOGIN_TYPE_ROBOT && isrobot(usr)) + authenticated = usr.name + var/mob/living/silicon/robot/R = usr + rank = "[R.modtype] [R.braintype]" + return TRUE + if("logout") + if(scan) + scan.forceMove(loc) + if(ishuman(usr) && !usr.get_active_hand()) + usr.put_in_hands(scan) scan = null - else - var/obj/item/I = usr.get_active_hand() - if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I)) - I.loc = src - scan = I - authenticated = 0 + authenticated = null + return TRUE + if("remove") + if(copyitem) + if(get_dist(usr, src) >= 2) + to_chat(usr, "\The [copyitem] is too far away for you to remove it.") + return + copyitem.forceMove(loc) + usr.put_in_hands(copyitem) + to_chat(usr, "You take \the [copyitem] out of \the [src].") + copyitem = null - if(href_list["dept"]) - var/lastdestination = destination - destination = input(usr, "Which department?", "Choose a department", "") as null|anything in (alldepartments + admin_departments) - if(!destination) destination = lastdestination + if(!authenticated) + return + + switch(action) + if("send") + if(copyitem) + if (destination in admin_departments) + send_admin_fax(usr, destination) + else + sendfax(destination) - if(href_list["auth"]) - if ( (!( authenticated ) && (scan)) ) - if (check_access(scan)) - authenticated = 1 + if (sendcooldown) + spawn(sendcooldown) // cooldown time + sendcooldown = 0 - if(href_list["logout"]) - authenticated = 0 + if("dept") + var/lastdestination = destination + destination = input(usr, "Which department?", "Choose a department", "") as null|anything in (alldepartments + admin_departments) + if(!destination) + destination = lastdestination - SSnanoui.update_uis(src) + return TRUE /obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob) if(O.is_multitool() && panel_open) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 8c12f654f6..9182a17530 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -6,6 +6,8 @@ var/label = null var/labels_left = 30 var/mode = 0 //off or on. + drop_sound = 'sound/items/drop/device.ogg' + pickup_sound = 'sound/items/pickup/device.ogg' /obj/item/weapon/hand_labeler/attack() return diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 5bf6a9102a..07009a99c0 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -33,33 +33,71 @@ /obj/machinery/photocopier/attack_hand(mob/user as mob) user.set_machine(src) - ui_interact(user) + tgui_interact(user) -/** - * Display the NanoUI window for the photocopier. - * - * See NanoUI documentation for details. - */ -/obj/machinery/photocopier/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - user.set_machine(src) - - var/list/data = list() - data["copyItem"] = copyitem - data["assPresent"] = has_buckled_mobs() - data["toner"] = toner - data["copies"] = copies - data["maxCopies"] = maxcopies - if(istype(user,/mob/living/silicon)) - data["isSilicon"] = 1 - else - data["isSilicon"] = null - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "photocopier.tmpl", src.name, 300, 250) - ui.set_initial_data(data) +/obj/machinery/photocopier/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Photocopier", name) ui.open() - ui.set_auto_update(10) + +/obj/machinery/photocopier/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + data["has_item"] = copyitem || has_buckled_mobs() // VOREStation Edit: Ass copying + data["isAI"] = issilicon(user) + data["can_AI_print"] = (toner >= 5) + data["has_toner"] = !!toner + data["current_toner"] = toner + data["max_toner"] = 40 + data["num_copies"] = copies + data["max_copies"] = maxcopies + + return data + +/obj/machinery/photocopier/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + switch(action) + if("make_copy") + addtimer(CALLBACK(src, .proc/copy_operation, usr), 0) + . = TRUE + if("remove") + if(copyitem) + copyitem.loc = usr.loc + usr.put_in_hands(copyitem) + to_chat(usr, "You take \the [copyitem] out of \the [src].") + copyitem = null + else if(has_buckled_mobs()) + to_chat(buckled_mobs[1], "You feel a slight pressure on your ass.") // It can't eject your asscheeks, but it'll try. + . = TRUE + if("set_copies") + copies = clamp(text2num(params["num_copies"]), 1, maxcopies) + . = TRUE + if("ai_photo") + if(!issilicon(usr)) + return + if(stat & (BROKEN|NOPOWER)) + return + + if(toner >= 5) + var/mob/living/silicon/tempAI = usr + var/obj/item/device/camera/siliconcam/camera = tempAI.aiCamera + + if(!camera) + return + var/obj/item/weapon/photo/selection = camera.selectpicture() + if (!selection) + return + + var/obj/item/weapon/photo/p = photocopy(selection) + if (p.desc == "") + p.desc += "Copied by [tempAI.name]" + else + p.desc += " - Copied by [tempAI.name]" + toner -= 5 + . = TRUE /obj/machinery/photocopier/proc/copy_operation(var/mob/user) if(copying) @@ -104,51 +142,6 @@ use_power(active_power_usage) copying = FALSE -/obj/machinery/photocopier/Topic(href, href_list) - if(href_list["copy"]) - if(stat & (BROKEN|NOPOWER)) - return - addtimer(CALLBACK(src, .proc/copy_operation, usr), 0) - - else if(href_list["remove"]) - if(copyitem) - copyitem.loc = usr.loc - usr.put_in_hands(copyitem) - to_chat(usr, "You take \the [copyitem] out of \the [src].") - copyitem = null - else if(has_buckled_mobs()) - to_chat(buckled_mobs[1], "You feel a slight pressure on your ass.") // It can't eject your asscheeks, but it'll try. - return TOPIC_REFRESH - else if(href_list["min"]) - if(copies > 1) - copies-- - else if(href_list["add"]) - if(copies < maxcopies) - copies++ - else if(href_list["aipic"]) - if(!istype(usr,/mob/living/silicon)) return - if(stat & (BROKEN|NOPOWER)) return - - if(toner >= 5) - var/mob/living/silicon/tempAI = usr - var/obj/item/device/camera/siliconcam/camera = tempAI.aiCamera - - if(!camera) - return - var/obj/item/weapon/photo/selection = camera.selectpicture() - if (!selection) - return - - var/obj/item/weapon/photo/p = photocopy(selection) - if (p.desc == "") - p.desc += "Copied by [tempAI.name]" - else - p.desc += " - Copied by [tempAI.name]" - toner -= 5 - sleep(15) - - SSnanoui.update_uis(src) - /obj/machinery/photocopier/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, /obj/item/weapon/paper) || istype(O, /obj/item/weapon/photo) || istype(O, /obj/item/weapon/paper_bundle)) if(!copyitem) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index b63048fdc0..c4460e5dcf 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -195,7 +195,7 @@ var/global/photo_count = 0 for(var/i; i <= sorted.len; i++) var/atom/A = sorted[i] if(A) - var/icon/img = getFlatIcon(A)//, picture_planes = picture_planes)//build_composite_icon(A) //VOREStation Edit + var/icon/img = getFlatIcon(A, no_anim = TRUE)//, picture_planes = picture_planes)//build_composite_icon(A) //VOREStation Edit // If what we got back is actually a picture, draw it. if(istype(img, /icon)) @@ -216,7 +216,7 @@ var/global/photo_count = 0 // Calculate where we are relative to the center of the photo var/xoff = (the_turf.x - center.x) * 32 + center_offset var/yoff = (the_turf.y - center.y) * 32 + center_offset - res.Blend(getFlatIcon(the_turf.loc), blendMode2iconMode(the_turf.blend_mode),xoff,yoff) + res.Blend(getFlatIcon(the_turf.loc, no_anim = TRUE), blendMode2iconMode(the_turf.blend_mode),xoff,yoff) return res diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index ea614aa11e..7be509c96f 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -12,6 +12,8 @@ matter = list(DEFAULT_WALL_MATERIAL = 60) pressure_resistance = 2 attack_verb = list("stamped") + drop_sound = 'sound/items/drop/device.ogg' + pickup_sound = 'sound/items/pickup/device.ogg' /obj/item/weapon/stamp/captain name = "site manager's rubber stamp" diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm new file mode 100644 index 0000000000..10a04effb3 --- /dev/null +++ b/code/modules/pda/ai.dm @@ -0,0 +1,58 @@ + +// Special AI/pAI PDAs that cannot explode. +/obj/item/device/pda/ai + icon_state = "NONE" + ttone = "data" + detonate = 0 + touch_silent = TRUE + programs = list( + new/datum/data/pda/app/main_menu, + new/datum/data/pda/app/notekeeper, + new/datum/data/pda/app/news, + new/datum/data/pda/app/messenger) + +/obj/item/device/pda/ai/proc/set_name_and_job(newname as text, newjob as text, newrank as null|text) + owner = newname + ownjob = newjob + if(newrank) + ownrank = newrank + else + ownrank = ownjob + name = newname + " (" + ownjob + ")" + +//AI verb and proc for sending PDA messages. +/obj/item/device/pda/ai/verb/cmd_pda_open_ui() + set category = "AI IM" + set name = "Use PDA" + set src in usr + + if(!can_use(usr)) + return + tgui_interact(usr) + +/obj/item/device/pda/ai/can_use() + return 1 + +/obj/item/device/pda/ai/attack_self(mob/user as mob) + if ((honkamt > 0) && (prob(60)))//For clown virus. + honkamt-- + playsound(src, 'sound/items/bikehorn.ogg', 30, 1) + return + + +/obj/item/device/pda/ai/pai + ttone = "assist" + var/our_owner = null // Ref to a pAI + +/obj/item/device/pda/ai/pai/New(mob/living/silicon/pai/P) + if(istype(P)) + our_owner = REF(P) + return ..() + +/obj/item/device/pda/ai/pai/tgui_status(mob/living/silicon/pai/user, datum/tgui_state/state) + if(!istype(user) || REF(user) != our_owner) // Only allow our pAI to interface with us + return STATUS_CLOSE + return ..() + +/obj/item/device/pda/ai/shell + spam_proof = TRUE // Since empty shells get a functional PDA. diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm new file mode 100644 index 0000000000..eb64125ee9 --- /dev/null +++ b/code/modules/pda/app.dm @@ -0,0 +1,109 @@ +// Base class for anything that can show up on home screen +/datum/data/pda + var/icon = "tasks" //options comes from http://fontawesome.io/icons/ + var/notify_icon = "exclamation-circle" + var/notify_silent = 0 + var/hidden = 0 // program not displayed in main menu + var/category = "General" // the category to list it in on the main menu + var/obj/item/device/pda/pda // if this is null, and the app is running code, something's gone wrong + +/datum/data/pda/Destroy() + pda = null + return ..() + +/datum/data/pda/proc/start() + return + +/datum/data/pda/proc/stop() + return + +/datum/data/pda/proc/program_process() + return + +/datum/data/pda/proc/program_hit_check() + return + +/datum/data/pda/proc/notify(message, blink = 1) + if(message) + //Search for holder of the PDA. + var/mob/living/L = null + if(pda.loc && isliving(pda.loc)) + L = pda.loc + //Maybe they are a pAI! + else + L = get(pda, /mob/living/silicon) + + if(L) + to_chat(L, "[bicon(pda)] [message]") + SStgui.update_user_uis(L, pda) // Update the receiving user's PDA UI so that they can see the new message + + if(!notify_silent) + pda.play_ringtone() + + if(blink && !(src in pda.notifying_programs)) + pda.overlays += image('icons/obj/pda.dmi', "pda-r") + pda.notifying_programs |= src + +/datum/data/pda/proc/unnotify() + if(src in pda.notifying_programs) + pda.notifying_programs -= src + if(!pda.notifying_programs.len) + pda.overlays -= image('icons/obj/pda.dmi', "pda-r") + +// An app has a button on the home screen and its own UI +/datum/data/pda/app + name = "App" + size = 3 + var/title = null // what is displayed in the title bar when this is the current app + var/template = "" + var/update = PDA_APP_UPDATE + var/has_back = 0 + +/datum/data/pda/app/tgui_host(mob/user) + return pda || src + +/datum/data/pda/app/New() + if(!title) + title = name + +/datum/data/pda/app/start() + if(pda.current_app) + pda.current_app.stop() + pda.current_app = src + return 1 + +/datum/data/pda/app/proc/update_ui(mob/user as mob, list/data) + + +// Utilities just have a button on the home screen, but custom code when clicked +/datum/data/pda/utility + name = "Utility" + icon = "gear" + size = 1 + category = "Utilities" + + +/datum/data/pda/utility/scanmode + var/base_name + category = "Scanners" + +/datum/data/pda/utility/scanmode/New(obj/item/weapon/cartridge/C) + ..(C) + name = "Enable [base_name]" + +/datum/data/pda/utility/scanmode/start() + if(pda.scanmode) + pda.scanmode.name = "Enable [pda.scanmode.base_name]" + + if(pda.scanmode == src) + pda.scanmode = null + else + pda.scanmode = src + name = "Disable [base_name]" + + pda.update_shortcuts() + return 1 + +/datum/data/pda/utility/scanmode/proc/scan_mob(mob/living/C as mob, mob/living/user as mob) + +/datum/data/pda/utility/scanmode/proc/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm new file mode 100644 index 0000000000..2ec6a4e536 --- /dev/null +++ b/code/modules/pda/cart.dm @@ -0,0 +1,311 @@ +var/list/command_cartridges = list( + /obj/item/weapon/cartridge/captain, + /obj/item/weapon/cartridge/hop, + /obj/item/weapon/cartridge/hos, + /obj/item/weapon/cartridge/ce, + /obj/item/weapon/cartridge/rd, + /obj/item/weapon/cartridge/cmo, + /obj/item/weapon/cartridge/head, + /obj/item/weapon/cartridge/lawyer // Internal Affaris, + ) + +var/list/security_cartridges = list( + /obj/item/weapon/cartridge/security, + /obj/item/weapon/cartridge/detective, + /obj/item/weapon/cartridge/hos + ) + +var/list/engineering_cartridges = list( + /obj/item/weapon/cartridge/engineering, + /obj/item/weapon/cartridge/atmos, + /obj/item/weapon/cartridge/ce + ) + +var/list/medical_cartridges = list( + /obj/item/weapon/cartridge/medical, + /obj/item/weapon/cartridge/chemistry, + /obj/item/weapon/cartridge/cmo + ) + +var/list/research_cartridges = list( + /obj/item/weapon/cartridge/signal/science, + /obj/item/weapon/cartridge/rd + ) + +var/list/cargo_cartridges = list( + /obj/item/weapon/cartridge/quartermaster, // This also covers cargo-techs, apparently, + /obj/item/weapon/cartridge/miner, + /obj/item/weapon/cartridge/hop + ) + +var/list/civilian_cartridges = list( + /obj/item/weapon/cartridge/janitor, + /obj/item/weapon/cartridge/service, + /obj/item/weapon/cartridge/hop + ) + +/obj/item/weapon/cartridge + name = "generic cartridge" + desc = "A data cartridge for portable microcomputers." + icon = 'icons/obj/pda.dmi' + icon_state = "cart" + item_state = "electronic" + w_class = ITEMSIZE_TINY + drop_sound = 'sound/items/drop/component.ogg' + pickup_sound = 'sound/items/pickup/component.ogg' + + var/obj/item/radio/integrated/radio = null + + var/charges = 0 + + var/list/stored_data = list() + var/list/programs = list() + var/list/messenger_plugins = list() + +/obj/item/weapon/cartridge/Destroy() + QDEL_NULL(radio) + QDEL_LIST(programs) + QDEL_LIST(messenger_plugins) + return ..() + +/obj/item/weapon/cartridge/proc/update_programs(obj/item/device/pda/pda) + for(var/A in programs) + var/datum/data/pda/P = A + P.pda = pda + for(var/A in messenger_plugins) + var/datum/data/pda/messenger_plugin/P = A + P.pda = pda + +/obj/item/weapon/cartridge/engineering + name = "\improper Power-ON cartridge" + icon_state = "cart-e" + programs = list( + new/datum/data/pda/app/power, + new/datum/data/pda/utility/scanmode/halogen) + +/obj/item/weapon/cartridge/atmos + name = "\improper BreatheDeep cartridge" + icon_state = "cart-a" + programs = list(new/datum/data/pda/utility/scanmode/gas) + +/obj/item/weapon/cartridge/medical + name = "\improper Med-U cartridge" + icon_state = "cart-m" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical) + +/obj/item/weapon/cartridge/chemistry + name = "\improper ChemWhiz cartridge" + icon_state = "cart-chem" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + new/datum/data/pda/utility/scanmode/reagent) + +/obj/item/weapon/cartridge/security + name = "\improper R.O.B.U.S.T. cartridge" + icon_state = "cart-s" + programs = list( + new/datum/data/pda/app/crew_records/security) + +/obj/item/weapon/cartridge/detective + name = "\improper D.E.T.E.C.T. cartridge" + icon_state = "cart-s" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + + new/datum/data/pda/app/crew_records/security) + + +/obj/item/weapon/cartridge/janitor + name = "\improper CustodiPRO cartridge" + desc = "The ultimate in clean-room design." + icon_state = "cart-j" + programs = list(new/datum/data/pda/app/janitor) + +/obj/item/weapon/cartridge/lawyer + name = "\improper P.R.O.V.E. cartridge" + icon_state = "cart-s" + programs = list(new/datum/data/pda/app/crew_records/security) + +/obj/item/weapon/cartridge/clown + name = "\improper Honkworks 5.0 cartridge" + icon_state = "cart-clown" + charges = 5 + programs = list(new/datum/data/pda/utility/honk) + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/clown) + +/obj/item/weapon/cartridge/mime + name = "\improper Gestur-O 1000 cartridge" + icon_state = "cart-mi" + charges = 5 + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/mime) + +/obj/item/weapon/cartridge/service + name = "\improper Serv-U Pro cartridge" + desc = "A data cartridge designed to serve YOU!" + +/obj/item/weapon/cartridge/signal + name = "generic signaler cartridge" + desc = "A data cartridge with an integrated radio signaler module." + programs = list(new/datum/data/pda/app/signaller) + +/obj/item/weapon/cartridge/signal/Initialize() + radio = new /obj/item/radio/integrated/signal(src) + ..() + +/obj/item/weapon/cartridge/signal/science + name = "\improper Signal Ace 2 cartridge" + desc = "Complete with integrated radio signaler!" + icon_state = "cart-tox" + programs = list( + new/datum/data/pda/utility/scanmode/gas, + + new/datum/data/pda/utility/scanmode/reagent, + + new/datum/data/pda/app/signaller) + +/obj/item/weapon/cartridge/quartermaster + name = "\improper Space Parts & Space Vendors cartridge" + desc = "Perfect for the Quartermaster on the go!" + icon_state = "cart-q" + programs = list( + new/datum/data/pda/app/supply) + +/obj/item/weapon/cartridge/miner + name = "\improper Drill-Jockey 4.5 cartridge" + desc = "It's covered in some sort of sand." + icon_state = "cart-q" + +/obj/item/weapon/cartridge/head + name = "\improper Easy-Record DELUXE cartridge" + icon_state = "cart-h" + programs = list(new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/hop + name = "\improper HumanResources9001 cartridge" + icon_state = "cart-h" + programs = list( + new/datum/data/pda/app/crew_records/security, + + new/datum/data/pda/app/janitor, + + new/datum/data/pda/app/supply, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/hos + name = "\improper R.O.B.U.S.T. DELUXE cartridge" + icon_state = "cart-hos" + programs = list( + new/datum/data/pda/app/crew_records/security, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/ce + name = "\improper Power-On DELUXE cartridge" + icon_state = "cart-ce" + programs = list( + new/datum/data/pda/app/power, + new/datum/data/pda/utility/scanmode/halogen, + + new/datum/data/pda/utility/scanmode/gas, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/cmo + name = "\improper Med-U DELUXE cartridge" + icon_state = "cart-cmo" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + + new/datum/data/pda/utility/scanmode/reagent, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/rd + name = "\improper Signal Ace DELUXE cartridge" + icon_state = "cart-rd" + programs = list( + new/datum/data/pda/utility/scanmode/gas, + + new/datum/data/pda/utility/scanmode/reagent, + + new/datum/data/pda/app/signaller, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/rd/Initialize() + radio = new /obj/item/radio/integrated/signal(src) + . = ..() + +/obj/item/weapon/cartridge/captain + name = "\improper Value-PAK cartridge" + desc = "Now with 200% more value!" + icon_state = "cart-c" + programs = list( + new/datum/data/pda/app/power, + new/datum/data/pda/utility/scanmode/halogen, + + new/datum/data/pda/utility/scanmode/gas, + + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + + new/datum/data/pda/utility/scanmode/reagent, + + new/datum/data/pda/app/crew_records/security, + + new/datum/data/pda/app/janitor, + + new/datum/data/pda/app/supply, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/syndicate + name = "\improper Detomatix cartridge" + icon_state = "cart" + var/initial_remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. + charges = 4 + programs = list(new/datum/data/pda/utility/toggle_door) + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/detonate) + +/obj/item/weapon/cartridge/syndicate/New() + var/datum/data/pda/utility/toggle_door/D = programs[1] + if(istype(D)) + D.remote_door_id = initial_remote_door_id + +/obj/item/weapon/cartridge/proc/post_status(var/command, var/data1, var/data2) + + var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) + if(!frequency) return + + var/datum/signal/status_signal = new + status_signal.source = src + status_signal.transmission_method = TRANSMISSION_RADIO + status_signal.data["command"] = command + + switch(command) + if("message") + status_signal.data["msg1"] = data1 + status_signal.data["msg2"] = data2 + if(loc) + var/obj/item/PDA = loc + var/mob/user = PDA.fingerprintslast + log_admin("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") + message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") + + if("alert") + status_signal.data["picture_state"] = data1 + + frequency.post_signal(src, status_signal) + +/obj/item/weapon/cartridge/frame + name = "F.R.A.M.E. cartridge" + icon_state = "cart" + charges = 5 + var/telecrystals = 0 + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/frame) diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm new file mode 100644 index 0000000000..d7ca7717d5 --- /dev/null +++ b/code/modules/pda/cart_apps.dm @@ -0,0 +1,311 @@ +/datum/data/pda/app/status_display + name = "Status Display" + icon = "list-alt" + template = "pda_status_display" + category = "Utilities" + + var/message1 // used for status_displays + var/message2 + +/datum/data/pda/app/status_display/update_ui(mob/user as mob, list/data) + data["records"] = list( + "message1" = message1 ? message1 : "(none)", + "message2" = message2 ? message2 : "(none)") + +/datum/data/pda/app/status_display/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("Status") + switch(params["statdisp"]) + if("message") + post_status("message", message1, message2) + if("alert") + post_status("alert", params["alert"]) + if("setmsg1") + message1 = clean_input("Line 1", "Enter Message Text", message1) + if("setmsg2") + message2 = clean_input("Line 2", "Enter Message Text", message2) + else + post_status(params["statdisp"]) + return TRUE + +/datum/data/pda/app/status_display/proc/post_status(var/command, var/data1, var/data2) + var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) + if(!frequency) + return + + var/datum/signal/status_signal = new + status_signal.source = src + status_signal.transmission_method = 1 + status_signal.data["command"] = command + + switch(command) + if("message") + status_signal.data["msg1"] = data1 + status_signal.data["msg2"] = data2 + var/mob/user = pda.fingerprintslast + if(istype(pda.loc, /mob/living)) + user = pda.loc + log_admin("STATUS: [user] set status screen with [pda]. Message: [data1] [data2]") + message_admins("STATUS: [user] set status screen with [pda]. Message: [data1] [data2]") + + if("alert") + status_signal.data["picture_state"] = data1 + + spawn(0) + frequency.post_signal(src, status_signal) + + +/datum/data/pda/app/signaller + name = "Signaler System" + icon = "rss" + template = "pda_signaller" + category = "Utilities" + +/datum/data/pda/app/signaller/update_ui(mob/user as mob, list/data) + if(pda.cartridge && istype(pda.cartridge.radio, /obj/item/radio/integrated/signal)) + var/obj/item/radio/integrated/signal/R = pda.cartridge.radio + data["frequency"] = R.frequency + data["minFrequency"] = RADIO_LOW_FREQ + data["maxFrequency"] = RADIO_HIGH_FREQ + data["code"] = R.code + +/datum/data/pda/app/signaller/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + if(pda.cartridge && istype(pda.cartridge.radio, /obj/item/radio/integrated/signal)) + var/obj/item/radio/integrated/signal/R = pda.cartridge.radio + + switch(action) + if("signal") + spawn(0) + R.send_signal("ACTIVATE") + if("freq") + var/frequency = unformat_frequency(params["freq"]) + frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ) + R.set_frequency(frequency) + . = TRUE + if("code") + R.code = clamp(round(text2num(params["code"])), 1, 100) + . = TRUE + if("reset") + if(params["reset"] == "freq") + R.set_frequency(initial(R.frequency)) + else + R.code = initial(R.code) + . = TRUE + +/datum/data/pda/app/power + name = "Power Monitor" + icon = "exclamation-triangle" + template = "pda_power" + category = "Engineering" + + var/datum/tgui_module/power_monitor/power_monitor + +/datum/data/pda/app/power/New() + power_monitor = new(src) + . = ..() + +/datum/data/pda/app/power/Destroy() + QDEL_NULL(power_monitor) + return ..() + +/datum/data/pda/app/power/update_ui(mob/user as mob, list/data) + data.Add(power_monitor.tgui_data(user)) + +/datum/data/pda/app/power/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + if(power_monitor.tgui_act(action, params, ui, state)) + return TRUE + switch(action) + if("Back") + power_monitor.active_sensor = null + return TRUE + +/datum/data/pda/app/crew_records + var/datum/data/record/general_records = null + +/datum/data/pda/app/crew_records/update_ui(mob/user as mob, list/data) + var/list/records[0] + + if(general_records && (general_records in data_core.general)) + data["records"] = records + records["general"] = general_records.fields + return records + else + for(var/A in sortRecord(data_core.general)) + var/datum/data/record/R = A + if(R) + records += list(list(Name = R.fields["name"], "ref" = "\ref[R]")) + data["recordsList"] = records + data["records"] = null + return null + +/datum/data/pda/app/crew_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("Records") + var/datum/data/record/R = locate(params["target"]) + if(R && (R in data_core.general)) + load_records(R) + return TRUE + if("Back") + general_records = null + has_back = 0 + return TRUE + +/datum/data/pda/app/crew_records/proc/load_records(datum/data/record/R) + general_records = R + has_back = 1 + +/datum/data/pda/app/crew_records/medical + name = "Medical Records" + icon = "heartbeat" + template = "pda_medical" + category = "Medical" + + var/datum/data/record/medical_records = null + +/datum/data/pda/app/crew_records/medical/update_ui(mob/user as mob, list/data) + var/list/records = ..() + if(!records) + return + + if(medical_records && (medical_records in data_core.medical)) + records["medical"] = medical_records.fields + + return records + +/datum/data/pda/app/crew_records/medical/load_records(datum/data/record/R) + ..(R) + for(var/A in data_core.medical) + var/datum/data/record/E = A + if(E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + medical_records = E + break + +/datum/data/pda/app/crew_records/security + name = "Security Records" + icon = "tags" + template = "pda_security" + category = "Security" + + var/datum/data/record/security_records = null + +/datum/data/pda/app/crew_records/security/update_ui(mob/user as mob, list/data) + var/list/records = ..() + if(!records) + return + + if(security_records && (security_records in data_core.security)) + records["security"] = security_records.fields + + return records + +/datum/data/pda/app/crew_records/security/load_records(datum/data/record/R) + ..(R) + for(var/A in data_core.security) + var/datum/data/record/E = A + if(E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + security_records = E + break + +/datum/data/pda/app/supply + name = "Supply Records" + icon = "file-word-o" + template = "pda_supply" + category = "Quartermaster" + +/datum/data/pda/app/supply/update_ui(mob/user as mob, list/data) + var/supplyData[0] + var/datum/shuttle/autodock/ferry/supply/shuttle = SSsupply.shuttle + if (shuttle) + supplyData["shuttle_moving"] = shuttle.has_arrive_time() + supplyData["shuttle_eta"] = shuttle.eta_minutes() + supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock" + var/supplyOrderCount = 0 + var/supplyOrderData[0] + for(var/S in SSsupply.shoppinglist) + var/datum/supply_order/SO = S + + supplyOrderCount++ + supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment)) + + supplyData["approved"] = supplyOrderData + supplyData["approved_count"] = supplyOrderCount + + var/requestCount = 0 + var/requestData[0] + for(var/S in SSsupply.order_history) + var/datum/supply_order/SO = S + if(SO.status != SUP_ORDER_REQUESTED) + continue + + requestCount++ + requestData[++requestData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "OrderedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment)) + + supplyData["requests"] = requestData + supplyData["requests_count"] = requestCount + + data["supply"] = supplyData + +/datum/data/pda/app/janitor + name = "Custodial Locator" + icon = "trash-alt-o" + template = "pda_janitor" + category = "Utilities" + +/datum/data/pda/app/janitor/update_ui(mob/user as mob, list/data) + var/JaniData[0] + var/turf/cl = get_turf(pda) + + if(cl) + JaniData["user_loc"] = list("x" = cl.x, "y" = cl.y) + else + JaniData["user_loc"] = list("x" = 0, "y" = 0) + + var/MopData[0] + for(var/obj/item/weapon/mop/M in GLOB.all_mops)//GLOB.janitorial_equipment) + var/turf/ml = get_turf(M) + if(ml) + if(ml.z != cl.z) + continue + var/direction = get_dir(pda, M) + MopData[++MopData.len] = list ("x" = ml.x, "y" = ml.y, "dir" = uppertext(dir2text(direction)), "status" = M.reagents.total_volume ? "Wet" : "Dry") + + var/BucketData[0] + for(var/obj/structure/mopbucket/B in GLOB.all_mopbuckets)//GLOB.janitorial_equipment) + var/turf/bl = get_turf(B) + if(bl) + if(bl.z != cl.z) + continue + var/direction = get_dir(pda,B) + BucketData[++BucketData.len] = list ("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "volume" = B.reagents.total_volume, "max_volume" = B.reagents.maximum_volume) + + var/CbotData[0] + for(var/mob/living/bot/cleanbot/B in mob_list) + var/turf/bl = get_turf(B) + if(bl) + if(bl.z != cl.z) + continue + var/direction = get_dir(pda,B) + CbotData[++CbotData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.on ? "Online" : "Offline") + + var/CartData[0] + for(var/obj/structure/janitorialcart/B in GLOB.all_janitorial_carts)//GLOB.janitorial_equipment) + var/turf/bl = get_turf(B) + if(bl) + if(bl.z != cl.z) + continue + var/direction = get_dir(pda,B) + CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "volume" = B.reagents.total_volume, "max_volume" = B.reagents.maximum_volume) + + JaniData["mops"] = MopData.len ? MopData : null + JaniData["buckets"] = BucketData.len ? BucketData : null + JaniData["cleanbots"] = CbotData.len ? CbotData : null + JaniData["carts"] = CartData.len ? CartData : null + data["janitor"] = JaniData diff --git a/code/modules/pda/cart_vr.dm b/code/modules/pda/cart_vr.dm new file mode 100644 index 0000000000..1f1a1cbe52 --- /dev/null +++ b/code/modules/pda/cart_vr.dm @@ -0,0 +1,20 @@ +var/list/exploration_cartridges = list( + /obj/item/weapon/cartridge/explorer, + /obj/item/weapon/cartridge/sar + ) + +/obj/item/weapon/cartridge/explorer + name = "\improper Explorator cartridge" + icon_state = "cart-e" + programs = list( + new/datum/data/pda/utility/scanmode/reagent, + new/datum/data/pda/utility/scanmode/gas) + +/obj/item/weapon/cartridge/sar + name = "\improper Med-Exp cartridge" + icon_state = "cart-m" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + new/datum/data/pda/utility/scanmode/reagent, + new/datum/data/pda/utility/scanmode/gas) diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm new file mode 100644 index 0000000000..4b561c9844 --- /dev/null +++ b/code/modules/pda/core_apps.dm @@ -0,0 +1,206 @@ +/datum/data/pda/app/main_menu + icon = "home" + template = "pda_main_menu" + hidden = 1 + +/datum/data/pda/app/main_menu/update_ui(mob/user as mob, list/data) + title = pda.name + + data["app"]["is_home"] = 1 + + data["apps"] = pda.shortcut_cache + data["categories"] = pda.shortcut_cat_order + data["pai"] = !isnull(pda.pai) // pAI inserted? + + var/list/notifying[0] + for(var/P in pda.notifying_programs) + notifying["\ref[P]"] = 1 + data["notifying"] = notifying + +/datum/data/pda/app/main_menu/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("UpdateInfo") + pda.ownjob = pda.id.assignment + pda.ownrank = pda.id.rank + pda.name = "PDA-[pda.owner] ([pda.ownjob])" + return TRUE + if("pai") + if(pda.pai) + if(pda.pai.loc != pda) + pda.pai = null + else + switch(text2num(params["option"])) + if(1) // Configure pAI device + pda.pai.attack_self(usr) + if(2) // Eject pAI device + var/turf/T = get_turf_or_move(pda.loc) + if(T) + pda.pai.loc = T + pda.pai = null + return TRUE + +/datum/data/pda/app/notekeeper + name = "Notekeeper" + icon = "sticky-note-o" + template = "pda_notekeeper" + + var/note = null + var/notehtml = "" + +/datum/data/pda/app/notekeeper/start() + . = ..() + if(!note) + note = "Congratulations, your station has chosen the [pda.model_name]!" + +/datum/data/pda/app/notekeeper/update_ui(mob/user as mob, list/data) + data["note"] = note // current pda notes + +/datum/data/pda/app/notekeeper/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("Edit") + var/n = input("Please enter message", name, notehtml) as message + if(pda.loc == usr) + note = adminscrub(n) + notehtml = html_decode(note) + note = replacetext(note, "\n", "
") + else + pda.close(usr) + return TRUE + +/datum/data/pda/app/manifest + name = "Crew Manifest" + icon = "user" + template = "pda_manifest" + +/datum/data/pda/app/manifest/update_ui(mob/user as mob, list/data) + if(data_core) + data_core.get_manifest_list() + data["manifest"] = PDA_Manifest + +/datum/data/pda/app/manifest/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + +/datum/data/pda/app/atmos_scanner + name = "Atmospheric Scan" + icon = "fire" + template = "pda_atmos_scan" + category = "Utilities" + +/datum/data/pda/app/atmos_scanner/update_ui(mob/user as mob, list/data) + var/list/results = list() + var/turf/T = get_turf(user) + if(!isnull(T)) + var/datum/gas_mixture/environment = T.return_air() + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles + if (total_moles) + var/o2_level = environment.gas["oxygen"]/total_moles + var/n2_level = environment.gas["nitrogen"]/total_moles + var/co2_level = environment.gas["carbon_dioxide"]/total_moles + var/phoron_level = environment.gas["phoron"]/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) + + // entry is what the element is describing + // Type identifies which unit or other special characters to use + // Val is the information reported + // Bad_high/_low are the values outside of which the entry reports as dangerous + // Poor_high/_low are the values outside of which the entry reports as unideal + // Values were extracted from the template itself + results = list( + list("entry" = "Pressure", "units" = "kPa", "val" = "[round(pressure,0.1)]", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80), + list("entry" = "Temperature", "units" = "°C", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5), + list("entry" = "Oxygen", "units" = "kPa", "val" = "[round(o2_level*100,0.1)]", "bad_high" = 140, "poor_high" = 135, "poor_low" = 19, "bad_low" = 17), + list("entry" = "Nitrogen", "units" = "kPa", "val" = "[round(n2_level*100,0.1)]", "bad_high" = 105, "poor_high" = 85, "poor_low" = 50, "bad_low" = 40), + list("entry" = "Carbon Dioxide", "units" = "kPa", "val" = "[round(co2_level*100,0.1)]", "bad_high" = 10, "poor_high" = 5, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Phoron", "units" = "kPa", "val" = "[round(phoron_level*100,0.01)]", "bad_high" = 0.5, "poor_high" = 0, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Other", "units" = "kPa", "val" = "[round(unknown_level, 0.01)]", "bad_high" = 1, "poor_high" = 0.5, "poor_low" = 0, "bad_low" = 0) + ) + + if(isnull(results)) + results = list(list("entry" = "pressure", "units" = "kPa", "val" = "0", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80)) + + data["aircontents"] = results + +/datum/data/pda/app/news + name = "News" + icon = "newspaper" + template = "pda_news" + + var/newsfeed_channel + +/datum/data/pda/app/news/update_ui(mob/user as mob, list/data) + data["feeds"] = compile_news() + data["latest_news"] = get_recent_news() + if(newsfeed_channel) + data["target_feed"] = data["feeds"][newsfeed_channel] + else + data["target_feed"] = null + +/datum/data/pda/app/news/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("newsfeed") + newsfeed_channel = text2num(params["newsfeed"]) + +/datum/data/pda/app/news/proc/compile_news() + var/list/feeds = list() + for(var/datum/feed_channel/channel in news_network.network_channels) + var/list/messages = list() + if(!channel.censored) + var/index = 0 + for(var/datum/feed_message/FM in channel.messages) + index++ + var/list/msgdata = list( + "author" = FM.author, + "body" = FM.body, + "img" = null, + "message_type" = FM.message_type, + "time_stamp" = FM.time_stamp, + "caption" = FM.caption, + "index" = index + ) + if(FM.img) + msgdata["img"] = icon2base64(FM.img) + messages[++messages.len] = msgdata + + feeds[++feeds.len] = list( + "name" = channel.channel_name, + "censored" = channel.censored, + "author" = channel.author, + "messages" = messages, + "index" = feeds.len + 1 + ) + return feeds + +/datum/data/pda/app/news/proc/get_recent_news() + var/list/news = list() + + // Compile all the newscasts + for(var/datum/feed_channel/channel in news_network.network_channels) + if(!channel.censored) + for(var/datum/feed_message/FM in channel.messages) + var/body = replacetext(FM.body, "\n", "
") + news[++news.len] = list( + "channel" = channel.channel_name, + "author" = FM.author, + "body" = body, + "message_type" = FM.message_type, + "time_stamp" = FM.time_stamp, + "has_image" = (FM.img != null), + "caption" = FM.caption, + "time" = FM.post_time + ) + + // Cut out all but the youngest three + if(news.len > 3) + sortByKey(news, "time") + news.Cut(1, news.len - 2) // Last three have largest timestamps, youngest posts + news.Swap(1, 3) // List is sorted in ascending order of timestamp, we want descending + + return news \ No newline at end of file diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm new file mode 100644 index 0000000000..a902bec3aa --- /dev/null +++ b/code/modules/pda/messenger.dm @@ -0,0 +1,247 @@ +/datum/data/pda/app/messenger + name = "Messenger" + icon = "comments-o" + notify_icon = "comments" + title = "SpaceMessenger V4.1.0" + template = "pda_messenger" + + var/toff = 0 //If 1, messenger disabled + var/list/tnote[0] //Current Texts + var/last_text //No text spamming + + var/m_hidden = 0 // Is the PDA hidden from the PDA list? + var/active_conversation = null // New variable that allows us to only view a single conversation. + var/list/conversations = list() // For keeping up with who we have PDA messsages from. + +/datum/data/pda/app/messenger/start() + . = ..() + unnotify() + +/datum/data/pda/app/messenger/update_ui(mob/user as mob, list/data) + data["silent"] = notify_silent // does the pda make noise when it receives a message? + data["toff"] = toff // is the messenger function turned off? + data["active_conversation"] = active_conversation // Which conversation are we following right now? + + has_back = active_conversation + if(active_conversation) + data["messages"] = tnote + for(var/c in tnote) + if(c["target"] == active_conversation) + data["convo_name"] = sanitize(c["owner"]) + data["convo_job"] = sanitize(c["job"]) + break + else + var/convopdas[0] + var/pdas[0] + for(var/A in PDAs) + var/obj/item/device/pda/P = A + var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) + + if(!P.owner || PM.toff || P == pda || PM.m_hidden) + continue + if(conversations.Find("\ref[P]")) + convopdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "1"))) + else + pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0"))) + + data["convopdas"] = convopdas + data["pdas"] = pdas + + var/list/plugins = list() + if(pda.cartridge) + for(var/A in pda.cartridge.messenger_plugins) + var/datum/data/pda/messenger_plugin/P = A + plugins += list(list(name = P.name, icon = P.icon, ref = "\ref[P]")) + data["plugins"] = plugins + + if(pda.cartridge) + data["charges"] = pda.cartridge.charges ? pda.cartridge.charges : 0 + +/datum/data/pda/app/messenger/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + unnotify() + + . = TRUE + switch(action) + if("Toggle Messenger") + toff = !toff + if("Toggle Ringer")//If viewing texts then erase them, if not then toggle silent status + notify_silent = !notify_silent + if("Clear")//Clears messages + if(params["option"] == "All") + tnote.Cut() + conversations.Cut() + if(params["option"] == "Convo") + var/new_tnote[0] + for(var/i in tnote) + if(i["target"] != active_conversation) + new_tnote[++new_tnote.len] = i + tnote = new_tnote + conversations.Remove(active_conversation) + + active_conversation = null + if("Message") + var/obj/item/device/pda/P = locate(params["target"]) + create_message(usr, P) + if(params["target"] in conversations) // Need to make sure the message went through, if not welp. + active_conversation = params["target"] + if("Select Conversation") + var/P = params["target"] + for(var/n in conversations) + if(P == n) + active_conversation = P + if("Messenger Plugin") + if(!params["target"] || !params["plugin"]) + return + + var/obj/item/device/pda/P = locate(params["target"]) + if(!P) + to_chat(usr, "PDA not found.") + + var/datum/data/pda/messenger_plugin/plugin = locate(params["plugin"]) + if(plugin && (plugin in pda.cartridge.messenger_plugins)) + plugin.messenger = src + plugin.user_act(usr, P) + if("Back") + active_conversation = null + +// Specifically here for the chat message. +/datum/data/pda/app/messenger/Topic(href, href_list) + if(!pda.can_use(usr)) + return + unnotify() + + switch(href_list["choice"]) + if("Message") + var/obj/item/device/pda/P = locate(href_list["target"]) + create_message(usr, P) + if(href_list["target"] in conversations) // Need to make sure the message went through, if not welp. + active_conversation = href_list["target"] + + +/datum/data/pda/app/messenger/proc/create_message(var/mob/living/U, var/obj/item/device/pda/P) + var/t = input(U, "Please enter message", name, null) as text|null + if(!t) + return + t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN)) + t = readd_quotes(t) + if(!t || !istype(P)) + return + if(!in_range(pda, U) && pda.loc != U) + return + + var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) + + if(!PM || PM.toff || toff) + return + + if(last_text && world.time < last_text + 5) + return + + if(!pda.can_use(usr)) + return + + last_text = world.time + // check if telecomms I/O route 1459 is stable + //var/telecomms_intact = telecomms_process(P.owner, owner, t) + var/obj/machinery/message_server/useMS = null + if(message_servers) + for(var/A in message_servers) + var/obj/machinery/message_server/MS = A + //PDAs are now dependent on the Message Server. + if(MS.active) + useMS = MS + break + + var/datum/signal/signal = pda.telecomms_process() + + var/useTC = 0 + if(signal) + if(signal.data["done"]) + useTC = 1 + var/turf/pos = get_turf(P) + // TODO: Make the radio system cooperate with the space manager + if(pos.z in signal.data["level"]) + useTC = 2 + //Let's make this barely readable + if(signal.data["compression"] > 0) + t = Gibberish(t, signal.data["compression"] + 50) + + if(useMS && useTC) // only send the message if it's stable + if(useTC != 2) // Does our recipient have a broadcaster on their level? + to_chat(U, "ERROR: Cannot reach recipient.") + return + useMS.send_pda_message("[P.owner]","[pda.owner]","[t]") + pda.investigate_log("PDA Message - [U.key] - [pda.owner] -> [P.owner]: ", "pda") + + receive_message(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]"), "\ref[P]") + PM.receive_message(list("sent" = 0, "owner" = "[pda.owner]", "job" = "[pda.ownjob]", "message" = "[t]", "target" = "\ref[pda]"), "\ref[pda]") + + SStgui.update_user_uis(U, P) // Update the sending user's PDA UI so that they can see the new message + log_pda("(PDA: [src.name]) sent \"[t]\" to [P.name]", usr) + else + to_chat(U, "ERROR: Messaging server is not responding.") + +/datum/data/pda/app/messenger/proc/available_pdas() + var/list/names = list() + var/list/plist = list() + var/list/namecounts = list() + + if(toff) + to_chat(usr, "Turn on your receiver in order to send messages.") + return + + for(var/A in PDAs) + var/obj/item/device/pda/P = A + var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) + + if(!P.owner || !PM || PM.hidden || P == pda || PM.toff) + continue + + var/name = P.owner + if(name in names) + namecounts[name]++ + name = text("[name] ([namecounts[name]])") + else + names.Add(name) + namecounts[name] = 1 + + plist[text("[name]")] = P + return plist + +/datum/data/pda/app/messenger/proc/can_receive() + return pda.owner && !toff && !hidden + +/datum/data/pda/app/messenger/proc/receive_message(list/data, ref) + tnote.Add(list(data)) + if(!conversations.Find(ref)) + conversations.Add(ref) + if(!data["sent"]) + var/owner = data["owner"] + var/job = data["job"] + var/message = data["message"] + notify("Message from [owner] ([job]), \"[message]\" (Reply)") + +/datum/data/pda/app/messenger/multicast +/datum/data/pda/app/messenger/multicast/receive_message(list/data, ref) + . = ..() + + var/obj/item/device/pda/multicaster/M = pda + if(!istype(M)) + return + + var/list/modified_message = data.Copy() + modified_message["owner"] = modified_message["owner"] + " \[Relayed]" + modified_message["target"] = "\ref[M]" + + var/list/targets = list() + for(var/obj/item/device/pda/pda in PDAs) + if(pda.cartridge && pda.owner && is_type_in_list(pda.cartridge, M.cartridges_to_send_to)) + targets |= pda + if(targets.len) + for(var/obj/item/device/pda/target in targets) + var/datum/data/pda/app/messenger/P = target.find_program(/datum/data/pda/app/messenger) + if(P) + P.receive_message(modified_message, "\ref[M]") \ No newline at end of file diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm new file mode 100644 index 0000000000..90cb9460a4 --- /dev/null +++ b/code/modules/pda/messenger_plugins.dm @@ -0,0 +1,91 @@ +/datum/data/pda/messenger_plugin + var/datum/data/pda/app/messenger/messenger + +/datum/data/pda/messenger_plugin/proc/user_act(mob/user as mob, obj/item/device/pda/P) + + +/datum/data/pda/messenger_plugin/virus + name = "*Send Virus*" + +/datum/data/pda/messenger_plugin/virus/user_act(mob/user as mob, obj/item/device/pda/P) + var/datum/data/pda/app/messenger/M = P.find_program(/datum/data/pda/app/messenger) + + if(M && !M.toff && pda.cartridge.charges > 0) + pda.cartridge.charges-- + return 1 + return 0 + + +/datum/data/pda/messenger_plugin/virus/clown + icon = "star" + +/datum/data/pda/messenger_plugin/virus/clown/user_act(mob/user as mob, obj/item/device/pda/P) + . = ..(user, P) + if(.) + user.show_message("Virus sent!", 1) + P.honkamt = (rand(15,20)) + P.ttone = "honk" + + +/datum/data/pda/messenger_plugin/virus/mime + icon = "arrow-circle-down" + +/datum/data/pda/messenger_plugin/virus/mime/user_act(mob/user as mob, obj/item/device/pda/P) + . = ..(user, P) + if(.) + user.show_message("Virus sent!", 1) + var/datum/data/pda/app/M = P.find_program(/datum/data/pda/app/messenger) + if(M) + M.notify_silent = 1 + P.ttone = "silence" + + +/datum/data/pda/messenger_plugin/virus/detonate + name = "*Detonate*" + icon = "exclamation-circle" + +/datum/data/pda/messenger_plugin/virus/detonate/user_act(mob/user as mob, obj/item/device/pda/P) + . = ..(user, P) + if(.) + var/difficulty = 0 + + if(pda.cartridge) + difficulty += pda.cartridge.programs.len / 2 + else + difficulty += 2 + + if(!P.detonate || P.hidden_uplink) + user.show_message("The target PDA does not seem to respond to the detonation command.", 1) + pda.cartridge.charges++ + else if(prob(difficulty * 12)) + user.show_message("An error flashes on your [pda].", 1) + else if(prob(difficulty * 3)) + user.show_message("Energy feeds back into your [pda]!", 1) + pda.close(user) + pda.explode() + log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up") + message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up", 1) + else + user.show_message("Success!", 1) + log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge and succeded") + message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge and succeded", 1) + P.explode() + +/datum/data/pda/messenger_plugin/virus/frame + icon = "exclamation-circle" + +/datum/data/pda/messenger_plugin/virus/frame/user_act(mob/user, obj/item/device/pda/P) + . = ..(user, P) + if(.) + var/lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" + user.show_message("Virus Sent! The unlock code to the target is: [lock_code]") + if(!P.hidden_uplink) + var/obj/item/device/uplink/hidden/uplink = new(P) + P.hidden_uplink = uplink + P.lock_code = lock_code + // else + // P.hidden_uplink.hidden_crystals += P.hidden_uplink.uses //Temporarially hide the PDA's crystals, so you can't steal telecrystals. + var/obj/item/weapon/cartridge/frame/parent_cart = pda.cartridge + P.hidden_uplink.uses = parent_cart.telecrystals + parent_cart.telecrystals = 0 + P.hidden_uplink.active = TRUE diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm new file mode 100644 index 0000000000..2c3b368730 --- /dev/null +++ b/code/modules/pda/pda.dm @@ -0,0 +1,494 @@ + +//The advanced pea-green monochrome lcd of tomorrow. + +var/global/list/obj/item/device/pda/PDAs = list() + +/obj/item/device/pda + name = "\improper PDA" + desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." + icon = 'icons/obj/pda.dmi' + icon_state = "pda" + item_state = "electronic" + w_class = ITEMSIZE_SMALL + slot_flags = SLOT_ID | SLOT_BELT + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/id.dmi') + + //Main variables + var/pdachoice = 1 + var/owner = null + var/default_cartridge = 0 // Access level defined by cartridge + var/obj/item/weapon/cartridge/cartridge = null //current cartridge + + //Secondary variables + var/model_name = "Thinktronic 5230 Personal Data Assistant" + var/datum/data/pda/utility/scanmode/scanmode = null + + var/lock_code = "" // Lockcode to unlock uplink + var/honkamt = 0 //How many honks left when infected with honk.exe + var/mimeamt = 0 //How many silence left when infected with mime.exe + var/detonate = 1 // Can the PDA be blown up? + var/ttone = "beep" //The ringtone! + var/list/ttone_sound = list("beep" = 'sound/machines/twobeep.ogg', + "boom" = 'sound/effects/explosionfar.ogg', + "slip" = 'sound/misc/slip.ogg', + "honk" = 'sound/items/bikehorn.ogg', + "SKREE" = 'sound/voice/shriek1.ogg', + // "holy" = 'sound/items/PDA/ambicha4-short.ogg', + "xeno" = 'sound/voice/hiss1.ogg') + var/hidden = 0 // Is the PDA hidden from the PDA list? + var/touch_silent = 0 //If 1, no beeps on interacting. + + var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. + var/ownjob = null //related to above - this is assignment (potentially alt title) + var/ownrank = null // this one is rank, never alt title + + var/obj/item/device/paicard/pai = null // A slot for a personal AI device + + var/spam_proof = FALSE // If true, it can't be spammed by random events. + + var/datum/data/pda/app/current_app = null + var/datum/data/pda/app/lastapp = null + var/list/programs = list( + new/datum/data/pda/app/main_menu, + new/datum/data/pda/app/notekeeper, + new/datum/data/pda/app/news, + new/datum/data/pda/app/messenger, + new/datum/data/pda/app/manifest, + new/datum/data/pda/app/atmos_scanner, + new/datum/data/pda/utility/scanmode/notes, + new/datum/data/pda/utility/flashlight) + var/list/shortcut_cache = list() + var/list/shortcut_cat_order = list() + var/list/notifying_programs = list() + var/retro_mode = 0 + +/obj/item/device/pda/examine(mob/user) + . = ..() + if(Adjacent(user)) + . += "The time [stationtime2text()] is displayed in the corner of the screen." + +/obj/item/device/pda/CtrlClick() + if(issilicon(usr)) + return + + if(can_use(usr)) + remove_pen() + return + ..() + +/obj/item/device/pda/AltClick() + if(issilicon(usr)) + return + + if ( can_use(usr) ) + if(id) + remove_id() + else + to_chat(usr, "This PDA does not have an ID in it.") + +/obj/item/device/pda/proc/play_ringtone() + var/S + + if(ttone in ttone_sound) + S = ttone_sound[ttone] + else + S = 'sound/machines/twobeep.ogg' + playsound(loc, S, 50, 1) + for(var/mob/O in hearers(3, loc)) + O.show_message(text("[bicon(src)] *[ttone]*")) + +/obj/item/device/pda/proc/set_ringtone() + var/t = input("Please enter new ringtone", name, ttone) as text + if(in_range(src, usr) && loc == usr) + if(t) + if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code))) + to_chat(usr, "The PDA softly beeps.") + close(usr) + else + t = sanitize(copytext(t, 1, 20)) + ttone = t + return 1 + else + close(usr) + return 0 + +/obj/item/device/pda/New(var/mob/living/carbon/human/H) + ..() + PDAs += src + PDAs = sortAtom(PDAs) + update_programs() + if(default_cartridge) + cartridge = new default_cartridge(src) + cartridge.update_programs(src) + new /obj/item/weapon/pen(src) + pdachoice = isnull(H) ? 1 : (ishuman(H) ? H.pdachoice : 1) + switch(pdachoice) + if(1) icon = 'icons/obj/pda.dmi' + if(2) icon = 'icons/obj/pda_slim.dmi' + if(3) icon = 'icons/obj/pda_old.dmi' + if(4) icon = 'icons/obj/pda_rugged.dmi' + if(5) icon = 'icons/obj/pda_holo.dmi' + if(6) + icon = 'icons/obj/pda_wrist.dmi' + item_state = icon_state + item_icons = list( + slot_belt_str = 'icons/mob/pda_wrist.dmi', + slot_wear_id_str = 'icons/mob/pda_wrist.dmi', + slot_gloves_str = 'icons/mob/pda_wrist.dmi' + ) + desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a wrist-bound version." + slot_flags = SLOT_ID | SLOT_BELT | SLOT_GLOVES + sprite_sheets = list( + SPECIES_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', + SPECIES_VR_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', + ) + else + icon = 'icons/obj/pda_old.dmi' + log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.") + start_program(find_program(/datum/data/pda/app/main_menu)) + +/obj/item/device/pda/proc/can_use(mob/user) + return (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE) + +/obj/item/device/pda/GetAccess() + if(id) + return id.GetAccess() + else + return ..() + +/obj/item/device/pda/GetID() + return id + +/obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location) + var/mob/M = usr + if((!istype(over_object, /obj/screen)) && can_use(usr)) + return attack_self(M) + return + +/obj/item/device/pda/proc/close(mob/user) + SStgui.close_uis(src) + +/obj/item/device/pda/attack_self(mob/user as mob) + user.set_machine(src) + + if(active_uplink_check(user)) + return + + tgui_interact(user) + return + +/obj/item/device/pda/proc/start_program(datum/data/pda/P) + if(P && ((P in programs) || (cartridge && (P in cartridge.programs)))) + return P.start() + return 0 + +/obj/item/device/pda/proc/find_program(type) + var/datum/data/pda/A = locate(type) in programs + if(A) + return A + if(cartridge) + A = locate(type) in cartridge.programs + if(A) + return A + return null + +// force the cache to rebuild on update_ui +/obj/item/device/pda/proc/update_shortcuts() + shortcut_cache.Cut() + +/obj/item/device/pda/proc/update_programs() + for(var/A in programs) + var/datum/data/pda/P = A + P.pda = src + +/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P) + //TODO: sometimes these attacks show up on the message server + var/i = rand(1,100) + var/j = rand(0,1) //Possibility of losing the PDA after the detonation + var/message = "" + var/mob/living/M = null + if(ismob(P.loc)) + M = P.loc + + //switch(i) //Yes, the overlapping cases are intended. + if(i<=10) //The traditional explosion + P.explode() + j=1 + message += "Your [P] suddenly explodes!" + if(i>=10 && i<= 20) //The PDA burns a hole in the holder. + j=1 + if(M && isliving(M)) + M.apply_damage( rand(30,60) , BURN) + message += "You feel a searing heat! Your [P] is burning!" + if(i>=20 && i<=25) //EMP + empulse(P.loc, 1, 2, 4, 6, 1) + message += "Your [P] emits a wave of electromagnetic energy!" + if(i>=25 && i<=40) //Smoke + var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem + S.attach(P.loc) + S.set_up(P, 10, 0, P.loc) + playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3) + S.start() + message += "Large clouds of smoke billow forth from your [P]!" + if(i>=40 && i<=45) //Bad smoke + var/datum/effect/effect/system/smoke_spread/bad/B = new /datum/effect/effect/system/smoke_spread/bad + B.attach(P.loc) + B.set_up(P, 10, 0, P.loc) + playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3) + B.start() + message += "Large clouds of noxious smoke billow forth from your [P]!" + if(i>=65 && i<=75) //Weaken + if(M && isliving(M)) + M.apply_effects(0,1) + message += "Your [P] flashes with a blinding white light! You feel weaker." + if(i>=75 && i<=85) //Stun and stutter + if(M && isliving(M)) + M.apply_effects(1,0,0,0,1) + message += "Your [P] flashes with a blinding white light! You feel weaker." + if(i>=85) //Sparks + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, P.loc) + s.start() + message += "Your [P] begins to spark violently!" + if(i>45 && i<65 && prob(50)) //Nothing happens + message += "Your [P] bleeps loudly." + j = prob(10) + + if(j && detonate) //This kills the PDA + qdel(P) + if(message) + message += "It melts in a puddle of plastic." + else + message += "Your [P] shatters in a thousand pieces!" + + if(M && isliving(M)) + message = "[message]" + M.show_message(message, 1) + +/obj/item/device/pda/proc/remove_id() + if (id) + if (ismob(loc)) + var/mob/M = loc + M.put_in_hands(id) + to_chat(usr, "You remove the ID from the [name].") + playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) + else + id.loc = get_turf(src) + id = null + +/obj/item/device/pda/proc/remove_pen() + var/obj/item/weapon/pen/O = locate() in src + if(O) + if(istype(loc, /mob)) + var/mob/M = loc + if(M.get_active_hand() == null) + M.put_in_hands(O) + to_chat(usr, "You remove \the [O] from \the [src].") + return + O.loc = get_turf(src) + else + to_chat(usr, "This PDA does not have a pen in it.") + +/obj/item/device/pda/verb/verb_reset_pda() + set category = "Object" + set name = "Reset PDA" + set src in usr + + if(issilicon(usr)) + return + + if(can_use(usr)) + start_program(find_program(/datum/data/pda/app/main_menu)) + notifying_programs.Cut() + overlays -= image('icons/obj/pda.dmi', "pda-r") + to_chat(usr, "You press the reset button on \the [src].") + else + to_chat(usr, "You cannot do this while restrained.") + +/obj/item/device/pda/verb/verb_remove_id() + set category = "Object" + set name = "Remove id" + set src in usr + + if(issilicon(usr)) + return + + if ( can_use(usr) ) + if(id) + remove_id() + else + to_chat(usr, "This PDA does not have an ID in it.") + else + to_chat(usr, "You cannot do this while restrained.") + + +/obj/item/device/pda/verb/verb_remove_pen() + set category = "Object" + set name = "Remove pen" + set src in usr + + if(issilicon(usr)) + return + + if ( can_use(usr) ) + remove_pen() + else + to_chat(usr, "You cannot do this while restrained.") + +/obj/item/device/pda/verb/verb_remove_cartridge() + set category = "Object" + set name = "Remove cartridge" + set src in usr + + if(issilicon(usr)) + return + + if(!can_use(usr)) + to_chat(usr, "You cannot do this while restrained.") + return + + if(isnull(cartridge)) + to_chat(usr, "There's no cartridge to eject.") + return + + cartridge.forceMove(get_turf(src)) + if(ismob(loc)) + var/mob/M = loc + M.put_in_hands(cartridge) + // mode = 0 + // scanmode = 0 + if (cartridge.radio) + cartridge.radio.hostpda = null + to_chat(usr, "You remove \the [cartridge] from the [name].") + playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) + cartridge = null + update_programs() + update_shortcuts() + start_program(find_program(/datum/data/pda/app/main_menu)) + + +/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. + if(choice == 1) + if (id) + remove_id() + return 1 + else + var/obj/item/I = user.get_active_hand() + if (istype(I, /obj/item/weapon/card/id) && user.unEquip(I)) + I.loc = src + id = I + return 1 + else + var/obj/item/weapon/card/I = user.get_active_hand() + if (istype(I, /obj/item/weapon/card/id) && I:registered_name && user.unEquip(I)) + var/obj/old_id = id + I.loc = src + id = I + user.put_in_hands(old_id) + return 1 + return 0 + +// access to status display signals +/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob) + ..() + if(istype(C, /obj/item/weapon/cartridge) && !cartridge) + cartridge = C + user.drop_item() + cartridge.loc = src + cartridge.update_programs(src) + update_shortcuts() + to_chat(usr, "You insert [cartridge] into [src].") + if(cartridge.radio) + cartridge.radio.hostpda = src + + else if(istype(C, /obj/item/weapon/card/id)) + var/obj/item/weapon/card/id/idcard = C + if(!idcard.registered_name) + to_chat(user, "\The [src] rejects the ID.") + return + if(!owner) + owner = idcard.registered_name + ownjob = idcard.assignment + ownrank = idcard.rank + name = "PDA-[owner] ([ownjob])" + to_chat(user, "Card scanned.") + else + //Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand. + if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) ) + if(id_check(user, 2)) + to_chat(user, "You put the ID into \the [src]'s slot.") + updateSelfDialog()//Update self dialog on success. + return //Return in case of failed check or when successful. + updateSelfDialog()//For the non-input related code. + else if(istype(C, /obj/item/device/paicard) && !src.pai) + user.drop_item() + C.loc = src + pai = C + to_chat(user, "You slot \the [C] into \the [src].") + SStgui.update_uis(src) // update all UIs attached to src + else if(istype(C, /obj/item/weapon/pen)) + var/obj/item/weapon/pen/O = locate() in src + if(O) + to_chat(user, "There is already a pen in \the [src].") + else + user.drop_item() + C.loc = src + to_chat(user, "You slot \the [C] into \the [src].") + return + +/obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob) + if (istype(C, /mob/living/carbon) && scanmode) + scanmode.scan_mob(C, user) + +/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) + if(proximity && scanmode) + scanmode.scan_atom(A, user) + +/obj/item/device/pda/proc/explode() //This needs tuning. //Sure did. + if(!src.detonate) return + var/turf/T = get_turf(src.loc) + if(T) + T.hotspot_expose(700,125) + explosion(T, 0, 0, 1, rand(1,2)) + return + +/obj/item/device/pda/Destroy() + PDAs -= src + if (src.id && prob(100) && !delete_id) //IDs are kept in 90% of the cases //VOREStation Edit - 100% of the cases, excpet when specified otherwise + src.id.forceMove(get_turf(src.loc)) + else + QDEL_NULL(src.id) + + current_app = null + scanmode = null + QDEL_NULL(pai) + QDEL_LIST(programs) + QDEL_NULL(cartridge) + return ..() + +//Some spare PDAs in a box +/obj/item/weapon/storage/box/PDAs + name = "box of spare PDAs" + desc = "A box of spare PDA microcomputers." + icon = 'icons/obj/pda.dmi' + icon_state = "pdabox" + +/obj/item/weapon/storage/box/PDAs/New() + ..() + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/weapon/cartridge/head(src) + + var/newcart = pick( /obj/item/weapon/cartridge/engineering, + /obj/item/weapon/cartridge/security, + /obj/item/weapon/cartridge/medical, + /obj/item/weapon/cartridge/signal/science, + /obj/item/weapon/cartridge/quartermaster) + new newcart(src) + +// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP +/obj/item/device/pda/emp_act(severity) + for(var/atom/A in src) + A.emp_act(severity) diff --git a/code/modules/pda/pda_subtypes.dm b/code/modules/pda/pda_subtypes.dm new file mode 100644 index 0000000000..11b684b678 --- /dev/null +++ b/code/modules/pda/pda_subtypes.dm @@ -0,0 +1,246 @@ + +/obj/item/device/pda/medical + default_cartridge = /obj/item/weapon/cartridge/medical + icon_state = "pda-m" + +/obj/item/device/pda/viro + default_cartridge = /obj/item/weapon/cartridge/medical + icon_state = "pda-v" + +/obj/item/device/pda/engineering + default_cartridge = /obj/item/weapon/cartridge/engineering + icon_state = "pda-e" + +/obj/item/device/pda/security + default_cartridge = /obj/item/weapon/cartridge/security + icon_state = "pda-s" + +/obj/item/device/pda/detective + default_cartridge = /obj/item/weapon/cartridge/detective + icon_state = "pda-det" + +/obj/item/device/pda/warden + default_cartridge = /obj/item/weapon/cartridge/security + icon_state = "pda-warden" + +/obj/item/device/pda/janitor + default_cartridge = /obj/item/weapon/cartridge/janitor + icon_state = "pda-j" + ttone = "slip" + +/obj/item/device/pda/science + default_cartridge = /obj/item/weapon/cartridge/signal/science + icon_state = "pda-tox" + ttone = "boom" + +/obj/item/device/pda/clown + default_cartridge = /obj/item/weapon/cartridge/clown + icon_state = "pda-clown" + desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings." + ttone = "honk" + +/obj/item/device/pda/mime + default_cartridge = /obj/item/weapon/cartridge/mime + icon_state = "pda-mime" + +/obj/item/device/pda/mime/New() + . = ..() + var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger) + if(M) + M.notify_silent = TRUE + +/obj/item/device/pda/heads + default_cartridge = /obj/item/weapon/cartridge/head + icon_state = "pda-h" + +/obj/item/device/pda/heads/hop + default_cartridge = /obj/item/weapon/cartridge/hop + icon_state = "pda-hop" + +/obj/item/device/pda/heads/hos + default_cartridge = /obj/item/weapon/cartridge/hos + icon_state = "pda-hos" + +/obj/item/device/pda/heads/ce + default_cartridge = /obj/item/weapon/cartridge/ce + icon_state = "pda-ce" + +/obj/item/device/pda/heads/cmo + default_cartridge = /obj/item/weapon/cartridge/cmo + icon_state = "pda-cmo" + +/obj/item/device/pda/heads/rd + default_cartridge = /obj/item/weapon/cartridge/rd + icon_state = "pda-rd" + +/obj/item/device/pda/captain + default_cartridge = /obj/item/weapon/cartridge/captain + icon_state = "pda-c" + detonate = 0 + //toff = 1 + +/obj/item/device/pda/ert + default_cartridge = /obj/item/weapon/cartridge/captain + icon_state = "pda-h" + detonate = 0 +// hidden = 1 + +/obj/item/device/pda/cargo + default_cartridge = /obj/item/weapon/cartridge/quartermaster + icon_state = "pda-cargo" + +/obj/item/device/pda/quartermaster + default_cartridge = /obj/item/weapon/cartridge/quartermaster + icon_state = "pda-q" + +/obj/item/device/pda/shaftminer + icon_state = "pda-miner" + default_cartridge = /obj/item/weapon/cartridge/miner + +/obj/item/device/pda/syndicate + default_cartridge = /obj/item/weapon/cartridge/syndicate + icon_state = "pda-syn" +// name = "Military PDA" // Vorestation Edit +// owner = "John Doe" + hidden = 1 + +/obj/item/device/pda/chaplain + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-holy" + ttone = "holy" + +/obj/item/device/pda/lawyer + default_cartridge = /obj/item/weapon/cartridge/lawyer + icon_state = "pda-lawyer" + ttone = "..." + +/obj/item/device/pda/botanist + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-hydro" + +/obj/item/device/pda/roboticist + default_cartridge = /obj/item/weapon/cartridge/signal/science + icon_state = "pda-robot" + +/obj/item/device/pda/librarian + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-libb" + desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader." + model_name = "Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant" + +/obj/item/device/pda/librarian/New() + . = ..() + var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger) + if(M) + M.notify_silent = TRUE //Quiet in the library! + +/obj/item/device/pda/clear + icon_state = "pda-transp" + desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition with a transparent case." + model_name = "Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition" + +/obj/item/device/pda/chef + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-chef" + +/obj/item/device/pda/bar + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-bar" + +/obj/item/device/pda/atmos + default_cartridge = /obj/item/weapon/cartridge/atmos + icon_state = "pda-atmo" + +/obj/item/device/pda/chemist + default_cartridge = /obj/item/weapon/cartridge/chemistry + icon_state = "pda-chem" + +/obj/item/device/pda/geneticist + default_cartridge = /obj/item/weapon/cartridge/medical + icon_state = "pda-gene" + + +// Used for the PDA multicaster, which mirrors messages sent to it to a specific department, +/obj/item/device/pda/multicaster + ownjob = "Relay" + icon_state = "NONE" + detonate = 0 + spam_proof = TRUE // Spam messages don't actually work and its difficult to disable these. + programs = list( + new/datum/data/pda/app/messenger/multicast + ) + var/list/cartridges_to_send_to = list() + +/obj/item/device/pda/multicaster/command/New() + ..() + owner = "Command Department" + name = "Command Department (Relay)" + cartridges_to_send_to = command_cartridges + +/obj/item/device/pda/multicaster/security/New() + ..() + owner = "Security Department" + name = "Security Department (Relay)" + cartridges_to_send_to = security_cartridges + +/obj/item/device/pda/multicaster/engineering/New() + ..() + owner = "Engineering Department" + name = "Engineering Department (Relay)" + cartridges_to_send_to = engineering_cartridges + +/obj/item/device/pda/multicaster/medical/New() + ..() + owner = "Medical Department" + name = "Medical Department (Relay)" + cartridges_to_send_to = medical_cartridges + +/obj/item/device/pda/multicaster/research/New() + ..() + owner = "Research Department" + name = "Research Department (Relay)" + cartridges_to_send_to = research_cartridges + +/obj/item/device/pda/multicaster/cargo/New() + ..() + owner = "Cargo Department" + name = "Cargo Department (Relay)" + cartridges_to_send_to = cargo_cartridges + +/obj/item/device/pda/multicaster/civilian/New() + ..() + owner = "Civilian Services Department" + name = "Civilian Services Department (Relay)" + cartridges_to_send_to = civilian_cartridges + +/obj/item/device/pda/clown/Crossed(atom/movable/AM as mob|obj) //Clown PDA is slippery. + if(AM.is_incorporeal()) + return + if (istype(AM, /mob/living)) + var/mob/living/M = AM + + if(M.slip("the PDA",8) && M.real_name != src.owner && istype(src.cartridge, /obj/item/weapon/cartridge/clown)) + if(src.cartridge.charges < 5) + src.cartridge.charges++ + +//Some spare PDAs in a box +/obj/item/weapon/storage/box/PDAs + name = "box of spare PDAs" + desc = "A box of spare PDA microcomputers." + icon = 'icons/obj/pda.dmi' + icon_state = "pdabox" + +/obj/item/weapon/storage/box/PDAs/New() + ..() + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/weapon/cartridge/head(src) + + var/newcart = pick( /obj/item/weapon/cartridge/engineering, + /obj/item/weapon/cartridge/security, + /obj/item/weapon/cartridge/medical, + /obj/item/weapon/cartridge/signal/science, + /obj/item/weapon/cartridge/quartermaster) + new newcart(src) diff --git a/code/modules/pda/pda_tgui.dm b/code/modules/pda/pda_tgui.dm new file mode 100644 index 0000000000..6d57a6c25e --- /dev/null +++ b/code/modules/pda/pda_tgui.dm @@ -0,0 +1,116 @@ +// Self contained file for all things TGUI +/obj/item/device/pda/tgui_state(mob/user) + return GLOB.tgui_inventory_state + +/obj/item/device/pda/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Pda", "Personal Data Assistant", parent_ui) + ui.open() + +/obj/item/device/pda/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + data["owner"] = owner // Who is your daddy... + data["ownjob"] = ownjob // ...and what does he do? + + // update list of shortcuts, only if they changed + if(!shortcut_cache.len) + shortcut_cache = list() + shortcut_cat_order = list() + var/prog_list = programs.Copy() + if(cartridge) + prog_list |= cartridge.programs + + for(var/A in prog_list) + var/datum/data/pda/P = A + + if(P.hidden) + continue + var/list/cat + if(P.category in shortcut_cache) + cat = shortcut_cache[P.category] + else + cat = list() + shortcut_cache[P.category] = cat + shortcut_cat_order += P.category + cat |= list(list(name = P.name, icon = P.icon, notify_icon = P.notify_icon, ref = "\ref[P]")) + + // force the order of a few core categories + shortcut_cat_order = list("General") \ + + sortList(shortcut_cat_order - list("General", "Scanners", "Utilities")) \ + + list("Scanners", "Utilities") + + data["idInserted"] = (id ? 1 : 0) + data["idLink"] = (id ? text("[id.registered_name], [id.assignment]") : "--------") + + data["useRetro"] = retro_mode + data["touch_silent"] = touch_silent + + data["cartridge_name"] = cartridge ? cartridge.name : "" + data["stationTime"] = stationtime2text() //worldtime2stationtime(world.time) // Aaa which fucking one is canonical there's SO MANY + + data["app"] = list( + "name" = current_app.title, + "icon" = current_app.icon, + "template" = current_app.template, + "has_back" = current_app.has_back) + + current_app.update_ui(user, data) + + return data + +/obj/item/device/pda/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + add_fingerprint(usr) + usr.set_machine(src) + + if(!touch_silent) + playsound(src, 'sound/machines/pda_click.ogg', 20) + + . = TRUE + switch(action) + if("Home") //Go home, largely replaces the old Return + var/datum/data/pda/app/main_menu/A = find_program(/datum/data/pda/app/main_menu) + if(A) + start_program(A) + if("StartProgram") + if(params["program"]) + var/datum/data/pda/app/A = locate(params["program"]) + if(A) + start_program(A) + if("Eject")//Ejects the cart, only done from hub. + if(!isnull(cartridge)) + var/turf/T = loc + if(ismob(T)) + T = T.loc + var/obj/item/weapon/cartridge/C = cartridge + C.forceMove(T) + if(scanmode in C.programs) + scanmode = null + if(current_app in C.programs) + start_program(find_program(/datum/data/pda/app/main_menu)) + if(C.radio) + C.radio.hostpda = null + for(var/datum/data/pda/P in notifying_programs) + if(P in C.programs) + P.unnotify() + cartridge = null + update_shortcuts() + if("Authenticate")//Checks for ID + id_check(usr, 1) + if("Retro") + retro_mode = !retro_mode + if("TouchSounds") + touch_silent = !touch_silent + if("Ringtone") + return set_ringtone() + else + if(current_app) + . = current_app.tgui_act(action, params, ui, state) + + if((honkamt > 0) && (prob(60)))//For clown virus. + honkamt-- + playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) diff --git a/code/game/objects/items/devices/PDA/PDA_vr.dm b/code/modules/pda/pda_vr.dm similarity index 100% rename from code/game/objects/items/devices/PDA/PDA_vr.dm rename to code/modules/pda/pda_vr.dm diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm new file mode 100644 index 0000000000..0d3b115a13 --- /dev/null +++ b/code/modules/pda/radio.dm @@ -0,0 +1,138 @@ +/obj/item/radio/integrated + name = "\improper PDA radio module" + desc = "An electronic radio system." + icon = 'icons/obj/module.dmi' + icon_state = "power_mod" + var/obj/item/device/pda/hostpda = null + + var/list/botlist = null // list of bots + var/mob/living/bot/active // the active bot; if null, show bot list + var/list/botstatus // the status signal sent by the bot + + var/bot_type //The type of bot it is. + var/bot_filter //Determines which radio filter to use. + + var/control_freq = BOT_FREQ + + var/on = 0 //Are we currently active?? + var/menu_message = "" + +/obj/item/radio/integrated/New() + ..() + if(istype(loc.loc, /obj/item/device/pda)) + hostpda = loc.loc + if(bot_filter) + spawn(5) + add_to_radio(bot_filter) + +/obj/item/radio/integrated/Destroy() + if(radio_controller) + radio_controller.remove_object(src, control_freq) + hostpda = null + return ..() + +/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3, s_filter) + + //to_world("Post: [freq]: [key]=[value], [key2]=[value2]") + var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq) + + if(!frequency) + return + + var/datum/signal/signal = new() + signal.source = src + signal.transmission_method = TRANSMISSION_RADIO + signal.data[key] = value + if(key2) + signal.data[key2] = value2 + if(key3) + signal.data[key3] = value3 + + frequency.post_signal(src, signal, radio_filter = s_filter) + +/obj/item/radio/integrated/Topic(href, href_list) + ..() + switch(href_list["op"]) + if("control") + active = locate(href_list["bot"]) + spawn(0) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) + + if("scanbots") // find all bots + botlist = null + spawn(0) + post_signal(control_freq, "command", "bot_status", s_filter = bot_filter) + + if("botlist") + active = null + + if("stop", "go", "home") + spawn(0) + post_signal(control_freq, "command", href_list["op"], "active", active, s_filter = bot_filter) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) + + if("summon") + spawn(0) + post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(hostpda), "useraccess", hostpda.GetAccess(), "user", usr, s_filter = bot_filter) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) + +/obj/item/radio/integrated/receive_signal(datum/signal/signal) + if(bot_type && istype(signal.source, /mob/living/bot) && signal.data["type"] == bot_type) + if(!botlist) + botlist = new() + + botlist |= signal.source + + if(active == signal.source) + var/list/b = signal.data + botstatus = b.Copy() + +/obj/item/radio/integrated/proc/add_to_radio(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots. + if(radio_controller) + radio_controller.add_object(src, control_freq, radio_filter = bot_filter) + +/* + * Radio Cartridge, essentially a signaler. + */ +/obj/item/radio/integrated/signal + var/frequency = 1457 + var/code = 30.0 + var/last_transmission + var/datum/radio_frequency/radio_connection + +/obj/item/radio/integrated/signal/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + +/obj/item/radio/integrated/signal/Initialize() + if(!radio_controller) + return + + if(src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ) + src.frequency = sanitize_frequency(src.frequency) + + set_frequency(frequency) + +/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency) + radio_controller.remove_object(src, frequency) + frequency = new_frequency + radio_connection = radio_controller.add_object(src, frequency) + +/obj/item/radio/integrated/signal/proc/send_signal(message="ACTIVATE") + if(last_transmission && world.time < (last_transmission + 5)) + return + last_transmission = world.time + + var/time = time2text(world.realtime,"hh:mm:ss") + var/turf/T = get_turf(src) + lastsignalers.Add("[time] : [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) : [format_frequency(frequency)]/[code]") + + var/datum/signal/signal = new + signal.source = src + signal.encryption = code + signal.data["message"] = message + + spawn(0) + radio_connection.post_signal(src, signal) diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm new file mode 100644 index 0000000000..be8bb8f444 --- /dev/null +++ b/code/modules/pda/utilities.dm @@ -0,0 +1,184 @@ +/datum/data/pda/utility/flashlight + name = "Enable Flashlight" + icon = "lightbulb-o" + + var/fon = 0 //Is the flashlight function on? + var/f_lum = 2 //Luminosity for the flashlight function + +/datum/data/pda/utility/flashlight/start() + fon = !fon + name = fon ? "Disable Flashlight" : "Enable Flashlight" + pda.update_shortcuts() + pda.set_light(fon ? f_lum : 0) + +/datum/data/pda/utility/honk + name = "Honk Synthesizer" + icon = "smile-o" + category = "Clown" + + var/last_honk //Also no honk spamming that's bad too + +/datum/data/pda/utility/honk/start() + if(!(last_honk && world.time < last_honk + 20)) + playsound(pda.loc, 'sound/items/bikehorn.ogg', 50, 1) + last_honk = world.time + +/datum/data/pda/utility/toggle_door + name = "Toggle Door" + icon = "external-link" + var/remote_door_id = "" + +// /datum/data/pda/utility/toggle_door/start() +// for(var/obj/machinery/door/poddoor/M in airlocks) +// if(M.id_tag == remote_door_id) +// if(M.density) +// M.open() +// else +// M.close() + +/datum/data/pda/utility/scanmode/medical + base_name = "Med Scanner" + icon = "heart-o" + +/datum/data/pda/utility/scanmode/medical/scan_mob(mob/living/C as mob, mob/living/user as mob) + C.visible_message("[user] has analyzed [C]'s vitals!") + + user.show_message("Analyzing Results for [C]:") + user.show_message(" Overall Status: [C.stat > 1 ? "dead" : "[C.health - C.halloss]% healthy"]", 1) + user.show_message(text(" Damage Specifics: []-[]-[]-[]", + (C.getOxyLoss() > 50) ? "warning" : "", C.getOxyLoss(), + (C.getToxLoss() > 50) ? "warning" : "", C.getToxLoss(), + (C.getFireLoss() > 50) ? "warning" : "", C.getFireLoss(), + (C.getBruteLoss() > 50) ? "warning" : "", C.getBruteLoss() + ), 1) + user.show_message(" Key: Suffocation/Toxin/Burns/Brute", 1) + user.show_message(" Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1) + if(C.tod && (C.stat == DEAD || (C.status_flags & FAKEDEATH))) + user.show_message(" Time of Death: [C.tod]") + if(istype(C, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = C + var/list/damaged = H.get_damaged_organs(1,1) + user.show_message("Localized Damage, Brute/Burn:",1) + if(length(damaged)>0) + for(var/obj/item/organ/external/org in damaged) + user.show_message(text(" []: []-[]", + capitalize(org.name), (org.brute_dam > 0) ? "warning" : "notice", org.brute_dam, (org.burn_dam > 0) ? "warning" : "notice", org.burn_dam),1) + else + user.show_message(" Limbs are OK.",1) + +/datum/data/pda/utility/scanmode/dna + base_name = "DNA Scanner" + icon = "link" + +/datum/data/pda/utility/scanmode/dna/scan_mob(mob/living/C as mob, mob/living/user as mob) + if(istype(C, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = C + if(!istype(H.dna, /datum/dna)) + to_chat(user, "No fingerprints found on [H]") + else + to_chat(user, "[H]'s Fingerprints: [md5(H.dna.uni_identity)]") + scan_blood(C, user) + +/datum/data/pda/utility/scanmode/dna/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) + scan_blood(A, user) + +/datum/data/pda/utility/scanmode/dna/proc/scan_blood(atom/A, mob/user) + if(!A.blood_DNA) + to_chat(user, "No blood found on [A]") + if(A.blood_DNA) + qdel(A.blood_DNA) + else + to_chat(user, "Blood found on [A]. Analysing...") + spawn(15) + for(var/blood in A.blood_DNA) + to_chat(user, "Blood type: [A.blood_DNA[blood]]\nDNA: [blood]") + +/datum/data/pda/utility/scanmode/halogen + base_name = "Halogen Counter" + icon = "exclamation-circle" + +/datum/data/pda/utility/scanmode/halogen/scan_mob(mob/living/C as mob, mob/living/user as mob) + C.visible_message("[user] has analyzed [C]'s radiation levels!") + + user.show_message("Analyzing Results for [C]:") + if(C.radiation) + user.show_message("Radiation Level: [C.radiation > 0 ? "[C.radiation]" : "0"]") + else + user.show_message("No radiation detected.") + +/datum/data/pda/utility/scanmode/reagent + base_name = "Reagent Scanner" + icon = "flask" + +/datum/data/pda/utility/scanmode/reagent/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) + if(!isnull(A.reagents)) + if(A.reagents.reagent_list.len > 0) + var/reagents_length = A.reagents.reagent_list.len + to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.") + for(var/re in A.reagents.reagent_list) + to_chat(user, "\t [re]") + else + to_chat(user, "No active chemical agents found in [A].") + else + to_chat(user, "No significant chemical agents found in [A].") + +/datum/data/pda/utility/scanmode/gas + base_name = "Gas Scanner" + icon = "tachometer-alt" + +/datum/data/pda/utility/scanmode/gas/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) + pda.analyze_gases(A, user) + +/datum/data/pda/utility/scanmode/notes + base_name = "Note Scanner" + icon = "clipboard" + var/datum/data/pda/app/notekeeper/notes + +/datum/data/pda/utility/scanmode/notes/start() + . = ..() + notes = pda.find_program(/datum/data/pda/app/notekeeper) + +/datum/data/pda/utility/scanmode/notes/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) + if(notes && istype(A, /obj/item/weapon/paper)) + var/obj/item/weapon/paper/P = A + var/list/brlist = list("p", "/p", "br", "hr", "h1", "h2", "h3", "h4", "/h1", "/h2", "/h3", "/h4") + + // JMO 20140705: Makes scanned document show up properly in the notes. Not pretty for formatted documents, + // as this will clobber the HTML, but at least it lets you scan a document. You can restore the original + // notes by editing the note again. (Was going to allow you to edit, but scanned documents are too long.) + var/raw_scan = sanitize_simple(P.info, list("\t" = "", "ÿ" = "")) + var/formatted_scan = "" + // Scrub out the tags (replacing a few formatting ones along the way) + // Find the beginning and end of the first tag. + var/tag_start = findtext(raw_scan, "<") + var/tag_stop = findtext(raw_scan, ">") + // Until we run out of complete tags... + while(tag_start && tag_stop) + var/pre = copytext(raw_scan, 1, tag_start) // Get the stuff that comes before the tag + var/tag = lowertext(copytext(raw_scan, tag_start + 1, tag_stop)) // Get the tag so we can do intellegent replacement + var/tagend = findtext(tag, " ") // Find the first space in the tag if there is one. + // Anything that's before the tag can just be added as is. + formatted_scan = formatted_scan + pre + // If we have a space after the tag (and presumably attributes) just crop that off. + if(tagend) + tag = copytext(tag, 1, tagend) + if(tag in brlist) // Check if it's I vertical space tag. + formatted_scan = formatted_scan + "
" // If so, add some padding in. + raw_scan = copytext(raw_scan, tag_stop + 1) // continue on with the stuff after the tag + // Look for the next tag in what's left + tag_start = findtext(raw_scan, "<") + tag_stop = findtext(raw_scan, ">") + // Anything that is left in the page. just tack it on to the end as is + formatted_scan = formatted_scan + raw_scan + // If there is something in there already, pad it out. + if(length(notes.note) > 0) + notes.note += "
" + // Store the scanned document to the notes + notes.note += "Scanned Document. Edit to restore previous notes/delete scan.
----------
" + formatted_scan + "
" + // notehtml ISN'T set to allow user to get their old notes back. A better implementation would add a "scanned documents" + // feature to the PDA, which would better convey the availability of the feature, but this will work for now. + // Inform the user + to_chat(user, "Paper scanned and OCRed to notekeeper.")//concept of scanning paper copyright brainoblivion 2009 + + else + to_chat(user, "Error scanning [A].") diff --git a/code/modules/persistence/filth.dm b/code/modules/persistence/filth.dm index 2eea824f83..a7aa9e9cd4 100644 --- a/code/modules/persistence/filth.dm +++ b/code/modules/persistence/filth.dm @@ -6,6 +6,7 @@ random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7") color = "#464f33" persistent = TRUE + anchored = 1 /obj/effect/decal/cleanable/filth/Initialize() . = ..() diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index 2780c3b9a4..539b7b7a3b 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -8,6 +8,7 @@ blend_mode = BLEND_MULTIPLY color = "#000000" alpha = 120 + anchored = 1 var/message var/graffiti_age = 0 diff --git a/code/modules/power/apc_vr.dm b/code/modules/power/apc_vr.dm index c08c9b8db0..ec7d4dba09 100644 --- a/code/modules/power/apc_vr.dm +++ b/code/modules/power/apc_vr.dm @@ -6,4 +6,7 @@ NA.apc = src area = NA name = "[area.name] APC" - update() \ No newline at end of file + update() + +/obj/machinery/power/apc/get_cell() + return cell \ No newline at end of file diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index f6bc1c9ff6..dc1dbe7e58 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -25,6 +25,7 @@ var/equalise = 0 // If true try to equalise charge between cells var/icon_update = 0 // Timer in ticks for icon update. var/ui_tick = 0 + should_be_mapped = TRUE /obj/machinery/power/smes/batteryrack/New() @@ -113,6 +114,8 @@ if(equalise) // Now try to get least charged cell and use the power from it. var/obj/item/weapon/cell/CL = get_least_charged_cell() + if(!CL) + return amount -= CL.give(amount) if(!amount) return @@ -209,8 +212,43 @@ celldiff = min(min(celldiff, most.charge), least.maxcharge - least.charge) least.give(most.use(celldiff)) -/obj/machinery/power/smes/batteryrack/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - var/data[0] +/obj/machinery/power/smes/batteryrack/dismantle() + for(var/obj/item/weapon/cell/C in internal_cells) + C.forceMove(get_turf(src)) + internal_cells -= C + return ..() + +/obj/machinery/power/smes/batteryrack/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/weapon/cell)) // ID Card, try to insert it. + if(insert_cell(W, user)) + to_chat(user, "You insert \the [W] into \the [src].") + else + to_chat(user, "\The [src] has no empty slot for \the [W]") + if(!..()) + return 0 + if(default_deconstruction_crowbar(user, W)) + return + if(default_part_replacement(user, W)) + return + +/obj/machinery/power/smes/batteryrack/inputting() + return + +/obj/machinery/power/smes/batteryrack/outputting() + return + +/obj/machinery/power/smes/batteryrack/attack_hand(var/mob/user) + tgui_interact(user) + +/obj/machinery/power/smes/batteryrack/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Batteryrack", name) + ui.open() + +/obj/machinery/power/smes/batteryrack/tgui_data(mob/user) + // DO NOT CALL PARENT. + var/list/data = list() data["mode"] = mode data["transfer_max"] = max_transfer_rate @@ -238,75 +276,44 @@ cells += list(cell) data["cells_list"] = cells - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "psu.tmpl", "Cell Rack PSU", 500, 430) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data -/obj/machinery/power/smes/batteryrack/dismantle() - for(var/obj/item/weapon/cell/C in internal_cells) - C.forceMove(get_turf(src)) - internal_cells -= C - return ..() - -/obj/machinery/power/smes/batteryrack/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(!..()) - return 0 - if(default_deconstruction_crowbar(user, W)) - return - if(default_part_replacement(user, W)) - return - if(istype(W, /obj/item/weapon/cell)) // ID Card, try to insert it. - if(insert_cell(W, user)) - to_chat(user, "You insert \the [W] into \the [src].") - else - to_chat(user, "\The [src] has no empty slot for \the [W]") - -/obj/machinery/power/smes/batteryrack/attack_hand(var/mob/user) - ui_interact(user) - -/obj/machinery/power/smes/batteryrack/inputting() - return - -/obj/machinery/power/smes/batteryrack/outputting() - return - -/obj/machinery/power/smes/batteryrack/Topic(href, href_list) +/obj/machinery/power/smes/batteryrack/tgui_act(action, list/params) // ..() would respond to those topic calls, but we don't want to use them at all. // Calls to these shouldn't occur anyway, due to usage of different nanoUI, but // it's here in case someone decides to try hrefhacking/modified templates. - if(href_list["input"] || href_list["output"]) - return 1 + if(!(action in list("disable", "enable", "equaliseon", "equaliseoff", "ejectcell"))) + return TRUE if(..()) - return 1 - if( href_list["disable"] ) - update_io(0) - return 1 - else if( href_list["enable"] ) - update_io(between(1, text2num(href_list["enable"]), 3)) - return 1 - else if( href_list["equaliseon"] ) - equalise = 1 - return 1 - else if( href_list["equaliseoff"] ) - equalise = 0 - return 1 - else if( href_list["ejectcell"] ) - var/obj/item/weapon/cell/C - for(var/obj/item/weapon/cell/CL in internal_cells) - if(CL.c_uid == text2num(href_list["ejectcell"])) - C = CL - break + return TRUE - if(!istype(C)) - return 1 + switch(action) + if("disable") + update_io(0) + return TRUE + if("enable") + update_io(between(1, text2num(params["enable"]), 3)) + return TRUE + if("equaliseon") + equalise = 1 + return TRUE + if("equaliseoff") + equalise = 0 + return TRUE + if("ejectcell") + var/obj/item/weapon/cell/C + for(var/obj/item/weapon/cell/CL in internal_cells) + if(CL.c_uid == text2num(params["ejectcell"])) + C = CL + break - C.forceMove(get_turf(src)) - internal_cells -= C - update_icon() - RefreshParts() - update_maxcharge() - return 1 \ No newline at end of file + if(!istype(C)) + return TRUE + + C.forceMove(get_turf(src)) + internal_cells -= C + update_icon() + RefreshParts() + update_maxcharge() + return TRUE \ No newline at end of file diff --git a/code/modules/power/batteryrack_vr.dm b/code/modules/power/batteryrack_vr.dm new file mode 100644 index 0000000000..69a2cb5330 --- /dev/null +++ b/code/modules/power/batteryrack_vr.dm @@ -0,0 +1,9 @@ +/obj/item/weapon/module/power_control/attackby(var/obj/item/I, var/mob/user) + if(I.is_multitool()) + to_chat(user, SPAN_NOTICE("You begin tweaking the power control circuits to support a power cell rack.")) + if(do_after(user, 50 * I.toolspeed)) + var/obj/item/newcircuit = new/obj/item/weapon/circuitboard/batteryrack(get_turf(user)) + qdel(src) + user.put_in_hands(newcircuit) + return + return ..() diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index ecfbf00a5f..d77f8341a6 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -25,6 +25,8 @@ var/last_use = 0 // A tracker for use in self-charging var/charge_delay = 0 // How long it takes for the cell to start recharging after last use matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50) + drop_sound = 'sound/items/drop/component.ogg' + pickup_sound = 'sound/items/pickup/component.ogg' // Overlay stuff. var/overlay_half_state = "cell-o1" // Overlay used when not fully charged but not empty. diff --git a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm index 73543ead92..740ef842c2 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm @@ -19,7 +19,7 @@ /obj/item/weapon/fuel_assembly/Initialize() . = ..() - var/material/material = get_material_by_name(fuel_type) + var/datum/material/material = get_material_by_name(fuel_type) if(istype(material)) name = "[material.use_name] fuel rod assembly" desc = "A fuel rod for a fusion reactor. This one is made from [material.use_name]." diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm index d38fd76e86..71dcc7684f 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm @@ -49,7 +49,7 @@ if(istype(thing, /obj/item/stack/material)) var/obj/item/stack/material/M = thing - var/material/mat = M.get_material() + var/datum/material/mat = M.get_material() if(!mat.is_fusion_fuel) to_chat(user, "It would be pointless to make a fuel rod out of [mat.use_name].") return diff --git a/code/modules/power/grid_checker.dm b/code/modules/power/grid_checker.dm index 224eade429..53766098f0 100644 --- a/code/modules/power/grid_checker.dm +++ b/code/modules/power/grid_checker.dm @@ -59,7 +59,7 @@ if(opened) wires.Interact(user) - return ui_interact(user) + return tgui_interact(user) /obj/machinery/power/grid_checker/proc/power_failure(var/announce = TRUE) if(announce) diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index 386437db0b..01fa9932d9 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -43,9 +43,12 @@ for(var/obj/item/I in contents) . += "\the [I]" +/obj/machinery/particle_smasher/atmosanalyze(var/mob/user) + return list("\The [src] reads an energy level of [energy].") + /obj/machinery/particle_smasher/attackby(obj/item/W as obj, mob/user as mob) if(W.type == /obj/item/device/analyzer) - to_chat(user, "\The [src] reads an energy level of [energy].") + return else if(istype(W, /obj/item/stack/material)) var/obj/item/stack/material/M = W if(M.uses_charge) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 2caa008f0c..1d5262044e 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -345,59 +345,59 @@ /obj/machinery/computer/turbine_computer/attack_hand(var/mob/user as mob) if((. = ..())) return - src.interact(user) + tgui_interact(user) -/obj/machinery/computer/turbine_computer/interact(mob/user) - return ui_interact(user) +/obj/machinery/computer/turbine_computer/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "TurbineControl", name) + ui.open() -/obj/machinery/computer/turbine_computer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/machinery/computer/turbine_computer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = list() data["connected"] = (compressor && compressor.turbine) ? TRUE : FALSE data["compressor_broke"] = (!compressor || (compressor.stat & BROKEN)) ? TRUE : FALSE data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.stat & BROKEN)) ? TRUE : FALSE data["broken"] = (data["compressor_broke"] || data["turbine_broke"]) data["door_status"] = door_status ? TRUE : FALSE + + data["online"] = FALSE + data["power"] = 0 + data["rpm"] = 0 + data["temp"] = 0 + if(compressor && compressor.turbine) data["online"] = compressor.starter - data["power"] = DisplayPower(compressor.turbine.lastgen) + data["power"] = compressor.turbine.lastgen // DisplayPower data["rpm"] = compressor.rpm data["temp"] = compressor.gas_contained.temperature - // update the ui if it exists, returns null if no ui is passed/found - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm - ui = new(user, src, ui_key, "turbine_computer.tmpl", name, 520, 440) - // when the ui is first opened this is the data it will use - ui.set_initial_data(data) - // open the new ui window - ui.open() - // auto update every Master Controller tick - ui.set_auto_update(TRUE) + return data -/obj/machinery/computer/turbine_computer/Topic(href, href_list) +/obj/machinery/computer/turbine_computer/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) - return - if(href_list["power-on"]) - if(compressor && compressor.turbine) - compressor.starter = TRUE + return TRUE + + switch(action) + if("power-on") + if(compressor && compressor.turbine) + compressor.starter = TRUE + . = TRUE + if("power-off") + if(compressor && compressor.turbine) + compressor.starter = FALSE + . = TRUE + if("reconnect") + locate_machinery() . = TRUE - else if(href_list["power-off"]) - if(compressor && compressor.turbine) - compressor.starter = FALSE + if("doors") + door_status = !door_status + for(var/obj/machinery/door/blast/D in src.doors) + if (door_status) + spawn(0) D.close() + else + spawn(0)D.open() . = TRUE - else if(href_list["reconnect"]) - locate_machinery() - . = TRUE - else if(href_list["doors"]) - door_status = !door_status - for(var/obj/machinery/door/blast/D in src.doors) - if (door_status) - spawn(0) D.close() - else - spawn(0)D.open() - . = TRUE #undef COMPFRICTION #undef COMPSTARTERLOAD diff --git a/code/modules/projectiles/broken.dm b/code/modules/projectiles/broken.dm index a63f685ba1..15f63f4c54 100644 --- a/code/modules/projectiles/broken.dm +++ b/code/modules/projectiles/broken.dm @@ -37,7 +37,7 @@ var/res_name = "" if(ispath(res,/obj/item/stack/material)) var/obj/item/stack/material/mat_stack = res - var/material/mat = get_material_by_name("[initial(mat_stack.default_type)]") + var/datum/material/mat = get_material_by_name("[initial(mat_stack.default_type)]") if(material_needs[resource]>1) res_name = "[mat.use_name] [mat.sheet_plural_name]" else diff --git a/code/modules/projectiles/guns/energy/hooklauncher.dm b/code/modules/projectiles/guns/energy/hooklauncher.dm index 2c170544a0..79ddf7443d 100644 --- a/code/modules/projectiles/guns/energy/hooklauncher.dm +++ b/code/modules/projectiles/guns/energy/hooklauncher.dm @@ -5,12 +5,14 @@ /obj/item/weapon/gun/energy/hooklauncher name = "gravity whip" desc = "A large, strange gauntlet." + icon = 'icons/obj/gun2.dmi' icon_state = "gravwhip" item_state = "gravwhip" fire_sound_text = "laser blast" fire_delay = 15 charge_cost = 300 + charge_meter = FALSE cell_type = /obj/item/weapon/cell/device/weapon projectile_type = /obj/item/projectile/energy/hook @@ -29,7 +31,6 @@ cell_type = /obj/item/weapon/cell/device/weapon/recharge/alien battery_lock = TRUE charge_cost = 400 - charge_meter = FALSE projectile_type = /obj/item/projectile/energy/hook/ring diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm new file mode 100644 index 0000000000..0b0678894f --- /dev/null +++ b/code/modules/projectiles/guns/magic.dm @@ -0,0 +1,60 @@ +/* + * "Magic" "Guns" + */ + +/obj/item/weapon/gun/magic + name = "staff of nothing" + desc = "This staff is boring to watch because even though it came first you've seen everything it can do in other staves for years." + icon = 'icons/obj/wizard.dmi' + icon_state = "staffofnothing" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_magic.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_magic.dmi', + ) + fire_sound = 'sound/weapons/emitter.ogg' + w_class = ITEMSIZE_HUGE + projectile_type = null + var/checks_antimagic = TRUE + var/max_charges = 6 + var/charges = 0 + var/recharge_rate = 4 + var/charge_tick = 0 + var/can_charge = TRUE + +/obj/item/weapon/gun/magic/consume_next_projectile() + if(checks_antimagic && locate(/obj/item/weapon/nullrod) in usr) return null + if(!ispath(projectile_type)) return null + if(charges <= 0) return null + + charges -= 1 + + return new projectile_type(src) + +/obj/item/weapon/gun/magic/Initialize() + . = ..() + charges = max_charges + if(can_charge) + START_PROCESSING(SSobj, src) + +/obj/item/weapon/gun/magic/Destroy() + if(can_charge) + STOP_PROCESSING(SSobj, src) + return ..() + +/obj/item/weapon/gun/magic/process() + if (charges >= max_charges) + charge_tick = 0 + return + charge_tick++ + if(charge_tick < recharge_rate) + return 0 + charge_tick = 0 + charges++ + return 1 + +/obj/item/weapon/gun/magic/handle_click_empty(mob/user) + if (user) + user.visible_message("*wzhzhzh*", "The [name] whizzles quietly.") + else + src.visible_message("*wzhzh*") + playsound(src, 'sound/weapons/empty.ogg', 100, 1) diff --git a/code/modules/projectiles/guns/magic/fireball.dm b/code/modules/projectiles/guns/magic/fireball.dm new file mode 100644 index 0000000000..4abe3e286e --- /dev/null +++ b/code/modules/projectiles/guns/magic/fireball.dm @@ -0,0 +1,17 @@ + +/obj/item/weapon/gun/magic/firestaff + name = "flaming staff" + desc = "A long, everburning torch." + icon = 'icons/obj/wizard.dmi' + icon_state = "staffoffire" + item_state = "staff" + fire_sound = 'sound/weapons/emitter.ogg' + w_class = ITEMSIZE_HUGE + checks_antimagic = TRUE + max_charges = 6 + charges = 0 + recharge_rate = 4 + charge_tick = 0 + can_charge = TRUE + + projectile_type = /obj/item/projectile/energy/fireball diff --git a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm index 7745c9c623..8476e28bee 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm @@ -11,7 +11,7 @@ if(istype(thing, /obj/item/stack/material) && construction_stage == 1) var/obj/item/stack/material/reinforcing = thing - var/material/reinforcing_with = reinforcing.get_material() + var/datum/material/reinforcing_with = reinforcing.get_material() if(reinforcing_with.name == DEFAULT_WALL_MATERIAL) // Steel if(reinforcing.get_amount() < 5) to_chat(user, "You need at least 5 [reinforcing.singular_name]\s for this task.") diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm index 9e93d46b8a..1aa8e83957 100644 --- a/code/modules/projectiles/guns/projectile/boltaction.dm +++ b/code/modules/projectiles/guns/projectile/boltaction.dm @@ -14,6 +14,7 @@ ammo_type = /obj/item/ammo_casing/a762 load_method = SINGLE_CASING|SPEEDLOADER action_sound = 'sound/weapons/riflebolt.ogg' + pump_animation = null /obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice // For target practice desc = "A bolt-action rifle with a lightweight synthetic wood stock, designed for competitive shooting. Comes shipped with practice rounds pre-loaded into the gun. Popular among professional marksmen. Uses 7.62mm rounds." @@ -66,4 +67,4 @@ desc = "An iconic manually operated lever action rifle, offering adequate stopping power due to it's still powerful cartridge while at the same time having a rather respectable firing rate due to it's mechanism. It is very probable this is a replica instead of a museum piece, but rifles of this pattern still see usage as colonist guns in some far off regions. Uses 7.62mm rounds." item_state = "levercarabine" // That isn't how carbine is spelled ya knob! :U icon_state = "levercarabine" - animated_pump = 1 + pump_animation = "levercarabine-cycling" diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 799c27ac54..6e69b65a6a 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -14,10 +14,10 @@ ammo_type = /obj/item/ammo_casing/a12g/beanbag projectile_type = /obj/item/projectile/bullet/shotgun handle_casings = HOLD_CASINGS - var/recentpump = 0 // to prevent spammage + var/recentpump = 0 //To prevent spammage var/action_sound = 'sound/weapons/shotgunpump.ogg' - var/animated_pump = 0 //This is for cyling animations. - var/empty_sprite = 0 //This is just a dirty var so it doesn't fudge up. + var/empty_sprite = 0 //This is just a dirty var so it doesn't fudge up. + var/pump_animation = "shotgun-pump" //You put the reference to the animation in question here. Frees up namming. Ex: "shotgun_old_pump" or "sniper_cycle" /obj/item/weapon/gun/projectile/shotgun/pump/consume_next_projectile() if(chambered) @@ -41,8 +41,8 @@ loaded -= AC //Remove casing from loaded list. chambered = AC - if(animated_pump)//This affects all bolt action and shotguns. - flick("[icon_state]-cycling", src)//This plays any pumping + if(pump_animation)//This affects all bolt action and shotguns. + flick("[pump_animation]", src)//This plays any pumping update_icon() @@ -60,6 +60,7 @@ /obj/item/weapon/gun/projectile/shotgun/pump/slug ammo_type = /obj/item/ammo_casing/a12g + pump_animation = null /obj/item/weapon/gun/projectile/shotgun/pump/combat name = "combat shotgun" @@ -71,6 +72,7 @@ max_shells = 7 //match the ammo box capacity, also it can hold a round in the chamber anyways, for a total of 8. ammo_type = /obj/item/ammo_casing/a12g load_method = SINGLE_CASING|SPEEDLOADER + pump_animation = "cshotgun-pump" /obj/item/weapon/gun/projectile/shotgun/pump/combat/empty ammo_type = null diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 8ef1bfe2a6..6cd885f0c1 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -739,6 +739,8 @@ shot_from = launcher.name silenced = launcher.silenced + if(user) + firer = user return launch_projectile(target, target_zone, user, params, angle_override, forced_spread) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index e3ac4d0591..c72d9b35ea 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -119,7 +119,7 @@ icon_state = "bullet_chonk" //Ywedit fire_sound = 'sound/weapons/Gunshot_shotgun.ogg' damage = 50 - armor_penetration = 15 + armor_penetration = 20 /obj/item/projectile/bullet/shotgun/beanbag //because beanbags are not bullets name = "beanbag" diff --git a/code/modules/projectiles/projectile/hook.dm b/code/modules/projectiles/projectile/hook.dm index ee5fd6c471..3e98319ebd 100644 --- a/code/modules/projectiles/projectile/hook.dm +++ b/code/modules/projectiles/projectile/hook.dm @@ -27,13 +27,15 @@ var/list/help_messages = list("slaps", "pokes", "nudges", "bumps", "pinches") var/done_mob_unique = FALSE // Has the projectile already done something to a mob? + var/datum/beam/chain = null + /obj/item/projectile/energy/hook/launch_projectile(atom/target, target_zone, mob/user, params, angle_override, forced_spread = 0) var/expected_distance = get_dist(target, loc) range = expected_distance // So the hook hits the ground if no mob is hit. target_distance = expected_distance if(firer) // Needed to ensure later checks in impact and on hit function. launcher_intent = firer.a_intent - firer.Beam(src,icon_state=beam_state,icon='icons/effects/beam.dmi',time=60, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time=1) + chain = firer.Beam(src,icon_state=beam_state,icon='icons/effects/beam.dmi',time=60, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time=1) if(launcher_intent) switch(launcher_intent) @@ -58,10 +60,22 @@ ..() // Does the regular launching stuff. +/obj/item/projectile/energy/hook/after_move() + if(chain) + var/origin_turf = get_turf(firer) + var/target_turf = get_turf(src) + if(!chain.static_beam && (origin_turf != chain.origin_oldloc || target_turf != chain.target_oldloc)) + chain.origin_oldloc = origin_turf //so we don't keep checking against their initial positions, leading to endless Reset()+Draw() calls + chain.target_oldloc = target_turf + chain.Reset() + chain.Draw() + return + /obj/item/projectile/energy/hook/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null) if(..()) perform_intent_unique(target) + /obj/item/projectile/energy/hook/on_impact(var/atom/A) perform_intent_unique(get_turf(A)) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm new file mode 100644 index 0000000000..9fcc1c1979 --- /dev/null +++ b/code/modules/projectiles/projectile/magic.dm @@ -0,0 +1,20 @@ + +/obj/item/projectile/energy/fireball + name = "fireball" + icon_state = "fireball2" + damage = 15 + damage_type = BURN + check_armour = "bomb" + armor_penetration = 25 // It's a great ball of fire. + + combustion = TRUE + +/obj/item/projectile/energy/fireball/on_hit(var/atom/target, var/blocked = 0) + new /obj/effect/explosion(get_turf(target)) + explosion(target, -1, 0, 2) + ..() + +/obj/item/projectile/energy/fireball/on_impact(var/atom/target) + new /obj/effect/explosion(get_turf(target)) + explosion(target, -1, 0, 2) + ..() diff --git a/code/modules/radiation/radiation.dm b/code/modules/radiation/radiation.dm index c107390094..cb701027d8 100644 --- a/code/modules/radiation/radiation.dm +++ b/code/modules/radiation/radiation.dm @@ -36,7 +36,7 @@ cached_rad_resistance += O.rad_resistance else if(O.density) //So open doors don't get counted - var/material/M = O.get_material() + var/datum/material/M = O.get_material() if(!M) continue cached_rad_resistance += (M.weight + M.radiation_resistance) / config.radiation_material_resistance_divisor // Looks like storing the contents length is meant to be a basic check if the cache is stale due to items enter/exiting. Better than nothing so I'm leaving it as is. ~Leshana diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index ae75e5ae89..b96e223ed9 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -493,4 +493,4 @@ trans_to(M, mobportion, multiplier, copy) trans_to(T, total_volume, multiplier, copy) if (total_volume <= 0) - qdel(src) + qdel(src) \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 212de66431..e636a28d0a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -118,7 +118,7 @@ remove_self(volume) /datum/reagent/blood/synthblood - name = "Synthetic blood" + name = "synthetic blood" id = "synthblood" color = "#999966" volume_mod = 2 @@ -127,8 +127,16 @@ ..() if(data && !data["blood_type"]) data["blood_type"] = "O-" + if(data && data["species"]) + data["species"] = null return +/datum/reagent/blood/synthblood/dilute + name = "synthetic plasma" + id = "synthblood_dilute" + color = "#cacaaf" + volume_mod = 1.2 + // pure concentrated antibodies /datum/reagent/antibodies data = list("antibodies"=list()) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 9077b694d5..5185e5a8f4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -18,11 +18,14 @@ return //add the new taste data - for(var/taste in newdata) - if(taste in data) - data[taste] += newdata[taste] - else - data[taste] = newdata[taste] + if(islist(data)) + for(var/taste in newdata) + if(taste in data) + data[taste] += newdata[taste] + else + data[taste] = newdata[taste] + else + initialize_data(newdata) //cull all tastes below 10% of total var/totalFlavor = 0 @@ -136,6 +139,8 @@ description = "More commonly known as fat, the third macronutrient, with over double the energy content of carbs and protein" reagent_state = SOLID + taste_description = "greasiness" + taste_mult = 0.1 nutriment_factor = 27//The caloric ratio of carb/protein/fat is 4:4:9 color = "#CCCCCC" @@ -145,6 +150,7 @@ id = "oil" description = "Oils are liquid fats." reagent_state = LIQUID + taste_description = "oil" color = "#c79705" touch_met = 1.5 var/lastburnmessage = 0 @@ -221,8 +227,6 @@ name = "Corn Oil" id = "cornoil" description = "An oil derived from various types of corn." - taste_description = "oil" - taste_mult = 0.1 reagent_state = LIQUID /datum/reagent/nutriment/triglyceride/oil/peanut @@ -588,7 +592,7 @@ //SYNNONO MEME FOODS EXPANSION - Credit to Synnono /datum/reagent/spacespice - name = "Space Spice" + name = "Wurmwoad" id = "spacespice" description = "An exotic blend of spices for cooking. Definitely not worms." reagent_state = SOLID @@ -676,7 +680,7 @@ var/mob/living/carbon/human/H = M if(!H.can_feel_pain()) return - + var/effective_dose = (dose * M.species.spice_mod) if((effective_dose < 5) && (dose == metabolism || prob(5))) to_chat(M, "Your insides feel uncomfortably hot!") diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index d2e6818701..15d471da7a 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2674,4 +2674,4 @@ id = "browniemix" result = "browniemix" required_reagents = list("flour" = 5, "coco" = 5, "sugar" = 5) - result_amount = 15 \ No newline at end of file + result_amount = 15 diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index 2bd766213e..fa4763f41d 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -77,6 +77,14 @@ /datum/chemical_reaction/foam/softdrink required_reagents = list("cola" = 1, "mint" = 1) + +/datum/chemical_reaction/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them + name = "Firefighting Foam" + id = "firefighting foam" + result = "firefoam" + required_reagents = list("water" = 1) + catalysts = list("fluorine" = 10) + result_amount = 1 /////////////////////////////////////////////////////////////////////////////////// /// Vore Drugs diff --git a/code/modules/reagents/dispenser/dispenser2_energy.dm b/code/modules/reagents/dispenser/dispenser2_energy.dm index 84c5260c3f..b0dec9f65b 100644 --- a/code/modules/reagents/dispenser/dispenser2_energy.dm +++ b/code/modules/reagents/dispenser/dispenser2_energy.dm @@ -25,7 +25,7 @@ C.reagents.add_reagent(id, to_restore) . = 1 if(.) - SSnanoui.update_uis(src) + SStgui.update_uis(src) /obj/machinery/chemical_dispenser dispense_reagents = list( diff --git a/code/modules/reagents/distilling/Distilling-Recipes.dm b/code/modules/reagents/distilling/Distilling-Recipes.dm index a8ac2ee975..0736ac7e61 100644 --- a/code/modules/reagents/distilling/Distilling-Recipes.dm +++ b/code/modules/reagents/distilling/Distilling-Recipes.dm @@ -128,6 +128,17 @@ temp_range = list(T0C + 100, T0C + 120) +/datum/chemical_reaction/distilling/synthplas + name = "Distilling Synthplas" + id = "distill_synthplas" + result = "synthblood_dilute" + required_reagents = list("protein" = 2, "antibodies" = 1, "bicaridine" = 1) + result_amount = 3 + + reaction_rate = HALF_LIFE(15) + + temp_range = list(T0C + 110, T0C + 130) + // Alcohol /datum/chemical_reaction/distilling/beer name = "Distilling Beer" diff --git a/code/modules/reagents/distilling/distilling.dm b/code/modules/reagents/distilling/distilling.dm index 645f13c76b..5d37f8510c 100644 --- a/code/modules/reagents/distilling/distilling.dm +++ b/code/modules/reagents/distilling/distilling.dm @@ -19,7 +19,7 @@ var/target_temp = T20C - var/max_temp = T20C + 300 + var/max_temp = T0C + 300 var/min_temp = T0C - 10 var/current_temp = T20C @@ -86,6 +86,16 @@ update_icon() +/obj/machinery/portable_atmospherics/powered/reagent_distillery/RefreshParts() + var/total_laser_rating = 0 + for(var/obj/item/weapon/stock_parts/micro_laser/ML in component_parts) + total_laser_rating += ML.rating + + max_temp = initial(max_temp) + (50 * (total_laser_rating - 1)) + min_temp = max(1, initial(min_temp) - (30 * (total_laser_rating - 1))) + + return + /obj/machinery/portable_atmospherics/powered/reagent_distillery/proc/setup_overlay_vars() overlay_output_beaker = image(icon = src.icon, icon_state = "[base_state]-output") overlay_input_beaker = image(icon = src.icon, icon_state = "[base_state]-input") diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 223583f7dc..693330fef7 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -27,6 +27,7 @@ var/label_text = "" var/blood_type = null + var/reag_id = "blood" /obj/item/weapon/reagent_containers/blood/Initialize() . = ..() @@ -35,7 +36,7 @@ if(blood_type != null) label_text = "[blood_type]" update_iv_label() - reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) + reagents.add_reagent(reag_id, 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) update_icon() /obj/item/weapon/reagent_containers/blood/on_reagent_change() @@ -95,6 +96,14 @@ /obj/item/weapon/reagent_containers/blood/OMinus blood_type = "O-" +/obj/item/weapon/reagent_containers/blood/synthplas + blood_type = "O-" + reag_id = "synthblood_dilute" + +/obj/item/weapon/reagent_containers/blood/synthblood + blood_type = "O-" + reag_id = "synthblood" + /obj/item/weapon/reagent_containers/blood/empty name = "Empty BloodPack" desc = "Seems pretty useless... Maybe if there were a way to fill it?" diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghypo.dm similarity index 87% rename from code/modules/reagents/reagent_containers/borghydro.dm rename to code/modules/reagents/reagent_containers/borghypo.dm index 347c136e40..12a3df61df 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -79,9 +79,11 @@ if(!affected) to_chat(user, "\The [H] is missing that limb!") return + /* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity. else if(affected.robotic >= ORGAN_ROBOT) to_chat(user, "You cannot inject a robotic limb.") return + */ if(M.can_inject(user, 1, ignore_thickness = bypass_protection)) to_chat(user, "You inject [M] with the injector.") @@ -133,7 +135,48 @@ recharge_time = 3 volume = 60 possible_transfer_amounts = list(5, 10, 20, 30) - reagent_ids = list("ale", "cider", "beer", "berryjuice", "bitters", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine") + reagent_ids = list("ale", + "cider", + "beer", + "berryjuice", + "bitters", + "coffee", + "cognac", + "cola", + "dr_gibb", + "egg", + "gin", + "gingerale", + "hot_coco", + "ice", + "icetea", + "kahlua", + "lemonjuice", + "lemon_lime", + "limejuice", + "mead", + "milk", + "mint", + "orangejuice", + "rum", + "sake", + "sodawater", + "soymilk", + "space_up", + "spacemountainwind", + "spacespice", + "specialwhiskey", + "sugar", + "tea", + "tequilla", + "tomatojuice", + "tonic", + "vermouth", + "vodka", + "water", + "watermelonjuice", + "whiskey", + "wine") /obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user) return diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 6b567f47f0..9e7eb5a575 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -135,7 +135,7 @@ update_name_label() if(istype(W,/obj/item/weapon/storage/bag)) ..() - if(W && W.w_class <= w_class && (flags & OPENCONTAINER)) + if(W && W.w_class <= w_class && (flags & OPENCONTAINER) && user.a_intent != I_HELP) to_chat(user, "You dip \the [W] into \the [src].") reagents.touch_obj(W, reagents.total_volume) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 9a1882e47b..80d0e1e34d 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -42,9 +42,11 @@ if(!affected) to_chat(user, "\The [H] is missing that limb!") return + /* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity. else if(affected.robotic >= ORGAN_ROBOT) to_chat(user, "You cannot inject a robotic limb.") return + */ //VOREStation Add Start - Adds Prototype Hypo functionality if(H != user && prototype) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 4bdf471989..fe50843852 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -170,9 +170,11 @@ if(!affected) to_chat(user, "\The [H] is missing that limb!") return + /* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity. else if(affected.robotic >= ORGAN_ROBOT) to_chat(user, "You cannot inject a robotic limb.") return + */ var/cycle_time = injtime*0.33 //33% of the time slept between 5u doses var/warmup_time = 0 //0 for containers diff --git a/code/modules/research/designs/circuits/ai_modules_vr.dm b/code/modules/research/designs/circuits/ai_modules_vr.dm new file mode 100644 index 0000000000..d8bc3814ac --- /dev/null +++ b/code/modules/research/designs/circuits/ai_modules_vr.dm @@ -0,0 +1,41 @@ +/datum/design/aimodule/core/predator + name = "Predator" + id = "laws_predator_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/predator + sort_string = "XAVAA" + +/datum/design/aimodule/core/protective_shell + name = "Protective Shell" + id = "laws_protective_shell_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/protective_shell + sort_string = "XAVAB" + +/datum/design/aimodule/core/scientific_pursuer + name = "Scientific Pursuer" + id = "laws_scientific_pursuer_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/scientific_pursuer + sort_string = "XAVAC" + +/datum/design/aimodule/core/guard_dog + name = "Guard Dog" + id = "laws_guard_dog_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/guard_dog + sort_string = "XAVAD" + +/datum/design/aimodule/core/pleasurebot + name = "Pleasurebot" + id = "laws_pleasurebot_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/pleasurebot + sort_string = "XAVAE" + +/datum/design/aimodule/core/consuming_eradicator + name = "Consuming Eradicator" + id = "laws_consuming_eradicator_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 6, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/consuming_eradicator + sort_string = "XAVAF" diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 34b3510031..d12441c8fe 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -226,7 +226,7 @@ var/recursive = amount == -1 ? 1 : 0 material = lowertext(material) var/obj/item/stack/material/mattype - var/material/MAT = get_material_by_name(material) + var/datum/material/MAT = get_material_by_name(material) if(!MAT) return diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 5f58c50f3d..e317c665d0 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -18,7 +18,7 @@ return /obj/machinery/r_n_d/proc/getMaterialType(var/name) - var/material/M = get_material_by_name(name) + var/datum/material/M = get_material_by_name(name) if(M && M.stack_type) return M.stack_type return null diff --git a/code/modules/resleeving/infomorph.dm b/code/modules/resleeving/infomorph.dm index 7fd716bc96..fed79fe078 100644 --- a/code/modules/resleeving/infomorph.dm +++ b/code/modules/resleeving/infomorph.dm @@ -112,7 +112,10 @@ var/list/infomorph_emotions = list( pda.ownjob = "Sleevecard" pda.owner = text("[]", src) pda.name = pda.owner + " (" + pda.ownjob + ")" - pda.toff = 1 + + var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger) + if(M) + M.toff = TRUE ..() @@ -144,9 +147,9 @@ var/list/infomorph_emotions = list( return 0 ..() -/mob/living/silicon/infomorph/default_can_use_topic(var/src_object) +/mob/living/silicon/infomorph/default_can_use_tgui_topic(var/src_object) if(src_object in src) - return shared_nano_interaction() + return shared_tgui_interaction() /////////// DAMAGES /mob/living/silicon/infomorph/emp_act(severity) @@ -187,7 +190,7 @@ var/list/infomorph_emotions = list( medicalActive1 = null medicalActive2 = null medical_cannotfind = 0 - SSnanoui.update_uis(src) + SStgui.update_uis(src) to_chat(usr, "You reset your record-viewing software.") /* @@ -460,94 +463,81 @@ var/global/list/default_infomorph_software = list() set category = "Card Commands" set name = "Software Interface" - ui_interact(src) + tgui_interact(src) -/mob/living/silicon/infomorph/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, key_state = self_state) - if(user != src) - if(ui) ui.set_status(STATUS_CLOSE, 0) - return +/mob/living/silicon/infomorph/tgui_state(mob/user) + return GLOB.tgui_self_state - if(ui_key != "main") - var/datum/infomorph_software/S = software[ui_key] - if(S && !S.toggle) - S.on_ui_interact(src, ui, force_open) - else - if(ui) ui.set_status(STATUS_CLOSE, 0) - return - - var/data[0] +/mob/living/silicon/infomorph/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIInterface", "Card Software Interface") + ui.open() +/mob/living/silicon/infomorph/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + // Software we have bought - var/bought_software[0] + var/list/bought_software = list() // Software we have not bought - var/not_bought_software[0] + var/list/not_bought_software = list() for(var/key in infomorph_software_by_key) var/datum/infomorph_software/S = infomorph_software_by_key[key] - var/software_data[0] + var/list/software_data = list() software_data["name"] = S.name software_data["id"] = S.id if(key in software) software_data["on"] = S.is_active(src) - bought_software[++bought_software.len] = software_data + bought_software.Add(list(software_data)) else software_data["ram"] = S.ram_cost - not_bought_software[++not_bought_software.len] = software_data + not_bought_software.Add(list(software_data)) data["bought"] = bought_software data["not_bought"] = not_bought_software data["available_ram"] = ram // Emotions - var/emotions[0] + var/list/emotions = list() for(var/name in infomorph_emotions) - var/emote[0] + var/list/emote = list() emote["name"] = name emote["id"] = infomorph_emotions[name] - emotions[++emotions.len] = emote + emotions.Add(list(emote)) data["emotions"] = emotions data["current_emotion"] = card.current_emotion - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open, key_state) - if (!ui) - ui = new(user, src, ui_key, "pai_interface.tmpl", "Card Software Interface", 450, 600, state = key_state) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data -/mob/living/silicon/infomorph/Topic(href, href_list) - . = ..() - if(.) return +/mob/living/silicon/infomorph/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE - if(href_list["software"]) - var/soft = href_list["software"] - var/datum/infomorph_software/S = software[soft] - if(S.toggle) - S.toggle(src) - else - ui_interact(src, ui_key = soft) - return 1 + switch(action) + if("software") + var/soft = params["software"] + var/datum/infomorph_software/S = software[soft] + if(S.toggle) + S.toggle(src) + else + S.tgui_interact(src, parent_ui = ui) + return TRUE - else if(href_list["stopic"]) - var/soft = href_list["stopic"] - var/datum/infomorph_software/S = software[soft] - if(S) - return S.Topic(href, href_list) + if("purchase") + var/soft = params["purchase"] + var/datum/infomorph_software/S = infomorph_software_by_key[soft] + if(S && (ram >= S.ram_cost)) + ram -= S.ram_cost + software[S.id] = S + return TRUE - else if(href_list["purchase"]) - var/soft = href_list["purchase"] - var/datum/infomorph_software/S = infomorph_software_by_key[soft] - if(S && (ram >= S.ram_cost)) - ram -= S.ram_cost - software[S.id] = S - return 1 - - else if(href_list["image"]) - var/img = href_list["image"] - if(img) - card.setEmotion(img) - return 1 + if("image") + var/img = text2num(params["image"]) + if(img) + card.setEmotion(img) + return TRUE /mob/living/silicon/infomorph/examine(mob/user) . = ..(user, infix = ", personal AI") diff --git a/code/modules/resleeving/infomorph_software.dm b/code/modules/resleeving/infomorph_software.dm index 2d2439b614..67a2bd47f9 100644 --- a/code/modules/resleeving/infomorph_software.dm +++ b/code/modules/resleeving/infomorph_software.dm @@ -12,35 +12,38 @@ // Whether pAIs should automatically receive this module at no cost var/default = 0 - proc/on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - return +/datum/infomorph_software/tgui_state(mob/user) + return GLOB.tgui_always_state - proc/toggle(mob/living/silicon/infomorph/user) - return +/datum/infomorph_software/tgui_status(mob/user) + if(!istype(user, /mob/living/silicon/infomorph)) + return STATUS_CLOSE + return ..() - proc/is_active(mob/living/silicon/infomorph/user) - return 0 +/datum/infomorph_software/proc/toggle(mob/living/silicon/infomorph/user) + return + +/datum/infomorph_software/proc/is_active(mob/living/silicon/infomorph/user) + return 0 /datum/infomorph_software/crew_manifest name = "Crew Manifest" - ram_cost = 15 + ram_cost = 5 id = "manifest" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) +/datum/infomorph_software/crew_manifest/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "CrewManifest", name, parent_ui) + ui.open() + +/datum/infomorph_software/crew_manifest/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + if(data_core) data_core.get_manifest_list() - - var/data[0] - // This is dumb, but NanoUI breaks if it has no data to send - data["manifest"] = PDA_Manifest - - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_manifest.tmpl", "Crew Manifest", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + data["manifest"] = PDA_Manifest + return data /datum/infomorph_software/med_records name = "Medical Records" @@ -48,53 +51,55 @@ id = "med_records" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/med_records/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIMedrecords", name, parent_ui) + ui.open() - var/records[0] - for(var/datum/data/record/general in sortRecord(data_core.general)) - var/record[0] - record["name"] = general.fields["name"] - record["ref"] = "\ref[general]" - records[++records.len] = record +/datum/infomorph_software/med_records/tgui_data(mob/living/silicon/infomorph/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/list/records = list() + for(var/datum/data/record/general in sortRecord(data_core.general)) + var/list/record = list() + record["name"] = general.fields["name"] + record["ref"] = "\ref[general]" + records.Add(list(record)) - data["records"] = records + data["records"] = records - var/datum/data/record/G = user.medicalActive1 - var/datum/data/record/M = user.medicalActive2 - data["general"] = G ? G.fields : null - data["medical"] = M ? M.fields : null - data["could_not_find"] = user.medical_cannotfind + var/datum/data/record/G = user.medicalActive1 + var/datum/data/record/M = user.medicalActive2 + data["general"] = G ? G.fields : null + data["medical"] = M ? M.fields : null + data["could_not_find"] = user.medical_cannotfind - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_medrecords.tmpl", "Medical Records", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data - Topic(href, href_list) - var/mob/living/silicon/infomorph/P = usr - if(!istype(P)) return +/datum/infomorph_software/med_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + var/mob/living/silicon/infomorph/P = usr + if(!istype(P)) + return - if(href_list["select"]) - var/datum/data/record/record = locate(href_list["select"]) - if(record) - var/datum/data/record/R = record - var/datum/data/record/M = null - if (!( data_core.general.Find(R) )) - P.medical_cannotfind = 1 - else - P.medical_cannotfind = 0 - for(var/datum/data/record/E in data_core.medical) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - P.medicalActive1 = R - P.medicalActive2 = M - else + if(action == "select") + var/datum/data/record/record = locate(params["select"]) + if(record) + var/datum/data/record/R = record + var/datum/data/record/M = null + if (!( data_core.general.Find(R) )) P.medical_cannotfind = 1 - return 1 + else + P.medical_cannotfind = 0 + for(var/datum/data/record/E in data_core.medical) + if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + M = E + P.medicalActive1 = R + P.medicalActive2 = M + else + P.medical_cannotfind = 1 + return 1 /datum/infomorph_software/sec_records name = "Security Records" @@ -102,57 +107,59 @@ id = "sec_records" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/sec_records/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAISecrecords", name, parent_ui) + ui.open() - var/records[0] - for(var/datum/data/record/general in sortRecord(data_core.general)) - var/record[0] - record["name"] = general.fields["name"] - record["ref"] = "\ref[general]" - records[++records.len] = record +/datum/infomorph_software/sec_records/tgui_data(mob/living/silicon/infomorph/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/list/records = list() + for(var/datum/data/record/general in sortRecord(data_core.general)) + var/list/record = list() + record["name"] = general.fields["name"] + record["ref"] = "\ref[general]" + records.Add(list(record)) - data["records"] = records + data["records"] = records - var/datum/data/record/G = user.securityActive1 - var/datum/data/record/S = user.securityActive2 - data["general"] = G ? G.fields : null - data["security"] = S ? S.fields : null - data["could_not_find"] = user.security_cannotfind + var/datum/data/record/G = user.securityActive1 + var/datum/data/record/S = user.securityActive2 + data["general"] = G ? G.fields : null + data["security"] = S ? S.fields : null + data["could_not_find"] = user.security_cannotfind - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_secrecords.tmpl", "Security Records", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data - Topic(href, href_list) - var/mob/living/silicon/infomorph/P = usr - if(!istype(P)) return +/datum/infomorph_software/sec_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + var/mob/living/silicon/infomorph/P = usr + if(!istype(P)) + return - if(href_list["select"]) - var/datum/data/record/record = locate(href_list["select"]) - if(record) - var/datum/data/record/R = record - var/datum/data/record/S = null - if (!( data_core.general.Find(R) )) - P.securityActive1 = null - P.securityActive2 = null - P.security_cannotfind = 1 - else - P.security_cannotfind = 0 - for(var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - S = E - P.securityActive1 = R - P.securityActive2 = S - else + if(action == "select") + var/datum/data/record/record = locate(params["select"]) + if(record) + var/datum/data/record/R = record + var/datum/data/record/S = null + if (!( data_core.general.Find(R) )) P.securityActive1 = null P.securityActive2 = null P.security_cannotfind = 1 - return 1 + else + P.security_cannotfind = 0 + for(var/datum/data/record/E in data_core.security) + if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + S = E + P.securityActive1 = R + P.securityActive2 = S + else + P.securityActive1 = null + P.securityActive2 = null + P.security_cannotfind = 1 + return TRUE /datum/infomorph_software/door_jack name = "Door Jack" @@ -160,44 +167,45 @@ id = "door_jack" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/door_jack/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIDoorjack", "Door Jack", parent_ui) + ui.open() - data["cable"] = user.cable != null - data["machine"] = user.cable && (user.cable.machine != null) - data["inprogress"] = user.hackdoor != null - data["progress_a"] = round(user.hackprogress) - data["progress_b"] = user.hackprogress % 10 - data["aborted"] = user.hack_aborted +/datum/infomorph_software/door_jack/tgui_data(mob/living/silicon/infomorph/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_doorjack.tmpl", "Door Jack", 300, 150) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + data["cable"] = user.cable != null + data["machine"] = user.cable && (user.cable.machine != null) + data["inprogress"] = user.hackdoor != null + data["progress_a"] = round(user.hackprogress / 10) + data["progress_b"] = user.hackprogress % 10 + data["aborted"] = user.hack_aborted - Topic(href, href_list) - var/mob/living/silicon/infomorph/P = usr - if(!istype(P)) return + return data - if(href_list["jack"]) +/datum/infomorph_software/door_jack/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + var/mob/living/silicon/infomorph/P = usr + if(!istype(P) || ..()) + return TRUE + + switch(action) + if("jack") if(P.cable && P.cable.machine) P.hackdoor = P.cable.machine P.hackloop() return 1 - else if(href_list["cancel"]) + if("cancel") P.hackdoor = null return 1 - else if(href_list["cable"]) + if("cable") var/turf/T = get_turf(P) P.hack_aborted = 0 P.cable = new /obj/item/weapon/pai_cable(T) - if(ishuman(P.card.loc)) - var/mob/living/carbon/human/H = P.card.loc - H.put_in_any_hand_if_possible(P.cable) - T.visible_message("A port on \the [P] opens to reveal \the [P.cable].") + for(var/mob/M in viewers(T)) + M.show_message("A port on [P] opens to reveal [P.cable], which promptly falls to the floor.", 3, + "You hear the soft click of something light and hard falling to the ground.", 2) return 1 /mob/living/silicon/infomorph/proc/hackloop() @@ -239,43 +247,54 @@ /datum/infomorph_software/atmosphere_sensor name = "Atmosphere Sensor" - ram_cost = 15 + ram_cost = 5 id = "atmos_sense" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/atmosphere_sensor/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIAtmos", name, parent_ui) + ui.open() - var/turf/T = get_turf_or_move(user.loc) - if(!T) - data["reading"] = 0 - data["pressure"] = 0 - data["temperature"] = 0 - data["temperatureC"] = 0 - data["gas"] = list() - else - var/datum/gas_mixture/env = T.return_air() - data["reading"] = 1 - var/pres = env.return_pressure() * 10 - data["pressure"] = "[round(pres/10)].[pres%10]" - data["temperature"] = round(env.temperature) - data["temperatureC"] = round(env.temperature-T0C) +/datum/infomorph_software/atmosphere_sensor/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() - var/t_moles = env.total_moles - var/gases[0] - for(var/g in env.gas) - var/gas[0] - gas["name"] = gas_data.name[g] - gas["percent"] = round((env.gas[g] / t_moles) * 100) - gases[++gases.len] = gas - data["gas"] = gases + var/list/results = list() + var/turf/T = get_turf(user) + if(!isnull(T)) + var/datum/gas_mixture/environment = T.return_air() + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles + if (total_moles) + var/o2_level = environment.gas["oxygen"]/total_moles + var/n2_level = environment.gas["nitrogen"]/total_moles + var/co2_level = environment.gas["carbon_dioxide"]/total_moles + var/phoron_level = environment.gas["phoron"]/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_atmosphere.tmpl", "Atmosphere Sensor", 350, 300) - ui.set_initial_data(data) - ui.open() + // entry is what the element is describing + // Type identifies which unit or other special characters to use + // Val is the information reported + // Bad_high/_low are the values outside of which the entry reports as dangerous + // Poor_high/_low are the values outside of which the entry reports as unideal + // Values were extracted from the template itself + results = list( + list("entry" = "Pressure", "units" = "kPa", "val" = "[round(pressure,0.1)]", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80), + list("entry" = "Temperature", "units" = "°C", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5), + list("entry" = "Oxygen", "units" = "kPa", "val" = "[round(o2_level*100,0.1)]", "bad_high" = 140, "poor_high" = 135, "poor_low" = 19, "bad_low" = 17), + list("entry" = "Nitrogen", "units" = "kPa", "val" = "[round(n2_level*100,0.1)]", "bad_high" = 105, "poor_high" = 85, "poor_low" = 50, "bad_low" = 40), + list("entry" = "Carbon Dioxide", "units" = "kPa", "val" = "[round(co2_level*100,0.1)]", "bad_high" = 10, "poor_high" = 5, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Phoron", "units" = "kPa", "val" = "[round(phoron_level*100,0.01)]", "bad_high" = 0.5, "poor_high" = 0, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Other", "units" = "kPa", "val" = "[round(unknown_level, 0.01)]", "bad_high" = 1, "poor_high" = 0.5, "poor_low" = 0, "bad_low" = 0) + ) + + if(isnull(results)) + results = list(list("entry" = "pressure", "units" = "kPa", "val" = "0", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80)) + + data["aircontents"] = results + + return data /datum/infomorph_software/ar_hud name = "AR HUD" @@ -302,45 +321,56 @@ is_active(mob/living/silicon/infomorph/user) return user.translator.listening + /datum/infomorph_software/signaller - name = "Remote Signaller" - ram_cost = 15 + name = "Remote Signaler" + ram_cost = 5 id = "signaller" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/signaller/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Signaler", "Signaler", parent_ui) + ui.open() - data["frequency"] = format_frequency(user.sradio.frequency) - data["code"] = user.sradio.code +/datum/infomorph_software/signaller/tgui_data(mob/living/silicon/infomorph/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/obj/item/radio/integrated/signal/R = user.sradio - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_signaller.tmpl", "Signaller", 320, 150) - ui.set_initial_data(data) - ui.open() + data["frequency"] = R.frequency + data["minFrequency"] = RADIO_LOW_FREQ + data["maxFrequency"] = RADIO_HIGH_FREQ + data["code"] = R.code - Topic(href, href_list) - var/mob/living/silicon/infomorph/P = usr - if(!istype(P)) return + return data - if(href_list["send"]) - P.sradio.send_signal("ACTIVATE") - for(var/mob/O in hearers(1, P.loc)) - O.show_message("[bicon(P)] *beep* *beep*", 3, "*beep* *beep*", 2) - return 1 +/datum/infomorph_software/signaller/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE - else if(href_list["freq"]) - var/new_frequency = (P.sradio.frequency + text2num(href_list["freq"])) - if(new_frequency < PUBLIC_LOW_FREQ || new_frequency > PUBLIC_HIGH_FREQ) - new_frequency = sanitize_frequency(new_frequency) - P.sradio.set_frequency(new_frequency) - return 1 + var/mob/living/silicon/infomorph/user = usr + if(istype(user)) + var/obj/item/radio/integrated/signal/R = user.sradio - else if(href_list["code"]) - P.sradio.code += text2num(href_list["code"]) - P.sradio.code = round(P.sradio.code) - P.sradio.code = min(100, P.sradio.code) - P.sradio.code = max(1, P.sradio.code) - return 1 + switch(action) + if("signal") + spawn(0) + R.send_signal("ACTIVATE") + for(var/mob/O in hearers(1, R.loc)) + O.show_message("[bicon(R)] *beep* *beep*", 3, "*beep* *beep*", 2) + if("freq") + var/frequency = unformat_frequency(params["freq"]) + frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ) + R.set_frequency(frequency) + . = TRUE + if("code") + R.code = clamp(round(text2num(params["code"])), 1, 100) + . = TRUE + if("reset") + if(params["reset"] == "freq") + R.set_frequency(initial(R.frequency)) + else + R.code = initial(R.code) + . = TRUE diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index d7a7ab3c4d..8e8bb68a77 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -1,6 +1,9 @@ /obj/item/device/radio/sleevecard canhear_range = 0 +/obj/item/device/radio/sleevecard/tgui_state(mob/user) + return GLOB.tgui_always_state + /obj/item/device/sleevecard name = "sleevecard" desc = "This Vey-Med-upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." diff --git a/code/modules/shuttles/shuttle_console_multi.dm b/code/modules/shuttles/shuttle_console_multi.dm index 9226caebfb..2e45441b1a 100644 --- a/code/modules/shuttles/shuttle_console_multi.dm +++ b/code/modules/shuttles/shuttle_console_multi.dm @@ -26,7 +26,7 @@ switch(action) if("pick") var/dest_key = input("Choose shuttle destination", "Shuttle Destination") as null|anything in shuttle.get_destinations() - if(dest_key && CanInteract(usr, global.default_state)) + if(dest_key && CanInteract(usr, GLOB.tgui_default_state)) shuttle.set_destination(dest_key, usr) return TRUE diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index 3b491a0c5b..f6f56cc7fd 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -175,84 +175,3 @@ /obj/machinery/computer/shuttle_control/emergency/attackby(obj/item/weapon/W as obj, mob/user as mob) read_authorization(W) ..() - -/obj/machinery/computer/shuttle_control/emergency/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - var/data[0] - var/datum/shuttle/autodock/ferry/emergency/shuttle = SSshuttles.shuttles[shuttle_tag] - if (!istype(shuttle)) - return - - var/shuttle_state - switch(shuttle.moving_status) - if(SHUTTLE_IDLE) shuttle_state = "idle" - if(SHUTTLE_WARMUP) shuttle_state = "warmup" - if(SHUTTLE_INTRANSIT) shuttle_state = "in_transit" - - var/shuttle_status - switch (shuttle.process_state) - if(IDLE_STATE) - if (shuttle.in_use) - shuttle_status = "Busy." - else if (!shuttle.location) - shuttle_status = "Standing by at [station_name()]." - else - shuttle_status = "Standing by at [using_map.dock_name]." - if(WAIT_LAUNCH, FORCE_LAUNCH) - shuttle_status = "Shuttle has received command and will depart shortly." - if(WAIT_ARRIVE) - shuttle_status = "Proceeding to destination." - if(WAIT_FINISH) - shuttle_status = "Arriving at destination now." - - //build a list of authorizations - var/list/auth_list[req_authorizations] - - if (!emagged) - var/i = 1 - for (var/dna_hash in authorized) - auth_list[i++] = list("auth_name"=authorized[dna_hash], "auth_hash"=dna_hash) - - while (i <= req_authorizations) //fill up the rest of the list with blank entries - auth_list[i++] = list("auth_name"="", "auth_hash"=null) - else - for (var/i = 1; i <= req_authorizations; i++) - auth_list[i] = list("auth_name"="ERROR", "auth_hash"=null) - - var/has_auth = has_authorization() - - data = list( - "shuttle_status" = shuttle_status, - "shuttle_state" = shuttle_state, - "has_docking" = shuttle.active_docking_controller? 1 : 0, - "docking_status" = shuttle.active_docking_controller? shuttle.active_docking_controller.get_docking_status() : null, - "docking_override" = shuttle.active_docking_controller? shuttle.active_docking_controller.override_enabled : null, - "can_launch" = shuttle.can_launch(src), - "can_cancel" = shuttle.can_cancel(src), - "can_force" = shuttle.can_force(src), - "auth_list" = auth_list, - "has_auth" = has_auth, - "user" = debug? user : null, - ) - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - - if (!ui) - ui = new(user, src, ui_key, "escape_shuttle_control_console.tmpl", "Shuttle Control", 470, 420) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) - -/obj/machinery/computer/shuttle_control/emergency/Topic(href, href_list) - if(..()) - return 1 - - if(href_list["removeid"]) - var/dna_hash = href_list["removeid"] - authorized -= dna_hash - - if(!emagged && href_list["scanid"]) - //They selected an empty entry. Try to scan their id. - if (ishuman(usr)) - var/mob/living/carbon/human/H = usr - if (!read_authorization(H.get_active_hand())) //try to read what's in their hand first - read_authorization(H.wear_id) diff --git a/code/modules/tables/debug.dm b/code/modules/tables/debug.dm index d1b7a968a9..688758cace 100644 --- a/code/modules/tables/debug.dm +++ b/code/modules/tables/debug.dm @@ -7,7 +7,7 @@ material = get_material_by_name("debugium") ..() -/material/debug +/datum/material/debug name = "debugium" stack_type = /obj/item/stack/material/debug icon_base = "debug" diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 2857d022a9..32aca8f090 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -20,8 +20,8 @@ var/list/table_icon_cache = list() var/can_plate = 1 var/manipulating = 0 - var/material/material = null - var/material/reinforced = null + var/datum/material/material = null + var/datum/material/reinforced = null // Gambling tables. I'd prefer reinforced with carpet/felt/cloth/whatever, but AFAIK it's either harder or impossible to get /obj/item/stack/material of those. // Convert if/when you can easily get stacks of these. @@ -237,7 +237,7 @@ var/list/table_icon_cache = list() // Returns the material to set the table to. /obj/structure/table/proc/common_material_add(obj/item/stack/material/S, mob/user, verb) // Verb is actually verb without 'e' or 'ing', which is added. Works for 'plate'/'plating' and 'reinforce'/'reinforcing'. - var/material/M = S.get_material() + var/datum/material/M = S.get_material() if(!istype(M)) to_chat(user, "You cannot [verb]e \the [src] with \the [S].") return null @@ -253,7 +253,7 @@ var/list/table_icon_cache = list() return M // Returns the material to set the table to. -/obj/structure/table/proc/common_material_remove(mob/user, material/M, delay, what, type_holding, sound) +/obj/structure/table/proc/common_material_remove(mob/user, datum/material/M, delay, what, type_holding, sound) if(!M.stack_type) to_chat(user, "You are unable to remove the [what] from this [src]!") return M @@ -322,7 +322,7 @@ var/list/table_icon_cache = list() if(full_return || prob(20)) new /obj/item/stack/material/steel(src.loc) else - var/material/M = get_material_by_name(DEFAULT_WALL_MATERIAL) + var/datum/material/M = get_material_by_name(DEFAULT_WALL_MATERIAL) S = M.place_shard(loc) if(S) shards += S qdel(src) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 1119e565ef..d2a6a0a35a 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -6,7 +6,7 @@ circuit = /obj/item/weapon/circuitboard/telesci_console var/sending = 1 var/obj/machinery/telepad/telepad = null - var/temp_msg = "Telescience control console initialized.
Welcome." + var/temp_msg = "Telescience control console initialized. Welcome." // VARIABLES // var/teles_left // How many teleports left until it becomes uncalibrated @@ -83,16 +83,21 @@ /obj/machinery/computer/telescience/attack_hand(mob/user) if(..()) return - ui_interact(user) + tgui_interact(user) -/obj/machinery/computer/telescience/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - user.set_machine(src) +/obj/machinery/computer/telescience/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "TelesciConsole", name) + ui.open() - var/data[0] +/obj/machinery/computer/telescience/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = list() if(!telepad) in_use = 0 //Yeah so if you deconstruct teleporter while its in the process of shooting it wont disable the console data["noTelepad"] = 1 else + data["noTelepad"] = 0 data["insertedGps"] = inserted_gps data["rotation"] = rotation data["currentZ"] = z_co @@ -110,6 +115,7 @@ //We'll base our options on connected z's or overmap data["sectorOptions"] = using_map.get_map_levels(z, TRUE, overmap_range) + data["lastTeleData"] = null if(last_tele_data) data["lastTeleData"] = list() data["lastTeleData"]["src_x"] = last_tele_data.src_x @@ -117,12 +123,61 @@ data["lastTeleData"]["distance"] = last_tele_data.distance data["lastTeleData"]["time"] = last_tele_data.time - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "telescience_console.tmpl", src.name, 400, 450) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(5) + return data + +/obj/machinery/computer/telescience/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + if(!telepad || telepad.panel_open) + return TRUE + + switch(action) + if("setrotation") + rotation = CLAMP(text2num(params["val"]), -900, 900) + rotation = round(rotation, 0.01) + + if("setdistance") + distance = CLAMP(text2num(params["val"]), 1, get_max_allowed_distance()) + distance = FLOOR(distance, 1) + + if("setz") + var/new_z = text2num(params["setz"]) + if(new_z in using_map.player_levels) + z_co = new_z + + if("ejectGPS") + if(inserted_gps) + inserted_gps.forceMove(loc) + inserted_gps = null + + if("setMemory") + if(last_target && inserted_gps) + // TODO - What was this even supposed to do?? + //inserted_gps.locked_location = last_target + temp_msg = "Location saved." + else + temp_msg = "ERROR! No data was stored." + + if("send") + sending = 1 + teleport(usr) + + if("receive") + sending = 0 + teleport(usr) + + if("recal") + recalibrate() + sparks() + temp_msg = "NOTICE: Calibration successful." + + if("eject") + eject() + temp_msg = "NOTICE: Bluespace crystals ejected." + else + return FALSE + + return TRUE /obj/machinery/computer/telescience/proc/sparks() if(telepad) @@ -198,7 +253,7 @@ playsound(telepad, 'sound/weapons/flash.ogg', 50, 1) // Wait depending on the time the projectile took to get there teleporting = 1 - temp_msg = "Powering up bluespace crystals.
Please wait." + temp_msg = "Powering up bluespace crystals. Please wait." spawn(spawn_time) // in deciseconds if(!telepad) @@ -218,12 +273,12 @@ if(!A || (A.flags & BLUE_SHIELDED)) telefail() - temp_msg = "ERROR!
Target is shielded from bluespace intersection!" + temp_msg = "ERROR! Target is shielded from bluespace intersection!" return - temp_msg = "Teleport successful.
" + temp_msg = "Teleport successful. " if(teles_left < 10) - temp_msg += "Calibration required soon.
" + temp_msg += "Calibration required soon. " temp_msg += "Data printed below." var/sparks = get_turf(target) @@ -286,11 +341,11 @@ /obj/machinery/computer/telescience/proc/teleport(mob/user) distance = CLAMP(distance, 0, get_max_allowed_distance()) if(rotation == null || distance == null || z_co == null) - temp_msg = "ERROR!
Set a distance, rotation and sector." + temp_msg = "ERROR! Set a distance, rotation and sector." return if(distance <= 0) telefail() - temp_msg = "ERROR!
No distance selected!" + temp_msg = "ERROR! No distance selected!" return if(!(z_co in using_map.player_levels)) telefail() @@ -300,7 +355,7 @@ doteleport(user) else telefail() - temp_msg = "ERROR!
Calibration required." + temp_msg = "ERROR! Calibration required." return return @@ -310,64 +365,6 @@ crystals -= I distance = 0 -/obj/machinery/computer/telescience/Topic(href, href_list) - if(..()) - return - if(!telepad || telepad.panel_open) - updateDialog() - return - - if(href_list["setrotation"]) - var/new_rot = input("Please input desired bearing in degrees.", name, rotation) as num - if(..()) // Check after we input a value, as they could've moved after they entered something - return - rotation = CLAMP(new_rot, -900, 900) - rotation = round(rotation, 0.01) - - if(href_list["setdistance"]) - var/new_pow = input("Please input desired distance in meters.", name, rotation) as num - if(..()) // Check after we input a value, as they could've moved after they entered something - return - distance = CLAMP(new_pow, 1, get_max_allowed_distance()) - distance = FLOOR(distance, 1) - - if(href_list["setz"]) - var/new_z = text2num(href_list["setz"]) - if(new_z in using_map.player_levels) - z_co = new_z - - if(href_list["ejectGPS"]) - if(inserted_gps) - inserted_gps.forceMove(loc) - inserted_gps = null - - if(href_list["setMemory"]) - if(last_target && inserted_gps) - // TODO - What was this even supposed to do?? - //inserted_gps.locked_location = last_target - temp_msg = "Location saved." - else - temp_msg = "ERROR!
No data was stored." - - if(href_list["send"]) - sending = 1 - teleport(usr) - - if(href_list["receive"]) - sending = 0 - teleport(usr) - - if(href_list["recal"]) - recalibrate() - sparks() - temp_msg = "NOTICE:
Calibration successful." - - if(href_list["eject"]) - eject() - temp_msg = "NOTICE:
Bluespace crystals ejected." - - updateDialog() - /obj/machinery/computer/telescience/proc/recalibrate() teles_left = rand(40, 50) distance_off = rand(-4, 4) diff --git a/code/modules/tgui/modules/_base.dm b/code/modules/tgui/modules/_base.dm index 1a1027072d..7cece1c097 100644 --- a/code/modules/tgui/modules/_base.dm +++ b/code/modules/tgui/modules/_base.dm @@ -123,4 +123,7 @@ Code is pretty much ripped verbatim from nano modules, but with un-needed stuff . += new /obj/screen/plane_master{plane = PLANE_CH_BACKUP} //Backup implant status . += new /obj/screen/plane_master{plane = PLANE_CH_VANTAG} //Vore Antags . += new /obj/screen/plane_master{plane = PLANE_AUGMENTED} //Augmented reality - //VOREStation Add End \ No newline at end of file + //VOREStation Add End + +/datum/tgui_module/proc/relaymove(mob/user, direction) + return FALSE diff --git a/code/modules/tgui/modules/agentcard.dm b/code/modules/tgui/modules/agentcard.dm new file mode 100644 index 0000000000..7d35a9bc4a --- /dev/null +++ b/code/modules/tgui/modules/agentcard.dm @@ -0,0 +1,135 @@ +/datum/tgui_module/agentcard + name = "Agent Card" + tgui_id = "AgentCard" + +/datum/tgui_module/agentcard/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/obj/item/weapon/card/id/syndicate/S = tgui_host() + if(!istype(S)) + return list() + + var/list/entries = list() + entries += list(list("name" = "Age", "value" = S.age)) + entries += list(list("name" = "Appearance", "value" = "Set")) + entries += list(list("name" = "Assignment", "value" = S.assignment)) + entries += list(list("name" = "Blood Type", "value" = S.blood_type)) + entries += list(list("name" = "DNA Hash", "value" = S.dna_hash)) + entries += list(list("name" = "Fingerprint Hash", "value" = S.fingerprint_hash)) + entries += list(list("name" = "Name", "value" = S.registered_name)) + entries += list(list("name" = "Photo", "value" = "Update")) + entries += list(list("name" = "Sex", "value" = S.sex)) + entries += list(list("name" = "Factory Reset", "value" = "Use With Care")) + data["entries"] = entries + + data["electronic_warfare"] = S.electronic_warfare + + return data + +/datum/tgui_module/agentcard/tgui_status(mob/user, datum/tgui_state/state) + var/obj/item/weapon/card/id/syndicate/S = tgui_host() + if(!istype(S)) + return STATUS_CLOSE + if(user != S.registered_user) + return STATUS_CLOSE + return ..() + +/datum/tgui_module/agentcard/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + var/obj/item/weapon/card/id/syndicate/S = tgui_host() + switch(action) + if("electronic_warfare") + S.electronic_warfare = !S.electronic_warfare + to_chat(usr, "Electronic warfare [S.electronic_warfare ? "enabled" : "disabled"].") + . = TRUE + if("age") + var/new_age = input(usr,"What age would you like to put on this card?","Agent Card Age", S.age) as null|num + if(!isnull(new_age) && tgui_status(usr, state) == STATUS_INTERACTIVE) + if(new_age < 0) + S.age = initial(S.age) + else + S.age = new_age + to_chat(usr, "Age has been set to '[S.age]'.") + . = TRUE + if("appearance") + var/datum/card_state/choice = input(usr, "Select the appearance for this card.", "Agent Card Appearance") as null|anything in id_card_states() + if(choice && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.icon_state = choice.icon_state + S.item_state = choice.item_state + to_chat(usr, "Appearance changed to [choice].") + . = TRUE + if("assignment") + var/new_job = sanitize(input(usr,"What assignment would you like to put on this card?\nChanging assignment will not grant or remove any access levels.","Agent Card Assignment", S.assignment) as null|text) + if(!isnull(new_job) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.assignment = new_job + to_chat(usr, "Occupation changed to '[new_job]'.") + S.update_name() + . = TRUE + if("bloodtype") + var/default = S.blood_type + if(default == initial(S.blood_type) && ishuman(usr)) + var/mob/living/carbon/human/H = usr + if(H.dna) + default = H.dna.b_type + var/new_blood_type = sanitize(input(usr,"What blood type would you like to be written on this card?","Agent Card Blood Type",default) as null|text) + if(!isnull(new_blood_type) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.blood_type = new_blood_type + to_chat(usr, "Blood type changed to '[new_blood_type]'.") + . = TRUE + if("dnahash") + var/default = S.dna_hash + if(default == initial(S.dna_hash) && ishuman(usr)) + var/mob/living/carbon/human/H = usr + if(H.dna) + default = H.dna.unique_enzymes + var/new_dna_hash = sanitize(input(usr,"What DNA hash would you like to be written on this card?","Agent Card DNA Hash",default) as null|text) + if(!isnull(new_dna_hash) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.dna_hash = new_dna_hash + to_chat(usr, "DNA hash changed to '[new_dna_hash]'.") + . = TRUE + if("fingerprinthash") + var/default = S.fingerprint_hash + if(default == initial(S.fingerprint_hash) && ishuman(usr)) + var/mob/living/carbon/human/H = usr + if(H.dna) + default = md5(H.dna.uni_identity) + var/new_fingerprint_hash = sanitize(input(usr,"What fingerprint hash would you like to be written on this card?","Agent Card Fingerprint Hash",default) as null|text) + if(!isnull(new_fingerprint_hash) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.fingerprint_hash = new_fingerprint_hash + to_chat(usr, "Fingerprint hash changed to '[new_fingerprint_hash]'.") + . = TRUE + if("name") + var/new_name = sanitizeName(input(usr,"What name would you like to put on this card?","Agent Card Name", S.registered_name) as null|text) + if(!isnull(new_name) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.registered_name = new_name + S.update_name() + to_chat(usr, "Name changed to '[new_name]'.") + . = TRUE + if("photo") + S.set_id_photo(usr) + to_chat(usr, "Photo changed.") + . = TRUE + if("sex") + var/new_sex = sanitize(input(usr,"What sex would you like to put on this card?","Agent Card Sex", S.sex) as null|text) + if(!isnull(new_sex) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.sex = new_sex + to_chat(usr, "Sex changed to '[new_sex]'.") + . = TRUE + if("factoryreset") + if(alert("This will factory reset the card, including access and owner. Continue?", "Factory Reset", "No", "Yes") == "Yes" && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.age = initial(S.age) + S.access = syndicate_access.Copy() + S.assignment = initial(S.assignment) + S.blood_type = initial(S.blood_type) + S.dna_hash = initial(S.dna_hash) + S.electronic_warfare = initial(S.electronic_warfare) + S.fingerprint_hash = initial(S.fingerprint_hash) + S.icon_state = initial(S.icon_state) + S.name = initial(S.name) + S.registered_name = initial(S.registered_name) + S.unset_registered_user() + S.sex = initial(S.sex) + to_chat(usr, "All information has been deleted from \the [src].") + . = TRUE diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm index 83d3db4d1e..4fd477a531 100644 --- a/code/modules/tgui/modules/atmos_control.dm +++ b/code/modules/tgui/modules/atmos_control.dm @@ -34,6 +34,11 @@ ui.set_map_z_level(params["mapZLevel"]) return TRUE +/datum/tgui_module/atmos_control/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/simple/nanomaps), + ) + /datum/tgui_module/atmos_control/tgui_interact(mob/user, datum/tgui/ui = null) ui = SStgui.try_update_ui(user, src, ui) if(!ui) diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm new file mode 100644 index 0000000000..1af2a003cc --- /dev/null +++ b/code/modules/tgui/modules/communications.dm @@ -0,0 +1,486 @@ +#define COMM_SCREEN_MAIN 1 +#define COMM_SCREEN_STAT 2 +#define COMM_SCREEN_MESSAGES 3 + +#define COMM_AUTHENTICATION_NONE 0 +#define COMM_AUTHENTICATION_MIN 1 +#define COMM_AUTHENTICATION_MAX 2 + +#define COMM_MSGLEN_MINIMUM 6 +#define COMM_CCMSGLEN_MINIMUM 20 + +/datum/tgui_module/communications + name = "Command & Communications" + tgui_id = "CommunicationsConsole" + + var/emagged = FALSE + + var/current_viewing_message_id = 0 + var/current_viewing_message = null + + var/authenticated = COMM_AUTHENTICATION_NONE + var/menu_state = COMM_SCREEN_MAIN + var/ai_menu_state = COMM_SCREEN_MAIN + var/aicurrmsg + + var/message_cooldown + var/centcomm_message_cooldown + var/tmp_alertlevel = 0 + + var/stat_msg1 + var/stat_msg2 + var/display_type = "blank" + + var/datum/announcement/priority/crew_announcement + + var/datum/lore/atc_controller/ATC + + var/list/req_access = list() + +/datum/tgui_module/communications/New(host) + . = ..() + ATC = atc + crew_announcement = new() + crew_announcement.newscast = TRUE + +/datum/tgui_module/communications/tgui_interact(mob/user, datum/tgui/ui) + if(using_map && !(get_z(user) in using_map.contact_levels)) + to_chat(user, "Unable to establish a connection: You're too far away from the station!") + return FALSE + . = ..() + +/datum/tgui_module/communications/proc/is_authenticated(mob/user, message = TRUE) + if(authenticated == COMM_AUTHENTICATION_MAX) + return COMM_AUTHENTICATION_MAX + else if(isobserver(user)) + var/mob/observer/dead/D = user + if(D.can_admin_interact()) + return COMM_AUTHENTICATION_MAX + else if(authenticated) + return COMM_AUTHENTICATION_MIN + else + if(message) + to_chat(user, "Access denied.") + return COMM_AUTHENTICATION_NONE + +/datum/tgui_module/communications/proc/change_security_level(new_level) + tmp_alertlevel = new_level + var/old_level = security_level + if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN + if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN + if(tmp_alertlevel > SEC_LEVEL_BLUE) tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this + set_security_level(tmp_alertlevel) + if(security_level != old_level) + //Only notify the admins if an actual change happened + log_game("[key_name(usr)] has changed the security level to [get_security_level()].") + message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") + switch(security_level) + if(SEC_LEVEL_GREEN) + feedback_inc("alert_comms_green",1) + if(SEC_LEVEL_YELLOW) + feedback_inc("alert_comms_yellow",1) + if(SEC_LEVEL_VIOLET) + feedback_inc("alert_comms_violet",1) + if(SEC_LEVEL_ORANGE) + feedback_inc("alert_comms_orange",1) + if(SEC_LEVEL_BLUE) + feedback_inc("alert_comms_blue",1) + tmp_alertlevel = 0 + +/datum/tgui_module/communications/tgui_data(mob/user) + var/list/data = ..() + data["is_ai"] = isAI(user) || isrobot(user) + data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state + data["emagged"] = emagged + data["authenticated"] = is_authenticated(user, 0) + data["authmax"] = data["authenticated"] == COMM_AUTHENTICATION_MAX ? TRUE : FALSE + data["atcsquelch"] = ATC.squelched + data["boss_short"] = using_map.boss_short + + data["stat_display"] = list( + "type" = display_type, + // "icon" = display_icon, + "line_1" = (stat_msg1 ? stat_msg1 : "-----"), + "line_2" = (stat_msg2 ? stat_msg2 : "-----"), + + "presets" = list( + list("name" = "blank", "label" = "Clear", "desc" = "Blank slate"), + list("name" = "shuttle", "label" = "Shuttle ETA", "desc" = "Display how much time is left."), + list("name" = "message", "label" = "Message", "desc" = "A custom message.") + ), + ) + + data["security_level"] = security_level + switch(security_level) + if(SEC_LEVEL_BLUE) + data["security_level_color"] = "blue"; + if(SEC_LEVEL_ORANGE) + data["security_level_color"] = "orange"; + if(SEC_LEVEL_VIOLET) + data["security_level_color"] = "violet"; + if(SEC_LEVEL_YELLOW) + data["security_level_color"] = "yellow"; + if(SEC_LEVEL_GREEN) + data["security_level_color"] = "green"; + if(SEC_LEVEL_RED) + data["security_level_color"] = "red"; + else + data["security_level_color"] = "purple"; + data["str_security_level"] = capitalize(get_security_level()) + data["levels"] = list( + list("id" = SEC_LEVEL_GREEN, "name" = "Green", "icon" = "dove"), + list("id" = SEC_LEVEL_YELLOW, "name" = "Yellow", "icon" = "exclamation-triangle"), + list("id" = SEC_LEVEL_BLUE, "name" = "Blue", "icon" = "eye"), + list("id" = SEC_LEVEL_ORANGE, "name" = "Orange", "icon" = "wrench"), + list("id" = SEC_LEVEL_VIOLET, "name" = "Violet", "icon" = "biohazard"), + ) + + var/datum/comm_message_listener/l = obtain_message_listener() + data["messages"] = l.messages + data["message_deletion_allowed"] = l != global_message_listener + data["message_current_id"] = current_viewing_message_id + data["message_current"] = current_viewing_message + + // data["lastCallLoc"] = SSshuttle.emergencyLastCallLoc ? format_text(SSshuttle.emergencyLastCallLoc.name) : null + data["msg_cooldown"] = message_cooldown ? (round((message_cooldown - world.time) / 10)) : 0 + data["cc_cooldown"] = centcomm_message_cooldown ? (round((centcomm_message_cooldown - world.time) / 10)) : 0 + + data["esc_callable"] = emergency_shuttle.location() && !emergency_shuttle.online() ? TRUE : FALSE + data["esc_recallable"] = emergency_shuttle.location() && emergency_shuttle.online() ? TRUE : FALSE + data["esc_status"] = FALSE + if(emergency_shuttle.has_eta()) + var/timeleft = emergency_shuttle.estimate_arrival_time() + data["esc_status"] = emergency_shuttle.online() ? "ETA:" : "RECALLING:" + data["esc_status"] += " [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]" + return data + +/datum/tgui_module/communications/proc/setCurrentMessage(mob/user, value) + current_viewing_message_id = value + + var/datum/comm_message_listener/l = obtain_message_listener() + for(var/list/m in l.messages) + if(m["id"] == current_viewing_message_id) + current_viewing_message = m + +/datum/tgui_module/communications/proc/setMenuState(mob/user, value) + if(isAI(user) || isrobot(user)) + ai_menu_state = value + else + menu_state = value + +/datum/tgui_module/communications/proc/obtain_message_listener() + if(istype(host, /datum/computer_file/program/comm)) + var/datum/computer_file/program/comm/P = host + return P.message_core + return global_message_listener + +/proc/post_status(atom/source, command, data1, data2, mob/user = null) + var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) + + if(!frequency) + return + + var/datum/signal/status_signal = new + status_signal.source = source + status_signal.transmission_method = TRANSMISSION_RADIO + status_signal.data["command"] = command + + switch(command) + if("message") + status_signal.data["msg1"] = data1 + status_signal.data["msg2"] = data2 + log_admin("STATUS: [user] set status screen message: [data1] [data2]") + //message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") + if("alert") + status_signal.data["picture_state"] = data1 + + frequency.post_signal(null, status_signal) + +/datum/tgui_module/communications/tgui_act(action, params) + if(..()) + return TRUE + if(using_map && !(get_z(usr) in using_map.contact_levels)) + to_chat(usr, "Unable to establish a connection: You're too far away from the station!") + return FALSE + + . = TRUE + if(action == "auth") + if(!ishuman(usr)) + to_chat(usr, "Access denied.") + return FALSE + // Logout function. + if(authenticated != COMM_AUTHENTICATION_NONE) + authenticated = COMM_AUTHENTICATION_NONE + crew_announcement.announcer = null + setMenuState(usr, COMM_SCREEN_MAIN) + return + // Login function. + if(check_access(usr, access_heads)) + authenticated = COMM_AUTHENTICATION_MIN + if(check_access(usr, access_captain)) + authenticated = COMM_AUTHENTICATION_MAX + var/mob/M = usr + var/obj/item/weapon/card/id = M.GetIdCard() + if(istype(id)) + crew_announcement.announcer = GetNameAndAssignmentFromId(id) + if(authenticated == COMM_AUTHENTICATION_NONE) + to_chat(usr, "You need to wear your ID.") + + // All functions below this point require authentication. + if(!is_authenticated(usr)) + return FALSE + + switch(action) + // main interface + if("main") + setMenuState(usr, COMM_SCREEN_MAIN) + + if("newalertlevel") + if(isAI(usr) || isrobot(usr)) + to_chat(usr, "Firewalls prevent you from changing the alert level.") + return + else if(isobserver(usr)) + var/mob/observer/dead/D = usr + if(D.can_admin_interact()) + change_security_level(text2num(params["level"])) + return TRUE + else if(!ishuman(usr)) + to_chat(usr, "Security measures prevent you from changing the alert level.") + return + + if(check_access(usr, access_captain)) + change_security_level(text2num(params["level"])) + else + to_chat(usr, "You are not authorized to do this.") + setMenuState(usr, COMM_SCREEN_MAIN) + + if("announce") + if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) + if(message_cooldown > world.time) + to_chat(usr, "Please allow at least one minute to pass between announcements.") + return + var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") as null|message + if(!input || message_cooldown > world.time || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + return + if(length(input) < COMM_MSGLEN_MINIMUM) + to_chat(usr, "Message '[input]' is too short. [COMM_MSGLEN_MINIMUM] character minimum.") + return + crew_announcement.Announce(input) + message_cooldown = world.time + 600 //One minute + + if("callshuttle") + if(!is_authenticated(usr)) + return + + call_shuttle_proc(usr) + if(emergency_shuttle.online()) + post_status(src, "shuttle", user = usr) + setMenuState(usr, COMM_SCREEN_MAIN) + + if("cancelshuttle") + if(isAI(usr) || isrobot(usr)) + to_chat(usr, "Firewalls prevent you from recalling the shuttle.") + return + var/response = alert("Are you sure you wish to recall the shuttle?", "Confirm", "Yes", "No") + if(response == "Yes") + cancel_call_proc(usr) + setMenuState(usr, COMM_SCREEN_MAIN) + + if("messagelist") + current_viewing_message = null + current_viewing_message_id = null + if(params["msgid"]) + setCurrentMessage(usr, text2num(params["msgid"])) + setMenuState(usr, COMM_SCREEN_MESSAGES) + + if("toggleatc") + ATC.squelched = !ATC.squelched + + if("delmessage") + var/datum/comm_message_listener/l = obtain_message_listener() + if(params["msgid"]) + setCurrentMessage(usr, text2num(params["msgid"])) + var/response = alert("Are you sure you wish to delete this message?", "Confirm", "Yes", "No") + if(response == "Yes") + if(current_viewing_message) + if(l != global_message_listener) + l.Remove(current_viewing_message) + current_viewing_message = null + setMenuState(usr, COMM_SCREEN_MESSAGES) + + if("status") + setMenuState(usr, COMM_SCREEN_STAT) + + // Status display stuff + if("setstat") + display_type = params["statdisp"] + switch(display_type) + if("message") + post_status(src, "message", stat_msg1, stat_msg2, user = usr) + if("alert") + post_status(src, "alert", params["alert"], user = usr) + else + post_status(src, params["statdisp"], user = usr) + + if("setmsg1") + stat_msg1 = reject_bad_text(sanitize(input("Line 1", "Enter Message Text", stat_msg1) as text|null, 40), 40) + setMenuState(usr, COMM_SCREEN_STAT) + + if("setmsg2") + stat_msg2 = reject_bad_text(sanitize(input("Line 2", "Enter Message Text", stat_msg2) as text|null, 40), 40) + setMenuState(usr, COMM_SCREEN_STAT) + + // OMG CENTCOMM LETTERHEAD + if("MessageCentCom") + if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) + if(centcomm_message_cooldown > world.time) + to_chat(usr, "Arrays recycling. Please stand by.") + return + var/input = sanitize(input("Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. \ + Please be aware that this process is very expensive, and abuse will lead to... termination. \ + Transmission does not guarantee a response. \ + There is a 30 second delay before you may send another message, be clear, full and concise.", "Central Command Quantum Messaging") as null|message) + if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + return + if(length(input) < COMM_CCMSGLEN_MINIMUM) + to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.") + return + CentCom_announce(input, usr) + to_chat(usr, "Message transmitted.") + log_game("[key_name(usr)] has made an IA [using_map.boss_short] announcement: [input]") + centcomm_message_cooldown = world.time + 300 // 30 seconds + setMenuState(usr, COMM_SCREEN_MAIN) + + // OMG SYNDICATE ...LETTERHEAD + if("MessageSyndicate") + if((is_authenticated(usr) == COMM_AUTHENTICATION_MAX) && (emagged)) + if(centcomm_message_cooldown > world.time) + to_chat(usr, "Arrays recycling. Please stand by.") + return + var/input = sanitize(input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) + if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + return + if(length(input) < COMM_CCMSGLEN_MINIMUM) + to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.") + return + Syndicate_announce(input, usr) + to_chat(usr, "Message transmitted.") + log_game("[key_name(usr)] has made an illegal announcement: [input]") + centcomm_message_cooldown = world.time + 300 // 30 seconds + + if("RestoreBackup") + to_chat(usr, "Backup routing data restored!") + emagged = FALSE + setMenuState(usr, COMM_SCREEN_MAIN) + +/datum/tgui_module/communications/ntos + ntos = TRUE + +/* Etc global procs */ +/proc/enable_prison_shuttle(var/mob/user) + for(var/obj/machinery/computer/prison_shuttle/PS in machines) + PS.allowedtocall = !(PS.allowedtocall) + +/proc/call_shuttle_proc(var/mob/user) + if ((!( ticker ) || !emergency_shuttle.location())) + return + + if(!universe.OnShuttleCall(usr)) + to_chat(user, "Cannot establish a bluespace connection.") + return + + if(deathsquad.deployed) + to_chat(user, "[using_map.boss_short] will not allow the shuttle to be called. Consider all contracts terminated.") + return + + if(emergency_shuttle.deny_shuttle) + to_chat(user, "The emergency shuttle may not be sent at this time. Please try again later.") + return + + if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE + to_chat(user, "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minute\s before trying again.") + return + + if(emergency_shuttle.going_to_centcom()) + to_chat(user, "The emergency shuttle may not be called while returning to [using_map.boss_short].") + return + + if(emergency_shuttle.online()) + to_chat(user, "The emergency shuttle is already on its way.") + return + + if(ticker.mode.name == "blob") + to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") + return + + emergency_shuttle.call_evac() + log_game("[key_name(user)] has called the shuttle.") + message_admins("[key_name_admin(user)] has called the shuttle.", 1) + admin_chat_message(message = "Emergency evac beginning! Called by [key_name(user)]!", color = "#CC2222") //VOREStation Add + + return + +/proc/init_shift_change(var/mob/user, var/force = 0) + if ((!( ticker ) || !emergency_shuttle.location())) + return + + if(emergency_shuttle.going_to_centcom()) + to_chat(user, "The shuttle may not be called while returning to [using_map.boss_short].") + return + + if(emergency_shuttle.online()) + to_chat(user, "The shuttle is already on its way.") + return + + // if force is 0, some things may stop the shuttle call + if(!force) + if(emergency_shuttle.deny_shuttle) + to_chat(user, "[using_map.boss_short] does not currently have a shuttle available in your sector. Please try again later.") + return + + if(deathsquad.deployed == 1) + to_chat(user, "[using_map.boss_short] will not allow the shuttle to be called. Consider all contracts terminated.") + return + + if(world.time < 54000) // 30 minute grace period to let the game get going + to_chat(user, "The shuttle is refueling. Please wait another [round((54000-world.time)/60)] minutes before trying again.") + return + + if(ticker.mode.auto_recall_shuttle) + //New version pretends to call the shuttle but cause the shuttle to return after a random duration. + emergency_shuttle.auto_recall = 1 + + if(ticker.mode.name == "blob" || ticker.mode.name == "epidemic") + to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") + return + + emergency_shuttle.call_transfer() + + //delay events in case of an autotransfer + if (isnull(user)) + SSevents.delay_events(EVENT_LEVEL_MODERATE, 9000) //15 minutes + SSevents.delay_events(EVENT_LEVEL_MAJOR, 9000) + + log_game("[user? key_name(user) : "Autotransfer"] has called the shuttle.") + message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1) + admin_chat_message(message = "Autotransfer shuttle dispatched, shift ending soon.", color = "#2277BB") //VOREStation Add + + return + +/proc/cancel_call_proc(var/mob/user) + if (!( ticker ) || !emergency_shuttle.can_recall()) + return + if((ticker.mode.name == "blob")||(ticker.mode.name == "Meteor")) + return + + if(!emergency_shuttle.going_to_centcom()) //check that shuttle isn't already heading to CentCom + emergency_shuttle.recall() + log_game("[key_name(user)] has recalled the shuttle.") + message_admins("[key_name_admin(user)] has recalled the shuttle.", 1) + return + +/proc/is_relay_online() + for(var/obj/machinery/telecomms/relay/M in world) + if(M.stat == 0) + return 1 + return 0 diff --git a/code/modules/tgui/modules/crew_manifest.dm b/code/modules/tgui/modules/crew_manifest.dm new file mode 100644 index 0000000000..7c4daf7f2a --- /dev/null +++ b/code/modules/tgui/modules/crew_manifest.dm @@ -0,0 +1,14 @@ +/datum/tgui_module/crew_manifest + name = "Crew Manifest" + tgui_id = "CrewManifest" + +/datum/tgui_module/crew_manifest/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + if(data_core) + data_core.get_manifest_list() + data["manifest"] = PDA_Manifest + return data + +/datum/tgui_module/crew_manifest/robot +/datum/tgui_module/crew_manifest/robot/tgui_state(mob/user) + return GLOB.tgui_self_state \ No newline at end of file diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index 9d4af68652..d24cd3414a 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -2,6 +2,11 @@ name = "Crew monitor" tgui_id = "CrewMonitor" +/datum/tgui_module/crew_monitor/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/simple/nanomaps), + ) + /datum/tgui_module/crew_monitor/tgui_act(action, params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/ntos-only/cardmod.dm b/code/modules/tgui/modules/ntos-only/cardmod.dm new file mode 100644 index 0000000000..c5aecd8808 --- /dev/null +++ b/code/modules/tgui/modules/ntos-only/cardmod.dm @@ -0,0 +1,235 @@ +// This really should be used for both regular ID computers and NTOS, but +// the data structures are just different enough right now that I can't be assed +/datum/tgui_module/cardmod + name = "ID card modification program" + ntos = TRUE + tgui_id = "IdentificationComputer" + var/mod_mode = 1 + var/is_centcom = 0 + +/datum/tgui_module/cardmod/tgui_static_data(mob/user) + var/list/data = ..() + if(data_core) + data_core.get_manifest_list() + data["manifest"] = PDA_Manifest + return data + +/datum/tgui_module/cardmod/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/datum/computer_file/program/card_mod/program = host + if(!istype(program)) + return 0 + var/list/data = ..() + data["station_name"] = station_name() + data["mode"] = mod_mode + data["printing"] = FALSE + if(program && program.computer) + data["have_id_slot"] = !!program.computer.card_slot + data["have_printer"] = !!program.computer.nano_printer + data["authenticated"] = program.can_run(user) + if(!program.computer.card_slot) + mod_mode = 0 //We can't modify IDs when there is no card reader + else + data["have_id_slot"] = 0 + data["have_printer"] = 0 + data["authenticated"] = 0 + data["centcom_access"] = is_centcom + + + data["has_modify"] = null + data["account_number"] = null + data["id_rank"] = null + data["target_owner"] = null + data["target_name"] = null + if(program && program.computer && program.computer.card_slot) + var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card + data["has_modify"] = !!id_card + data["account_number"] = id_card ? id_card.associated_account_number : null + data["id_rank"] = id_card && id_card.assignment ? id_card.assignment : "Unassigned" + data["target_owner"] = id_card && id_card.registered_name ? id_card.registered_name : "-----" + data["target_name"] = id_card ? id_card.name : "-----" + + var/list/departments = list() + for(var/D in SSjob.get_all_department_datums()) + var/datum/department/dept = D + if(!dept.assignable) // No AI ID cards for you. + continue + if(dept.centcom_only && !is_centcom) + continue + departments.Add(list(list( + "department_name" = dept.name, + "jobs" = format_jobs(SSjob.get_job_titles_in_department(dept.name)), + ))) + + data["departments"] = departments + + var/list/all_centcom_access = list() + var/list/regions = list() + if(program.computer.card_slot && program.computer.card_slot.stored_card) + var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card + if(is_centcom) + for(var/access in get_all_centcom_access()) + all_centcom_access.Add(list(list( + "desc" = replacetext(get_centcom_access_desc(access), " ", " "), + "ref" = access, + "allowed" = (access in id_card.access) ? 1 : 0))) + data["all_centcom_access"] = all_centcom_access + else + for(var/i in ACCESS_REGION_SECURITY to ACCESS_REGION_SUPPLY) + var/list/accesses = list() + for(var/access in get_region_accesses(i)) + if(get_access_desc(access)) + accesses.Add(list(list( + "desc" = replacetext(get_access_desc(access), " ", " "), + "ref" = access, + "allowed" = (access in id_card.access) ? 1 : 0))) + + regions.Add(list(list( + "name" = get_region_accesses_name(i), + "accesses" = accesses))) + data["regions"] = regions + + data["regions"] = regions + data["all_centcom_access"] = all_centcom_access + + return data + +/datum/tgui_module/cardmod/proc/format_jobs(list/jobs) + var/datum/computer_file/program/card_mod/program = host + if(!istype(program)) + return null + + var/obj/item/weapon/card/id/id_card = program.computer.card_slot ? program.computer.card_slot.stored_card : null + 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))) + + return formatted + +/datum/tgui_module/cardmod/tgui_act(action, list/params, datum/tgui/ui) + if(..()) + return TRUE + + + var/datum/computer_file/program/card_mod/program = host + if(!istype(program)) + return TRUE + var/obj/item/modular_computer/computer = tgui_host() + if(!istype(computer)) + return TRUE + + var/obj/item/weapon/card/id/user_id_card = usr.GetIdCard() + var/obj/item/weapon/card/id/id_card + if(computer.card_slot) + id_card = computer.card_slot.stored_card + + switch(action) + if("mode") + mod_mode = clamp(text2num(params["mode_target"]), 0, 1) + . = TRUE + if("print") + if(computer && computer.nano_printer) //This option should never be called if there is no printer + if(!mod_mode) + if(program.can_run(usr, 1)) + var/contents = {"
+ For: [id_card.registered_name ? id_card.registered_name : "Unregistered"]
+
+ Assignment: [id_card.assignment]
+ Account Number: #[id_card.associated_account_number]
+ Blood Type: [id_card.blood_type]
+ Access:
+ "} + + var/known_access_rights = get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM) + for(var/A in id_card.access) + if(A in known_access_rights) + contents += " [get_access_desc(A)]" + + if(!computer.nano_printer.print_text(contents,"access report")) + to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") + return + else + computer.visible_message("\The [computer] prints out paper.") + else + var/contents = {"
+ [data_core ? data_core.get_manifest(0) : ""] + "} + if(!computer.nano_printer.print_text(contents,text("crew manifest ([])", stationtime2text()))) + to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") + return + else + computer.visible_message("\The [computer] prints out paper.") + . = TRUE + if("modify") + if(computer && computer.card_slot) + if(id_card) + data_core.manifest_modify(id_card.registered_name, id_card.assignment) + computer.proc_eject_id(usr) + . = TRUE + if("terminate") + if(computer && program.can_run(usr, 1)) + id_card.assignment = "Dismissed" //VOREStation Edit: setting adjustment + id_card.access = list() + callHook("terminate_employee", list(id_card)) + . = TRUE + if("reg") + if(computer && program.can_run(usr, 1)) + var/temp_name = sanitizeName(params["reg"], allow_numbers = TRUE) + if(temp_name) + id_card.registered_name = temp_name + else + computer.visible_message("[computer] buzzes rudely.") + . = TRUE + if("account") + if(computer && program.can_run(usr, 1)) + var/account_num = text2num(params["account"]) + id_card.associated_account_number = account_num + . = TRUE + if("assign") + if(computer && program.can_run(usr, 1) && id_card) + var/t1 = params["assign_target"] + if(t1 == "Custom") + var/temp_t = sanitize(input("Enter a custom job assignment.","Assignment", id_card.assignment), 45) + //let custom jobs function as an impromptu alt title, mainly for sechuds + if(temp_t) + id_card.assignment = temp_t + else + var/list/access = list() + if(is_centcom) + access = get_centcom_access(t1) + else + var/datum/job/jobdatum + for(var/jobtype in typesof(/datum/job)) + var/datum/job/J = new jobtype + if(ckey(J.title) == ckey(t1)) + jobdatum = J + break + if(!jobdatum) + to_chat(usr, "No log exists for this job: [t1]") + return + + access = jobdatum.get_access() + + id_card.access = access + id_card.assignment = t1 + id_card.rank = t1 + + callHook("reassign_employee", list(id_card)) + . = TRUE + if("access") + if(computer && program.can_run(usr, 1)) + var/access_type = text2num(params["access_target"]) + var/access_allowed = text2num(params["allowed"]) + if(access_type in get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM)) + id_card.access -= access_type + if(!access_allowed) + id_card.access += access_type + . = TRUE + + if(id_card) + id_card.name = text("[id_card.registered_name]'s ID Card ([id_card.assignment])") + diff --git a/code/modules/tgui/modules/ntos-only/configurator.dm b/code/modules/tgui/modules/ntos-only/configurator.dm new file mode 100644 index 0000000000..263409f5e3 --- /dev/null +++ b/code/modules/tgui/modules/ntos-only/configurator.dm @@ -0,0 +1,48 @@ +/datum/tgui_module/computer_configurator + name = "NTOS Computer Configuration Tool" + ntos = TRUE + tgui_id = "Configuration" + var/obj/item/modular_computer/movable = null + +/datum/tgui_module/computer_configurator/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + movable = tgui_host() + // No computer connection, we can't get data from that. + if(!istype(movable)) + return 0 + + var/list/data = ..() + + data["disk_size"] = movable.hard_drive.max_capacity + data["disk_used"] = movable.hard_drive.used_capacity + data["power_usage"] = movable.last_power_usage + data["battery_exists"] = movable.battery_module ? 1 : 0 + if(movable.battery_module) + data["battery_rating"] = movable.battery_module.battery.maxcharge + data["battery_percent"] = round(movable.battery_module.battery.percent()) + + if(movable.battery_module && movable.battery_module.battery) + data["battery"] = list("max" = movable.battery_module.battery.maxcharge, "charge" = round(movable.battery_module.battery.charge)) + + var/list/hardware = movable.get_all_components() + var/list/all_entries[0] + for(var/obj/item/weapon/computer_hardware/H in hardware) + all_entries.Add(list(list( + "name" = H.name, + "desc" = H.desc, + "enabled" = H.enabled, + "critical" = H.critical, + "powerusage" = H.power_usage + ))) + + data["hardware"] = all_entries + return data + +/datum/tgui_module/computer_configurator/tgui_act(action, params) + if(..()) + return + switch(action) + if("PC_toggle_component") + var/obj/item/weapon/computer_hardware/H = movable.find_hardware_by_name(params["name"]) + if(H && istype(H)) + H.enabled = !H.enabled + . = TRUE \ No newline at end of file diff --git a/code/modules/tgui/modules/ntos-only/email.dm b/code/modules/tgui/modules/ntos-only/email.dm new file mode 100644 index 0000000000..8d8d1fbbc7 --- /dev/null +++ b/code/modules/tgui/modules/ntos-only/email.dm @@ -0,0 +1,476 @@ +/datum/tgui_module/email_client + name = "Email Client" + tgui_id = "NtosEmailClient" + + var/stored_login = "" + var/stored_password = "" + var/error = "" + + var/msg_title = "" + var/msg_body = "" + var/msg_recipient = "" + var/datum/computer_file/msg_attachment = null + var/folder = "Inbox" + var/addressbook = FALSE + var/new_message = FALSE + + var/last_message_count = 0 // How many messages were there during last check. + var/read_message_count = 0 // How many messages were there when user has last accessed the UI. + + var/datum/computer_file/downloading = null + var/download_progress = 0 + var/download_speed = 0 + + var/datum/computer_file/data/email_account/current_account = null + var/datum/computer_file/data/email_message/current_message = null + +/datum/tgui_module/email_client/proc/log_in() + for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts) + if(!account.can_login) + continue + if(account.login == stored_login) + if(account.password == stored_password) + if(account.suspended) + error = "This account has been suspended. Please contact the system administrator for assistance." + return 0 + current_account = account + return 1 + else + error = "Invalid Password" + return 0 + error = "Invalid Login" + return 0 + +// Returns 0 if no new messages were received, 1 if there is an unread message but notification has already been sent. +// and 2 if there is a new message that appeared in this tick (and therefore notification should be sent by the program). +/datum/tgui_module/email_client/proc/check_for_new_messages(var/messages_read = FALSE) + if(!current_account) + return 0 + + var/list/allmails = current_account.all_emails() + + if(allmails.len > last_message_count) + . = 2 + else if(allmails.len > read_message_count) + . = 1 + else + . = 0 + + last_message_count = allmails.len + if(messages_read) + read_message_count = allmails.len + +/datum/tgui_module/email_client/proc/log_out() + current_account = null + downloading = null + download_progress = 0 + last_message_count = 0 + read_message_count = 0 + +/datum/tgui_module/email_client/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + // Password has been changed by other client connected to this email account + if(current_account) + if(current_account.password != stored_password) + log_out() + error = "Invalid Password" + // Banned. + if(current_account.suspended) + log_out() + error = "This account has been suspended. Please contact the system administrator for assistance." + + // So, TGUI has a bug/feature where it just conveniently doesn't bother to clear out old data if it only gets + // a partial data update; as such, we have to make sure to null all of these out ourselves so the UI works properly. + data["accounts"] = null + data["addressbook"] = null + data["cur_attachment_filename"] = null + data["cur_attachment_size"] = null + data["cur_body"] = null + data["cur_hasattachment"] = null + data["cur_source"] = null + data["cur_timestamp"] = null + data["cur_title"] = null + data["cur_uid"] = null + data["current_account"] = null + data["down_filename"] = null + data["down_progress"] = null + data["down_size"] = null + data["down_speed"] = null + data["downloading"] = null + data["error"] = null + data["folder"] = null + data["label_deleted"] = null + data["label_inbox"] = null + data["label_spam"] = null + data["messagecount"] = null + data["messages"] = null + data["msg_attachment_filename"] = null + data["msg_attachment_size"] = null + data["msg_body"] = null + data["msg_hasattachment"] = null + data["msg_recipient"] = null + data["msg_title"] = null + data["new_message"] = null + data["stored_login"] = null + data["stored_password"] = null + + if(error) + data["error"] = error + else if(downloading) + data["downloading"] = 1 + data["down_filename"] = "[downloading.filename].[downloading.filetype]" + data["down_progress"] = download_progress + data["down_size"] = downloading.size + data["down_speed"] = download_speed + + else if(istype(current_account)) + data["current_account"] = current_account.login + if(addressbook) + var/list/all_accounts = list() + for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts) + if(!account.can_login) + continue + all_accounts.Add(list(list( + "login" = account.login + ))) + data["addressbook"] = 1 + data["accounts"] = all_accounts + else if(new_message) + data["new_message"] = 1 + data["msg_title"] = msg_title + data["msg_body"] = pencode2html(msg_body) + data["msg_recipient"] = msg_recipient + if(msg_attachment) + data["msg_hasattachment"] = 1 + data["msg_attachment_filename"] = "[msg_attachment.filename].[msg_attachment.filetype]" + data["msg_attachment_size"] = msg_attachment.size + else if (current_message) + data["cur_title"] = current_message.title + data["cur_body"] = pencode2html(current_message.stored_data) + data["cur_timestamp"] = current_message.timestamp + data["cur_source"] = current_message.source + data["cur_uid"] = current_message.uid + if(istype(current_message.attachment)) + data["cur_hasattachment"] = 1 + data["cur_attachment_filename"] = "[current_message.attachment.filename].[current_message.attachment.filetype]" + data["cur_attachment_size"] = current_message.attachment.size + else + data["label_inbox"] = "Inbox ([current_account.inbox.len])" + data["label_spam"] = "Spam ([current_account.spam.len])" + data["label_deleted"] = "Deleted ([current_account.deleted.len])" + var/list/message_source + if(folder == "Inbox") + message_source = current_account.inbox + else if(folder == "Spam") + message_source = current_account.spam + else if(folder == "Deleted") + message_source = current_account.deleted + + if(message_source) + data["folder"] = folder + var/list/all_messages = list() + for(var/datum/computer_file/data/email_message/message in message_source) + all_messages.Add(list(list( + "title" = message.title, + "body" = pencode2html(message.stored_data), + "source" = message.source, + "timestamp" = message.timestamp, + "uid" = message.uid + ))) + data["messages"] = all_messages + data["messagecount"] = all_messages.len + else + data["stored_login"] = stored_login + data["stored_password"] = stars(stored_password, 0) + + return data + +/datum/tgui_module/email_client/proc/find_message_by_fuid(var/fuid) + if(!istype(current_account)) + return + + // params works with strings, so this makes it a bit easier for us + if(istext(fuid)) + fuid = text2num(fuid) + + for(var/datum/computer_file/data/email_message/message in current_account.all_emails()) + if(message.uid == fuid) + return message + +/datum/tgui_module/email_client/proc/clear_message() + new_message = FALSE + msg_title = "" + msg_body = "" + msg_recipient = "" + msg_attachment = null + current_message = null + +/datum/tgui_module/email_client/proc/relayed_process(var/netspeed) + download_speed = netspeed + if(!downloading) + return + download_progress = min(download_progress + netspeed, downloading.size) + if(download_progress >= downloading.size) + var/obj/item/modular_computer/MC = tgui_host() + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" + downloading = null + download_progress = 0 + return 1 + + if(MC.hard_drive.store_file(downloading)) + error = "File successfully downloaded to local device." + else + error = "Error saving file: I/O Error: The hard drive may be full or nonfunctional." + downloading = null + download_progress = 0 + return 1 + + +/datum/tgui_module/email_client/tgui_act(action, params) + if(..()) + return TRUE + + var/mob/living/user = usr + check_for_new_messages(1) // Any actual interaction (button pressing) is considered as acknowledging received message, for the purpose of notification icons. + + switch(action) + if("login") + log_in() + return 1 + + if("logout") + log_out() + return 1 + + if("reset") + error = "" + return 1 + + if("new_message") + new_message = TRUE + return 1 + + if("cancel") + if(addressbook) + addressbook = FALSE + else + clear_message() + return 1 + + if("addressbook") + addressbook = TRUE + return 1 + + if("set_recipient") + msg_recipient = sanitize(params["set_recipient"]) + addressbook = FALSE + return 1 + + if("edit_title") + var/newtitle = sanitize(params["val"], 100) + if(newtitle) + msg_title = newtitle + return 1 + + // This uses similar editing mechanism as the FileManager program, therefore it supports various paper tags and remembers formatting. + if("edit_body") + var/oldtext = html_decode(msg_body) + oldtext = replacetext(oldtext, "\[editorbr\]", "\n") + + var/newtext = sanitize(replacetext(input(usr, "Enter your message. You may use most tags from paper formatting", "Message Editor", oldtext) as message|null, "\n", "\[editorbr\]"), 20000) + if(newtext) + msg_body = newtext + return 1 + + if("edit_recipient") + var/newrecipient = sanitize(params["val"], 100) + if(newrecipient) + msg_recipient = newrecipient + return 1 + + if("edit_login") + var/newlogin = sanitize(params["val"], 100) + if(newlogin) + stored_login = newlogin + return 1 + + if("edit_password") + var/newpass = sanitize(params["val"], 100) + if(newpass) + stored_password = newpass + return 1 + + if("delete") + if(!istype(current_account)) + return 1 + var/datum/computer_file/data/email_message/M = find_message_by_fuid(params["delete"]) + if(!istype(M)) + return 1 + if(folder == "Deleted") + current_account.deleted.Remove(M) + qdel(M) + else + current_account.deleted.Add(M) + current_account.inbox.Remove(M) + current_account.spam.Remove(M) + if(current_message == M) + current_message = null + return 1 + + if("send") + if(!current_account) + return 1 + if((msg_title == "") || (msg_body == "") || (msg_recipient == "")) + error = "Error sending mail: Title or message body is empty!" + return 1 + + var/datum/computer_file/data/email_message/message = new() + message.title = msg_title + message.stored_data = msg_body + message.source = current_account.login + message.attachment = msg_attachment + if(!current_account.send_mail(msg_recipient, message)) + error = "Error sending email: this address doesn't exist." + return 1 + else + error = "Email successfully sent." + clear_message() + return 1 + + if("set_folder") + folder = params["set_folder"] + return 1 + + if("reply") + var/datum/computer_file/data/email_message/M = find_message_by_fuid(params["reply"]) + if(!istype(M)) + return 1 + + new_message = TRUE + msg_recipient = M.source + msg_title = "Re: [M.title]" + msg_body = "\[editorbr\]\[editorbr\]\[editorbr\]\[br\]==============================\[br\]\[editorbr\]" + msg_body += "Received by [current_account.login] at [M.timestamp]\[br\]\[editorbr\][M.stored_data]" + return 1 + + if("view") + var/datum/computer_file/data/email_message/M = find_message_by_fuid(params["view"]) + if(istype(M)) + current_message = M + return 1 + + if("changepassword") + var/oldpassword = sanitize(input(user,"Please enter your old password:", "Password Change"), 100) + if(!oldpassword) + return 1 + var/newpassword1 = sanitize(input(user,"Please enter your new password:", "Password Change"), 100) + if(!newpassword1) + return 1 + var/newpassword2 = sanitize(input(user,"Please re-enter your new password:", "Password Change"), 100) + if(!newpassword2) + return 1 + + if(!istype(current_account)) + error = "Please log in before proceeding." + return 1 + + if(current_account.password != oldpassword) + error = "Incorrect original password" + return 1 + + if(newpassword1 != newpassword2) + error = "The entered passwords do not match." + return 1 + + current_account.password = newpassword1 + stored_password = newpassword1 + error = "Your password has been successfully changed!" + return 1 + + // The following entries are Modular Computer framework only, and therefore won't do anything in other cases (like AI View) + + if("save") + // Fully dependant on modular computers here. + var/obj/item/modular_computer/MC = tgui_host() + + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error exporting file. Are you using a functional and NTOS-compliant device?" + return 1 + + var/filename = sanitize(input(user,"Please specify file name:", "Message export"), 100) + if(!filename) + return 1 + + var/datum/computer_file/data/email_message/M = find_message_by_fuid(params["save"]) + var/datum/computer_file/data/mail = istype(M) ? M.export() : null + if(!istype(mail)) + return 1 + mail.filename = filename + if(!MC.hard_drive || !MC.hard_drive.store_file(mail)) + error = "Internal I/O error when writing file, the hard drive may be full." + else + error = "Email exported successfully" + return 1 + + if("addattachment") + var/obj/item/modular_computer/MC = tgui_host() + msg_attachment = null + + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" + return 1 + + var/list/filenames = list() + for(var/datum/computer_file/CF in MC.hard_drive.stored_files) + if(CF.unsendable) + continue + filenames.Add(CF.filename) + var/picked_file = input(user, "Please pick a file to send as attachment (max 32GQ)") as null|anything in filenames + + if(!picked_file) + return 1 + + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" + return 1 + + for(var/datum/computer_file/CF in MC.hard_drive.stored_files) + if(CF.unsendable) + continue + if(CF.filename == picked_file) + msg_attachment = CF.clone() + break + if(!istype(msg_attachment)) + msg_attachment = null + error = "Unknown error when uploading attachment." + return 1 + + if(msg_attachment.size > 32) + error = "Error uploading attachment: File exceeds maximal permitted file size of 32GQ." + msg_attachment = null + else + error = "File [msg_attachment.filename].[msg_attachment.filetype] has been successfully uploaded." + return 1 + + if("downloadattachment") + if(!current_account || !current_message || !current_message.attachment) + return 1 + var/obj/item/modular_computer/MC = tgui_host() + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error downloading file. Are you using a functional and NTOSv2-compliant device?" + return 1 + + downloading = current_message.attachment.clone() + download_progress = 0 + return 1 + + if("canceldownload") + downloading = null + download_progress = 0 + return 1 + + if("remove_attachment") + msg_attachment = null + return 1 \ No newline at end of file diff --git a/code/modules/tgui/modules/ntos-only/uav.dm b/code/modules/tgui/modules/ntos-only/uav.dm new file mode 100644 index 0000000000..f27a08eda9 --- /dev/null +++ b/code/modules/tgui/modules/ntos-only/uav.dm @@ -0,0 +1,241 @@ +/datum/tgui_module/uav + name = "UAV Control" + tgui_id = "UAV" + ntos = TRUE + var/obj/item/device/uav/current_uav = null //The UAV we're watching + var/signal_strength = 0 //Our last signal strength report (cached for a few seconds) + var/signal_test_counter = 0 //How long until next signal strength check + var/list/viewers //Who's viewing a UAV through us + var/adhoc_range = 30 //How far we can operate on a UAV without NTnet + +/datum/tgui_module/uav/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + if(current_uav) + if(QDELETED(current_uav)) + set_current(null) + else if(signal_test_counter-- <= 0) + signal_strength = get_signal_to(current_uav) + if(!signal_strength) + set_current(null) + else // Don't reset counter until we find a UAV that's actually in range we can stay connected to + signal_test_counter = 20 + + data["current_uav"] = null + if(current_uav) + data["current_uav"] = list("status" = current_uav.get_status_string(), "power" = current_uav.state == 1 ? 1 : null) + data["signal_strength"] = signal_strength ? signal_strength >= 2 ? "High" : "Low" : "None" + data["in_use"] = LAZYLEN(viewers) + + var/list/paired_map = list() + var/obj/item/modular_computer/mc_host = tgui_host() + if(istype(mc_host)) + for(var/puav in mc_host.paired_uavs) + var/weakref/wr = puav + var/obj/item/device/uav/U = wr.resolve() + paired_map.Add(list(list("name" = "[U ? U.nickname : "!!Missing!!"]", "uavref" = "\ref[U]"))) + + data["paired_uavs"] = paired_map + return data + +/datum/tgui_module/uav/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + switch(action) + if("switch_uav") + var/obj/item/device/uav/U = locate(params["switch_uav"]) //This is a \ref to the UAV itself + if(!istype(U)) + to_chat(usr,"Something is blocking the connection to that UAV. In-person investigation is required.") + return FALSE + + if(!get_signal_to(U)) + to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") + return FALSE + + set_current(U) + return TRUE + + if("del_uav") + var/refstring = params["del_uav"] //This is a \ref to the UAV itself + var/obj/item/modular_computer/mc_host = tgui_host() + //This is so we can really scrape up any weakrefs that can't resolve + for(var/weakref/wr in mc_host.paired_uavs) + if(wr.ref == refstring) + if(current_uav?.weakref == wr) + set_current(null) + LAZYREMOVE(mc_host.paired_uavs, wr) + return TRUE + + if("view_uav") + if(!current_uav) + return FALSE + + if(current_uav.check_eye(usr) < 0) + to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") + else + viewing_uav(usr) ? unlook(usr) : look(usr) + return TRUE + + if("power_uav") + if(!current_uav) + return FALSE + else if(current_uav.toggle_power()) + //Clean up viewers faster + if(LAZYLEN(viewers)) + for(var/weakref/W in viewers) + var/M = W.resolve() + if(M) + unlook(M) + return TRUE + +/datum/tgui_module/uav/proc/set_current(var/obj/item/device/uav/U) + if(current_uav == U) + return + + signal_strength = 0 + current_uav = U + + if(LAZYLEN(viewers)) + for(var/weakref/W in viewers) + var/M = W.resolve() + if(M) + if(current_uav) + to_chat(M, "You're disconnected from the UAV's camera!") + unlook(M) + else + look(M) + +//// +//// Finding signal strength between us and the UAV +//// +/datum/tgui_module/uav/proc/get_signal_to(atom/movable/AM) + // Following roughly the ntnet signal levels + // 0 is none + // 1 is weak + // 2 is strong + var/obj/item/modular_computer/host = tgui_host() //Better not add this to anything other than modular computers. + if(!istype(host)) + return + var/our_signal = host.get_ntnet_status() //1 low, 2 good, 3 wired, 0 none + var/their_z = get_z(AM) + + //If we have no NTnet connection don't bother getting theirs + if(!our_signal) + if(get_z(host) == their_z && (get_dist(host, AM) < adhoc_range)) + return 1 //We can connect (with weak signal) in same z without ntnet, within 30 turfs + else + return 0 + + var/list/zlevels_in_range = using_map.get_map_levels(their_z, FALSE) + var/list/zlevels_in_long_range = using_map.get_map_levels(their_z, TRUE, om_range = DEFAULT_OVERMAP_RANGE) - zlevels_in_range + var/their_signal = 0 + for(var/relay in ntnet_global.relays) + var/obj/machinery/ntnet_relay/R = relay + if(!R.operable()) + continue + if(R.z == their_z) + their_signal = 2 + break + if(R.z in zlevels_in_range) + their_signal = 2 + break + if(R.z in zlevels_in_long_range) + their_signal = 1 + break + + if(!their_signal) //They have no NTnet at all + if(get_z(host) == their_z && (get_dist(host, AM) < adhoc_range)) + return 1 //We can connect (with weak signal) in same z without ntnet, within 30 turfs + else + return 0 + else + return max(our_signal, their_signal) + +/* All handling viewers */ +/datum/tgui_module/uav/Destroy() + if(LAZYLEN(viewers)) + for(var/weakref/W in viewers) + var/M = W.resolve() + if(M) + unlook(M) + . = ..() + +/datum/tgui_module/uav/tgui_status(mob/user) + . = ..() + if(. > STATUS_DISABLED) + if(viewing_uav(user)) + look(user) + return + unlook(user) + +/datum/tgui_module/uav/tgui_close(mob/user) + . = ..() + unlook(user) + +/datum/tgui_module/uav/proc/viewing_uav(mob/user) + return (weakref(user) in viewers) + +/datum/tgui_module/uav/proc/look(mob/user) + if(issilicon(user)) //Too complicated for me to want to mess with at the moment + to_chat(user, "Regulations prevent you from controlling several corporeal forms at the same time!") + return + + if(!current_uav) + return + + if(user.machine != tgui_host()) + user.set_machine(tgui_host()) + user.reset_view(current_uav) + current_uav.add_master(user) + LAZYDISTINCTADD(viewers, weakref(user)) + +/datum/tgui_module/uav/proc/unlook(mob/user) + user.unset_machine() + user.reset_view() + if(current_uav) + current_uav.remove_master(user) + LAZYREMOVE(viewers, weakref(user)) + +/datum/tgui_module/uav/check_eye(mob/user) + if(get_dist(user, tgui_host()) > 1 || user.blinded || !current_uav) + unlook(user) + return -1 + + var/viewflag = current_uav.check_eye(user) + if(viewflag < 0) //camera doesn't work + unlook(user) + return -1 + + return viewflag + +//// +//// Relaying movements to the UAV +//// +/datum/tgui_module/uav/relaymove(var/mob/user, direction) + if(current_uav) + return current_uav.relaymove(user, direction, signal_strength) + +//// +//// The effects when looking through a UAV +//// +/datum/tgui_module/uav/apply_visual(mob/M) + if(!M.client) + return + if(weakref(M) in viewers) + M.overlay_fullscreen("fishbed",/obj/screen/fullscreen/fishbed) + M.overlay_fullscreen("scanlines",/obj/screen/fullscreen/scanline) + + if(signal_strength <= 1) + M.overlay_fullscreen("whitenoise",/obj/screen/fullscreen/noise) + else + M.clear_fullscreen("whitenoise", 0) + else + remove_visual(M) + +/datum/tgui_module/uav/remove_visual(mob/M) + if(!M.client) + return + M.clear_fullscreen("fishbed",0) + M.clear_fullscreen("scanlines",0) + M.clear_fullscreen("whitenoise",0) diff --git a/code/modules/tgui/modules/teleporter.dm b/code/modules/tgui/modules/teleporter.dm new file mode 100644 index 0000000000..9bba6a8659 --- /dev/null +++ b/code/modules/tgui/modules/teleporter.dm @@ -0,0 +1,85 @@ +/datum/tgui_module/teleport_control + name = "Teleporter Control" + tgui_id = "Teleporter" + var/locked_name = "Not Locked" + var/obj/item/locked = null + var/obj/machinery/teleport/station/station = null + var/obj/machinery/teleport/hub/hub = null + +/datum/tgui_module/teleport_control/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + data["locked_name"] = locked_name || "No Target" + data["station_connected"] = !!station + data["hub_connected"] = !!hub + data["calibrated"] = hub?.accurate + data["teleporter_on"] = station?.engaged + + return data + +/datum/tgui_module/teleport_control/tgui_act(action, params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + switch(action) + if("select_target") + var/list/L = list() + var/list/areaindex = list() + + for(var/obj/item/device/radio/beacon/R in GLOB.all_beacons) + var/turf/T = get_turf(R) + if(!T) + continue + if(!(T.z in using_map.player_levels)) + continue + var/tmpname = T.loc.name + if(areaindex[tmpname]) + tmpname = "[tmpname] ([++areaindex[tmpname]])" + else + areaindex[tmpname] = 1 + L[tmpname] = R + + for(var/obj/item/weapon/implant/tracking/I in GLOB.all_tracking_implants) + if(!I.implanted || !ismob(I.loc)) + continue + else + var/mob/M = I.loc + if(M.stat == 2) + if(M.timeofdeath + 6000 < world.time) + continue + var/turf/T = get_turf(M) + if(T) + continue + if(!(T in using_map.station_levels)) + continue + var/tmpname = M.real_name + if(areaindex[tmpname]) + tmpname = "[tmpname] ([++areaindex[tmpname]])" + else + areaindex[tmpname] = 1 + L[tmpname] = I + + var/desc = input("Please select a location to lock in.", "Locking Menu") in L|null + if(!desc) + return FALSE + if(tgui_status(usr, state) != STATUS_INTERACTIVE) + return FALSE + + locked = L[desc] + locked_name = desc + return TRUE + + if("test_fire") + station?.testfire() + return TRUE + + if("toggle_on") + if(!station) + return FALSE + + if(station.engaged) + station.disengage() + else + station.engage() + + return TRUE diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index 111ee9e30b..2973d51668 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -122,4 +122,4 @@ /mob/living/carbon/human/shared_living_tgui_distance(atom/movable/src_object) if((TK in mutations) && (get_dist(src, src_object) <= 2)) return STATUS_INTERACTIVE - return ..() + return ..() \ No newline at end of file diff --git a/code/modules/tgui/states/deep_inventory.dm b/code/modules/tgui/states/deep_inventory.dm index 137f262a0e..d8a5e699c2 100644 --- a/code/modules/tgui/states/deep_inventory.dm +++ b/code/modules/tgui/states/deep_inventory.dm @@ -9,4 +9,4 @@ GLOBAL_DATUM_INIT(tgui_deep_inventory_state, /datum/tgui_state/deep_inventory_st /datum/tgui_state/deep_inventory_state/can_use_topic(src_object, mob/user) if(!user.contains(src_object)) return STATUS_CLOSE - return user.shared_tgui_interaction(src_object) + return user.shared_tgui_interaction(src_object) \ No newline at end of file diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm index ba8d132e0b..a69295452b 100644 --- a/code/modules/tgui/states/default.dm +++ b/code/modules/tgui/states/default.dm @@ -68,12 +68,12 @@ GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new) /mob/living/silicon/pai/default_can_use_tgui_topic(src_object) // pAIs can only use themselves and the owner's radio. - if((src_object == src || src_object == radio) && !stat) + if((src_object == src || src_object == radio || src_object == communicator) && !stat) return STATUS_INTERACTIVE else return ..() /mob/observer/dead/default_can_use_tgui_topic() - if(check_rights(R_ADMIN, 0, src)) + if(can_admin_interact()) return STATUS_INTERACTIVE // Admins are more equal return STATUS_UPDATE // Ghosts can view updates diff --git a/code/modules/tgui/states/inventory_vr.dm b/code/modules/tgui/states/inventory_vr.dm index b8e3ea224c..bc0fe2c3e3 100644 --- a/code/modules/tgui/states/inventory_vr.dm +++ b/code/modules/tgui/states/inventory_vr.dm @@ -16,6 +16,21 @@ GLOBAL_DATUM_INIT(tgui_nif_state, /datum/tgui_state/nif_state, new) return STATUS_CLOSE +// This is slightly distinct from the module state, as it wants to update if not working +GLOBAL_DATUM_INIT(tgui_nif_main_state, /datum/tgui_state/nif_main_state, new) +/datum/tgui_state/nif_main_state/can_use_topic(var/src_object, var/mob/user) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(!H.nif || src_object != H.nif) + return STATUS_CLOSE + + if(H.nif.stat == NIF_WORKING) + return user.shared_tgui_interaction() + else + return min(user.shared_tgui_interaction(), STATUS_UPDATE) + + return STATUS_CLOSE + GLOBAL_DATUM_INIT(tgui_commlink_state, /datum/tgui_state/commlink_state, new) /datum/tgui_state/commlink_state/can_use_topic(var/src_object, var/mob/user) if(ishuman(user)) diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 2f928ae6fa..eb128a129b 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -114,7 +114,6 @@ closing = TRUE for(var/datum/tgui/child in children) child.close(can_be_suspended, logout) - children.Cut() // If we don't have window_id, open proc did not have the opportunity // to finish, therefore it's safe to skip this whole block. if(window) @@ -126,6 +125,8 @@ src_object.tgui_close(user) SStgui.on_close(src) state = null + if(parent_ui) + parent_ui.children -= src parent_ui = null qdel(src) diff --git a/code/modules/vehicles/boat.dm b/code/modules/vehicles/boat.dm index ea17e29678..170ad4aa81 100644 --- a/code/modules/vehicles/boat.dm +++ b/code/modules/vehicles/boat.dm @@ -10,7 +10,7 @@ move_delay = 3 // Rather slow, but still faster than swimming, and won't get you wet. max_buckled_mobs = 2 anchored = FALSE - var/material/material = null + var/datum/material/material = null var/riding_datum_type = /datum/riding/boat/small /obj/vehicle/boat/sifwood/New(newloc, material_name) @@ -43,7 +43,7 @@ icon_state = "oar" item_state = "oar" force = 12 - var/material/material = null + var/datum/material/material = null /obj/item/weapon/oar/sifwood/New(newloc, material_name) ..(newloc, MAT_SIFWOOD) diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index 1d610be51c..d2bed00deb 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -68,8 +68,13 @@ var/mob/living/carbon/human/H = M if(isTaurTail(H.tail_style)) - to_chat(src,"Too many legs. TOO MANY LEGS!!") - return FALSE + var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style + if(ridertype.can_ride) + if(istype(ridertype, /datum/sprite_accessory/tail/taur/naga) || istype(ridertype, /datum/sprite_accessory/tail/taur/slug)) + to_chat(src,"Too few legs. TOO FEW LEGS!!") + return FALSE + to_chat(src,"Too many legs. TOO MANY LEGS!!") + return FALSE . = ..() if(.) @@ -126,7 +131,7 @@ var/icon/suit_sprites = null //File for suit sprites, if any. var/icon/under_sprites = null - var/icon_sprite_tag // This is where we put stuff like _Horse, so we can assign icons easier. + var/icon_sprite_tag // This is where we put stuff like _Horse, so we can assign icons easier. var/can_ride = 1 //whether we're real rideable taur or just in that category @@ -207,6 +212,12 @@ extra_overlay = "synthwolf_markings" //icon_sprite_tag = "synthwolf" +/datum/sprite_accessory/tail/taur/skunk + name = "Skunk (Taur)" + icon_state = "skunk_s" + extra_overlay = "skunk_markings" + icon_sprite_tag = "skunk" + /datum/sprite_accessory/tail/taur/naga name = "Naga (Taur)" icon_state = "naga_s" diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index 32128c2708..f8ba23f341 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -41,6 +41,21 @@ // Ears avaliable to anyone +/datum/sprite_accessory/ears/hyena + name = "hyena ears, dual-color" + desc = "" + icon_state = "hyena" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "hyena-inner" + +/datum/sprite_accessory/ears/moth + name = "moth antennae" + desc = "" + icon_state = "moth" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/ears/squirrel_orange name = "squirel, orange" desc = "" diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 80cea8ae2e..967c894f9d 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -728,7 +728,7 @@ return var/list/nom = null - var/material/M = null + var/datum/material/M = null if(istype(I, /obj/item/weapon/ore)) //Raw unrefined ore. Some things are just better untempered! var/obj/item/weapon/ore/O = I //List in list, define by material property of ore in code/mining/modules/ore.dm. @@ -743,7 +743,7 @@ "silver" = list("nutrition" = 40, "remark" = "[O] tastes quite nice indeed as you munch on it. A little tarnished, but that's just fine aging.", "WTF" = FALSE), "gold" = list("nutrition" = 40, "remark" = "You taste supreme richness that exceeds expectations and satisfies your hunger.", "WTF" = FALSE), "diamond" = list("nutrition" = 50, "remark" = "The heavenly taste of [O] almost brings a tear to your eye. Its glimmering gloriousness is even better on the tongue than you imagined, so you savour it fondly.", "WTF" = FALSE), - "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectible.", "WTF" = FALSE), + "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE), "mhydrogen" = list("nutrition" = 30, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE), "rutile" = list("nutrition" = 50, "remark" = "A little... angular, you savour the light but chewy [O], finishing it quickly.", "WTF" = FALSE), MAT_VERDANTIUM = list("nutrition" = 50, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE), @@ -779,11 +779,11 @@ "borosilicate glass" = list("nutrition" = 10, "remark" = "With a satisfying crunch, you grind [O] down with ease and find it somewhat palatable due to a subtle but familiar rush of phoronic warmth.", "WTF" = FALSE), "reinforced borosilicate glass" = list("nutrition" = 15, "remark" = "With a satisfying crunch, you grind [O] down. It is quite palatable due to a subtle metallic tang and familiar rush of phoronic warmth.", "WTF" = FALSE), MAT_GRAPHITE = list("nutrition" = 30, "remark" = "Satisfyingly metallic with a mildly savoury tartness, you chew [O] until its flavour is no more but are left longing for another.", "WTF" = FALSE), - "osmium" = list("nutrition" = 45, "remark" = "Successive bites serve to almost chill your palate, a rush of rich and mildly sour flavour unlocked with the grinding of your powerful jaws. Delectible.", "WTF" = FALSE), + "osmium" = list("nutrition" = 45, "remark" = "Successive bites serve to almost chill your palate, a rush of rich and mildly sour flavour unlocked with the grinding of your powerful jaws. Delectable.", "WTF" = FALSE), "mhydrogen" = list("nutrition" = 35, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE), - "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectible.", "WTF" = FALSE), + "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE), "iron" = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE), - MAT_LEAD = list("nutrition" = 0, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE), + MAT_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE), MAT_VERDANTIUM = list("nutrition" = 55, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE), MAT_MORPHIUM = list("nutrition" = 75, "remark" = "The question, the answer and the taste: It all floods your mouth and your mind to momentarily overwhelm the senses. What the hell was that? Your mouth and throat are left tingling for a while.", "WTF" = 10), "alienalloy" = list("nutrition" = 120, "remark" = "Working hard for so long to rend the material apart has left your jaw sore, but a veritable explosion of mind boggling indescribable flavour is unleashed. Completely alien sensations daze and overwhelm you while it feels like an interdimensional rift opened in your mouth, briefly numbing your face.", "WTF" = 15) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index e8e0360555..482928985b 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -271,6 +271,18 @@ if("bellypick") host.vore_selected = locate(params["bellypick"]) return TRUE + if("move_belly") + var/dir = text2num(params["dir"]) + if(LAZYLEN(host.vore_organs) <= 1) + to_chat(usr, "You can't sort bellies with only one belly to sort...") + return TRUE + + var/current_index = host.vore_organs.Find(host.vore_selected) + if(current_index) + var/new_index = clamp(current_index + dir, 1, LAZYLEN(host.vore_organs)) + host.vore_organs.Swap(current_index, new_index) + unsaved_changes = TRUE + return TRUE if("set_attribute") return set_attr(usr, params) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 8ae03765e9..ffff210dbc 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2002,4 +2002,9 @@ Departamental Swimsuits, for general use flags_inv = HIDEHOLSTER icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "flintlock_mob" \ No newline at end of file + item_state = "flintlock_mob" + +//BobOfBoblandia: Charles Gettler +/obj/item/clothing/head/that/fluff/gettler + name = "Charles' Top-Hat" + desc = "A special hat, removed from its owner." \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index fa0acd60d6..b2d82a7066 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1274,3 +1274,34 @@ /obj/item/clothing/accessory/solgov/department/security/aurora name = "Old security insignia" desc = "Insignia denoting assignment to the security department. These fit Expeditionary Corps uniforms. This one seems to be from the 2100s..." + +//Tigercat2000 - Shadow Larkens +/obj/item/modular_computer/laptop/preset/custom_loadout/advanced/shadowlarkens + name = "Shadow's laptop computer" + desc = "A laptop with a different color scheme than usual!" + icon = 'icons/vore/custom_items_vr.dmi' + overlay_icon = 'icons/obj/modular_laptop.dmi' + icon_state_unpowered = "shadowlaptop-open" + icon_state = "shadowlaptop-open" + icon_state_closed = "shadowlaptop-closed" + +//Rboys2 - Clara Mali +/obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask + name = "Clara's Vacuum Flask" + desc = "A rose gold vacuum flask." + base_name = "Clara's Vacuum Flask" + base_icon = "claraflask" + icon = 'icons/vore/custom_items_vr.dmi' + center_of_mass = list("x" = 15,"y" = 4) + filling_states = list(15, 30, 50, 60, 80, 100) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask/Initialize() + . = ..() + reagents.add_reagent("tea", 40) + reagents.add_reagent("milk", 20) + +/obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask/update_icon() + ..() + name = initial(name) + desc = initial(desc) \ No newline at end of file diff --git a/code/unit_tests/research_tests.dm b/code/unit_tests/research_tests.dm index 24d307c5e6..9d0174cabe 100644 --- a/code/unit_tests/research_tests.dm +++ b/code/unit_tests/research_tests.dm @@ -54,7 +54,7 @@ design = new design_type() // Unfortunately we have to actually instantiate to get a list. for(var/material_name in design.materials) - var/material/material = get_material_by_name(material_name) + var/datum/material/material = get_material_by_name(material_name) if(!material) log_unit_test("The entry [design_type] has invalid material type [material_name]") number_of_issues++ diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 64ba396c77..c423c19e38 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -12,13 +12,6 @@ alphaprime1 - Protean bothnevarbackwards - Diona bricker98 - Protean crossexonar - Protean -<<<<<<< HEAD -======= -chillyfang - Black-Eyed Shadekin -cgr - Protean -draycu - Vox -flaktual - Vox ->>>>>>> e791692aea59a96b1b45c20d61974aa10493a7f6 funnyman2003 - Xenochimera flurriee - Protean hawkerthegreat - Vox diff --git a/config/example/config.txt b/config/example/config.txt index d56d60a5ae..dd07f7b73d 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -551,4 +551,7 @@ ENABLE_NIGHT_SHIFTS # Uncomment to allow links of the following kinds. # # ALLOW_BYOND_LINKS # ALLOW_DISCORD_LINKS -ALLOW_URL_LINKS \ No newline at end of file +ALLOW_URL_LINKS + +# Control which submaps are loaded for the Dynamic Engine system +ENGINE_MAP Supermatter Engine,Edison's Bane diff --git a/guides/Guide to Opening Your First PR.md b/guides/Guide to Opening Your First PR.md index 73d44dace5..58d28b1362 100644 --- a/guides/Guide to Opening Your First PR.md +++ b/guides/Guide to Opening Your First PR.md @@ -16,7 +16,7 @@ Everyone has their own preferred Github clients - I use Gitkraken because it’s **SourceTree:** https://www.sourcetreeapp.com/ **Github Desktop:** https://desktop.github.com/ -I recommend Gitkraken as it’s very good at handling things for you, and it comes with built-in darkmode. It DOES have paid features, but you don’t need them. +I recommend Gitkraken as it’s very good at handling things for you, and it comes with built-in darkmode. It does have paid features, but you don’t need them. Cloning your Repo: AKA “Progress bar time†I’ll give these instructions in relevance to Gitkraken as that’s what I use, but they should be relatively applicable to other platforms. diff --git a/html/changelog.html b/html/changelog.html index 7153910a42..1ddf4203de 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,52 @@ -->
Access Report
- Prepared By: [user_id_card.registered_name ? user_id_card.registered_name : "Unknown"]- For: [id_card.registered_name ? id_card.registered_name : "Unregistered"]
-
- Assignment: [id_card.assignment]
- Account Number: #[id_card.associated_account_number]
- Blood Type: [id_card.blood_type]
- Access:
- "} - - var/known_access_rights = get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM) - for(var/A in id_card.access) - if(A in known_access_rights) - contents += " [get_access_desc(A)]" - - if(!computer.nano_printer.print_text(contents,"access report")) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") - return - else - computer.visible_message("\The [computer] prints out paper.") - else - var/contents = {"
Crew Manifest
-- [data_core ? data_core.get_manifest(0) : ""] - "} - if(!computer.nano_printer.print_text(contents,text("crew manifest ([])", stationtime2text()))) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") - return - else - computer.visible_message("\The [computer] prints out paper.") - if("eject") - if(computer && computer.card_slot) - if(id_card) - data_core.manifest_modify(id_card.registered_name, id_card.assignment) - computer.proc_eject_id(user) - if("terminate") - if(computer && can_run(user, 1)) - id_card.assignment = "Dismissed" //VOREStation Edit: setting adjustment - id_card.access = list() - callHook("terminate_employee", list(id_card)) - if("edit") - if(computer && can_run(user, 1)) - if(href_list["name"]) - var/temp_name = sanitizeName(input("Enter name.", "Name", id_card.registered_name),allow_numbers=TRUE) - if(temp_name) - id_card.registered_name = temp_name - else - computer.visible_message("[computer] buzzes rudely.") - else if(href_list["account"]) - var/account_num = text2num(input("Enter account number.", "Account", id_card.associated_account_number)) - id_card.associated_account_number = account_num - if("assign") - if(computer && can_run(user, 1) && id_card) - var/t1 = href_list["assign_target"] - if(t1 == "Custom") - var/temp_t = sanitize(input("Enter a custom job assignment.","Assignment", id_card.assignment), 45) - //let custom jobs function as an impromptu alt title, mainly for sechuds - if(temp_t) - id_card.assignment = temp_t - else - var/list/access = list() - if(module.is_centcom) - access = get_centcom_access(t1) - else - var/datum/job/jobdatum - for(var/jobtype in typesof(/datum/job)) - var/datum/job/J = new jobtype - if(ckey(J.title) == ckey(t1)) - jobdatum = J - break - if(!jobdatum) - to_chat(usr, "No log exists for this job: [t1]") - return - - access = jobdatum.get_access() - - id_card.access = access - id_card.assignment = t1 - id_card.rank = t1 - - callHook("reassign_employee", list(id_card)) - if("access") - if(href_list["allowed"] && computer && can_run(user, 1)) - var/access_type = text2num(href_list["access_target"]) - var/access_allowed = text2num(href_list["allowed"]) - if(access_type in get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM)) - id_card.access -= access_type - if(!access_allowed) - id_card.access += access_type - if(id_card) - id_card.name = text("[id_card.registered_name]'s ID Card ([id_card.assignment])") - - SSnanoui.update_uis(NM) - return 1 diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index fc2efa8820..a2079ad494 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -9,7 +9,7 @@ program_icon_state = "comm" program_key_state = "med_key" program_menu_icon = "flag" - nanomodule_path = /datum/nano_module/program/comm + tguimodule_path = /datum/tgui_module/communications/ntos extended_desc = "Used to command and control. Can relay long-range communications. This program can not be run on tablet computers." required_access = access_heads requires_ntnet = 1 @@ -24,269 +24,6 @@ temp.message_core.messages = message_core.messages.Copy() return temp -/datum/nano_module/program/comm - name = "Command and Communications Program" - //available_to_ai = TRUE - var/current_status = STATE_DEFAULT - var/msg_line1 = "" - var/msg_line2 = "" - var/centcomm_message_cooldown = 0 - var/announcment_cooldown = 0 - var/datum/announcement/priority/crew_announcement = new - var/current_viewing_message_id = 0 - var/current_viewing_message = null - -/datum/nano_module/program/comm/New() - ..() - crew_announcement.newscast = 1 - -/datum/nano_module/program/comm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - var/list/data = host.initial_data() - - if(program) - data["emagged"] = program.computer_emagged - data["net_comms"] = !!program.get_signal(NTNET_COMMUNICATION) //Double !! is needed to get 1 or 0 answer - data["net_syscont"] = !!program.get_signal(NTNET_SYSTEMCONTROL) - if(program.computer) - data["have_printer"] = !!program.computer.nano_printer - else - data["have_printer"] = 0 - else - data["emagged"] = 0 - data["net_comms"] = 1 - data["net_syscont"] = 1 - data["have_printer"] = 0 - - data["message_line1"] = msg_line1 - data["message_line2"] = msg_line2 - data["state"] = current_status - data["isAI"] = issilicon(usr) - data["authenticated"] = get_authentication_level(user) - data["current_security_level"] = security_level - data["current_security_level_title"] = num2seclevel(security_level) - - data["def_SEC_LEVEL_DELTA"] = SEC_LEVEL_DELTA - data["def_SEC_LEVEL_YELLOW"] = SEC_LEVEL_YELLOW - data["def_SEC_LEVEL_ORANGE"] = SEC_LEVEL_ORANGE - data["def_SEC_LEVEL_VIOLET"] = SEC_LEVEL_VIOLET - data["def_SEC_LEVEL_BLUE"] = SEC_LEVEL_BLUE - data["def_SEC_LEVEL_GREEN"] = SEC_LEVEL_GREEN - - var/datum/comm_message_listener/l = obtain_message_listener() - data["messages"] = l.messages - data["message_deletion_allowed"] = l != global_message_listener - data["message_current_id"] = current_viewing_message_id - if(current_viewing_message) - data["message_current"] = current_viewing_message - - if(emergency_shuttle.location()) - data["have_shuttle"] = 1 - if(emergency_shuttle.online()) - data["have_shuttle_called"] = 1 - else - data["have_shuttle_called"] = 0 - else - data["have_shuttle"] = 0 - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if(!ui) - ui = new(user, src, ui_key, "mod_communication.tmpl", name, 550, 420, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - -/datum/nano_module/program/comm/proc/get_authentication_level(var/mob/user) - if(program) - if(program.can_run(user, 0, access_captain)) - return 2 - else - return program.can_run(user) - return 1 - -/datum/nano_module/program/comm/proc/obtain_message_listener() - if(program) - var/datum/computer_file/program/comm/P = program - return P.message_core - return global_message_listener - -/datum/nano_module/program/comm/Topic(href, href_list) - if(..()) - return 1 - var/mob/user = usr - var/ntn_comm = program ? !!program.get_signal(NTNET_COMMUNICATION) : 1 - var/ntn_cont = program ? !!program.get_signal(NTNET_SYSTEMCONTROL) : 1 - var/datum/comm_message_listener/l = obtain_message_listener() - switch(href_list["action"]) - if("sw_menu") - . = 1 - current_status = text2num(href_list["target"]) - if("announce") - . = 1 - if(get_authentication_level(user) == 2 && !issilicon(usr) && ntn_comm) - if(user) - var/obj/item/weapon/card/id/id_card = user.GetIdCard() - crew_announcement.announcer = GetNameAndAssignmentFromId(id_card) - else - crew_announcement.announcer = "Unknown" - if(announcment_cooldown) - to_chat(usr, "Please allow at least one minute to pass between announcements") - return TRUE - var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") as null|message - if(!input || !can_still_topic()) - return 1 - crew_announcement.Announce(input) - announcment_cooldown = 1 - spawn(600)//One minute cooldown - announcment_cooldown = 0 - if("message") - . = 1 - if(href_list["target"] == "emagged") - if(program) - if(get_authentication_level(user) == 2 && program.computer_emagged && !issilicon(usr) && ntn_comm) - if(centcomm_message_cooldown) - to_chat(usr, "Arrays recycling. Please stand by.") - SSnanoui.update_uis(src) - return - var/input = sanitize(input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "") as null|text) - if(!input || !can_still_topic()) - return 1 - Syndicate_announce(input, usr) - to_chat(usr, "Message transmitted.") - log_say("[key_name(usr)] has made an illegal announcement: [input]") - centcomm_message_cooldown = 1 - spawn(300)//30 second cooldown - centcomm_message_cooldown = 0 - else if(href_list["target"] == "regular") - if(get_authentication_level(user) == 2 && !issilicon(usr) && ntn_comm) - if(centcomm_message_cooldown) - to_chat(usr, "Arrays recycling. Please stand by.") - SSnanoui.update_uis(src) - return - if(!is_relay_online())//Contact Centcom has a check, Syndie doesn't to allow for Traitor funs. - to_chat(usr, "No Emergency Bluespace Relay detected. Unable to transmit message.") - return 1 - var/input = sanitize(input("Please choose a message to transmit to Centcomm via quantum entanglement. \ - Please be aware that this process is very expensive, and abuse will lead to... termination. \ - Transmission does not guarantee a response. There is a 30 second delay before you may send another message, \ - be clear, full and concise.", "Central Command Quantum Messaging") as null|message) - if(!input || !can_still_topic()) - return 1 - CentCom_announce(input, usr) - to_chat(usr, "Message transmitted.") - log_say("[key_name(usr)] has made an IA Centcomm announcement: [input]") - centcomm_message_cooldown = 1 - spawn(300) //30 second cooldown - centcomm_message_cooldown = 0 - if("shuttle") - . = 1 - if(get_authentication_level(user) && ntn_cont) - if(href_list["target"] == "call") - var/confirm = alert("Are you sure you want to call the shuttle?", name, "No", "Yes") - if(confirm == "Yes" && can_still_topic()) - call_shuttle_proc(usr) - - if(href_list["target"] == "cancel" && !issilicon(usr)) - var/confirm = alert("Are you sure you want to cancel the shuttle?", name, "No", "Yes") - if(confirm == "Yes" && can_still_topic()) - cancel_call_proc(usr) - if("setstatus") - . = 1 - if(get_authentication_level(user) && ntn_cont) - switch(href_list["target"]) - if("line1") - var/linput = reject_bad_text(sanitize(input("Line 1", "Enter Message Text", msg_line1) as text|null, 40), 40) - if(can_still_topic()) - msg_line1 = linput - if("line2") - var/linput = reject_bad_text(sanitize(input("Line 2", "Enter Message Text", msg_line2) as text|null, 40), 40) - if(can_still_topic()) - msg_line2 = linput - if("message") - post_status("message", msg_line1, msg_line2) - if("alert") - post_status("alert", href_list["alert"]) - else - post_status(href_list["target"]) - if("setalert") - . = 1 - if(get_authentication_level(user) && !issilicon(usr) && ntn_cont && ntn_comm) - var/current_level = text2num(href_list["target"]) - var/confirm = alert("Are you sure you want to change alert level to [num2seclevel(current_level)]?", name, "No", "Yes") - if(confirm == "Yes" && can_still_topic()) - var/old_level = security_level - if(!current_level) current_level = SEC_LEVEL_GREEN - if(current_level < SEC_LEVEL_GREEN) current_level = SEC_LEVEL_GREEN - if(current_level > SEC_LEVEL_BLUE) current_level = SEC_LEVEL_BLUE //Cannot engage delta with this - set_security_level(current_level) - if(security_level != old_level) - log_game("[key_name(usr)] has changed the security level to [get_security_level()].") - message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") - switch(security_level) - if(SEC_LEVEL_GREEN) - feedback_inc("alert_comms_green",1) - if(SEC_LEVEL_YELLOW) - feedback_inc("alert_comms_yellow",1) - if(SEC_LEVEL_ORANGE) - feedback_inc("alert_comms_orange",1) - if(SEC_LEVEL_VIOLET) - feedback_inc("alert_comms_violet",1) - if(SEC_LEVEL_BLUE) - feedback_inc("alert_comms_blue",1) - else - to_chat(usr, "You press button, but red light flashes and nothing happens.")//This should never happen - - current_status = STATE_DEFAULT - if("viewmessage") - . = 1 - if(get_authentication_level(user) && ntn_comm) - current_viewing_message_id = text2num(href_list["target"]) - for(var/list/m in l.messages) - if(m["id"] == current_viewing_message_id) - current_viewing_message = m - current_status = STATE_VIEWMESSAGE - if("delmessage") - . = 1 - if(get_authentication_level(user) && ntn_comm && l != global_message_listener) - l.Remove(current_viewing_message) - current_status = STATE_MESSAGELIST - if("printmessage") - . = 1 - if(get_authentication_level(user) && ntn_comm) - if(program && program.computer && program.computer.nano_printer) - if(!program.computer.nano_printer.print_text(current_viewing_message["contents"],current_viewing_message["title"])) - to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") - else - program.computer.visible_message("\The [program.computer] prints out paper.") - - -/datum/nano_module/program/comm/proc/post_status(var/command, var/data1, var/data2) - - var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) - - if(!frequency) return - - - var/datum/signal/status_signal = new - status_signal.source = src - status_signal.transmission_method = TRANSMISSION_RADIO - status_signal.data["command"] = command - - switch(command) - if("message") - status_signal.data["msg1"] = data1 - status_signal.data["msg2"] = data2 - log_admin("STATUS: [key_name(usr)] set status screen message with [src]: [data1] [data2]") - if("alert") - status_signal.data["picture_state"] = data1 - - frequency.post_signal(src, status_signal) - -#undef STATE_DEFAULT -#undef STATE_MESSAGELIST -#undef STATE_VIEWMESSAGE -#undef STATE_STATUSDISPLAY -#undef STATE_ALERT_LEVEL - /* General message handling stuff */ @@ -304,19 +41,9 @@ proc/post_comm_message(var/message_title, var/message_text) message["title"] = message_title message["contents"] = message_text - for (var/datum/comm_message_listener/l in comm_message_listeners) + for(var/datum/comm_message_listener/l in comm_message_listeners) l.Add(message) - //Old console support - for (var/obj/machinery/computer/communications/comm in machines) - if (!(comm.stat & (BROKEN | NOPOWER)) && comm.prints_intercept) - var/obj/item/weapon/paper/intercept = new /obj/item/weapon/paper( comm.loc ) - intercept.name = message_title - intercept.info = message_text - - comm.messagetitle.Add(message_title) - comm.messagetext.Add(message_text) - /datum/comm_message_listener var/list/messages diff --git a/code/modules/modular_computers/file_system/programs/generic/configurator.dm b/code/modules/modular_computers/file_system/programs/generic/configurator.dm index c3ce1e358a..2d660c8b7e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/configurator.dm +++ b/code/modules/modular_computers/file_system/programs/generic/configurator.dm @@ -14,51 +14,4 @@ size = 4 available_on_ntnet = 0 requires_ntnet = 0 - nanomodule_path = /datum/nano_module/program/computer_configurator/ - -/datum/nano_module/program/computer_configurator - name = "NTOS Computer Configuration Tool" - var/obj/item/modular_computer/movable = null - -/datum/nano_module/program/computer_configurator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - if(program) - movable = program.computer - if(!istype(movable)) - movable = null - - // No computer connection, we can't get data from that. - if(!movable) - return 0 - - var/list/data = list() - - if(program) - data = program.get_header_data() - - var/list/hardware = movable.get_all_components() - - data["disk_size"] = movable.hard_drive.max_capacity - data["disk_used"] = movable.hard_drive.used_capacity - data["power_usage"] = movable.last_power_usage - data["battery_exists"] = movable.battery_module ? 1 : 0 - if(movable.battery_module) - data["battery_rating"] = movable.battery_module.battery.maxcharge - data["battery_percent"] = round(movable.battery_module.battery.percent()) - - var/list/all_entries[0] - for(var/obj/item/weapon/computer_hardware/H in hardware) - all_entries.Add(list(list( - "name" = H.name, - "desc" = H.desc, - "enabled" = H.enabled, - "critical" = H.critical, - "powerusage" = H.power_usage - ))) - - data["hardware"] = all_entries - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "laptop_configuration.tmpl", "NTOS Configuration Utility", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() \ No newline at end of file + tguimodule_path = /datum/tgui_module/computer_configurator diff --git a/code/modules/modular_computers/file_system/programs/generic/email_client.dm b/code/modules/modular_computers/file_system/programs/generic/email_client.dm index 3e2f979bb5..32d635fef4 100644 --- a/code/modules/modular_computers/file_system/programs/generic/email_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/email_client.dm @@ -11,15 +11,15 @@ var/stored_login = "" var/stored_password = "" - nanomodule_path = /datum/nano_module/email_client + tguimodule_path = /datum/tgui_module/email_client // Persistency. Unless you log out, or unless your password changes, this will pre-fill the login data when restarting the program /datum/computer_file/program/email_client/kill_program() - if(NM) - var/datum/nano_module/email_client/NME = NM - if(NME.current_account) - stored_login = NME.stored_login - stored_password = NME.stored_password + if(TM) + var/datum/tgui_module/email_client/TME = TM + if(TME.current_account) + stored_login = TME.stored_login + stored_password = TME.stored_password else stored_login = "" stored_password = "" @@ -27,473 +27,31 @@ /datum/computer_file/program/email_client/run_program() . = ..() - if(NM) - var/datum/nano_module/email_client/NME = NM - NME.stored_login = stored_login - NME.stored_password = stored_password - NME.log_in() - NME.error = "" - NME.check_for_new_messages(1) + if(TM) + var/datum/tgui_module/email_client/TME = TM + TME.stored_login = stored_login + TME.stored_password = stored_password + TME.log_in() + TME.error = "" + TME.check_for_new_messages(1) /datum/computer_file/program/email_client/proc/new_mail_notify() - computer.visible_message("\The [computer] beeps softly, indicating a new email has been received.", 1) + var/turf/T = get_turf(computer) // Because visible_message is being a butt + if(T) + T.visible_message("[computer] beeps softly, indicating a new email has been received.") + playsound(computer, 'sound/misc/server-ready.ogg', 100, 0) /datum/computer_file/program/email_client/process_tick() ..() - var/datum/nano_module/email_client/NME = NM - if(!istype(NME)) + var/datum/tgui_module/email_client/TME = TM + if(!istype(TME)) return - NME.relayed_process(ntnet_speed) + TME.relayed_process(ntnet_speed) - var/check_count = NME.check_for_new_messages() + var/check_count = TME.check_for_new_messages() if(check_count) if(check_count == 2) new_mail_notify() ui_header = "ntnrc_new.gif" else ui_header = "ntnrc_idle.gif" - -/datum/nano_module/email_client/ - name = "Email Client" - var/stored_login = "" - var/stored_password = "" - var/error = "" - - var/msg_title = "" - var/msg_body = "" - var/msg_recipient = "" - var/datum/computer_file/msg_attachment = null - var/folder = "Inbox" - var/addressbook = FALSE - var/new_message = FALSE - - var/last_message_count = 0 // How many messages were there during last check. - var/read_message_count = 0 // How many messages were there when user has last accessed the UI. - - var/datum/computer_file/downloading = null - var/download_progress = 0 - var/download_speed = 0 - - var/datum/computer_file/data/email_account/current_account = null - var/datum/computer_file/data/email_message/current_message = null - -/datum/nano_module/email_client/proc/log_in() - for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts) - if(!account.can_login) - continue - if(account.login == stored_login) - if(account.password == stored_password) - if(account.suspended) - error = "This account has been suspended. Please contact the system administrator for assistance." - return 0 - current_account = account - return 1 - else - error = "Invalid Password" - return 0 - error = "Invalid Login" - return 0 - -// Returns 0 if no new messages were received, 1 if there is an unread message but notification has already been sent. -// and 2 if there is a new message that appeared in this tick (and therefore notification should be sent by the program). -/datum/nano_module/email_client/proc/check_for_new_messages(var/messages_read = FALSE) - if(!current_account) - return 0 - - var/list/allmails = current_account.all_emails() - - if(allmails.len > last_message_count) - . = 2 - else if(allmails.len > read_message_count) - . = 1 - else - . = 0 - - last_message_count = allmails.len - if(messages_read) - read_message_count = allmails.len - - -/datum/nano_module/email_client/proc/log_out() - current_account = null - downloading = null - download_progress = 0 - last_message_count = 0 - read_message_count = 0 - -/datum/nano_module/email_client/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - var/list/data = host.initial_data() - - // Password has been changed by other client connected to this email account - if(current_account) - if(current_account.password != stored_password) - log_out() - error = "Invalid Password" - // Banned. - if(current_account.suspended) - log_out() - error = "This account has been suspended. Please contact the system administrator for assistance." - - if(error) - data["error"] = error - else if(downloading) - data["downloading"] = 1 - data["down_filename"] = "[downloading.filename].[downloading.filetype]" - data["down_progress"] = download_progress - data["down_size"] = downloading.size - data["down_speed"] = download_speed - - else if(istype(current_account)) - data["current_account"] = current_account.login - if(addressbook) - var/list/all_accounts = list() - for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts) - if(!account.can_login) - continue - all_accounts.Add(list(list( - "login" = account.login - ))) - data["addressbook"] = 1 - data["accounts"] = all_accounts - else if(new_message) - data["new_message"] = 1 - data["msg_title"] = msg_title - data["msg_body"] = pencode2html(msg_body) - data["msg_recipient"] = msg_recipient - if(msg_attachment) - data["msg_hasattachment"] = 1 - data["msg_attachment_filename"] = "[msg_attachment.filename].[msg_attachment.filetype]" - data["msg_attachment_size"] = msg_attachment.size - else if (current_message) - data["cur_title"] = current_message.title - data["cur_body"] = pencode2html(current_message.stored_data) - data["cur_timestamp"] = current_message.timestamp - data["cur_source"] = current_message.source - data["cur_uid"] = current_message.uid - if(istype(current_message.attachment)) - data["cur_hasattachment"] = 1 - data["cur_attachment_filename"] = "[current_message.attachment.filename].[current_message.attachment.filetype]" - data["cur_attachment_size"] = current_message.attachment.size - else - data["label_inbox"] = "Inbox ([current_account.inbox.len])" - data["label_spam"] = "Spam ([current_account.spam.len])" - data["label_deleted"] = "Deleted ([current_account.deleted.len])" - var/list/message_source - if(folder == "Inbox") - message_source = current_account.inbox - else if(folder == "Spam") - message_source = current_account.spam - else if(folder == "Deleted") - message_source = current_account.deleted - - if(message_source) - data["folder"] = folder - var/list/all_messages = list() - for(var/datum/computer_file/data/email_message/message in message_source) - all_messages.Add(list(list( - "title" = message.title, - "body" = pencode2html(message.stored_data), - "source" = message.source, - "timestamp" = message.timestamp, - "uid" = message.uid - ))) - data["messages"] = all_messages - data["messagecount"] = all_messages.len - else - data["stored_login"] = stored_login - data["stored_password"] = stars(stored_password, 0) - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "email_client.tmpl", "Email Client", 600, 450, state = state) - if(host.update_layout()) - ui.auto_update_layout = 1 - ui.set_auto_update(1) - ui.set_initial_data(data) - ui.open() - -/datum/nano_module/email_client/proc/find_message_by_fuid(var/fuid) - if(!istype(current_account)) - return - - // href_list works with strings, so this makes it a bit easier for us - if(istext(fuid)) - fuid = text2num(fuid) - - for(var/datum/computer_file/data/email_message/message in current_account.all_emails()) - if(message.uid == fuid) - return message - -/datum/nano_module/email_client/proc/clear_message() - new_message = FALSE - msg_title = "" - msg_body = "" - msg_recipient = "" - msg_attachment = null - current_message = null - -/datum/nano_module/email_client/proc/relayed_process(var/netspeed) - download_speed = netspeed - if(!downloading) - return - download_progress = min(download_progress + netspeed, downloading.size) - if(download_progress >= downloading.size) - var/obj/item/modular_computer/MC = nano_host() - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" - downloading = null - download_progress = 0 - return 1 - - if(MC.hard_drive.store_file(downloading)) - error = "File successfully downloaded to local device." - else - error = "Error saving file: I/O Error: The hard drive may be full or nonfunctional." - downloading = null - download_progress = 0 - return 1 - - -/datum/nano_module/email_client/Topic(href, href_list) - if(..()) - return 1 - var/mob/living/user = usr - check_for_new_messages(1) // Any actual interaction (button pressing) is considered as acknowledging received message, for the purpose of notification icons. - if(href_list["login"]) - log_in() - return 1 - - if(href_list["logout"]) - log_out() - return 1 - - if(href_list["reset"]) - error = "" - return 1 - - if(href_list["new_message"]) - new_message = TRUE - return 1 - - if(href_list["cancel"]) - if(addressbook) - addressbook = FALSE - else - clear_message() - return 1 - - if(href_list["addressbook"]) - addressbook = TRUE - return 1 - - if(href_list["set_recipient"]) - msg_recipient = sanitize(href_list["set_recipient"]) - addressbook = FALSE - return 1 - - if(href_list["edit_title"]) - var/newtitle = sanitize(input(user,"Enter title for your message:", "Message title", msg_title), 100) - if(newtitle) - msg_title = newtitle - return 1 - - // This uses similar editing mechanism as the FileManager program, therefore it supports various paper tags and remembers formatting. - if(href_list["edit_body"]) - var/oldtext = html_decode(msg_body) - oldtext = replacetext(oldtext, "\[editorbr\]", "\n") - - var/newtext = sanitize(replacetext(input(usr, "Enter your message. You may use most tags from paper formatting", "Message Editor", oldtext) as message|null, "\n", "\[editorbr\]"), 20000) - if(newtext) - msg_body = newtext - return 1 - - if(href_list["edit_recipient"]) - var/newrecipient = sanitize(input(user,"Enter recipient's email address:", "Recipient", msg_recipient), 100) - if(newrecipient) - msg_recipient = newrecipient - return 1 - - if(href_list["edit_login"]) - var/newlogin = sanitize(input(user,"Enter login", "Login", stored_login), 100) - if(newlogin) - stored_login = newlogin - return 1 - - if(href_list["edit_password"]) - var/newpass = sanitize(input(user,"Enter password", "Password"), 100) - if(newpass) - stored_password = newpass - return 1 - - if(href_list["delete"]) - if(!istype(current_account)) - return 1 - var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["delete"]) - if(!istype(M)) - return 1 - if(folder == "Deleted") - current_account.deleted.Remove(M) - qdel(M) - else - current_account.deleted.Add(M) - current_account.inbox.Remove(M) - current_account.spam.Remove(M) - if(current_message == M) - current_message = null - return 1 - - if(href_list["send"]) - if(!current_account) - return 1 - if((msg_title == "") || (msg_body == "") || (msg_recipient == "")) - error = "Error sending mail: Title or message body is empty!" - return 1 - - var/datum/computer_file/data/email_message/message = new() - message.title = msg_title - message.stored_data = msg_body - message.source = current_account.login - message.attachment = msg_attachment - if(!current_account.send_mail(msg_recipient, message)) - error = "Error sending email: this address doesn't exist." - return 1 - else - error = "Email successfully sent." - clear_message() - return 1 - - if(href_list["set_folder"]) - folder = href_list["set_folder"] - return 1 - - if(href_list["reply"]) - var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["reply"]) - if(!istype(M)) - return 1 - - new_message = TRUE - msg_recipient = M.source - msg_title = "Re: [M.title]" - msg_body = "\[editorbr\]\[editorbr\]\[editorbr\]\[br\]==============================\[br\]\[editorbr\]" - msg_body += "Received by [current_account.login] at [M.timestamp]\[br\]\[editorbr\][M.stored_data]" - return 1 - - if(href_list["view"]) - var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["view"]) - if(istype(M)) - current_message = M - return 1 - - if(href_list["changepassword"]) - var/oldpassword = sanitize(input(user,"Please enter your old password:", "Password Change"), 100) - if(!oldpassword) - return 1 - var/newpassword1 = sanitize(input(user,"Please enter your new password:", "Password Change"), 100) - if(!newpassword1) - return 1 - var/newpassword2 = sanitize(input(user,"Please re-enter your new password:", "Password Change"), 100) - if(!newpassword2) - return 1 - - if(!istype(current_account)) - error = "Please log in before proceeding." - return 1 - - if(current_account.password != oldpassword) - error = "Incorrect original password" - return 1 - - if(newpassword1 != newpassword2) - error = "The entered passwords do not match." - return 1 - - current_account.password = newpassword1 - stored_password = newpassword1 - error = "Your password has been successfully changed!" - return 1 - - // The following entries are Modular Computer framework only, and therefore won't do anything in other cases (like AI View) - - if(href_list["save"]) - // Fully dependant on modular computers here. - var/obj/item/modular_computer/MC = nano_host() - - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error exporting file. Are you using a functional and NTOS-compliant device?" - return 1 - - var/filename = sanitize(input(user,"Please specify file name:", "Message export"), 100) - if(!filename) - return 1 - - var/datum/computer_file/data/email_message/M = find_message_by_fuid(href_list["save"]) - var/datum/computer_file/data/mail = istype(M) ? M.export() : null - if(!istype(mail)) - return 1 - mail.filename = filename - if(!MC.hard_drive || !MC.hard_drive.store_file(mail)) - error = "Internal I/O error when writing file, the hard drive may be full." - else - error = "Email exported successfully" - return 1 - - if(href_list["addattachment"]) - var/obj/item/modular_computer/MC = nano_host() - msg_attachment = null - - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" - return 1 - - var/list/filenames = list() - for(var/datum/computer_file/CF in MC.hard_drive.stored_files) - if(CF.unsendable) - continue - filenames.Add(CF.filename) - var/picked_file = input(user, "Please pick a file to send as attachment (max 32GQ)") as null|anything in filenames - - if(!picked_file) - return 1 - - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" - return 1 - - for(var/datum/computer_file/CF in MC.hard_drive.stored_files) - if(CF.unsendable) - continue - if(CF.filename == picked_file) - msg_attachment = CF.clone() - break - if(!istype(msg_attachment)) - msg_attachment = null - error = "Unknown error when uploading attachment." - return 1 - - if(msg_attachment.size > 32) - error = "Error uploading attachment: File exceeds maximal permitted file size of 32GQ." - msg_attachment = null - else - error = "File [msg_attachment.filename].[msg_attachment.filetype] has been successfully uploaded." - return 1 - - if(href_list["downloadattachment"]) - if(!current_account || !current_message || !current_message.attachment) - return 1 - var/obj/item/modular_computer/MC = nano_host() - if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) - error = "Error downloading file. Are you using a functional and NTOSv2-compliant device?" - return 1 - - downloading = current_message.attachment.clone() - download_progress = 0 - return 1 - - if(href_list["canceldownload"]) - downloading = null - download_progress = 0 - return 1 - - if(href_list["remove_attachment"]) - msg_attachment = null - return 1 \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm index 42dfdd622d..13a137993e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm @@ -6,202 +6,190 @@ program_key_state = "generic_key" program_menu_icon = "folder-collapsed" size = 8 - requires_ntnet = 0 - available_on_ntnet = 0 - undeletable = 1 - nanomodule_path = /datum/nano_module/program/computer_filemanager/ + requires_ntnet = FALSE + available_on_ntnet = FALSE + undeletable = TRUE + tgui_id = "NtosFileManager" + var/open_file var/error -/datum/computer_file/program/filemanager/Topic(href, href_list) +/datum/computer_file/program/filemanager/tgui_act(action, list/params, datum/tgui/ui) if(..()) - return 1 + return TRUE - if(href_list["PRG_openfile"]) - . = 1 - open_file = href_list["PRG_openfile"] - if(href_list["PRG_newtextfile"]) - . = 1 - var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename")) - if(!newname) - return 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/data/F = new/datum/computer_file/data() - F.filename = newname - F.filetype = "TXT" - HDD.store_file(F) - if(href_list["PRG_deletefile"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_deletefile"]) - if(!file || file.undeletable) - return 1 - HDD.remove_file(file) - if(href_list["PRG_usbdeletefile"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive - if(!RHDD) - return 1 - var/datum/computer_file/file = RHDD.find_file_by_name(href_list["PRG_usbdeletefile"]) - if(!file || file.undeletable) - return 1 - RHDD.remove_file(file) - if(href_list["PRG_closefile"]) - . = 1 - open_file = null - error = null - if(href_list["PRG_clone"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_clone"]) - if(!F || !istype(F)) - return 1 - var/datum/computer_file/C = F.clone(1) - HDD.store_file(C) - if(href_list["PRG_rename"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/file = HDD.find_file_by_name(href_list["PRG_rename"]) - if(!file || !istype(file)) - return 1 - var/newname = sanitize(input(usr, "Enter new file name:", "File rename", file.filename)) - if(file && newname) + var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/weapon/computer_hardware/hard_drive/RHDD = computer.portable_drive + + switch(action) + if("PRG_openfile") + open_file = params["name"] + return TRUE + if("PRG_newtextfile") + if(!HDD) + return + var/newname = sanitize(input(usr, "Enter file name or leave blank to cancel:", "File rename")) + if(!newname) + return + var/datum/computer_file/data/F = new/datum/computer_file/data() + F.filename = newname + F.filetype = "TXT" + HDD.store_file(F) + return TRUE + if("PRG_closefile") + open_file = null + error = null + return TRUE + if("PRG_clone") + if(!HDD) + return + var/datum/computer_file/F = HDD.find_file_by_name(params["name"]) + if(!F || !istype(F)) + return + var/datum/computer_file/C = F.clone(1) + HDD.store_file(C) + return TRUE + if("PRG_edit") + if(!HDD) + return + if(!open_file) + return + var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) + if(!F || !istype(F)) + return + if(F.do_not_edit && (alert("WARNING: This file is not compatible with editor. Editing it may result in permanently corrupted formatting or damaged data consistency. Edit anyway?", "Incompatible File", "No", "Yes") == "No")) + return + + var/oldtext = html_decode(F.stored_data) + oldtext = replacetext(oldtext, "\[br\]", "\n") + + var/newtext = sanitize(replacetext(input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", oldtext) as message|null, "\n", "\[br\]"), MAX_TEXTFILE_LENGTH) + if(!newtext) + return + + if(F) + var/datum/computer_file/data/backup = F.clone() + HDD.remove_file(F) + F.stored_data = newtext + F.calculate_size() + // We can't store the updated file, it's probably too large. Print an error and restore backed up version. + // This is mostly intended to prevent people from losing texts they spent lot of time working on due to running out of space. + // They will be able to copy-paste the text from error screen and store it in notepad or something. + if(!HDD.store_file(F)) + error = "I/O error: Unable to overwrite file. Hard drive is probably full. You may want to backup your changes before closing this window:
[html_decode(F.stored_data)]
" + HDD.store_file(backup) + return TRUE + if("PRG_printfile") + if(!HDD) + return + if(!open_file) + return + var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) + if(!F || !istype(F)) + return + if(!computer.nano_printer) + error = "Missing Hardware: Your computer does not have required hardware to complete this operation." + return + if(!computer.nano_printer.print_text(pencode2html(F.stored_data))) + error = "Hardware error: Printer was unable to print the file. It may be out of paper." + return + return TRUE + if("PRG_deletefile") + if(!HDD) + return + var/datum/computer_file/file = HDD.find_file_by_name(params["name"]) + if(!file || file.undeletable) + return + HDD.remove_file(file) + return TRUE + if("PRG_usbdeletefile") + if(!RHDD) + return + var/datum/computer_file/file = RHDD.find_file_by_name(params["name"]) + if(!file || file.undeletable) + return + RHDD.remove_file(file) + return TRUE + if("PRG_rename") + if(!HDD) + return + var/datum/computer_file/file = HDD.find_file_by_name(params["name"]) + if(!file) + return + var/newname = params["new_name"] + if(!newname) + return file.filename = newname - if(href_list["PRG_edit"]) - . = 1 - if(!open_file) - return 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) - if(!F || !istype(F)) - return 1 - if(F.do_not_edit && (alert("WARNING: This file is not compatible with editor. Editing it may result in permanently corrupted formatting or damaged data consistency. Edit anyway?", "Incompatible File", "No", "Yes") == "No")) - return 1 + return TRUE + if("PRG_copytousb") + if(!HDD || !RHDD) + return + var/datum/computer_file/F = HDD.find_file_by_name(params["name"]) + if(!F) + return + var/datum/computer_file/C = F.clone(FALSE) + RHDD.store_file(C) + return TRUE + if("PRG_copyfromusb") + if(!HDD || !RHDD) + return + var/datum/computer_file/F = RHDD.find_file_by_name(params["name"]) + if(!F || !istype(F)) + return + var/datum/computer_file/C = F.clone(FALSE) + HDD.store_file(C) + return TRUE - var/oldtext = html_decode(F.stored_data) - oldtext = replacetext(oldtext, "\[br\]", "\n") +/datum/computer_file/program/filemanager/tgui_data(mob/user) + var/list/data = get_header_data() - var/newtext = sanitize(replacetext(input(usr, "Editing file [open_file]. You may use most tags used in paper formatting:", "Text Editor", oldtext) as message|null, "\n", "\[br\]"), MAX_TEXTFILE_LENGTH) - if(!newtext) - return + var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive - if(F) - var/datum/computer_file/data/backup = F.clone() - HDD.remove_file(F) - F.stored_data = newtext - F.calculate_size() - // We can't store the updated file, it's probably too large. Print an error and restore backed up version. - // This is mostly intended to prevent people from losing texts they spent lot of time working on due to running out of space. - // They will be able to copy-paste the text from error screen and store it in notepad or something. - if(!HDD.store_file(F)) - error = "I/O error: Unable to overwrite file. Hard drive is probably full. You may want to backup your changes before closing this window:
[html_decode(F.stored_data)]
" - HDD.store_file(backup) - if(href_list["PRG_printfile"]) - . = 1 - if(!open_file) - return 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/data/F = HDD.find_file_by_name(open_file) - if(!F || !istype(F)) - return 1 - if(!computer.nano_printer) - error = "Missing Hardware: Your computer does not have required hardware to complete this operation." - return 1 - if(!computer.nano_printer.print_text(pencode2html(F.stored_data))) - error = "Hardware error: Printer was unable to print the file. It may be out of paper." - return 1 - if(href_list["PRG_copytousb"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive - if(!HDD || !RHDD) - return 1 - var/datum/computer_file/F = HDD.find_file_by_name(href_list["PRG_copytousb"]) - if(!F || !istype(F)) - return 1 - var/datum/computer_file/C = F.clone(0) - RHDD.store_file(C) - if(href_list["PRG_copyfromusb"]) - . = 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD = computer.portable_drive - if(!HDD || !RHDD) - return 1 - var/datum/computer_file/F = RHDD.find_file_by_name(href_list["PRG_copyfromusb"]) - if(!F || !istype(F)) - return 1 - var/datum/computer_file/C = F.clone(0) - HDD.store_file(C) - if(.) - SSnanoui.update_uis(NM) + data["error"] = null + if(error) + data["error"] = error + if(!computer || !HDD) + data["error"] = "I/O ERROR: Unable to access hard drive." + + data["filedata"] = null + data["filename"] = null + data["files"] = list() + data["usbconnected"] = FALSE + data["usbfiles"] = list() -/datum/nano_module/program/computer_filemanager - name = "NTOS File Manager" - -/datum/nano_module/program/computer_filemanager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - var/list/data = host.initial_data() - var/datum/computer_file/program/filemanager/PRG - PRG = program - - var/obj/item/weapon/computer_hardware/hard_drive/HDD - var/obj/item/weapon/computer_hardware/hard_drive/portable/RHDD - if(PRG.error) - data["error"] = PRG.error - if(PRG.open_file) + if(open_file) var/datum/computer_file/data/file - if(!PRG.computer || !PRG.computer.hard_drive) + if(!computer || !computer.hard_drive) data["error"] = "I/O ERROR: Unable to access hard drive." else - HDD = PRG.computer.hard_drive - file = HDD.find_file_by_name(PRG.open_file) + file = HDD.find_file_by_name(open_file) if(!istype(file)) data["error"] = "I/O ERROR: Unable to open file." else data["filedata"] = pencode2html(file.stored_data) data["filename"] = "[file.filename].[file.filetype]" else - if(!PRG.computer || !PRG.computer.hard_drive) - data["error"] = "I/O ERROR: Unable to access hard drive." - else - HDD = PRG.computer.hard_drive - RHDD = PRG.computer.portable_drive - var/list/files[0] - for(var/datum/computer_file/F in HDD.stored_files) - files.Add(list(list( + var/list/files = list() + for(var/datum/computer_file/F in HDD.stored_files) + files += list(list( + "name" = F.filename, + "type" = F.filetype, + "size" = F.size, + "undeletable" = F.undeletable + )) + data["files"] = files + if(RHDD) + data["usbconnected"] = TRUE + var/list/usbfiles = list() + for(var/datum/computer_file/F in RHDD.stored_files) + usbfiles += list(list( "name" = F.filename, "type" = F.filetype, "size" = F.size, "undeletable" = F.undeletable - ))) - data["files"] = files - if(RHDD) - data["usbconnected"] = 1 - var/list/usbfiles[0] - for(var/datum/computer_file/F in RHDD.stored_files) - usbfiles.Add(list(list( - "name" = F.filename, - "type" = F.filetype, - "size" = F.size, - "undeletable" = F.undeletable - ))) - data["usbfiles"] = usbfiles + )) + data["usbfiles"] = usbfiles - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "file_manager.tmpl", "NTOS File Manager", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() \ No newline at end of file + return data diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index b4c0688c29..4d21095f9d 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -1,152 +1,188 @@ // This file is used as a reference for Modular Computers Development guide on the wiki. It contains a lot of excess comments, as it is intended as explanation // for someone who may not be as experienced in coding. When making changes, please try to keep it this way. -// An actual program definition. /datum/computer_file/program/game - filename = "arcadec" // File name, as shown in the file browser program. - filedesc = "Unknown Game" // User-Friendly name. In this case, we will generate a random name in constructor. - program_icon_state = "game" // Icon state of this program's screen. - program_menu_icon = "script" - extended_desc = "Fun for the whole family! Probably not an AAA title, but at least you can download it on the corporate network.." // A nice description. - size = 5 // Size in GQ. Integers only. Smaller sizes should be used for utility/low use programs (like this one), while large sizes are for important programs. - requires_ntnet = 0 // This particular program does not require NTNet network conectivity... - available_on_ntnet = 1 // ... but we want it to be available for download. - nanomodule_path = /datum/nano_module/arcade_classic/ // Path of relevant nano module. The nano module is defined further in the file. - var/picked_enemy_name + filename = "dsarcade" // File name, as shown in the file browser program. + filedesc = "Donksoft Micro Arcade" // User-Friendly name. + program_icon_state = "arcade" // Icon state of this program's screen. + extended_desc = "This is a port of the classic game 'Outbomb Cuban Pete', redesigned to run on tablets; Now with thrilling graphics and chilling storytelling." // A nice description. + size = 6 // Size in GQ. Integers only. Smaller sizes should be used for utility/low use programs (like this one), while large sizes are for important programs. + requires_ntnet = FALSE // This particular program does not require NTNet network conectivity... + available_on_ntnet = TRUE // ... but we want it to be available for download. + tgui_id = "NtosArcade" // Path of relevant tgui template.js file. -// Blatantly stolen and shortened version from arcade machines. Generates a random enemy name -/datum/computer_file/program/game/proc/random_enemy_name() - var/name_part1 = pick("the Automatic ", "Farmer ", "Lord ", "Professor ", "the Cuban ", "the Evil ", "the Dread King ", "the Space ", "Lord ", "the Great ", "Duke ", "General ") - var/name_part2 = pick("Melonoid", "Murdertron", "Sorcerer", "Ruin", "Jeff", "Ectoplasm", "Crushulon", "Uhangoid", "Vhakoid", "Peteoid", "Slime", "Lizard Man", "Unicorn") - return "[name_part1] [name_part2]" + ///Returns TRUE if the game is being played. + var/game_active = TRUE + ///This disables buttom actions from having any impact if TRUE. Resets to FALSE when the player is allowed to make an action again. + var/pause_state = FALSE + var/boss_hp = 45 + var/boss_mp = 15 + var/player_hp = 30 + var/player_mp = 10 + var/ticket_count = 0 + ///Shows what text is shown on the app, usually showing the log of combat actions taken by the player. + var/heads_up = "Nanotrasen says, winners make us money." + var/boss_name = "Cuban Pete's Minion" + ///Determines which boss image to use on the UI. + var/boss_id = 1 -// When the program is first created, we generate a new enemy name and name ourselves accordingly. -/datum/computer_file/program/game/New() - ..() - picked_enemy_name = random_enemy_name() - filedesc = "Defeat [picked_enemy_name]" +// This is the primary game loop, which handles the logic of being defeated or winning. +/datum/computer_file/program/game/proc/game_check(mob/user) + sleep(5) + if(boss_hp <= 0) + heads_up = "You have crushed [boss_name]! Rejoice!" + playsound(computer.loc, 'sound/arcade/win.ogg', 50, TRUE, extrarange = -3, falloff = 10) + game_active = FALSE + program_icon_state = "arcade_off" + if(istype(computer)) + computer.update_icon() + ticket_count += 1 + // user?.mind?.adjust_experience(/datum/skill/gaming, 50) + sleep(10) + else if(player_hp <= 0 || player_mp <= 0) + heads_up = "You have been defeated... how will the station survive?" + playsound(computer.loc, 'sound/arcade/lose.ogg', 50, TRUE, extrarange = -3, falloff = 10) + game_active = FALSE + program_icon_state = "arcade_off" + if(istype(computer)) + computer.update_icon() + // user?.mind?.adjust_experience(/datum/skill/gaming, 10) + sleep(10) -// Important in order to ensure that copied versions will have the same enemy name. -/datum/computer_file/program/game/clone() - var/datum/computer_file/program/game/G = ..() - G.picked_enemy_name = picked_enemy_name - return G - -// When running the program, we also want to pass our enemy name to the nano module. -/datum/computer_file/program/game/run_program() - . = ..() - if(. && NM) - var/datum/nano_module/arcade_classic/NMC = NM - NMC.enemy_name = picked_enemy_name - - -// Nano module the program uses. -// This can be either /datum/nano_module/ or /datum/nano_module/program. The latter is intended for nano modules that are suposed to be exclusively used with modular computers, -// and should generally not be used, as such nano modules are hard to use on other places. -/datum/nano_module/arcade_classic/ - name = "Classic Arcade" - var/player_mana // Various variables specific to the nano module. In this case, the nano module is a simple arcade game, so the variables store health and other stats. - var/player_health - var/enemy_mana - var/enemy_health - var/enemy_name = "Greytide Horde" - var/gameover - var/information - -/datum/nano_module/arcade_classic/New() - ..() - new_game() - -// ui_interact handles transfer of data to NanoUI. Keep in mind that data you pass from here is actually sent to the client. In other words, don't send anything you don't want a client -// to see, and don't send unnecessarily large amounts of data (due to laginess). -/datum/nano_module/arcade_classic/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - var/list/data = host.initial_data() - - data["player_health"] = player_health - data["player_mana"] = player_mana - data["enemy_health"] = enemy_health - data["enemy_mana"] = enemy_mana - data["enemy_name"] = enemy_name - data["gameover"] = gameover - data["information"] = information - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "arcade_classic.tmpl", "Defeat [enemy_name]", 500, 350, state = state) - if(host.update_layout()) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - -// Three helper procs i've created. These are unique to this particular nano module. If you are creating your own nano module, you'll most likely create similar procs too. -/datum/nano_module/arcade_classic/proc/enemy_play() - if((enemy_mana < 5) && prob(60)) - var/steal = rand(2, 3) - player_mana -= steal - enemy_mana += steal - information += "[enemy_name] steals [steal] of your power!" - else if((enemy_health < 15) && (enemy_mana > 3) && prob(80)) - var/healamt = min(rand(3, 5), enemy_mana) - enemy_mana -= healamt - enemy_health += healamt - information += "[enemy_name] heals for [healamt] health!" +// This handles the boss "AI". +/datum/computer_file/program/game/proc/enemy_check(mob/user) + var/boss_attackamt = 0 //Spam protection from boss attacks as well. + var/boss_mpamt = 0 + var/bossheal = 0 + if(pause_state == TRUE) + boss_attackamt = rand(3,6) + boss_mpamt = rand (2,4) + bossheal = rand (4,6) + if(game_active == FALSE) + return + if(boss_mp <= 5) + heads_up = "[boss_mpamt] magic power has been stolen from you!" + playsound(computer.loc, 'sound/arcade/steal.ogg', 50, TRUE, extrarange = -3, falloff = 10) + player_mp -= boss_mpamt + boss_mp += boss_mpamt + else if(boss_mp > 5 && boss_hp <12) + heads_up = "[boss_name] heals for [bossheal] health!" + playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10) + boss_hp += bossheal + boss_mp -= boss_mpamt else - var/dam = rand(3,6) - player_health -= dam - information += "[enemy_name] attacks for [dam] damage!" + heads_up = "[boss_name] attacks you for [boss_attackamt] damage!" + playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10) + player_hp -= boss_attackamt -/datum/nano_module/arcade_classic/proc/check_gameover() - if((player_health <= 0) || player_mana <= 0) - if(enemy_health <= 0) - information += "You have defeated [enemy_name], but you have died in the fight!" - else - information += "You have been defeated by [enemy_name]!" - gameover = 1 + pause_state = FALSE + game_check() + +/** + * UI assets define a list of asset datums to be sent with the UI. + * In this case, it's a bunch of cute enemy sprites. + */ +/datum/computer_file/program/game/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/simple/arcade), + ) + +/** + * This provides all of the relevant data to the UI in a list(). + */ +/datum/computer_file/program/game/tgui_data(mob/user) + var/list/data = get_header_data() + data["Hitpoints"] = boss_hp + data["PlayerHitpoints"] = player_hp + data["PlayerMP"] = player_mp + data["TicketCount"] = ticket_count + data["GameActive"] = game_active + data["PauseState"] = pause_state + data["Status"] = heads_up + data["BossID"] = "boss[boss_id].gif" + return data + +/** + * This is tgui's replacement for Topic(). It handles any user input from the UI. + */ +/datum/computer_file/program/game/tgui_act(action, list/params) + if(..()) // Always call parent in tgui_act, it handles making sure the user is allowed to interact with the UI. return TRUE - else if(enemy_health <= 0) - gameover = 1 - information += "Congratulations! You have defeated [enemy_name]!" - return TRUE - return FALSE -/datum/nano_module/arcade_classic/proc/new_game() - player_mana = 10 - player_health = 30 - enemy_mana = 20 - enemy_health = 45 - gameover = FALSE - information = "A new game has started!" + var/obj/item/weapon/computer_hardware/nano_printer/printer + if(computer) + printer = computer.nano_printer - - -/datum/nano_module/arcade_classic/Topic(href, href_list) - if(..()) // Always begin your Topic() calls with a parent call! - return 1 - if(href_list["new_game"]) - new_game() - return 1 // Returning 1 (TRUE) in Topic automatically handles UI updates. - if(gameover) // If the game has already ended, we don't want the following three topic calls to be processed at all. - return 1 // Instead of adding checks into each of those three, we can easily add this one check here to reduce on code copy-paste. - if(href_list["attack"]) - var/damage = rand(2, 6) - information = "You attack for [damage] damage." - enemy_health -= damage - enemy_play() - check_gameover() - return 1 - if(href_list["heal"]) - var/healfor = rand(6, 8) - var/cost = rand(1, 3) - information = "You heal yourself for [healfor] damage, using [cost] energy in the process." - player_health += healfor - player_mana -= cost - enemy_play() - check_gameover() - return 1 - if(href_list["regain_mana"]) - var/regen = rand(4, 7) - information = "You rest of a while, regaining [regen] energy." - player_mana += regen - enemy_play() - check_gameover() - return 1 \ No newline at end of file + // var/gamerSkillLevel = usr.mind?.get_skill_level(/datum/skill/gaming) + // var/gamerSkill = usr.mind?.get_skill_modifier(/datum/skill/gaming, SKILL_RANDS_MODIFIER) + switch(action) + if("Attack") + var/attackamt = 0 //Spam prevention. + if(pause_state == FALSE) + attackamt = rand(2,6) // + rand(0, gamerSkill) + pause_state = TRUE + heads_up = "You attack for [attackamt] damage." + playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3, falloff = 10) + boss_hp -= attackamt + sleep(10) + game_check() + enemy_check() + return TRUE + if("Heal") + var/healamt = 0 //More Spam Prevention. + var/healcost = 0 + if(pause_state == FALSE) + healamt = rand(6,8) // + rand(0, gamerSkill) + var/maxPointCost = 3 + // if(gamerSkillLevel >= SKILL_LEVEL_JOURNEYMAN) + // maxPointCost = 2 + healcost = rand(1, maxPointCost) + pause_state = TRUE + heads_up = "You heal for [healamt] damage." + playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE, extrarange = -3, falloff = 10) + player_hp += healamt + player_mp -= healcost + sleep(10) + game_check() + enemy_check() + return TRUE + if("Recharge_Power") + var/rechargeamt = 0 //As above. + if(pause_state == FALSE) + rechargeamt = rand(4,7) // + rand(0, gamerSkill) + pause_state = TRUE + heads_up = "You regain [rechargeamt] magic power." + playsound(computer.loc, 'sound/arcade/mana.ogg', 50, TRUE, extrarange = -3, falloff = 10) + player_mp += rechargeamt + sleep(10) + game_check() + enemy_check() + return TRUE + if("Dispense_Tickets") + if(!printer) + to_chat(usr, "Hardware error: A printer is required to redeem tickets.") + return + if(printer.stored_paper <= 0) + to_chat(usr, "Hardware error: Printer is out of paper.") + return + else + computer.visible_message("\The [computer] prints out paper.") + if(ticket_count >= 1) + new /obj/item/stack/arcadeticket((get_turf(computer)), 1) + to_chat(usr, "[src] dispenses a ticket!") + ticket_count -= 1 + printer.stored_paper -= 1 + else + to_chat(usr, "You don't have any stored tickets!") + return TRUE + if("Start_Game") + game_active = TRUE + boss_hp = 45 + player_hp = 30 + player_mp = 10 + heads_up = "You stand before [boss_name]! Prepare for battle!" + program_icon_state = "arcade" + boss_id = rand(1,6) + pause_state = FALSE + if(istype(computer)) + computer.update_icon() diff --git a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm index 1d4da6d4d5..e72e30fd38 100644 --- a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm @@ -6,16 +6,17 @@ program_key_state = "generic_key" program_menu_icon = "contact" size = 4 - requires_ntnet = 1 - available_on_ntnet = 1 + requires_ntnet = TRUE + available_on_ntnet = TRUE + + tgui_id = "NtosNewsBrowser" - nanomodule_path = /datum/nano_module/program/computer_newsbrowser/ var/datum/computer_file/data/news_article/loaded_article var/download_progress = 0 var/download_netspeed = 0 - var/downloading = 0 + var/downloading = FALSE var/message = "" - var/show_archived = 0 + var/show_archived = FALSE /datum/computer_file/program/newsbrowser/process_tick() if(!downloading) @@ -33,86 +34,31 @@ if(download_progress >= loaded_article.size) downloading = 0 requires_ntnet = 0 // Turn off NTNet requirement as we already loaded the file into local memory. - SSnanoui.update_uis(NM) + SStgui.update_uis(src) -/datum/computer_file/program/newsbrowser/kill_program() - ..() - requires_ntnet = 1 - loaded_article = null - download_progress = 0 - downloading = 0 - show_archived = 0 +/datum/computer_file/program/newsbrowser/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = get_header_data() -/datum/computer_file/program/newsbrowser/Topic(href, href_list) - if(..()) - return 1 - if(href_list["PRG_openarticle"]) - . = 1 - if(downloading || loaded_article) - return 1 - - for(var/datum/computer_file/data/news_article/N in ntnet_global.available_news) - if(N.uid == text2num(href_list["PRG_openarticle"])) - loaded_article = N.clone() - downloading = 1 - break - if(href_list["PRG_reset"]) - . = 1 - downloading = 0 - download_progress = 0 - requires_ntnet = 1 - loaded_article = null - if(href_list["PRG_clearmessage"]) - . = 1 - message = "" - if(href_list["PRG_savearticle"]) - . = 1 - if(downloading || !loaded_article) - return - - var/savename = sanitize(input(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename)) - if(!savename) - return 1 - var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive - if(!HDD) - return 1 - var/datum/computer_file/data/news_article/N = loaded_article.clone() - N.filename = savename - HDD.store_file(N) - if(href_list["PRG_toggle_archived"]) - . = 1 - show_archived = !show_archived - if(.) - SSnanoui.update_uis(NM) - - -/datum/nano_module/program/computer_newsbrowser - name = "NTNet/ExoNet News Browser" - -/datum/nano_module/program/computer_newsbrowser/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - - var/datum/computer_file/program/newsbrowser/PRG - var/list/data = list() - if(program) - data = program.get_header_data() - PRG = program - else - return - - data["message"] = PRG.message - if(PRG.loaded_article && !PRG.downloading) // Viewing an article. - data["title"] = PRG.loaded_article.filename - data["cover"] = PRG.loaded_article.cover - data["article"] = PRG.loaded_article.stored_data - else if(PRG.downloading) // Downloading an article. - data["download_running"] = 1 - data["download_progress"] = PRG.download_progress - data["download_maxprogress"] = PRG.loaded_article.size - data["download_rate"] = PRG.download_netspeed + var/list/all_articles = list() + data["message"] = message + data["showing_archived"] = show_archived + data["download"] = null + data["article"] = null + if(loaded_article && !downloading) // Viewing an article. + data["article"] = list( + "title" = loaded_article.filename, + "cover" = loaded_article.cover, + "content" = loaded_article.stored_data, + ) + else if(downloading) // Downloading an article. + data["download"] = list( + "download_progress" = download_progress, + "download_maxprogress" = loaded_article.size, + "download_rate" = download_netspeed + ) else // Viewing list of articles - var/list/all_articles[0] for(var/datum/computer_file/data/news_article/F in ntnet_global.available_news) - if(!PRG.show_archived && F.archived) + if(!show_archived && F.archived) continue all_articles.Add(list(list( "name" = F.filename, @@ -120,12 +66,56 @@ "uid" = F.uid, "archived" = F.archived ))) - data["all_articles"] = all_articles - data["showing_archived"] = PRG.show_archived + data["all_articles"] = all_articles + + return data + +/datum/computer_file/program/newsbrowser/kill_program() + ..() + requires_ntnet = TRUE + loaded_article = null + download_progress = 0 + downloading = FALSE + show_archived = FALSE + +/datum/computer_file/program/newsbrowser/tgui_act(action, list/params, datum/tgui/ui) + if(..()) + return TRUE + switch(action) + if("PRG_openarticle") + . = TRUE + if(downloading || loaded_article) + return TRUE + + for(var/datum/computer_file/data/news_article/N in ntnet_global.available_news) + if(N.uid == text2num(params["uid"])) + loaded_article = N.clone() + downloading = 1 + break + if("PRG_reset") + . = TRUE + downloading = 0 + download_progress = 0 + requires_ntnet = 1 + loaded_article = null + if("PRG_clearmessage") + . = TRUE + message = "" + if("PRG_savearticle") + . = TRUE + if(downloading || !loaded_article) + return + + var/savename = sanitize(input(usr, "Enter file name or leave blank to cancel:", "Save article", loaded_article.filename)) + if(!savename) + return TRUE + var/obj/item/weapon/computer_hardware/hard_drive/HDD = computer.hard_drive + if(!HDD) + return TRUE + var/datum/computer_file/data/news_article/N = loaded_article.clone() + N.filename = savename + HDD.store_file(N) + if("PRG_toggle_archived") + . = TRUE + show_archived = !show_archived - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "news_browser.tmpl", "NTNet/ExoNet News Browser", 575, 750, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() diff --git a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm index a0b2194168..14e2343e66 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm @@ -5,29 +5,26 @@ program_key_state = "generic_key" program_menu_icon = "arrowthickstop-1-s" extended_desc = "This program allows downloads of software from official NT repositories" - unsendable = 1 - undeletable = 1 + unsendable = TRUE + undeletable = TRUE size = 4 - requires_ntnet = 1 + requires_ntnet = TRUE requires_ntnet_feature = NTNET_SOFTWAREDOWNLOAD - available_on_ntnet = 0 - nanomodule_path = /datum/nano_module/program/computer_ntnetdownload/ + available_on_ntnet = FALSE ui_header = "downloader_finished.gif" + tgui_id = "NtosNetDownloader" + var/datum/computer_file/program/downloaded_file = null var/hacked_download = 0 var/download_completion = 0 //GQ of downloaded data. var/download_netspeed = 0 var/downloaderror = "" + var/obj/item/modular_computer/my_computer = null var/list/downloads_queue[0] /datum/computer_file/program/ntnetdownload/kill_program() ..() - downloaded_file = null - download_completion = 0 - download_netspeed = 0 - downloaderror = "" - ui_header = "downloader_finished.gif" - + abort_file_download() /datum/computer_file/program/ntnetdownload/proc/begin_file_download(var/filename) if(downloaded_file) @@ -108,93 +105,85 @@ download_netspeed = NTNETSPEED_ETHERNET download_completion += download_netspeed -/datum/computer_file/program/ntnetdownload/Topic(href, href_list) +/datum/computer_file/program/ntnetdownload/tgui_act(action, params) if(..()) - return 1 - if(href_list["PRG_downloadfile"]) - if(!downloaded_file) - begin_file_download(href_list["PRG_downloadfile"]) - else if(check_file_download(href_list["PRG_downloadfile"]) && !downloads_queue.Find(href_list["PRG_downloadfile"]) && downloaded_file.filename != href_list["PRG_downloadfile"]) - downloads_queue += href_list["PRG_downloadfile"] - return 1 - if(href_list["PRG_removequeued"]) - downloads_queue.Remove(href_list["PRG_removequeued"]) - return 1 - if(href_list["PRG_reseterror"]) - if(downloaderror) - download_completion = 0 - download_netspeed = 0 - downloaded_file = null - downloaderror = "" - return 1 - return 0 - -/datum/nano_module/program/computer_ntnetdownload - name = "Network Downloader" - var/obj/item/modular_computer/my_computer = null - -/datum/nano_module/program/computer_ntnetdownload/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - if(program) - my_computer = program.computer + return TRUE + switch(action) + if("PRG_downloadfile") + if(!downloaded_file) + begin_file_download(params["filename"]) + else if(check_file_download(params["filename"]) && !downloads_queue.Find(params["filename"]) && downloaded_file.filename != params["filename"]) + downloads_queue += params["filename"] + return TRUE + if("PRG_removequeued") + downloads_queue.Remove(params["filename"]) + return TRUE + if("PRG_reseterror") + if(downloaderror) + download_completion = 0 + download_netspeed = 0 + downloaded_file = null + downloaderror = "" + return TRUE + return FALSE +/datum/computer_file/program/ntnetdownload/tgui_data(mob/user) + my_computer = computer if(!istype(my_computer)) return - var/list/data = list() - var/datum/computer_file/program/ntnetdownload/prog = program - // For now limited to execution by the downloader program - if(!prog || !istype(prog)) - return - if(program) - data = program.get_header_data() + var/list/data = get_header_data() - // This IF cuts on data transferred to client, so i guess it's worth it. - if(prog.downloaderror) // Download errored. Wait until user resets the program. - data["error"] = prog.downloaderror - if(prog.downloaded_file) // Download running. Wait please.. - data["downloadname"] = prog.downloaded_file.filename - data["downloaddesc"] = prog.downloaded_file.filedesc - data["downloadsize"] = prog.downloaded_file.size - data["downloadspeed"] = prog.download_netspeed - data["downloadcompletion"] = round(prog.download_completion, 0.1) + data["downloading"] = !!downloaded_file + data["error"] = downloaderror || FALSE + + if(downloaded_file) // Download running. Wait please.. + data["downloadname"] = downloaded_file.filename + data["downloaddesc"] = downloaded_file.filedesc + data["downloadsize"] = downloaded_file.size + data["downloadspeed"] = download_netspeed + data["downloadcompletion"] = round(download_completion, 0.1) data["disk_size"] = my_computer.hard_drive.max_capacity data["disk_used"] = my_computer.hard_drive.used_capacity var/list/all_entries[0] for(var/datum/computer_file/program/P in ntnet_global.available_station_software) // Only those programs our user can run will show in the list - if(!P.can_run(user) && P.requires_access_to_download) + if(!P.can_run(user) && P.requires_access_to_download || my_computer.hard_drive.find_file_by_name(P.filename)) continue all_entries.Add(list(list( - "filename" = P.filename, - "filedesc" = P.filedesc, - "fileinfo" = P.extended_desc, - "size" = P.size, - "icon" = P.program_menu_icon - ))) - data["hackedavailable"] = 0 - if(prog.computer_emagged) // If we are running on emagged computer we have access to some "bonus" software - var/list/hacked_programs[0] - for(var/datum/computer_file/program/P in ntnet_global.available_antag_software) - data["hackedavailable"] = 1 - hacked_programs.Add(list(list( "filename" = P.filename, "filedesc" = P.filedesc, "fileinfo" = P.extended_desc, + "compatibility" = check_compatibility(P), "size" = P.size, "icon" = P.program_menu_icon + ))) + data["hackedavailable"] = FALSE + if(computer_emagged) // If we are running on emagged computer we have access to some "bonus" software + var/list/hacked_programs[0] + for(var/datum/computer_file/program/P in ntnet_global.available_antag_software) + if(my_computer.hard_drive.find_file_by_name(P.filename)) + continue + data["hackedavailable"] = TRUE + hacked_programs.Add(list(list( + "filename" = P.filename, + "filedesc" = P.filedesc, + "fileinfo" = P.extended_desc, + "compatibility" = check_compatibility(P), + "size" = P.size, + "icon" = P.program_menu_icon ))) data["hacked_programs"] = hacked_programs data["downloadable_programs"] = all_entries + data["downloads_queue"] = downloads_queue - if(prog.downloads_queue.len > 0) - data["downloads_queue"] = prog.downloads_queue + return data - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "ntnet_downloader.tmpl", "NTNet Download Program", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) +/datum/computer_file/program/ntnetdownload/proc/check_compatibility(datum/computer_file/program/P) + var/hardflag = computer.hardware_flag + + if(P && P.is_supported_by_hardware(hardflag,0)) + return "Compatible" + return "Incompatible!" diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm index 6c67c02c0d..f2466213f3 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -11,222 +11,220 @@ network_destination = "NTNRC server" ui_header = "ntnrc_idle.gif" available_on_ntnet = 1 - nanomodule_path = /datum/nano_module/program/computer_chatclient/ - var/last_message = null // Used to generate the toolbar icon + tgui_id = "NtosNetChat" + var/last_message // Used to generate the toolbar icon var/username - var/datum/ntnet_conversation/channel = null - var/operator_mode = 0 // Channel operator mode - var/netadmin_mode = 0 // Administrator mode (invisible to other users + bypasses passwords) + var/active_channel + var/list/channel_history = list() + var/operator_mode = FALSE // Channel operator mode + var/netadmin_mode = FALSE // Administrator mode (invisible to other users + bypasses passwords) /datum/computer_file/program/chatclient/New() username = "DefaultUser[rand(100, 999)]" -/datum/computer_file/program/chatclient/Topic(href, href_list) +/datum/computer_file/program/chatclient/tgui_act(action, params) if(..()) - return 1 + return - if(href_list["PRG_speak"]) - . = 1 - if(!channel) - return 1 - var/mob/living/user = usr - var/message = sanitize(input(user, "Enter message or leave blank to cancel: "), 512) - if(!message || !channel) - return - channel.add_message(message, username) + var/datum/ntnet_conversation/channel = ntnet_global.get_chat_channel_by_id(active_channel) + var/authed = FALSE + if(channel && ((channel.operator == src) || netadmin_mode)) + authed = TRUE + switch(action) + if("PRG_speak") + if(!channel || isnull(active_channel)) + return + var/message = reject_bad_text(params["message"]) + if(!message) + return + if(channel.password && !(src in channel.clients)) + if(channel.password == message) + channel.add_client(src) + return TRUE - if(href_list["PRG_joinchannel"]) - . = 1 - var/datum/ntnet_conversation/C - for(var/datum/ntnet_conversation/chan in ntnet_global.chat_channels) - if(chan.id == text2num(href_list["PRG_joinchannel"])) - C = chan - break + channel.add_message(message, username) + // var/mob/living/user = usr + // user.log_talk(message, LOG_CHAT, tag="as [username] to channel [channel.title]") + return TRUE + if("PRG_joinchannel") + var/new_target = text2num(params["id"]) + if(isnull(new_target) || new_target == active_channel) + return - if(!C) - return 1 + if(netadmin_mode) + active_channel = new_target // Bypasses normal leave/join and passwords. Technically makes the user invisible to others. + return TRUE - if(netadmin_mode) - channel = C // Bypasses normal leave/join and passwords. Technically makes the user invisible to others. - return 1 - - if(C.password) + active_channel = new_target + channel = ntnet_global.get_chat_channel_by_id(new_target) + if(!(src in channel.clients) && !channel.password) + channel.add_client(src) + return TRUE + if("PRG_leavechannel") + if(channel) + channel.remove_client(src) + active_channel = null + return TRUE + if("PRG_newchannel") + var/channel_title = reject_bad_text(params["new_channel_name"]) + if(!channel_title) + return + var/datum/ntnet_conversation/C = new /datum/ntnet_conversation() + C.add_client(src) + C.operator = src + C.title = channel_title + active_channel = C.id + return TRUE + if("PRG_toggleadmin") + if(netadmin_mode) + netadmin_mode = FALSE + if(channel) + channel.remove_client(src) // We shouldn't be in channel's user list, but just in case... + return TRUE var/mob/living/user = usr - var/password = sanitize(input(user,"Access Denied. Enter password:")) - if(C && (password == C.password)) - C.add_client(src) - channel = C - return 1 - C.add_client(src) - channel = C - if(href_list["PRG_leavechannel"]) - . = 1 - if(channel) - channel.remove_client(src) - channel = null - if(href_list["PRG_newchannel"]) - . = 1 - var/mob/living/user = usr - var/channel_title = sanitizeSafe(input(user,"Enter channel name or leave blank to cancel:"), 64) - if(!channel_title) - return - var/datum/ntnet_conversation/C = new/datum/ntnet_conversation() - C.add_client(src) - C.operator = src - channel = C - C.title = channel_title - if(href_list["PRG_toggleadmin"]) - . = 1 - if(netadmin_mode) - netadmin_mode = 0 - if(channel) - channel.remove_client(src) // We shouldn't be in channel's user list, but just in case... - channel = null - return 1 - var/mob/living/user = usr - if(can_run(usr, 1, access_network)) - if(channel) - var/response = alert(user, "Really engage admin-mode? You will be disconnected from your current channel!", "NTNRC Admin mode", "Yes", "No") - if(response == "Yes") - if(channel) - channel.remove_client(src) - channel = null - else - return - netadmin_mode = 1 - if(href_list["PRG_changename"]) - . = 1 - var/mob/living/user = usr - var/newname = sanitize(input(user,"Enter new nickname or leave blank to cancel:"), 20) - if(!newname) - return 1 - if(channel) - channel.add_status_message("[username] is now known as [newname].") - username = newname + if(can_run(user, TRUE, access_network)) + for(var/C in ntnet_global.chat_channels) + var/datum/ntnet_conversation/chan = C + chan.remove_client(src) + netadmin_mode = TRUE + return TRUE + if("PRG_changename") + var/newname = sanitize(params["new_name"]) + if(!newname) + return + for(var/C in ntnet_global.chat_channels) + var/datum/ntnet_conversation/chan = C + if(src in chan.clients) + chan.add_status_message("[username] is now known as [newname].") + username = newname + return TRUE + if("PRG_savelog") + if(!channel) + return + var/logname = stripped_input(params["log_name"]) + if(!logname) + return + var/datum/computer_file/data/logfile = new /datum/computer_file/data/logfile() + // Now we will generate HTML-compliant file that can actually be viewed/printed. + logfile.filename = logname + logfile.stored_data = "\[b\]Logfile dump from NTNRC channel [channel.title]\[/b\]\[BR\]" + for(var/logstring in channel.messages) + logfile.stored_data = "[logfile.stored_data][logstring]\[BR\]" + logfile.stored_data = "[logfile.stored_data]\[b\]Logfile dump completed.\[/b\]" + logfile.calculate_size() + if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(logfile)) + if(!computer) + // This program shouldn't even be runnable without computer. + CRASH("Var computer is null!") + if(!computer.hard_drive) + computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.") + else // In 99.9% cases this will mean our HDD is full + computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.") + return TRUE + if("PRG_renamechannel") + if(!authed) + return + var/newname = reject_bad_text(params["new_name"]) + if(!newname || !channel) + return + channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.") + channel.title = newname + return TRUE + if("PRG_deletechannel") + if(authed) + qdel(channel) + active_channel = null + return TRUE + if("PRG_setpassword") + if(!authed) + return - if(href_list["PRG_savelog"]) - . = 1 - if(!channel) - return - var/mob/living/user = usr - var/logname = input(user,"Enter desired logfile name (.log) or leave blank to cancel:") - if(!logname || !channel) - return 1 - var/datum/computer_file/data/logfile = new/datum/computer_file/data/logfile() - // Now we will generate HTML-compliant file that can actually be viewed/printed. - logfile.filename = logname - logfile.stored_data = "\[b\]Logfile dump from NTNRC channel [channel.title]\[/b\]\[BR\]" - for(var/logstring in channel.messages) - logfile.stored_data += "[logstring]\[BR\]" - logfile.stored_data += "\[b\]Logfile dump completed.\[/b\]" - logfile.calculate_size() - if(!computer || !computer.hard_drive || !computer.hard_drive.store_file(logfile)) - if(!computer) - // This program shouldn't even be runnable without computer. - CRASH("Var computer is null!") - return 1 - if(!computer.hard_drive) - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.") - else // In 99.9% cases this will mean our HDD is full - computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.") - if(href_list["PRG_renamechannel"]) - . = 1 - if(!operator_mode || !channel) - return 1 - var/mob/living/user = usr - var/newname = sanitize(input(user, "Enter new channel name or leave blank to cancel:"), 64) - if(!newname || !channel) - return - channel.add_status_message("Channel renamed from [channel.title] to [newname] by operator.") - channel.title = newname - if(href_list["PRG_deletechannel"]) - . = 1 - if(channel && ((channel.operator == src) || netadmin_mode)) - qdel(channel) - channel = null - if(href_list["PRG_setpassword"]) - . = 1 - if(!channel || ((channel.operator != src) && !netadmin_mode)) - return 1 + var/new_password = sanitize(params["new_password"]) + if(!authed) + return - var/mob/living/user = usr - var/newpassword = sanitize(input(user, "Enter new password for this channel. Leave blank to cancel, enter 'nopassword' to remove password completely:")) - if(!channel || !newpassword || ((channel.operator != src) && !netadmin_mode)) - return 1 - - if(newpassword == "nopassword") - channel.password = "" - else - channel.password = newpassword + channel.password = new_password + return TRUE /datum/computer_file/program/chatclient/process_tick() ..() + var/datum/ntnet_conversation/channel = ntnet_global.get_chat_channel_by_id(active_channel) if(program_state != PROGRAM_STATE_KILLED) ui_header = "ntnrc_idle.gif" if(channel) // Remember the last message. If there is no message in the channel remember null. - last_message = channel.messages.len ? channel.messages[channel.messages.len - 1] : null + last_message = length(channel.messages) ? channel.messages[channel.messages.len - 1] : null else last_message = null return 1 - if(channel && channel.messages && channel.messages.len) + if(channel?.messages?.len) ui_header = last_message == channel.messages[channel.messages.len - 1] ? "ntnrc_idle.gif" : "ntnrc_new.gif" else ui_header = "ntnrc_idle.gif" -/datum/computer_file/program/chatclient/kill_program(var/forced = 0) - if(channel) +/datum/computer_file/program/chatclient/kill_program(forced = FALSE) + for(var/C in ntnet_global.chat_channels) + var/datum/ntnet_conversation/channel = C channel.remove_client(src) - channel = null - ..(forced) - -/datum/nano_module/program/computer_chatclient - name = "NTNet Relay Chat Client" - -/datum/nano_module/program/computer_chatclient/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - if(!ntnet_global || !ntnet_global.chat_channels) - return + ..() +/datum/computer_file/program/chatclient/tgui_static_data(mob/user) var/list/data = list() - if(program) - data = program.get_header_data() + data["can_admin"] = can_run(user, FALSE, access_network) + return data + +/datum/computer_file/program/chatclient/tgui_data(mob/user) + if(!ntnet_global || !ntnet_global.chat_channels) + return list() - var/datum/computer_file/program/chatclient/C = program - if(!istype(C)) - return + var/list/data = get_header_data() - data["adminmode"] = C.netadmin_mode - if(C.channel) - data["title"] = C.channel.title - var/list/messages[0] - for(var/M in C.channel.messages) - messages.Add(list(list( - "msg" = M + var/list/all_channels = list() + for(var/C in ntnet_global.chat_channels) + var/datum/ntnet_conversation/conv = C + if(conv && conv.title) + all_channels.Add(list(list( + "chan" = conv.title, + "id" = conv.id ))) - data["messages"] = messages - var/list/clients[0] - for(var/datum/computer_file/program/chatclient/cl in C.channel.clients) + data["all_channels"] = all_channels + + data["active_channel"] = active_channel + data["username"] = username + data["adminmode"] = netadmin_mode + var/datum/ntnet_conversation/channel = ntnet_global.get_chat_channel_by_id(active_channel) + if(channel) + data["title"] = channel.title + var/authed = FALSE + if(!channel.password) + authed = TRUE + if(netadmin_mode) + authed = TRUE + var/list/clients = list() + for(var/C in channel.clients) + if(C == src) + authed = TRUE + var/datum/computer_file/program/chatclient/cl = C clients.Add(list(list( "name" = cl.username ))) - data["clients"] = clients - C.operator_mode = (C.channel.operator == C) ? 1 : 0 - data["is_operator"] = C.operator_mode || C.netadmin_mode - - else // Channel selection screen - var/list/all_channels[0] - for(var/datum/ntnet_conversation/conv in ntnet_global.chat_channels) - if(conv && conv.title) - all_channels.Add(list(list( - "chan" = conv.title, - "id" = conv.id + data["authed"] = authed + //no fishing for ui data allowed + if(authed) + data["clients"] = clients + var/list/messages = list() + for(var/M in channel.messages) + messages.Add(list(list( + "msg" = M ))) - data["all_channels"] = all_channels + data["messages"] = messages + data["is_operator"] = (channel.operator == src) || netadmin_mode + else + data["clients"] = list() + data["messages"] = list() + else + data["clients"] = list() + data["authed"] = FALSE + data["messages"] = list() - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "ntnet_chat.tmpl", "NTNet Relay Chat Client", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data \ No newline at end of file diff --git a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm index 0efed986ae..ea88d3597e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm +++ b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm @@ -12,7 +12,7 @@ var/global/nttransfer_uid = 0 requires_ntnet_feature = NTNET_PEERTOPEER network_destination = "other device via P2P tunnel" available_on_ntnet = 1 - nanomodule_path = /datum/nano_module/program/computer_nttransfer/ + tgui_id = "NtosNetTransfer" var/error = "" // Error screen var/server_password = "" // Optional password to download the file. @@ -75,111 +75,101 @@ var/global/nttransfer_uid = 0 remote = null download_completion = 0 +/datum/computer_file/program/nttransfer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = get_header_data() -/datum/nano_module/program/computer_nttransfer - name = "NTNet P2P Transfer Client" + data["error"] = error -/datum/nano_module/program/computer_nttransfer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) - if(!program) - return - var/datum/computer_file/program/nttransfer/PRG = program - if(!istype(PRG)) - return - - var/list/data = program.get_header_data() - - if(PRG.error) - data["error"] = PRG.error - else if(PRG.downloaded_file) - data["downloading"] = 1 - data["download_size"] = PRG.downloaded_file.size - data["download_progress"] = PRG.download_completion - data["download_netspeed"] = PRG.actual_netspeed - data["download_name"] = "[PRG.downloaded_file.filename].[PRG.downloaded_file.filetype]" - else if (PRG.provided_file) - data["uploading"] = 1 - data["upload_uid"] = PRG.unique_token - data["upload_clients"] = PRG.connected_clients.len - data["upload_haspassword"] = PRG.server_password ? 1 : 0 - data["upload_filename"] = "[PRG.provided_file.filename].[PRG.provided_file.filetype]" - else if (PRG.upload_menu) - var/list/all_files[0] - for(var/datum/computer_file/F in PRG.computer.hard_drive.stored_files) + data["downloading"] = !!downloaded_file + if(downloaded_file) + data["download_size"] = downloaded_file.size + data["download_progress"] = download_completion + data["download_netspeed"] = actual_netspeed + data["download_name"] = "[downloaded_file.filename].[downloaded_file.filetype]" + + data["uploading"] = !!provided_file + if(provided_file) + data["upload_uid"] = unique_token + data["upload_clients"] = connected_clients.len + data["upload_haspassword"] = server_password ? 1 : 0 + data["upload_filename"] = "[provided_file.filename].[provided_file.filetype]" + + data["upload_filelist"] = list() + if(upload_menu) + var/list/all_files = list() + for(var/datum/computer_file/F in computer.hard_drive.stored_files) all_files.Add(list(list( "uid" = F.uid, "filename" = "[F.filename].[F.filetype]", "size" = F.size ))) data["upload_filelist"] = all_files - else - var/list/all_servers[0] + + data["servers"] = list() + if(!(downloaded_file || provided_file || upload_menu)) + var/list/all_servers = list() for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers) if(!P.provided_file) continue all_servers.Add(list(list( - "uid" = P.unique_token, - "filename" = "[P.provided_file.filename].[P.provided_file.filetype]", - "size" = P.provided_file.size, - "haspassword" = P.server_password ? 1 : 0 + "uid" = P.unique_token, + "filename" = "[P.provided_file.filename].[P.provided_file.filetype]", + "size" = P.provided_file.size, + "haspassword" = P.server_password ? 1 : 0 ))) data["servers"] = all_servers - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "ntnet_transfer.tmpl", "NTNet P2P Transfer Client", 575, 700, state = state) - ui.auto_update_layout = 1 - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data -/datum/computer_file/program/nttransfer/Topic(href, href_list) +/datum/computer_file/program/nttransfer/tgui_act(action, list/params, datum/tgui/ui) if(..()) - return 1 - if(href_list["PRG_downloadfile"]) - for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers) - if("[P.unique_token]" == href_list["PRG_downloadfile"]) - remote = P - break - if(!remote || !remote.provided_file) - return - if(remote.server_password) - var/pass = sanitize(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required")) - if(pass != remote.server_password) - error = "Incorrect Password" + return TRUE + switch(action) + if("PRG_downloadfile") + for(var/datum/computer_file/program/nttransfer/P in ntnet_global.fileservers) + if(P.unique_token == text2num(params["uid"])) + remote = P + break + if(!remote || !remote.provided_file) return - downloaded_file = remote.provided_file.clone() - remote.connected_clients.Add(src) - return 1 - if(href_list["PRG_reset"]) - error = "" - upload_menu = 0 - finalize_download() - if(src in ntnet_global.fileservers) - ntnet_global.fileservers.Remove(src) - for(var/datum/computer_file/program/nttransfer/T in connected_clients) - T.crash_download("Remote server has forcibly closed the connection") - provided_file = null - return 1 - if(href_list["PRG_setpassword"]) - var/pass = sanitize(input(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none")) - if(!pass) - return - if(pass == "none") - server_password = "" - return - server_password = pass - return 1 - if(href_list["PRG_uploadfile"]) - for(var/datum/computer_file/F in computer.hard_drive.stored_files) - if("[F.uid]" == href_list["PRG_uploadfile"]) - if(F.unsendable) - error = "I/O Error: File locked." + if(remote.server_password) + var/pass = sanitize(input(usr, "Code 401 Unauthorized. Please enter password:", "Password required")) + if(pass != remote.server_password) + error = "Incorrect Password" return - provided_file = F - ntnet_global.fileservers.Add(src) + downloaded_file = remote.provided_file.clone() + remote.connected_clients.Add(src) + return TRUE + if("PRG_reset") + error = "" + upload_menu = 0 + finalize_download() + if(src in ntnet_global.fileservers) + ntnet_global.fileservers.Remove(src) + for(var/datum/computer_file/program/nttransfer/T in connected_clients) + T.crash_download("Remote server has forcibly closed the connection") + provided_file = null + return TRUE + if("PRG_setpassword") + var/pass = sanitize(input(usr, "Enter new server password. Leave blank to cancel, input 'none' to disable password.", "Server security", "none")) + if(!pass) return - error = "I/O Error: Unable to locate file on hard drive." - return 1 - if(href_list["PRG_uploadmenu"]) - upload_menu = 1 - return 0 + if(pass == "none") + server_password = "" + return + server_password = pass + return TRUE + if("PRG_uploadfile") + for(var/datum/computer_file/F in computer.hard_drive.stored_files) + if(F.uid == text2num(params["uid"])) + if(F.unsendable) + error = "I/O Error: File locked." + return + provided_file = F + ntnet_global.fileservers |= src + return + error = "I/O Error: Unable to locate file on hard drive." + return TRUE + if("PRG_uploadmenu") + upload_menu = 1 + return TRUE diff --git a/code/modules/modular_computers/file_system/programs/generic/uav.dm b/code/modules/modular_computers/file_system/programs/generic/uav.dm index 0e98d0e0ea..24d677b679 100644 --- a/code/modules/modular_computers/file_system/programs/generic/uav.dm +++ b/code/modules/modular_computers/file_system/programs/generic/uav.dm @@ -4,7 +4,7 @@ /datum/computer_file/program/uav filename = "rigger" filedesc = "UAV Control" - nanomodule_path = /datum/nano_module/uav + tguimodule_path = /datum/tgui_module/uav program_icon_state = "comm_monitor" program_key_state = "generic_key" program_menu_icon = "link" @@ -12,255 +12,3 @@ size = 12 available_on_ntnet = 1 //requires_ntnet = 1 - -/datum/nano_module/uav - name = "UAV Control program" - var/obj/item/device/uav/current_uav = null //The UAV we're watching - var/signal_strength = 0 //Our last signal strength report (cached for a few seconds) - var/signal_test_counter = 0 //How long until next signal strength check - var/list/viewers //Who's viewing a UAV through us - var/adhoc_range = 30 //How far we can operate on a UAV without NTnet - -/datum/nano_module/uav/Destroy() - if(LAZYLEN(viewers)) - for(var/weakref/W in viewers) - var/M = W.resolve() - if(M) - unlook(M) - . = ..() - -/datum/nano_module/uav/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = default_state) - var/list/data = host.initial_data() - - if(current_uav) - if(QDELETED(current_uav)) - set_current(null) - else if(signal_test_counter-- <= 0) - signal_strength = get_signal_to(current_uav) - if(!signal_strength) - set_current(null) - else // Don't reset counter until we find a UAV that's actually in range we can stay connected to - signal_test_counter = 20 - - data["current_uav"] = null - if(current_uav) - data["current_uav"] = list("status" = current_uav.get_status_string(), "power" = current_uav.state == 1 ? 1 : null) - data["signal_strength"] = signal_strength ? signal_strength >= 2 ? "High" : "Low" : "None" - data["in_use"] = LAZYLEN(viewers) - - var/list/paired_map = list() - var/obj/item/modular_computer/mc_host = nano_host() - if(istype(mc_host)) - for(var/puav in mc_host.paired_uavs) - var/weakref/wr = puav - var/obj/item/device/uav/U = wr.resolve() - paired_map[++paired_map.len] = list("name" = "[U ? U.nickname : "!!Missing!!"]", "uavref" = "\ref[U]") - - data["paired_uavs"] = paired_map - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "mod_uav.tmpl", "UAV Control", 600, 500, state = state) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) - -/datum/nano_module/uav/Topic(var/href, var/href_list = list(), var/datum/topic_state/state) - if((. = ..())) - return - state = state || DefaultTopicState() || global.default_state - if(CanUseTopic(usr, state, href_list) == STATUS_INTERACTIVE) - CouldUseTopic(usr) - return OnTopic(usr, href_list, state) - CouldNotUseTopic(usr) - return TRUE - -/datum/nano_module/uav/proc/OnTopic(var/mob/user, var/list/href_list) - if(href_list["switch_uav"]) - var/obj/item/device/uav/U = locate(href_list["switch_uav"]) //This is a \ref to the UAV itself - if(!istype(U)) - to_chat(usr,"Something is blocking the connection to that UAV. In-person investigation is required.") - return TOPIC_NOACTION - - if(!get_signal_to(U)) - to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") - return TOPIC_NOACTION - - set_current(U) - return TOPIC_REFRESH - - if(href_list["del_uav"]) - var/refstring = href_list["del_uav"] //This is a \ref to the UAV itself - var/obj/item/modular_computer/mc_host = nano_host() - //This is so we can really scrape up any weakrefs that can't resolve - for(var/weakref/wr in mc_host.paired_uavs) - if(wr.ref == refstring) - if(current_uav?.weakref == wr) - set_current(null) - LAZYREMOVE(mc_host.paired_uavs, wr) - - else if(href_list["view_uav"]) - if(!current_uav) - return TOPIC_NOACTION - - if(current_uav.check_eye(user) < 0) - to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") - else - viewing_uav(user) ? unlook(user) : look(user) - return TOPIC_NOACTION - - else if(href_list["power_uav"]) - if(!current_uav) - return TOPIC_NOACTION - else if(current_uav.toggle_power()) - //Clean up viewers faster - if(LAZYLEN(viewers)) - for(var/weakref/W in viewers) - var/M = W.resolve() - if(M) - unlook(M) - return TOPIC_REFRESH - -/datum/nano_module/uav/proc/DefaultTopicState() - return global.default_state - -/datum/nano_module/uav/proc/CouldNotUseTopic(mob/user) - . = ..() - unlook(user) - -/datum/nano_module/uav/proc/CouldUseTopic(mob/user) - . = ..() - if(viewing_uav(user)) - look(user) - -/datum/nano_module/uav/proc/set_current(var/obj/item/device/uav/U) - if(current_uav == U) - return - - signal_strength = 0 - current_uav = U - - if(LAZYLEN(viewers)) - for(var/weakref/W in viewers) - var/M = W.resolve() - if(M) - if(current_uav) - to_chat(M, "You're disconnected from the UAV's camera!") - unlook(M) - else - look(M) - -//// -//// Finding signal strength between us and the UAV -//// -/datum/nano_module/uav/proc/get_signal_to(var/atom/movable/AM) - // Following roughly the ntnet signal levels - // 0 is none - // 1 is weak - // 2 is strong - var/obj/item/modular_computer/host = nano_host() //Better not add this to anything other than modular computers. - if(!istype(host)) - return - var/our_signal = host.get_ntnet_status() //1 low, 2 good, 3 wired, 0 none - var/their_z = get_z(AM) - - //If we have no NTnet connection don't bother getting theirs - if(!our_signal) - if(get_z(host) == their_z && (get_dist(host, AM) < adhoc_range)) - return 1 //We can connect (with weak signal) in same z without ntnet, within 30 turfs - else - return 0 - - var/list/zlevels_in_range = using_map.get_map_levels(their_z, FALSE) - var/list/zlevels_in_long_range = using_map.get_map_levels(their_z, TRUE, om_range = DEFAULT_OVERMAP_RANGE) - zlevels_in_range - var/their_signal = 0 - for(var/relay in ntnet_global.relays) - var/obj/machinery/ntnet_relay/R = relay - if(!R.operable()) - continue - if(R.z == their_z) - their_signal = 2 - break - if(R.z in zlevels_in_range) - their_signal = 2 - break - if(R.z in zlevels_in_long_range) - their_signal = 1 - break - - if(!their_signal) //They have no NTnet at all - if(get_z(host) == their_z && (get_dist(host, AM) < adhoc_range)) - return 1 //We can connect (with weak signal) in same z without ntnet, within 30 turfs - else - return 0 - else - return max(our_signal, their_signal) - -//// -//// UAV viewer handling -//// -/datum/nano_module/uav/proc/viewing_uav(mob/user) - return (weakref(user) in viewers) - -/datum/nano_module/uav/proc/look(var/mob/user) - if(issilicon(user)) //Too complicated for me to want to mess with at the moment - to_chat(user, "Regulations prevent you from controlling several corporeal forms at the same time!") - return - - if(!current_uav) - return - - user.set_machine(nano_host()) - user.reset_view(current_uav) - current_uav.add_master(user) - LAZYDISTINCTADD(viewers, weakref(user)) - -/datum/nano_module/uav/proc/unlook(var/mob/user) - user.unset_machine() - user.reset_view() - if(current_uav) - current_uav.remove_master(user) - LAZYREMOVE(viewers, weakref(user)) - -/datum/nano_module/uav/check_eye(var/mob/user) - if(get_dist(user, nano_host()) > 1 || user.blinded || !current_uav) - unlook(user) - return -1 - - var/viewflag = current_uav.check_eye(user) - if (viewflag < 0) //camera doesn't work - unlook(user) - return -1 - - return viewflag - -//// -//// Relaying movements to the UAV -//// -/datum/nano_module/uav/relaymove(var/mob/user, direction) - if(current_uav) - return current_uav.relaymove(user, direction, signal_strength) - -//// -//// The effects when looking through a UAV -//// -/datum/nano_module/uav/apply_visual(var/mob/M) - if(!M.client) - return - if(weakref(M) in viewers) - M.overlay_fullscreen("fishbed",/obj/screen/fullscreen/fishbed) - M.overlay_fullscreen("scanlines",/obj/screen/fullscreen/scanline) - - if(signal_strength <= 1) - M.overlay_fullscreen("whitenoise",/obj/screen/fullscreen/noise) - else - M.clear_fullscreen("whitenoise", 0) - else - remove_visual(M) - -/datum/nano_module/uav/remove_visual(mob/M) - if(!M.client) - return - M.clear_fullscreen("fishbed",0) - M.clear_fullscreen("scanlines",0) - M.clear_fullscreen("whitenoise",0) diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm index 1a4d7a1871..61f3b43da8 100644 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -5,9 +5,10 @@ program_icon_state = "word" program_key_state = "atmos_key" size = 4 - requires_ntnet = 0 - available_on_ntnet = 1 - nanomodule_path = /datum/nano_module/program/computer_wordprocessor/ + requires_ntnet = FALSE + available_on_ntnet = TRUE + tgui_id = "NtosWordProcessor" + var/browsing var/open_file var/loaded_data @@ -28,7 +29,7 @@ if(F) open_file = F.filename loaded_data = F.stored_data - return 1 + return TRUE /datum/computer_file/program/wordprocessor/proc/save_file(var/filename) var/datum/computer_file/data/F = get_file(filename) @@ -46,7 +47,7 @@ HDD.store_file(backup) return 0 is_edited = 0 - return 1 + return TRUE /datum/computer_file/program/wordprocessor/proc/create_file(var/newname, var/data = "") if(!newname) @@ -64,142 +65,144 @@ if(HDD.store_file(F)) return F -/datum/computer_file/program/wordprocessor/Topic(href, href_list) +/datum/computer_file/program/wordprocessor/tgui_act(action, list/params, datum/tgui/ui) if(..()) - return 1 + return TRUE - if(href_list["PRG_txtrpeview"]) - show_browser(usr,"
Please swipe a card or insert cash to pay for the item." - status_error = 0 - - else if(href_list["cancelpurchase"]) - currently_vending = null - - else if((href_list["togglevoice"]) && (panel_open)) - shut_up = !shut_up - - add_fingerprint(usr) - SSnanoui.update_uis(src) + if(!H.nif.can_install(path)) + flick("[icon_state]-deny", entopic.my_image) + return FALSE + + if(initial(path.access)) + var/list/soft_access = list(initial(path.access)) + var/list/usr_access = user.GetAccess() + if(scan_id && !has_access(soft_access, list(), usr_access) && !emagged) + to_chat(user, "You aren't authorized to buy [initial(path.name)].") + flick("[icon_state]-deny", entopic.my_image) + return FALSE // Also special treatment! /obj/machinery/vending/nifsoft_shop/vend(datum/stored_item/vending_product/R, mob/user) var/mob/living/carbon/human/H = user - if((!allowed(usr)) && !emagged && scan_id && istype(H)) //For SECURE VENDING MACHINES YEAH - to_chat(usr, "Purchase not allowed.") //Unless emagged of course + if(!can_buy(R, user)) //For SECURE VENDING MACHINES YEAH + to_chat(user, "Purchase not allowed.") //Unless emagged of course flick("[icon_state]-deny",entopic.my_image) return vend_ready = 0 //One thing at a time!! - status_message = "Installing..." - status_error = 0 - SSnanoui.update_uis(src) + SStgui.update_uis(src) if(R.category & CAT_COIN) if(!coin) @@ -209,15 +157,14 @@ spawn(vend_delay) R.amount-- new R.item_path(H.nif) + H.nif.notify("New software installed: [R.item_name]") flick("[icon_state]-vend",entopic.my_image) if(has_logs) do_logging(R, user, 1) - status_message = "" - status_error = 0 vend_ready = 1 currently_vending = null - SSnanoui.update_uis(src) + SStgui.update_uis(src) return 1 //Can't throw intangible software at people. diff --git a/code/modules/nifsoft/nif_statpanel.dm b/code/modules/nifsoft/nif_statpanel.dm index 0cf2307b65..00e928429f 100644 --- a/code/modules/nifsoft/nif_statpanel.dm +++ b/code/modules/nifsoft/nif_statpanel.dm @@ -22,6 +22,7 @@ nif_status = "Unknown - Error" nif_status += " (Condition: [nif_percent]%)" stat("NIF Status", nif_status) + stat("UI", nif.our_statclick) // TGUI Hook if(nif.stat == NIF_WORKING) stat("- Modules -", "LMB: Toggle, Shift+LMB: Info/Uninstall") diff --git a/code/modules/nifsoft/nif_tgui.dm b/code/modules/nifsoft/nif_tgui.dm new file mode 100644 index 0000000000..23d8102f79 --- /dev/null +++ b/code/modules/nifsoft/nif_tgui.dm @@ -0,0 +1,114 @@ +/************************************************************************\ + * This module controls everything to do with the NIF's tgui interface. * +\************************************************************************/ +/** + * Etc variables on the NIF to keep this self contained + */ +/obj/item/device/nif + var/static/list/valid_ui_themes = list( + "abductor", + "cardtable", + "hackerman", + "malfunction", + "ntos", + "paper", + "retro", + "syndicate" + ) + var/tmp/obj/effect/statclick/nif_open/our_statclick + var/tmp/last_notification + +/** + * Special stat button for the interface + */ +/obj/effect/statclick/nif_open +/obj/effect/statclick/nif_open/Click(location, control, params) + var/obj/item/device/nif/N = target + if(istype(N)) + N.tgui_interact(usr) + +/** + * The NIF State ensures that only our authorized implanted user can touch us. + */ +/obj/item/device/nif/tgui_state(mob/user) + return GLOB.tgui_nif_main_state + +/** + * Standard TGUI stub to open the NIF.js template. + */ +/obj/item/device/nif/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "NIF", name) + ui.open() + +/** + * tgui_data gives the UI any relevant data it needs. + * In our case, that's basically everything from our statpanel. + */ +/obj/item/device/nif/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + data["theme"] = save_data["ui_theme"] + data["last_notification"] = last_notification + + // Random biometric information + data["nutrition"] = human.nutrition + data["isSynthetic"] = human.isSynthetic() + + data["nif_percent"] = round((durability/initial(durability))*100) + data["nif_stat"] = stat + + data["modules"] = list() + if(stat == NIF_WORKING) + for(var/nifsoft in nifsofts) + if(!nifsoft) + continue + var/datum/nifsoft/NS = nifsoft + data["modules"].Add(list(list( + "name" = NS.name, + "desc" = NS.desc, + "p_drain" = NS.p_drain, + "a_drain" = NS.a_drain, + "illegal" = NS.illegal, + "wear" = NS.wear, + "cost" = NS.cost, + "activates" = NS.activates, + "active" = NS.active, + "stat_text" = NS.stat_text(), + "ref" = REF(NS), + ))) + + return data + +/** + * tgui_act handles all user input in the UI. + */ +/obj/item/device/nif/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + switch(action) + if("setTheme") + if((params["theme"] in valid_ui_themes) || params["theme"] == null) + save_data["ui_theme"] = params["theme"] + return TRUE + if("toggle_module") + var/datum/nifsoft/NS = locate(params["module"]) in nifsofts + if(!istype(NS)) + return + if(NS.activates) + if(NS.active) + NS.deactivate() + else + NS.activate() + return TRUE + if("uninstall") + var/datum/nifsoft/NS = locate(params["module"]) in nifsofts + if(!istype(NS)) + return + NS.uninstall() + return TRUE + if("dismissNotification") + last_notification = null + return TRUE \ No newline at end of file diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index 0df241799f..ca1d0199a6 100644 --- a/code/modules/nifsoft/nifsoft.dm +++ b/code/modules/nifsoft/nifsoft.dm @@ -269,7 +269,8 @@ /obj/item/weapon/storage/box/nifsofts_security name = "security nifsoft uploaders" desc = "A box of free nifsofts for security employees." - icon_state = "disk_kit" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "nifsoft_kit_sec" /obj/item/weapon/storage/box/nifsofts_security/New() ..() @@ -293,7 +294,8 @@ /obj/item/weapon/storage/box/nifsofts_engineering name = "engineering nifsoft uploaders" desc = "A box of free nifsofts for engineering employees." - icon_state = "disk_kit" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "nifsoft_kit_eng" /obj/item/weapon/storage/box/nifsofts_engineering/New() ..() @@ -316,7 +318,8 @@ /obj/item/weapon/storage/box/nifsofts_medical name = "medical nifsoft uploaders" desc = "A box of free nifsofts for medical employees." - icon_state = "disk_kit" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "nifsoft_kit_med" /obj/item/weapon/storage/box/nifsofts_medical/New() ..() @@ -340,7 +343,8 @@ /obj/item/weapon/storage/box/nifsofts_mining name = "mining nifsoft uploaders" desc = "A box of free nifsofts for mining employees." - icon_state = "disk_kit" + icon = 'icons/obj/storage_vr.dmi' + icon_state = "nifsoft_kit_mining" /obj/item/weapon/storage/box/nifsofts_mining/New() ..() diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm index 7c7ca02079..7a792009f4 100644 --- a/code/modules/nifsoft/software/01_vision.dm +++ b/code/modules/nifsoft/software/01_vision.dm @@ -106,12 +106,12 @@ vision_flags = (NIF_V_MESONS) incompatible_with = list(NIF_MATERIAL,NIF_THERMALS,NIF_NIGHTVIS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.sight |= SEE_TURFS - if(H.client) - H.client.screen |= global_hud.meson +/datum/nifsoft/mesons/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.sight |= SEE_TURFS + if(H.client) + H.client.screen |= global_hud.meson /datum/nifsoft/material name = "Material Scanner" @@ -125,12 +125,12 @@ vision_flags = (NIF_V_MATERIAL) incompatible_with = list(NIF_MESONS,NIF_THERMALS,NIF_NIGHTVIS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.sight |= SEE_OBJS - if(H.client) - H.client.screen |= global_hud.material +/datum/nifsoft/material/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.sight |= SEE_OBJS + if(H.client) + H.client.screen |= global_hud.material /datum/nifsoft/thermals name = "Thermal Scanner" @@ -145,12 +145,12 @@ vision_flags = (NIF_V_THERMALS) incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_NIGHTVIS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.sight |= SEE_MOBS - if(H.client) - H.client.screen |= global_hud.thermal +/datum/nifsoft/thermals/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.sight |= SEE_MOBS + if(H.client) + H.client.screen |= global_hud.thermal /datum/nifsoft/nightvis name = "Low-Light Amp" @@ -164,9 +164,9 @@ vision_flags = (NIF_V_NIGHTVIS) incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_THERMALS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.see_in_dark += 7 - if(H.client) - H.client.screen |= global_hud.nvg +/datum/nifsoft/nightvis/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.see_in_dark += 7 + if(H.client) + H.client.screen |= global_hud.nvg diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm index 8ea4ef90c5..dfab36df3e 100644 --- a/code/modules/nifsoft/software/05_health.dm +++ b/code/modules/nifsoft/software/05_health.dm @@ -13,63 +13,63 @@ health_flags = (NIF_H_ORGREPAIR) //These self-activate on their own, these aren't user-settable to on/off. - activate() - if((. = ..())) - mode = 1 +/datum/nifsoft/medichines_org/activate() + if((. = ..())) + mode = 1 - deactivate() - if((. = ..())) - a_drain = initial(a_drain) - mode = initial(mode) - nif.human.Stasis(0) +/datum/nifsoft/medichines_org/deactivate() + if((. = ..())) + a_drain = initial(a_drain) + mode = initial(mode) + nif.human.Stasis(0) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - var/HP_percent = H.health/H.getMaxHealth() +/datum/nifsoft/medichines_org/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + var/HP_percent = H.health/H.getMaxHealth() - //Mode changing state machine - if(HP_percent >= 0.9) - if(mode) - nif.notify("User Status: NORMAL. Medichines deactivating.") - deactivate() - return TRUE - else if(!mode && HP_percent < 0.8) - nif.notify("User Status: INJURED. Commencing medichine routines.",TRUE) - activate() - else if(mode == 1 && HP_percent < 0.2) - nif.notify("User Status: DANGER. Seek medical attention!",TRUE) - mode = 2 - else if(mode == 2 && HP_percent < -0.4) - nif.notify("User Status: CRITICAL. Notifying medical, and starting emergency stasis!",TRUE) - mode = 3 - if(!isbelly(H.loc)) //Not notified in case of vore, for gameplay purposes. - var/turf/T = get_turf(H) - var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) - a.autosay("[H.real_name] has been put in emergency stasis, located at ([T.x],[T.y],[T.z])!", "[H.real_name]'s NIF", "Medical") - qdel(a) - - //Handle the actions in each mode - - //Injured but not critical + //Mode changing state machine + if(HP_percent >= 0.9) if(mode) - H.adjustToxLoss(-0.1 * mode) - H.adjustBruteLoss(-0.1 * mode) - H.adjustFireLoss(-0.1 * mode) - - if(mode >= 2) - nif.use_charge(a_drain) //A second drain if we're in level 2+ - - //Patient critical - emergency stasis - if(mode >= 3) - if(HP_percent <= 0) - H.Stasis(3) - if(HP_percent > 0.2) - H.Stasis(0) - nif.notify("Ending emergency stasis.",TRUE) - mode = 2 - + nif.notify("User Status: NORMAL. Medichines deactivating.") + deactivate() return TRUE + else if(!mode && HP_percent < 0.8) + nif.notify("User Status: INJURED. Commencing medichine routines.",TRUE) + activate() + else if(mode == 1 && HP_percent < 0.2) + nif.notify("User Status: DANGER. Seek medical attention!",TRUE) + mode = 2 + else if(mode == 2 && HP_percent < -0.4) + nif.notify("User Status: CRITICAL. Notifying medical, and starting emergency stasis!",TRUE) + mode = 3 + if(!isbelly(H.loc)) //Not notified in case of vore, for gameplay purposes. + var/turf/T = get_turf(H) + var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null) + a.autosay("[H.real_name] has been put in emergency stasis, located at ([T.x],[T.y],[T.z])!", "[H.real_name]'s NIF", "Medical") + qdel(a) + + //Handle the actions in each mode + + //Injured but not critical + if(mode) + H.adjustToxLoss(-0.1 * mode) + H.adjustBruteLoss(-0.1 * mode) + H.adjustFireLoss(-0.1 * mode) + + if(mode >= 2) + nif.use_charge(a_drain) //A second drain if we're in level 2+ + + //Patient critical - emergency stasis + if(mode >= 3) + if(HP_percent <= 0) + H.Stasis(3) + if(HP_percent > 0.2) + H.Stasis(0) + nif.notify("Ending emergency stasis.",TRUE) + mode = 2 + + return TRUE /datum/nifsoft/medichines_syn name = "Medichines" @@ -86,44 +86,44 @@ health_flags = (NIF_H_SYNTHREPAIR) //These self-activate on their own, these aren't user-settable to on/off. - activate() - if((. = ..())) - mode = 1 +/datum/nifsoft/medichines_syn/activate() + if((. = ..())) + mode = 1 - deactivate() - if((. = ..())) - mode = 0 - - life() - if((. = ..())) - //We're good! - if(!nif.human.bad_external_organs.len) - if(mode || active) - nif.notify("User Status: NORMAL. Medichines deactivating.") - deactivate() - return TRUE - - if(!mode && !active) - nif.notify("User Status: DAMAGED. Medichines performing minor repairs.",TRUE) - activate() - - for(var/eo in nif.human.bad_external_organs) - var/obj/item/organ/external/EO = eo - for(var/w in EO.wounds) - var/datum/wound/W = w - if(W.damage <= 5) - W.heal_damage(0.1) - EO.update_damages() - if(EO.update_icon()) - nif.human.UpdateDamageIcon(1) - nif.use_charge(0.1) - return TRUE //Return entirely, we only heal one at a time. - else if(mode == 1) - mode = 2 - nif.notify("Medichines unable to repair all damage. Perform manual repairs.",TRUE) +/datum/nifsoft/medichines_syn/deactivate() + if((. = ..())) + mode = 0 +/datum/nifsoft/medichines_syn/life() + if((. = ..())) + //We're good! + if(!nif.human.bad_external_organs.len) + if(mode || active) + nif.notify("User Status: NORMAL. Medichines deactivating.") + deactivate() return TRUE + if(!mode && !active) + nif.notify("User Status: DAMAGED. Medichines performing minor repairs.",TRUE) + activate() + + for(var/eo in nif.human.bad_external_organs) + var/obj/item/organ/external/EO = eo + for(var/w in EO.wounds) + var/datum/wound/W = w + if(W.damage <= 5) + W.heal_damage(0.1) + EO.update_damages() + if(EO.update_icon()) + nif.human.UpdateDamageIcon(1) + nif.use_charge(0.1) + return TRUE //Return entirely, we only heal one at a time. + else if(mode == 1) + mode = 2 + nif.notify("Medichines unable to repair all damage. Perform manual repairs.",TRUE) + + return TRUE + /datum/nifsoft/spare_breath name = "Respirocytes" desc = "Nanites simulating red blood cells will filter and recycle oxygen for a short time, preventing suffocation in hostile environments. NOTE: Only capable of supplying OXYGEN." @@ -137,47 +137,47 @@ var/filled = 100 //Tracks the internal tank 'refilling', which still uses power health_flags = (NIF_H_SPAREBREATH) - activate() - if(!(filled > 50)) - nif.notify("Respirocytes not saturated!",TRUE) - return FALSE - if((. = ..())) - nif.notify("Now taking air from reserves.") +/datum/nifsoft/spare_breath/activate() + if(!(filled > 50)) + nif.notify("Respirocytes not saturated!",TRUE) + return FALSE + if((. = ..())) + nif.notify("Now taking air from reserves.") - deactivate() - if((. = ..())) - nif.notify("Now taking air from environment and refilling reserves.") +/datum/nifsoft/spare_breath/deactivate() + if((. = ..())) + nif.notify("Now taking air from environment and refilling reserves.") - life() - if((. = ..())) - if(active) //Supplying air, not recharging it - switch(filled) //Text warnings - if(75) - nif.notify("Respirocytes at 75% saturation.",TRUE) - if(50) - nif.notify("Respirocytes at 50% saturation!",TRUE) - if(25) - nif.notify("Respirocytes at 25% saturation, seek a habitable environment!",TRUE) - if(5) - nif.notify("Respirocytes at 5% saturation! Failure imminent!",TRUE) +/datum/nifsoft/spare_breath/life() + if((. = ..())) + if(active) //Supplying air, not recharging it + switch(filled) //Text warnings + if(75) + nif.notify("Respirocytes at 75% saturation.",TRUE) + if(50) + nif.notify("Respirocytes at 50% saturation!",TRUE) + if(25) + nif.notify("Respirocytes at 25% saturation, seek a habitable environment!",TRUE) + if(5) + nif.notify("Respirocytes at 5% saturation! Failure imminent!",TRUE) - if(filled == 0) //Ran out - deactivate() - else //Drain a little - filled-- + if(filled == 0) //Ran out + deactivate() + else //Drain a little + filled-- - else //Recharging air, not supplying it - if(filled == 100) - return TRUE - else if(nif.use_charge(0.1) && ++filled == 100) - nif.notify("Respirocytes now fully saturated.") + else //Recharging air, not supplying it + if(filled == 100) + return TRUE + else if(nif.use_charge(0.1) && ++filled == 100) + nif.notify("Respirocytes now fully saturated.") - proc/resp_breath() - if(!active) return null - var/datum/gas_mixture/breath = new(BREATH_VOLUME) - breath.adjust_gas("oxygen", BREATH_MOLES) - breath.temperature = T20C - return breath +/datum/nifsoft/spare_breath/proc/resp_breath() + if(!active) return null + var/datum/gas_mixture/breath = new(BREATH_VOLUME) + breath.adjust_gas("oxygen", BREATH_MOLES) + breath.temperature = T20C + return breath /datum/nifsoft/mindbackup name = "Mind Backup" @@ -185,19 +185,19 @@ list_pos = NIF_BACKUP cost = 125 - activate() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - SStranscore.m_backup(H.mind,H.nif,one_time = TRUE) - persist_nif_data(H) - nif.notify("Mind backed up!") - nif.use_charge(0.1) - deactivate() - return TRUE +/datum/nifsoft/mindbackup/activate() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + SStranscore.m_backup(H.mind,H.nif,one_time = TRUE) + persist_nif_data(H) + nif.notify("Mind backed up!") + nif.use_charge(0.1) + deactivate() + return TRUE - deactivate() - if((. = ..())) - return TRUE +/datum/nifsoft/mindbackup/deactivate() + if((. = ..())) + return TRUE - stat_text() - return "Store Backup" +/datum/nifsoft/mindbackup/stat_text() + return "Store Backup" diff --git a/code/modules/nifsoft/software/06_screens.dm b/code/modules/nifsoft/software/06_screens.dm index 8dadc88192..253ed17c8d 100644 --- a/code/modules/nifsoft/software/06_screens.dm +++ b/code/modules/nifsoft/software/06_screens.dm @@ -7,25 +7,25 @@ p_drain = 0.025 var/datum/tgui_module/crew_monitor/nif/arscreen - New() - ..() - arscreen = new(nif) +/datum/nifsoft/crewmonitor/New() + ..() + arscreen = new(nif) - Destroy() - QDEL_NULL(arscreen) - return ..() +/datum/nifsoft/crewmonitor/Destroy() + QDEL_NULL(arscreen) + return ..() - activate() - if((. = ..())) - arscreen.tgui_interact(nif.human) - return TRUE +/datum/nifsoft/crewmonitor/activate() + if((. = ..())) + arscreen.tgui_interact(nif.human) + return TRUE - deactivate() - if((. = ..())) - return TRUE +/datum/nifsoft/crewmonitor/deactivate() + if((. = ..())) + return TRUE - stat_text() - return "Show Monitor" +/datum/nifsoft/crewmonitor/stat_text() + return "Show Monitor" /datum/nifsoft/alarmmonitor name = "Alarm Monitor" @@ -36,22 +36,22 @@ p_drain = 0.025 var/datum/tgui_module/alarm_monitor/engineering/nif/tgarscreen - New() - ..() - tgarscreen = new(nif) +/datum/nifsoft/alarmmonitor/New() + ..() + tgarscreen = new(nif) - Destroy() - QDEL_NULL(tgarscreen) - return ..() +/datum/nifsoft/alarmmonitor/Destroy() + QDEL_NULL(tgarscreen) + return ..() - activate() - if((. = ..())) - tgarscreen.tgui_interact(nif.human) - return TRUE +/datum/nifsoft/alarmmonitor/activate() + if((. = ..())) + tgarscreen.tgui_interact(nif.human) + return TRUE - deactivate() - if((. = ..())) - return TRUE +/datum/nifsoft/alarmmonitor/deactivate() + if((. = ..())) + return TRUE - stat_text() - return "Show Monitor" +/datum/nifsoft/alarmmonitor/stat_text() + return "Show Monitor" diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm index a4af60ae6e..a63e323792 100644 --- a/code/modules/nifsoft/software/10_combat.dm +++ b/code/modules/nifsoft/software/10_combat.dm @@ -34,10 +34,10 @@ tick_flags = NIF_ACTIVETICK combat_flags = (NIF_C_PAINKILLERS) - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.bloodstr.add_reagent("numbenzyme",0.5) +/datum/nifsoft/painkillers/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + H.bloodstr.add_reagent("numbenzyme",0.5) /datum/nifsoft/hardclaws name = "Bloodletters" @@ -74,25 +74,25 @@ var/global/datum/unarmed_attack/hardclaws/unarmed_hardclaws = new() var/used = FALSE combat_flags = (NIF_C_HIDELASER) - activate() - if((. = ..())) - if(used) - nif.notify("You do not have a hidden weapon to deploy anymore!",TRUE) - deactivate() - return FALSE - if(!nif.use_charge(50)) - nif.notify("Insufficient energy to deploy weapon!",TRUE) - deactivate() - return FALSE +/datum/nifsoft/hidelaser/activate() + if((. = ..())) + if(used) + nif.notify("You do not have a hidden weapon to deploy anymore!",TRUE) + deactivate() + return FALSE + if(!nif.use_charge(50)) + nif.notify("Insufficient energy to deploy weapon!",TRUE) + deactivate() + return FALSE - var/mob/living/carbon/human/H = nif.human - H.adjustHalLoss(30) - var/obj/item/weapon/gun/energy/gun/martin/dazzle/dgun = new(get_turf(H)) - H.put_in_hands(dgun) - nif.notify("Weapon deployed!",TRUE) - used = TRUE - spawn(0) - uninstall() + var/mob/living/carbon/human/H = nif.human + H.adjustHalLoss(30) + var/obj/item/weapon/gun/energy/gun/martin/dazzle/dgun = new(get_turf(H)) + H.put_in_hands(dgun) + nif.notify("Weapon deployed!",TRUE) + used = TRUE + spawn(0) + uninstall() //The gun to go with this implant /obj/item/weapon/gun/energy/gun/martin/dazzle diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm index 4cc7210bd4..c1de085532 100644 --- a/code/modules/nifsoft/software/13_soulcatcher.dm +++ b/code/modules/nifsoft/software/13_soulcatcher.dm @@ -21,243 +21,243 @@ var/list/brainmobs = list() var/inside_flavor = "A small completely white room with a couch, and a window to what seems to be the outside world. A small sign in the corner says 'Configure Me'." - New() - ..() - load_settings() +/datum/nifsoft/soulcatcher/New() + ..() + load_settings() - Destroy() - QDEL_LIST_NULL(brainmobs) - return ..() +/datum/nifsoft/soulcatcher/Destroy() + QDEL_LIST_NULL(brainmobs) + return ..() - activate() - if((. = ..())) - show_settings(nif.human) - spawn(0) - deactivate() +/datum/nifsoft/soulcatcher/activate() + if((. = ..())) + show_settings(nif.human) + spawn(0) + deactivate() - deactivate() - if((. = ..())) - return TRUE - - stat_text() - return "Change Settings ([brainmobs.len] minds)" - - install() - if((. = ..())) - nif.set_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) //Required on install, because other_flags aren't sufficient for our complicated settings. - nif.human.verbs |= /mob/living/carbon/human/proc/nsay - nif.human.verbs |= /mob/living/carbon/human/proc/nme - - uninstall() - QDEL_LIST_NULL(brainmobs) - if((. = ..()) && nif && nif.human) //Sometimes NIFs are deleted outside of a human - nif.human.verbs -= /mob/living/carbon/human/proc/nsay - nif.human.verbs -= /mob/living/carbon/human/proc/nme - - proc/save_settings() - if(!nif) - return - nif.save_data["[list_pos]"] = inside_flavor +/datum/nifsoft/soulcatcher/deactivate() + if((. = ..())) return TRUE - proc/load_settings() - if(!nif) - return - var/load = nif.save_data["[list_pos]"] - if(load) - inside_flavor = load - return TRUE +/datum/nifsoft/soulcatcher/stat_text() + return "Change Settings ([brainmobs.len] minds)" - proc/notify_into(var/message) - var/sound = nif.good_sound +/datum/nifsoft/soulcatcher/install() + if((. = ..())) + nif.set_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) //Required on install, because other_flags aren't sufficient for our complicated settings. + nif.human.verbs |= /mob/living/carbon/human/proc/nsay + nif.human.verbs |= /mob/living/carbon/human/proc/nme - to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") - nif.human << sound +/datum/nifsoft/soulcatcher/uninstall() + QDEL_LIST_NULL(brainmobs) + if((. = ..()) && nif && nif.human) //Sometimes NIFs are deleted outside of a human + nif.human.verbs -= /mob/living/carbon/human/proc/nsay + nif.human.verbs -= /mob/living/carbon/human/proc/nme +/datum/nifsoft/soulcatcher/proc/save_settings() + if(!nif) + return + nif.save_data["[list_pos]"] = inside_flavor + return TRUE + +/datum/nifsoft/soulcatcher/proc/load_settings() + if(!nif) + return + var/load = nif.save_data["[list_pos]"] + if(load) + inside_flavor = load + return TRUE + +/datum/nifsoft/soulcatcher/proc/notify_into(var/message) + var/sound = nif.good_sound + + to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") + nif.human << sound + + for(var/brainmob in brainmobs) + var/mob/living/carbon/brain/caught_soul/CS = brainmob + to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") + brainmob << sound + +/datum/nifsoft/soulcatcher/proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj) + var/sender_name = eyeobj ? eyeobj.name : sender.name + + //AR Projecting + if(eyeobj) + sender.eyeobj.visible_message("[sender_name] says, \"[message]\"") + + //Not AR Projecting + else + to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") for(var/brainmob in brainmobs) var/mob/living/carbon/brain/caught_soul/CS = brainmob - to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] Soulcatcher displays, \"[message]\"") - brainmob << sound + to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") - proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj) - var/sender_name = eyeobj ? eyeobj.name : sender.name + log_nsay(message,nif.human.real_name,sender) - //AR Projecting - if(eyeobj) - sender.eyeobj.visible_message("[sender_name] says, \"[message]\"") +/datum/nifsoft/soulcatcher/proc/emote_into(var/message, var/mob/living/sender, var/mob/eyeobj) + var/sender_name = eyeobj ? eyeobj.name : sender.name - //Not AR Projecting - else - to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") - for(var/brainmob in brainmobs) - var/mob/living/carbon/brain/caught_soul/CS = brainmob - to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] [sender_name] speaks, \"[message]\"") + //AR Projecting + if(eyeobj) + sender.eyeobj.visible_message("[sender_name] [message]") - log_nsay(message,nif.human.real_name,sender) + //Not AR Projecting + else + to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] [sender_name] [message]") + for(var/brainmob in brainmobs) + var/mob/living/carbon/brain/caught_soul/CS = brainmob + to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] [sender_name] [message]") - proc/emote_into(var/message, var/mob/living/sender, var/mob/eyeobj) - var/sender_name = eyeobj ? eyeobj.name : sender.name + log_nme(message,nif.human.real_name,sender) - //AR Projecting - if(eyeobj) - sender.eyeobj.visible_message("[sender_name] [message]") +/datum/nifsoft/soulcatcher/proc/show_settings(var/mob/living/carbon/human/H) + set waitfor = FALSE + var/settings_list = list( + "Catching You \[[setting_flags & NIF_SC_CATCHING_ME ? "Enabled" : "Disabled"]\]" = NIF_SC_CATCHING_ME, + "Catching Prey \[[setting_flags & NIF_SC_CATCHING_OTHERS ? "Enabled" : "Disabled"]\]" = NIF_SC_CATCHING_OTHERS, + "Ext. Hearing \[[setting_flags & NIF_SC_ALLOW_EARS ? "Enabled" : "Disabled"]\]" = NIF_SC_ALLOW_EARS, + "Ext. Vision \[[setting_flags & NIF_SC_ALLOW_EYES ? "Enabled" : "Disabled"]\]" = NIF_SC_ALLOW_EYES, + "Mind Backups \[[setting_flags & NIF_SC_BACKUPS ? "Enabled" : "Disabled"]\]" = NIF_SC_BACKUPS, + "AR Projecting \[[setting_flags & NIF_SC_PROJECTING ? "Enabled" : "Disabled"]\]" = NIF_SC_PROJECTING, + "Design Inside", + "Erase Contents") + var/choice = input(nif.human,"Select a setting to modify:","Soulcatcher NIFSoft") as null|anything in settings_list + if(choice in settings_list) + switch(choice) - //Not AR Projecting - else - to_chat(nif.human,"\[[bicon(nif.big_icon)]NIF\] [sender_name] [message]") - for(var/brainmob in brainmobs) - var/mob/living/carbon/brain/caught_soul/CS = brainmob - to_chat(CS,"\[[bicon(nif.big_icon)]NIF\] [sender_name] [message]") + if("Design Inside") + var/new_flavor = input(nif.human, "Type what the prey sees after being 'caught'. This will be \ + printed after an intro ending with: \"Around you, you see...\" to the prey. If you already \ + have prey, this will be printed to them after \"Your surroundings change to...\". Limit 2048 char.", \ + "VR Environment", html_decode(inside_flavor)) as message + new_flavor = sanitize(new_flavor, MAX_MESSAGE_LEN*2) + inside_flavor = new_flavor + nif.notify("Updating VR environment...") + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/CS = brain + to_chat(CS,"Your surroundings change to...\n[inside_flavor]") + save_settings() + return TRUE - log_nme(message,nif.human.real_name,sender) + if("Erase Contents") + var/mob/living/carbon/brain/caught_soul/brainpick = input(nif.human,"Select a mind to delete:","Erase Mind") as null|anything in brainmobs - proc/show_settings(var/mob/living/carbon/human/H) - set waitfor = FALSE - var/settings_list = list( - "Catching You \[[setting_flags & NIF_SC_CATCHING_ME ? "Enabled" : "Disabled"]\]" = NIF_SC_CATCHING_ME, - "Catching Prey \[[setting_flags & NIF_SC_CATCHING_OTHERS ? "Enabled" : "Disabled"]\]" = NIF_SC_CATCHING_OTHERS, - "Ext. Hearing \[[setting_flags & NIF_SC_ALLOW_EARS ? "Enabled" : "Disabled"]\]" = NIF_SC_ALLOW_EARS, - "Ext. Vision \[[setting_flags & NIF_SC_ALLOW_EYES ? "Enabled" : "Disabled"]\]" = NIF_SC_ALLOW_EYES, - "Mind Backups \[[setting_flags & NIF_SC_BACKUPS ? "Enabled" : "Disabled"]\]" = NIF_SC_BACKUPS, - "AR Projecting \[[setting_flags & NIF_SC_PROJECTING ? "Enabled" : "Disabled"]\]" = NIF_SC_PROJECTING, - "Design Inside", - "Erase Contents") - var/choice = input(nif.human,"Select a setting to modify:","Soulcatcher NIFSoft") as null|anything in settings_list - if(choice in settings_list) - switch(choice) + var/warning = alert(nif.human,"Are you SURE you want to erase \"[brainpick]\"?","Erase Mind","CANCEL","DELETE","CANCEL") + if(warning == "DELETE") + brainmobs -= brainpick + qdel(brainpick) + return TRUE - if("Design Inside") - var/new_flavor = input(nif.human, "Type what the prey sees after being 'caught'. This will be \ - printed after an intro ending with: \"Around you, you see...\" to the prey. If you already \ - have prey, this will be printed to them after \"Your surroundings change to...\". Limit 2048 char.", \ - "VR Environment", html_decode(inside_flavor)) as message - new_flavor = sanitize(new_flavor, MAX_MESSAGE_LEN*2) - inside_flavor = new_flavor - nif.notify("Updating VR environment...") - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/CS = brain - to_chat(CS,"Your surroundings change to...\n[inside_flavor]") - save_settings() - return TRUE + //Must just be a flag without special handling then. + else + var/flag = settings_list[choice] + return toggle_setting(flag) - if("Erase Contents") - var/mob/living/carbon/brain/caught_soul/brainpick = input(nif.human,"Select a mind to delete:","Erase Mind") as null|anything in brainmobs +/datum/nifsoft/soulcatcher/proc/toggle_setting(var/flag) + setting_flags ^= flag - var/warning = alert(nif.human,"Are you SURE you want to erase \"[brainpick]\"?","Erase Mind","CANCEL","DELETE","CANCEL") - if(warning == "DELETE") - brainmobs -= brainpick - qdel(brainpick) - return TRUE + var/notify_message + //Special treatment + switch(flag) + if(NIF_SC_BACKUPS) + if(setting_flags & NIF_SC_BACKUPS) + notify_message = "Mind backup system enabled." + else + notify_message = "Mind backup system disabled." - //Must just be a flag without special handling then. - else - var/flag = settings_list[choice] - return toggle_setting(flag) + if(NIF_SC_CATCHING_ME) + if(setting_flags & NIF_SC_CATCHING_ME) + nif.set_flag(NIF_O_SCMYSELF,NIF_FLAGS_OTHER) + else + nif.clear_flag(NIF_O_SCMYSELF,NIF_FLAGS_OTHER) + if(NIF_SC_CATCHING_OTHERS) + if(setting_flags & NIF_SC_CATCHING_OTHERS) + nif.set_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) + else + nif.clear_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) + if(NIF_SC_ALLOW_EARS) + if(setting_flags & NIF_SC_ALLOW_EARS) + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/brainmob = brain + brainmob.ext_deaf = FALSE + notify_message = "External audio input enabled." + else + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/brainmob = brain + brainmob.ext_deaf = TRUE + notify_message = "External audio input disabled." + if(NIF_SC_ALLOW_EYES) + if(setting_flags & NIF_SC_ALLOW_EYES) + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/brainmob = brain + brainmob.ext_blind = FALSE + notify_message = "External video input enabled." + else + for(var/brain in brainmobs) + var/mob/living/carbon/brain/caught_soul/brainmob = brain + brainmob.ext_blind = TRUE + notify_message = "External video input disabled." - proc/toggle_setting(var/flag) - setting_flags ^= flag + if(notify_message) + notify_into(notify_message) - var/notify_message - //Special treatment - switch(flag) - if(NIF_SC_BACKUPS) - if(setting_flags & NIF_SC_BACKUPS) - notify_message = "Mind backup system enabled." - else - notify_message = "Mind backup system disabled." + return TRUE - if(NIF_SC_CATCHING_ME) - if(setting_flags & NIF_SC_CATCHING_ME) - nif.set_flag(NIF_O_SCMYSELF,NIF_FLAGS_OTHER) - else - nif.clear_flag(NIF_O_SCMYSELF,NIF_FLAGS_OTHER) - if(NIF_SC_CATCHING_OTHERS) - if(setting_flags & NIF_SC_CATCHING_OTHERS) - nif.set_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) - else - nif.clear_flag(NIF_O_SCOTHERS,NIF_FLAGS_OTHER) - if(NIF_SC_ALLOW_EARS) - if(setting_flags & NIF_SC_ALLOW_EARS) - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/brainmob = brain - brainmob.ext_deaf = FALSE - notify_message = "External audio input enabled." - else - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/brainmob = brain - brainmob.ext_deaf = TRUE - notify_message = "External audio input disabled." - if(NIF_SC_ALLOW_EYES) - if(setting_flags & NIF_SC_ALLOW_EYES) - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/brainmob = brain - brainmob.ext_blind = FALSE - notify_message = "External video input enabled." - else - for(var/brain in brainmobs) - var/mob/living/carbon/brain/caught_soul/brainmob = brain - brainmob.ext_blind = TRUE - notify_message = "External video input disabled." +//Complex version for catching in-round characters +/datum/nifsoft/soulcatcher/proc/catch_mob(var/mob/M) + if(!M.mind) return - if(notify_message) - notify_into(notify_message) + //Create a new brain mob + var/mob/living/carbon/brain/caught_soul/brainmob = new(nif) + brainmob.nif = nif + brainmob.soulcatcher = src + brainmob.container = src + brainmob.stat = 0 + brainmob.silent = FALSE + dead_mob_list -= brainmob + brainmob.add_language(LANGUAGE_GALCOM) + brainmobs |= brainmob - return TRUE + //Put the mind and player into the mob + M.mind.transfer_to(brainmob) + brainmob.name = brainmob.mind.name + brainmob.real_name = brainmob.mind.name - //Complex version for catching in-round characters - proc/catch_mob(var/mob/M) - if(!M.mind) return + //If we caught our owner, special settings. + if(M == nif.human) + brainmob.ext_deaf = FALSE + brainmob.ext_blind = FALSE + brainmob.parent_mob = TRUE - //Create a new brain mob - var/mob/living/carbon/brain/caught_soul/brainmob = new(nif) - brainmob.nif = nif - brainmob.soulcatcher = src - brainmob.container = src - brainmob.stat = 0 - brainmob.silent = FALSE - dead_mob_list -= brainmob - brainmob.add_language(LANGUAGE_GALCOM) - brainmobs |= brainmob + //If they have these values, apply them + if(ishuman(M)) + var/mob/living/carbon/human/H = M + brainmob.dna = H.dna + brainmob.ooc_notes = H.ooc_notes + brainmob.timeofhostdeath = H.timeofdeath + SStranscore.m_backup(brainmob.mind,0) //It does ONE, so medical will hear about it. - //Put the mind and player into the mob - M.mind.transfer_to(brainmob) - brainmob.name = brainmob.mind.name - brainmob.real_name = brainmob.mind.name + //Else maybe they're a joining ghost + else if(isobserver(M)) + brainmob.transient = TRUE + qdel(M) //Bye ghost - //If we caught our owner, special settings. - if(M == nif.human) - brainmob.ext_deaf = FALSE - brainmob.ext_blind = FALSE - brainmob.parent_mob = TRUE + //Give them a flavortext message + var/message = "Your vision fades in a haze of static, before returning.\n\ + Around you, you see...\n\ + [inside_flavor]" - //If they have these values, apply them - if(ishuman(M)) - var/mob/living/carbon/human/H = M - brainmob.dna = H.dna - brainmob.ooc_notes = H.ooc_notes - brainmob.timeofhostdeath = H.timeofdeath - SStranscore.m_backup(brainmob.mind,0) //It does ONE, so medical will hear about it. + to_chat(brainmob,message) - //Else maybe they're a joining ghost - else if(isobserver(M)) - brainmob.transient = TRUE - qdel(M) //Bye ghost + //Reminder on how this works to host + if(brainmobs.len == 1) //Only spam this on the first one + to_chat(nif.human,"Your occupant's messages/actions can only be seen by you, and you can \ + send messages that only they can hear/see by using the NSay and NMe verbs (or the *nsay and *nme emotes).") - //Give them a flavortext message - var/message = "Your vision fades in a haze of static, before returning.\n\ - Around you, you see...\n\ - [inside_flavor]" - - to_chat(brainmob,message) - - //Reminder on how this works to host - if(brainmobs.len == 1) //Only spam this on the first one - to_chat(nif.human,"Your occupant's messages/actions can only be seen by you, and you can \ - send messages that only they can hear/see by using the NSay and NMe verbs (or the *nsay and *nme emotes).") - - //Announce to host and other minds - notify_into("New mind loaded: [brainmob.name]") - return TRUE + //Announce to host and other minds + notify_into("New mind loaded: [brainmob.name]") + return TRUE //////////////// //The caught mob diff --git a/code/modules/nifsoft/software/14_commlink.dm b/code/modules/nifsoft/software/14_commlink.dm index f156e3ffb5..26539f20f2 100644 --- a/code/modules/nifsoft/software/14_commlink.dm +++ b/code/modules/nifsoft/software/14_commlink.dm @@ -9,24 +9,24 @@ p_drain = 0.01 other_flags = (NIF_O_COMMLINK) - install() - if((. = ..())) - nif.comm = new(nif,src) +/datum/nifsoft/commlink/install() + if((. = ..())) + nif.comm = new(nif,src) - uninstall() - var/obj/item/device/nif/lnif = nif //Awkward. Parent clears it in an attempt to clean up. - if((. = ..()) && lnif) - QDEL_NULL(lnif.comm) +/datum/nifsoft/commlink/uninstall() + var/obj/item/device/nif/lnif = nif //Awkward. Parent clears it in an attempt to clean up. + if((. = ..()) && lnif) + QDEL_NULL(lnif.comm) - activate() - if((. = ..())) - nif.comm.initialize_exonet(nif.human) - nif.comm.ui_interact(nif.human,key_state = commlink_state) - spawn(0) - deactivate() +/datum/nifsoft/commlink/activate() + if((. = ..())) + nif.comm.initialize_exonet(nif.human) + nif.comm.tgui_interact(nif.human, custom_state = GLOB.tgui_commlink_state) + spawn(0) + deactivate() - stat_text() - return "Show Commlink" +/datum/nifsoft/commlink/stat_text() + return "Show Commlink" /datum/nifsoft/commlink/Topic(href, href_list) if(href_list["open"]) @@ -39,18 +39,18 @@ var/obj/item/device/nif/nif var/datum/nifsoft/commlink/nifsoft - New(var/newloc,var/soft) - ..() - nif = newloc - nifsoft = soft - QDEL_NULL(camera) //Not supported on internal one. +/obj/item/device/communicator/commlink/New(var/newloc,var/soft) + ..() + nif = newloc + nifsoft = soft + QDEL_NULL(camera) //Not supported on internal one. - Destroy() - if(nif) - nif.comm = null - nif = null - nifsoft = null - return ..() +/obj/item/device/communicator/commlink/Destroy() + if(nif) + nif.comm = null + nif = null + nifsoft = null + return ..() /obj/item/device/communicator/commlink/register_device(var/new_name) owner = new_name diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index f6406ed186..7cdd364b16 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -9,36 +9,36 @@ var/obj/machinery/power/apc/apc other_flags = (NIF_O_APCCHARGE) - activate() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - apc = locate(/obj/machinery/power/apc) in get_step(H,H.dir) - if(!apc) - apc = locate(/obj/machinery/power/apc) in get_step(H,0) - if(!apc) - nif.notify("You must be facing an APC to connect to.",TRUE) - spawn(0) - deactivate() - return FALSE - - H.visible_message("Thin snakelike tendrils grow from [H] and connect to \the [apc].","Thin snakelike tendrils grow from you and connect to \the [apc].") - - deactivate() - if((. = ..())) - apc = null - - life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - if(apc && (get_dist(H,apc) <= 1) && H.nutrition < 440) // 440 vs 450, life() happens before we get here so it'll never be EXACTLY 450 - H.nutrition = min(H.nutrition+10, 450) - apc.drain_power(7000/450*10) //This is from the large rechargers. No idea what the math is. - return TRUE - else - nif.notify("APC charging has ended.") - H.visible_message("[H]'s snakelike tendrils whip back into their body from \the [apc].","The APC connector tendrils return to your body.") +/datum/nifsoft/apc_recharge/activate() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + apc = locate(/obj/machinery/power/apc) in get_step(H,H.dir) + if(!apc) + apc = locate(/obj/machinery/power/apc) in get_step(H,0) + if(!apc) + nif.notify("You must be facing an APC to connect to.",TRUE) + spawn(0) deactivate() - return FALSE + return FALSE + + H.visible_message("Thin snakelike tendrils grow from [H] and connect to \the [apc].","Thin snakelike tendrils grow from you and connect to \the [apc].") + +/datum/nifsoft/apc_recharge/deactivate() + if((. = ..())) + apc = null + +/datum/nifsoft/apc_recharge/life() + if((. = ..())) + var/mob/living/carbon/human/H = nif.human + if(apc && (get_dist(H,apc) <= 1) && H.nutrition < 440) // 440 vs 450, life() happens before we get here so it'll never be EXACTLY 450 + H.nutrition = min(H.nutrition+10, 450) + apc.drain_power(7000/450*10) //This is from the large rechargers. No idea what the math is. + return TRUE + else + nif.notify("APC charging has ended.") + H.visible_message("[H]'s snakelike tendrils whip back into their body from \the [apc].","The APC connector tendrils return to your body.") + deactivate() + return FALSE /datum/nifsoft/pressure name = "Pressure Seals" @@ -62,31 +62,31 @@ applies_to = NIF_SYNTHETIC other_flags = (NIF_O_HEATSINKS) - activate() - if((. = ..())) - if(used >= 1500) - nif.notify("Heat sinks not safe to operate again yet! Max 75% on activation.",TRUE) - spawn(0) - deactivate() - return FALSE - - stat_text() - return "[active ? "Active" : "Disabled"] (Stored Heat: [FLOOR((used/20), 1)]%)" - - life() - if((. = ..())) - //Not being used, all clean. - if(!active && !used) - return TRUE - - //Being used, and running out. - else if(active && ++used == 2000) - nif.notify("Heat sinks overloaded! Shutting down!",TRUE) +/datum/nifsoft/heatsinks/activate() + if((. = ..())) + if(used >= 1500) + nif.notify("Heat sinks not safe to operate again yet! Max 75% on activation.",TRUE) + spawn(0) deactivate() + return FALSE - //Being cleaned, and finishing empty. - else if(!active && --used == 0) - nif.notify("Heat sinks re-chilled.") +/datum/nifsoft/heatsinks/stat_text() + return "[active ? "Active" : "Disabled"] (Stored Heat: [FLOOR((used/20), 1)]%)" + +/datum/nifsoft/heatsinks/life() + if((. = ..())) + //Not being used, all clean. + if(!active && !used) + return TRUE + + //Being used, and running out. + else if(active && ++used == 2000) + nif.notify("Heat sinks overloaded! Shutting down!",TRUE) + deactivate() + + //Being cleaned, and finishing empty. + else if(!active && --used == 0) + nif.notify("Heat sinks re-chilled.") /datum/nifsoft/compliance name = "Compliance Module" @@ -99,24 +99,24 @@ access = 999 //Prevents anyone from buying it without an emag. var/laws = "Be nice to people!" - New(var/newloc,var/newlaws) - laws = newlaws //Sanitize before this (the disk does) - ..(newloc) +/datum/nifsoft/compliance/New(var/newloc,var/newlaws) + laws = newlaws //Sanitize before this (the disk does) + ..(newloc) - activate() - if((. = ..())) - to_chat(nif.human,"You are compelled to follow these rules: \n[laws]") +/datum/nifsoft/compliance/activate() + if((. = ..())) + to_chat(nif.human,"You are compelled to follow these rules: \n[laws]") - install() - if((. = ..())) - to_chat(nif.human,"You feel suddenly compelled to follow these rules: \n[laws]") +/datum/nifsoft/compliance/install() + if((. = ..())) + to_chat(nif.human,"You feel suddenly compelled to follow these rules: \n[laws]") - uninstall() - nif.notify("ERROR! Unable to comply!",TRUE) - return FALSE //NOPE. +/datum/nifsoft/compliance/uninstall() + nif.notify("ERROR! Unable to comply!",TRUE) + return FALSE //NOPE. - stat_text() - return "Show Laws" +/datum/nifsoft/compliance/stat_text() + return "Show Laws" /datum/nifsoft/sizechange name = "Mass Alteration" @@ -125,28 +125,28 @@ cost = 375 wear = 6 - activate() - if((. = ..())) - var/new_size = input("Put the desired size (25-200%)", "Set Size", 200) as num +/datum/nifsoft/sizechange/activate() + if((. = ..())) + var/new_size = input("Put the desired size (25-200%)", "Set Size", 200) as num - if (!ISINRANGE(new_size,25,200)) - to_chat(nif.human,"The safety features of the NIF Program prevent you from choosing this size.") - return - else - nif.human.resize(new_size/100) - to_chat(nif.human,"You set the size to [new_size]%") + if (!ISINRANGE(new_size,25,200)) + to_chat(nif.human,"The safety features of the NIF Program prevent you from choosing this size.") + return + else + nif.human.resize(new_size/100) + to_chat(nif.human,"You set the size to [new_size]%") - nif.human.visible_message("Swirling grey mist envelops [nif.human] as they change size!","Swirling streams of nanites wrap around you as you change size!") + nif.human.visible_message("Swirling grey mist envelops [nif.human] as they change size!","Swirling streams of nanites wrap around you as you change size!") - spawn(0) - deactivate() + spawn(0) + deactivate() - deactivate() - if((. = ..())) - return TRUE +/datum/nifsoft/sizechange/deactivate() + if((. = ..())) + return TRUE - stat_text() - return "Change Size" +/datum/nifsoft/sizechange/stat_text() + return "Change Size" /datum/nifsoft/worldbend name = "World Bender" @@ -155,22 +155,22 @@ cost = 100 a_drain = 0.01 - activate() - if((. = ..())) - var/list/justme = list(nif.human) - for(var/human in human_mob_list) - if(human == nif.human) - continue - var/mob/living/carbon/human/H = human - H.display_alt_appearance("animals", justme) - alt_farmanimals += nif.human +/datum/nifsoft/worldbend/activate() + if((. = ..())) + var/list/justme = list(nif.human) + for(var/human in human_mob_list) + if(human == nif.human) + continue + var/mob/living/carbon/human/H = human + H.display_alt_appearance("animals", justme) + alt_farmanimals += nif.human - deactivate() - if((. = ..())) - var/list/justme = list(nif.human) - for(var/human in human_mob_list) - if(human == nif.human) - continue - var/mob/living/carbon/human/H = human - H.hide_alt_appearance("animals", justme) - alt_farmanimals -= nif.human +/datum/nifsoft/worldbend/deactivate() + if((. = ..())) + var/list/justme = list(nif.human) + for(var/human in human_mob_list) + if(human == nif.human) + continue + var/mob/living/carbon/human/H = human + H.hide_alt_appearance("animals", justme) + alt_farmanimals -= nif.human diff --git a/code/modules/organs/internal/augment/armmounted.dm b/code/modules/organs/internal/augment/armmounted.dm index 73751be0d9..4131955e15 100644 --- a/code/modules/organs/internal/augment/armmounted.dm +++ b/code/modules/organs/internal/augment/armmounted.dm @@ -86,6 +86,13 @@ integrated_object_type = /obj/item/weapon/melee/energy/sword +/obj/item/organ/internal/augment/armmounted/hand/blade + name = "handblade implant" + desc = "A small implant that fits neatly into the hand. It deploys a small, but dangerous blade." + icon_state = "augment_handblade" + + integrated_object_type = /obj/item/weapon/melee/augment/blade + /* * Shoulder augment. */ @@ -136,6 +143,14 @@ if(istype(owner, /mob/living/carbon/human)) var/mob/living/carbon/human/H = owner H.add_modifier(/datum/modifier/melee_surge, 0.75 MINUTES) + +/obj/item/organ/internal/augment/armmounted/shoulder/blade + name = "armblade implant" + desc = "A large implant that fits into a subject's arm. It deploys a large metal blade by some painful means." + + icon_state = "augment_armblade" + + integrated_object_type = /obj/item/weapon/melee/augment/blade/arm // The toolkit / multi-tool implant. diff --git a/code/modules/organs/internal/stomach.dm b/code/modules/organs/internal/stomach.dm index c8e90d9f78..31adb758ae 100644 --- a/code/modules/organs/internal/stomach.dm +++ b/code/modules/organs/internal/stomach.dm @@ -64,4 +64,10 @@ if(owner && owner.stat != DEAD) owner.bodytemperature += round(owner.robobody_count * 0.25, 0.1) + if(ishuman(owner)) + var/mob/living/carbon/human/H = owner + + if(H.ingested?.total_volume && H.bloodstr) + H.ingested.trans_to_holder(H.bloodstr, rand(2,5)) + return diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 79aae1a776..ffc3d56d1d 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -1135,6 +1135,8 @@ Note that amputating the affected organ does in fact remove the infection from t remove_splint() get_icon() unmutate() + drop_sound = 'sound/items/drop/weldingtool.ogg' + pickup_sound = 'sound/items/pickup/weldingtool.ogg' for(var/obj/item/organ/external/T in children) T.robotize(company, keep_organs = keep_organs) diff --git a/code/modules/overmap/overmap_shuttle.dm b/code/modules/overmap/overmap_shuttle.dm index bdbe6bf382..86ee893f1e 100644 --- a/code/modules/overmap/overmap_shuttle.dm +++ b/code/modules/overmap/overmap_shuttle.dm @@ -133,10 +133,20 @@ var/icon_full = "fuel_port_full" var/opened = 0 var/parent_shuttle + var/base_tank = /obj/item/weapon/tank/phoron /obj/structure/fuel_port/Initialize() . = ..() - new /obj/item/weapon/tank/phoron(src) + if(base_tank) + new base_tank(src) + +/obj/structure/fuel_port/heavy + base_tank = /obj/item/weapon/tank/phoron/pressurized + +/obj/structure/fuel_port/empty + base_tank = null //oops, no gas! + opened = 1 //shows open so you can diagnose 'oops, no gas' easily + icon_state = "fuel_port_empty" //set the default state just to be safe /obj/structure/fuel_port/attack_hand(mob/user as mob) if(!opened) diff --git a/code/modules/overmap/ships/computers/ship.dm b/code/modules/overmap/ships/computers/ship.dm index f0d54125ae..5c886fb55a 100644 --- a/code/modules/overmap/ships/computers/ship.dm +++ b/code/modules/overmap/ships/computers/ship.dm @@ -70,6 +70,10 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov apply_visual(user) user.reset_view(linked) user.set_machine(src) + if(isliving(user)) + var/mob/living/L = user + L.looking_elsewhere = 1 + L.handle_vision() user.set_viewsize(world.view + extra_view) GLOB.moved_event.register(user, src, /obj/machinery/computer/ship/proc/unlook) // TODO GLOB.stat_set_event.register(user, src, /obj/machinery/computer/ship/proc/unlook) @@ -77,6 +81,10 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov /obj/machinery/computer/ship/proc/unlook(var/mob/user) user.reset_view() + if(isliving(user)) + var/mob/living/L = user + L.looking_elsewhere = 0 + L.handle_vision() user.set_viewsize() // reset to default GLOB.moved_event.unregister(user, src, /obj/machinery/computer/ship/proc/unlook) // TODO GLOB.stat_set_event.unregister(user, src, /obj/machinery/computer/ship/proc/unlook) @@ -112,4 +120,4 @@ somewhere on that shuttle. Subtypes of these can be then used to perform ship ov var/M = W.resolve() if(M) unlook(M) - . = ..() \ No newline at end of file + . = ..() diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm index f51587d594..76c0d3e6d1 100644 --- a/code/modules/overmap/ships/computers/shuttle.dm +++ b/code/modules/overmap/ships/computers/shuttle.dm @@ -47,6 +47,6 @@ else to_chat(usr,"No valid landing sites in range.") possible_d = shuttle.get_possible_destinations() - if(CanInteract(usr, global.default_state) && (D in possible_d)) + if(CanInteract(usr, GLOB.tgui_default_state) && (D in possible_d)) shuttle.set_destination(possible_d[D]) return TRUE diff --git a/code/modules/overmap/spacetravel.dm b/code/modules/overmap/spacetravel.dm index ac5846202a..8bae95434a 100644 --- a/code/modules/overmap/spacetravel.dm +++ b/code/modules/overmap/spacetravel.dm @@ -47,13 +47,35 @@ proc/get_deepspace(x,y) for(var/atom/movable/AM in contents) if(!AM.lost_in_space()) return FALSE + if(has_buckled_mobs()) + for(var/mob/M in buckled_mobs) + if(!M.lost_in_space()) + return FALSE + return TRUE +/obj/item/device/uav/lost_in_space() + if(state == 1) + return FALSE + return ..() + +/obj/machinery/power/supermatter/lost_in_space() + return FALSE + +/obj/singularity/lost_in_space() + return FALSE + +/obj/vehicle/lost_in_space() + if(load && !load.lost_in_space()) + return FALSE + return ..() + /mob/lost_in_space() return isnull(client) -/mob/living/carbon/human/lost_in_space() - return isnull(client) && !key && stat == DEAD +/mob/living/lost_in_space() + return FALSE + // return isnull(client) && !key && stat == DEAD // Allows bodies that players have ghosted from to be deleted - Ater proc/overmap_spacetravel(var/turf/space/T, var/atom/movable/A) if (!T || !A) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 85ac6d5770..d67ee7b496 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -17,8 +17,10 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins active_power_usage = 200 circuit = /obj/item/weapon/circuitboard/fax - var/obj/item/weapon/card/id/scan = null // identification - var/authenticated = 0 + var/obj/item/weapon/card/id/scan = null + var/authenticated = null + var/rank = null + var/sendcooldown = 0 // to avoid spamming fax messages var/department = "Unknown" // our department var/destination = null // the department we're sending to @@ -33,95 +35,105 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins /obj/machinery/photocopier/faxmachine/attack_hand(mob/user as mob) // CH edit begins here; this allows borgs to use fax machines, meant for the Unity and Clerical modules. user.set_machine(src) - if(issilicon(usr)) // Normally, you have to insert an ID. Borgs, obviously, cannot do this, so it skips the ID process completely. + if(issilicon(usr)) authenticated = 1 - ui_interact(user) + tgui_interact(user) else - ui_interact(user) // CH edit ends here + tgui_interact(user) -/** - * Display the NanoUI window for the fax machine. - * - * See NanoUI documentation for details. - */ -/obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - user.set_machine(src) +/obj/machinery/photocopier/faxmachine/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Fax", name) + ui.open() - var/list/data = list() - if(scan) - data["scanName"] = scan.name - else - data["scanName"] = null - data["bossName"] = using_map.boss_name +/obj/machinery/photocopier/faxmachine/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + data["scan"] = scan ? scan.name : null data["authenticated"] = authenticated + data["rank"] = rank + data["isAI"] = isAI(user) + data["isRobot"] = isrobot(user) + + data["bossName"] = using_map.boss_name data["copyItem"] = copyitem - if(copyitem) - data["copyItemName"] = copyitem.name - else - data["copyItemName"] = null data["cooldown"] = sendcooldown data["destination"] = destination - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "fax.tmpl", src.name, 500, 500) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(10) //this machine is so unimportant let's not have it update that often. + return data -/obj/machinery/photocopier/faxmachine/Topic(href, href_list) - if(href_list["send"]) - if(copyitem) - if (destination in admin_departments) - send_admin_fax(usr, destination) - else - sendfax(destination) +/obj/machinery/photocopier/faxmachine/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE - if (sendcooldown) - spawn(sendcooldown) // cooldown time - sendcooldown = 0 - - else if(href_list["remove"]) - if(copyitem) - if(get_dist(usr, src) >= 2) - to_chat(usr, "\The [copyitem] is too far away for you to remove it.") - return - copyitem.loc = usr.loc - usr.put_in_hands(copyitem) - to_chat(usr, "You take \the [copyitem] out of \the [src].") - copyitem = null - - if(href_list["scan"]) - if (scan) - if(ishuman(usr)) - scan.loc = usr.loc - if(!usr.get_active_hand()) + switch(action) + if("scan") + if(scan) + scan.forceMove(loc) + if(ishuman(usr) && !usr.get_active_hand()) usr.put_in_hands(scan) scan = null else - scan.loc = src.loc + var/obj/item/I = usr.get_active_hand() + if(istype(I, /obj/item/weapon/card/id)) + usr.drop_item() + I.forceMove(src) + scan = I + return TRUE + if("login") + var/login_type = text2num(params["login_type"]) + if(login_type == LOGIN_TYPE_NORMAL && istype(scan)) + if(check_access(scan)) + authenticated = scan.registered_name + rank = scan.assignment + else if(login_type == LOGIN_TYPE_AI && isAI(usr)) + authenticated = usr.name + rank = "AI" + else if(login_type == LOGIN_TYPE_ROBOT && isrobot(usr)) + authenticated = usr.name + var/mob/living/silicon/robot/R = usr + rank = "[R.modtype] [R.braintype]" + return TRUE + if("logout") + if(scan) + scan.forceMove(loc) + if(ishuman(usr) && !usr.get_active_hand()) + usr.put_in_hands(scan) scan = null - else - var/obj/item/I = usr.get_active_hand() - if (istype(I, /obj/item/weapon/card/id) && usr.unEquip(I)) - I.loc = src - scan = I - authenticated = 0 + authenticated = null + return TRUE + if("remove") + if(copyitem) + if(get_dist(usr, src) >= 2) + to_chat(usr, "\The [copyitem] is too far away for you to remove it.") + return + copyitem.forceMove(loc) + usr.put_in_hands(copyitem) + to_chat(usr, "You take \the [copyitem] out of \the [src].") + copyitem = null - if(href_list["dept"]) - var/lastdestination = destination - destination = input(usr, "Which department?", "Choose a department", "") as null|anything in (alldepartments + admin_departments) - if(!destination) destination = lastdestination + if(!authenticated) + return + + switch(action) + if("send") + if(copyitem) + if (destination in admin_departments) + send_admin_fax(usr, destination) + else + sendfax(destination) - if(href_list["auth"]) - if ( (!( authenticated ) && (scan)) ) - if (check_access(scan)) - authenticated = 1 + if (sendcooldown) + spawn(sendcooldown) // cooldown time + sendcooldown = 0 - if(href_list["logout"]) - authenticated = 0 + if("dept") + var/lastdestination = destination + destination = input(usr, "Which department?", "Choose a department", "") as null|anything in (alldepartments + admin_departments) + if(!destination) + destination = lastdestination - SSnanoui.update_uis(src) + return TRUE /obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob) if(O.is_multitool() && panel_open) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 8c12f654f6..9182a17530 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -6,6 +6,8 @@ var/label = null var/labels_left = 30 var/mode = 0 //off or on. + drop_sound = 'sound/items/drop/device.ogg' + pickup_sound = 'sound/items/pickup/device.ogg' /obj/item/weapon/hand_labeler/attack() return diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 5bf6a9102a..07009a99c0 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -33,33 +33,71 @@ /obj/machinery/photocopier/attack_hand(mob/user as mob) user.set_machine(src) - ui_interact(user) + tgui_interact(user) -/** - * Display the NanoUI window for the photocopier. - * - * See NanoUI documentation for details. - */ -/obj/machinery/photocopier/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - user.set_machine(src) - - var/list/data = list() - data["copyItem"] = copyitem - data["assPresent"] = has_buckled_mobs() - data["toner"] = toner - data["copies"] = copies - data["maxCopies"] = maxcopies - if(istype(user,/mob/living/silicon)) - data["isSilicon"] = 1 - else - data["isSilicon"] = null - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "photocopier.tmpl", src.name, 300, 250) - ui.set_initial_data(data) +/obj/machinery/photocopier/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Photocopier", name) ui.open() - ui.set_auto_update(10) + +/obj/machinery/photocopier/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + data["has_item"] = copyitem || has_buckled_mobs() // VOREStation Edit: Ass copying + data["isAI"] = issilicon(user) + data["can_AI_print"] = (toner >= 5) + data["has_toner"] = !!toner + data["current_toner"] = toner + data["max_toner"] = 40 + data["num_copies"] = copies + data["max_copies"] = maxcopies + + return data + +/obj/machinery/photocopier/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + switch(action) + if("make_copy") + addtimer(CALLBACK(src, .proc/copy_operation, usr), 0) + . = TRUE + if("remove") + if(copyitem) + copyitem.loc = usr.loc + usr.put_in_hands(copyitem) + to_chat(usr, "You take \the [copyitem] out of \the [src].") + copyitem = null + else if(has_buckled_mobs()) + to_chat(buckled_mobs[1], "You feel a slight pressure on your ass.") // It can't eject your asscheeks, but it'll try. + . = TRUE + if("set_copies") + copies = clamp(text2num(params["num_copies"]), 1, maxcopies) + . = TRUE + if("ai_photo") + if(!issilicon(usr)) + return + if(stat & (BROKEN|NOPOWER)) + return + + if(toner >= 5) + var/mob/living/silicon/tempAI = usr + var/obj/item/device/camera/siliconcam/camera = tempAI.aiCamera + + if(!camera) + return + var/obj/item/weapon/photo/selection = camera.selectpicture() + if (!selection) + return + + var/obj/item/weapon/photo/p = photocopy(selection) + if (p.desc == "") + p.desc += "Copied by [tempAI.name]" + else + p.desc += " - Copied by [tempAI.name]" + toner -= 5 + . = TRUE /obj/machinery/photocopier/proc/copy_operation(var/mob/user) if(copying) @@ -104,51 +142,6 @@ use_power(active_power_usage) copying = FALSE -/obj/machinery/photocopier/Topic(href, href_list) - if(href_list["copy"]) - if(stat & (BROKEN|NOPOWER)) - return - addtimer(CALLBACK(src, .proc/copy_operation, usr), 0) - - else if(href_list["remove"]) - if(copyitem) - copyitem.loc = usr.loc - usr.put_in_hands(copyitem) - to_chat(usr, "You take \the [copyitem] out of \the [src].") - copyitem = null - else if(has_buckled_mobs()) - to_chat(buckled_mobs[1], "You feel a slight pressure on your ass.") // It can't eject your asscheeks, but it'll try. - return TOPIC_REFRESH - else if(href_list["min"]) - if(copies > 1) - copies-- - else if(href_list["add"]) - if(copies < maxcopies) - copies++ - else if(href_list["aipic"]) - if(!istype(usr,/mob/living/silicon)) return - if(stat & (BROKEN|NOPOWER)) return - - if(toner >= 5) - var/mob/living/silicon/tempAI = usr - var/obj/item/device/camera/siliconcam/camera = tempAI.aiCamera - - if(!camera) - return - var/obj/item/weapon/photo/selection = camera.selectpicture() - if (!selection) - return - - var/obj/item/weapon/photo/p = photocopy(selection) - if (p.desc == "") - p.desc += "Copied by [tempAI.name]" - else - p.desc += " - Copied by [tempAI.name]" - toner -= 5 - sleep(15) - - SSnanoui.update_uis(src) - /obj/machinery/photocopier/attackby(obj/item/O as obj, mob/user as mob) if(istype(O, /obj/item/weapon/paper) || istype(O, /obj/item/weapon/photo) || istype(O, /obj/item/weapon/paper_bundle)) if(!copyitem) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index b63048fdc0..c4460e5dcf 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -195,7 +195,7 @@ var/global/photo_count = 0 for(var/i; i <= sorted.len; i++) var/atom/A = sorted[i] if(A) - var/icon/img = getFlatIcon(A)//, picture_planes = picture_planes)//build_composite_icon(A) //VOREStation Edit + var/icon/img = getFlatIcon(A, no_anim = TRUE)//, picture_planes = picture_planes)//build_composite_icon(A) //VOREStation Edit // If what we got back is actually a picture, draw it. if(istype(img, /icon)) @@ -216,7 +216,7 @@ var/global/photo_count = 0 // Calculate where we are relative to the center of the photo var/xoff = (the_turf.x - center.x) * 32 + center_offset var/yoff = (the_turf.y - center.y) * 32 + center_offset - res.Blend(getFlatIcon(the_turf.loc), blendMode2iconMode(the_turf.blend_mode),xoff,yoff) + res.Blend(getFlatIcon(the_turf.loc, no_anim = TRUE), blendMode2iconMode(the_turf.blend_mode),xoff,yoff) return res diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index ea614aa11e..7be509c96f 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -12,6 +12,8 @@ matter = list(DEFAULT_WALL_MATERIAL = 60) pressure_resistance = 2 attack_verb = list("stamped") + drop_sound = 'sound/items/drop/device.ogg' + pickup_sound = 'sound/items/pickup/device.ogg' /obj/item/weapon/stamp/captain name = "site manager's rubber stamp" diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm new file mode 100644 index 0000000000..10a04effb3 --- /dev/null +++ b/code/modules/pda/ai.dm @@ -0,0 +1,58 @@ + +// Special AI/pAI PDAs that cannot explode. +/obj/item/device/pda/ai + icon_state = "NONE" + ttone = "data" + detonate = 0 + touch_silent = TRUE + programs = list( + new/datum/data/pda/app/main_menu, + new/datum/data/pda/app/notekeeper, + new/datum/data/pda/app/news, + new/datum/data/pda/app/messenger) + +/obj/item/device/pda/ai/proc/set_name_and_job(newname as text, newjob as text, newrank as null|text) + owner = newname + ownjob = newjob + if(newrank) + ownrank = newrank + else + ownrank = ownjob + name = newname + " (" + ownjob + ")" + +//AI verb and proc for sending PDA messages. +/obj/item/device/pda/ai/verb/cmd_pda_open_ui() + set category = "AI IM" + set name = "Use PDA" + set src in usr + + if(!can_use(usr)) + return + tgui_interact(usr) + +/obj/item/device/pda/ai/can_use() + return 1 + +/obj/item/device/pda/ai/attack_self(mob/user as mob) + if ((honkamt > 0) && (prob(60)))//For clown virus. + honkamt-- + playsound(src, 'sound/items/bikehorn.ogg', 30, 1) + return + + +/obj/item/device/pda/ai/pai + ttone = "assist" + var/our_owner = null // Ref to a pAI + +/obj/item/device/pda/ai/pai/New(mob/living/silicon/pai/P) + if(istype(P)) + our_owner = REF(P) + return ..() + +/obj/item/device/pda/ai/pai/tgui_status(mob/living/silicon/pai/user, datum/tgui_state/state) + if(!istype(user) || REF(user) != our_owner) // Only allow our pAI to interface with us + return STATUS_CLOSE + return ..() + +/obj/item/device/pda/ai/shell + spam_proof = TRUE // Since empty shells get a functional PDA. diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm new file mode 100644 index 0000000000..eb64125ee9 --- /dev/null +++ b/code/modules/pda/app.dm @@ -0,0 +1,109 @@ +// Base class for anything that can show up on home screen +/datum/data/pda + var/icon = "tasks" //options comes from http://fontawesome.io/icons/ + var/notify_icon = "exclamation-circle" + var/notify_silent = 0 + var/hidden = 0 // program not displayed in main menu + var/category = "General" // the category to list it in on the main menu + var/obj/item/device/pda/pda // if this is null, and the app is running code, something's gone wrong + +/datum/data/pda/Destroy() + pda = null + return ..() + +/datum/data/pda/proc/start() + return + +/datum/data/pda/proc/stop() + return + +/datum/data/pda/proc/program_process() + return + +/datum/data/pda/proc/program_hit_check() + return + +/datum/data/pda/proc/notify(message, blink = 1) + if(message) + //Search for holder of the PDA. + var/mob/living/L = null + if(pda.loc && isliving(pda.loc)) + L = pda.loc + //Maybe they are a pAI! + else + L = get(pda, /mob/living/silicon) + + if(L) + to_chat(L, "[bicon(pda)] [message]") + SStgui.update_user_uis(L, pda) // Update the receiving user's PDA UI so that they can see the new message + + if(!notify_silent) + pda.play_ringtone() + + if(blink && !(src in pda.notifying_programs)) + pda.overlays += image('icons/obj/pda.dmi', "pda-r") + pda.notifying_programs |= src + +/datum/data/pda/proc/unnotify() + if(src in pda.notifying_programs) + pda.notifying_programs -= src + if(!pda.notifying_programs.len) + pda.overlays -= image('icons/obj/pda.dmi', "pda-r") + +// An app has a button on the home screen and its own UI +/datum/data/pda/app + name = "App" + size = 3 + var/title = null // what is displayed in the title bar when this is the current app + var/template = "" + var/update = PDA_APP_UPDATE + var/has_back = 0 + +/datum/data/pda/app/tgui_host(mob/user) + return pda || src + +/datum/data/pda/app/New() + if(!title) + title = name + +/datum/data/pda/app/start() + if(pda.current_app) + pda.current_app.stop() + pda.current_app = src + return 1 + +/datum/data/pda/app/proc/update_ui(mob/user as mob, list/data) + + +// Utilities just have a button on the home screen, but custom code when clicked +/datum/data/pda/utility + name = "Utility" + icon = "gear" + size = 1 + category = "Utilities" + + +/datum/data/pda/utility/scanmode + var/base_name + category = "Scanners" + +/datum/data/pda/utility/scanmode/New(obj/item/weapon/cartridge/C) + ..(C) + name = "Enable [base_name]" + +/datum/data/pda/utility/scanmode/start() + if(pda.scanmode) + pda.scanmode.name = "Enable [pda.scanmode.base_name]" + + if(pda.scanmode == src) + pda.scanmode = null + else + pda.scanmode = src + name = "Disable [base_name]" + + pda.update_shortcuts() + return 1 + +/datum/data/pda/utility/scanmode/proc/scan_mob(mob/living/C as mob, mob/living/user as mob) + +/datum/data/pda/utility/scanmode/proc/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm new file mode 100644 index 0000000000..2ec6a4e536 --- /dev/null +++ b/code/modules/pda/cart.dm @@ -0,0 +1,311 @@ +var/list/command_cartridges = list( + /obj/item/weapon/cartridge/captain, + /obj/item/weapon/cartridge/hop, + /obj/item/weapon/cartridge/hos, + /obj/item/weapon/cartridge/ce, + /obj/item/weapon/cartridge/rd, + /obj/item/weapon/cartridge/cmo, + /obj/item/weapon/cartridge/head, + /obj/item/weapon/cartridge/lawyer // Internal Affaris, + ) + +var/list/security_cartridges = list( + /obj/item/weapon/cartridge/security, + /obj/item/weapon/cartridge/detective, + /obj/item/weapon/cartridge/hos + ) + +var/list/engineering_cartridges = list( + /obj/item/weapon/cartridge/engineering, + /obj/item/weapon/cartridge/atmos, + /obj/item/weapon/cartridge/ce + ) + +var/list/medical_cartridges = list( + /obj/item/weapon/cartridge/medical, + /obj/item/weapon/cartridge/chemistry, + /obj/item/weapon/cartridge/cmo + ) + +var/list/research_cartridges = list( + /obj/item/weapon/cartridge/signal/science, + /obj/item/weapon/cartridge/rd + ) + +var/list/cargo_cartridges = list( + /obj/item/weapon/cartridge/quartermaster, // This also covers cargo-techs, apparently, + /obj/item/weapon/cartridge/miner, + /obj/item/weapon/cartridge/hop + ) + +var/list/civilian_cartridges = list( + /obj/item/weapon/cartridge/janitor, + /obj/item/weapon/cartridge/service, + /obj/item/weapon/cartridge/hop + ) + +/obj/item/weapon/cartridge + name = "generic cartridge" + desc = "A data cartridge for portable microcomputers." + icon = 'icons/obj/pda.dmi' + icon_state = "cart" + item_state = "electronic" + w_class = ITEMSIZE_TINY + drop_sound = 'sound/items/drop/component.ogg' + pickup_sound = 'sound/items/pickup/component.ogg' + + var/obj/item/radio/integrated/radio = null + + var/charges = 0 + + var/list/stored_data = list() + var/list/programs = list() + var/list/messenger_plugins = list() + +/obj/item/weapon/cartridge/Destroy() + QDEL_NULL(radio) + QDEL_LIST(programs) + QDEL_LIST(messenger_plugins) + return ..() + +/obj/item/weapon/cartridge/proc/update_programs(obj/item/device/pda/pda) + for(var/A in programs) + var/datum/data/pda/P = A + P.pda = pda + for(var/A in messenger_plugins) + var/datum/data/pda/messenger_plugin/P = A + P.pda = pda + +/obj/item/weapon/cartridge/engineering + name = "\improper Power-ON cartridge" + icon_state = "cart-e" + programs = list( + new/datum/data/pda/app/power, + new/datum/data/pda/utility/scanmode/halogen) + +/obj/item/weapon/cartridge/atmos + name = "\improper BreatheDeep cartridge" + icon_state = "cart-a" + programs = list(new/datum/data/pda/utility/scanmode/gas) + +/obj/item/weapon/cartridge/medical + name = "\improper Med-U cartridge" + icon_state = "cart-m" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical) + +/obj/item/weapon/cartridge/chemistry + name = "\improper ChemWhiz cartridge" + icon_state = "cart-chem" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + new/datum/data/pda/utility/scanmode/reagent) + +/obj/item/weapon/cartridge/security + name = "\improper R.O.B.U.S.T. cartridge" + icon_state = "cart-s" + programs = list( + new/datum/data/pda/app/crew_records/security) + +/obj/item/weapon/cartridge/detective + name = "\improper D.E.T.E.C.T. cartridge" + icon_state = "cart-s" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + + new/datum/data/pda/app/crew_records/security) + + +/obj/item/weapon/cartridge/janitor + name = "\improper CustodiPRO cartridge" + desc = "The ultimate in clean-room design." + icon_state = "cart-j" + programs = list(new/datum/data/pda/app/janitor) + +/obj/item/weapon/cartridge/lawyer + name = "\improper P.R.O.V.E. cartridge" + icon_state = "cart-s" + programs = list(new/datum/data/pda/app/crew_records/security) + +/obj/item/weapon/cartridge/clown + name = "\improper Honkworks 5.0 cartridge" + icon_state = "cart-clown" + charges = 5 + programs = list(new/datum/data/pda/utility/honk) + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/clown) + +/obj/item/weapon/cartridge/mime + name = "\improper Gestur-O 1000 cartridge" + icon_state = "cart-mi" + charges = 5 + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/mime) + +/obj/item/weapon/cartridge/service + name = "\improper Serv-U Pro cartridge" + desc = "A data cartridge designed to serve YOU!" + +/obj/item/weapon/cartridge/signal + name = "generic signaler cartridge" + desc = "A data cartridge with an integrated radio signaler module." + programs = list(new/datum/data/pda/app/signaller) + +/obj/item/weapon/cartridge/signal/Initialize() + radio = new /obj/item/radio/integrated/signal(src) + ..() + +/obj/item/weapon/cartridge/signal/science + name = "\improper Signal Ace 2 cartridge" + desc = "Complete with integrated radio signaler!" + icon_state = "cart-tox" + programs = list( + new/datum/data/pda/utility/scanmode/gas, + + new/datum/data/pda/utility/scanmode/reagent, + + new/datum/data/pda/app/signaller) + +/obj/item/weapon/cartridge/quartermaster + name = "\improper Space Parts & Space Vendors cartridge" + desc = "Perfect for the Quartermaster on the go!" + icon_state = "cart-q" + programs = list( + new/datum/data/pda/app/supply) + +/obj/item/weapon/cartridge/miner + name = "\improper Drill-Jockey 4.5 cartridge" + desc = "It's covered in some sort of sand." + icon_state = "cart-q" + +/obj/item/weapon/cartridge/head + name = "\improper Easy-Record DELUXE cartridge" + icon_state = "cart-h" + programs = list(new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/hop + name = "\improper HumanResources9001 cartridge" + icon_state = "cart-h" + programs = list( + new/datum/data/pda/app/crew_records/security, + + new/datum/data/pda/app/janitor, + + new/datum/data/pda/app/supply, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/hos + name = "\improper R.O.B.U.S.T. DELUXE cartridge" + icon_state = "cart-hos" + programs = list( + new/datum/data/pda/app/crew_records/security, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/ce + name = "\improper Power-On DELUXE cartridge" + icon_state = "cart-ce" + programs = list( + new/datum/data/pda/app/power, + new/datum/data/pda/utility/scanmode/halogen, + + new/datum/data/pda/utility/scanmode/gas, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/cmo + name = "\improper Med-U DELUXE cartridge" + icon_state = "cart-cmo" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + + new/datum/data/pda/utility/scanmode/reagent, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/rd + name = "\improper Signal Ace DELUXE cartridge" + icon_state = "cart-rd" + programs = list( + new/datum/data/pda/utility/scanmode/gas, + + new/datum/data/pda/utility/scanmode/reagent, + + new/datum/data/pda/app/signaller, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/rd/Initialize() + radio = new /obj/item/radio/integrated/signal(src) + . = ..() + +/obj/item/weapon/cartridge/captain + name = "\improper Value-PAK cartridge" + desc = "Now with 200% more value!" + icon_state = "cart-c" + programs = list( + new/datum/data/pda/app/power, + new/datum/data/pda/utility/scanmode/halogen, + + new/datum/data/pda/utility/scanmode/gas, + + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + + new/datum/data/pda/utility/scanmode/reagent, + + new/datum/data/pda/app/crew_records/security, + + new/datum/data/pda/app/janitor, + + new/datum/data/pda/app/supply, + + new/datum/data/pda/app/status_display) + +/obj/item/weapon/cartridge/syndicate + name = "\improper Detomatix cartridge" + icon_state = "cart" + var/initial_remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. + charges = 4 + programs = list(new/datum/data/pda/utility/toggle_door) + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/detonate) + +/obj/item/weapon/cartridge/syndicate/New() + var/datum/data/pda/utility/toggle_door/D = programs[1] + if(istype(D)) + D.remote_door_id = initial_remote_door_id + +/obj/item/weapon/cartridge/proc/post_status(var/command, var/data1, var/data2) + + var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) + if(!frequency) return + + var/datum/signal/status_signal = new + status_signal.source = src + status_signal.transmission_method = TRANSMISSION_RADIO + status_signal.data["command"] = command + + switch(command) + if("message") + status_signal.data["msg1"] = data1 + status_signal.data["msg2"] = data2 + if(loc) + var/obj/item/PDA = loc + var/mob/user = PDA.fingerprintslast + log_admin("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") + message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") + + if("alert") + status_signal.data["picture_state"] = data1 + + frequency.post_signal(src, status_signal) + +/obj/item/weapon/cartridge/frame + name = "F.R.A.M.E. cartridge" + icon_state = "cart" + charges = 5 + var/telecrystals = 0 + messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/frame) diff --git a/code/modules/pda/cart_apps.dm b/code/modules/pda/cart_apps.dm new file mode 100644 index 0000000000..d7ca7717d5 --- /dev/null +++ b/code/modules/pda/cart_apps.dm @@ -0,0 +1,311 @@ +/datum/data/pda/app/status_display + name = "Status Display" + icon = "list-alt" + template = "pda_status_display" + category = "Utilities" + + var/message1 // used for status_displays + var/message2 + +/datum/data/pda/app/status_display/update_ui(mob/user as mob, list/data) + data["records"] = list( + "message1" = message1 ? message1 : "(none)", + "message2" = message2 ? message2 : "(none)") + +/datum/data/pda/app/status_display/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("Status") + switch(params["statdisp"]) + if("message") + post_status("message", message1, message2) + if("alert") + post_status("alert", params["alert"]) + if("setmsg1") + message1 = clean_input("Line 1", "Enter Message Text", message1) + if("setmsg2") + message2 = clean_input("Line 2", "Enter Message Text", message2) + else + post_status(params["statdisp"]) + return TRUE + +/datum/data/pda/app/status_display/proc/post_status(var/command, var/data1, var/data2) + var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) + if(!frequency) + return + + var/datum/signal/status_signal = new + status_signal.source = src + status_signal.transmission_method = 1 + status_signal.data["command"] = command + + switch(command) + if("message") + status_signal.data["msg1"] = data1 + status_signal.data["msg2"] = data2 + var/mob/user = pda.fingerprintslast + if(istype(pda.loc, /mob/living)) + user = pda.loc + log_admin("STATUS: [user] set status screen with [pda]. Message: [data1] [data2]") + message_admins("STATUS: [user] set status screen with [pda]. Message: [data1] [data2]") + + if("alert") + status_signal.data["picture_state"] = data1 + + spawn(0) + frequency.post_signal(src, status_signal) + + +/datum/data/pda/app/signaller + name = "Signaler System" + icon = "rss" + template = "pda_signaller" + category = "Utilities" + +/datum/data/pda/app/signaller/update_ui(mob/user as mob, list/data) + if(pda.cartridge && istype(pda.cartridge.radio, /obj/item/radio/integrated/signal)) + var/obj/item/radio/integrated/signal/R = pda.cartridge.radio + data["frequency"] = R.frequency + data["minFrequency"] = RADIO_LOW_FREQ + data["maxFrequency"] = RADIO_HIGH_FREQ + data["code"] = R.code + +/datum/data/pda/app/signaller/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + if(pda.cartridge && istype(pda.cartridge.radio, /obj/item/radio/integrated/signal)) + var/obj/item/radio/integrated/signal/R = pda.cartridge.radio + + switch(action) + if("signal") + spawn(0) + R.send_signal("ACTIVATE") + if("freq") + var/frequency = unformat_frequency(params["freq"]) + frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ) + R.set_frequency(frequency) + . = TRUE + if("code") + R.code = clamp(round(text2num(params["code"])), 1, 100) + . = TRUE + if("reset") + if(params["reset"] == "freq") + R.set_frequency(initial(R.frequency)) + else + R.code = initial(R.code) + . = TRUE + +/datum/data/pda/app/power + name = "Power Monitor" + icon = "exclamation-triangle" + template = "pda_power" + category = "Engineering" + + var/datum/tgui_module/power_monitor/power_monitor + +/datum/data/pda/app/power/New() + power_monitor = new(src) + . = ..() + +/datum/data/pda/app/power/Destroy() + QDEL_NULL(power_monitor) + return ..() + +/datum/data/pda/app/power/update_ui(mob/user as mob, list/data) + data.Add(power_monitor.tgui_data(user)) + +/datum/data/pda/app/power/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + if(power_monitor.tgui_act(action, params, ui, state)) + return TRUE + switch(action) + if("Back") + power_monitor.active_sensor = null + return TRUE + +/datum/data/pda/app/crew_records + var/datum/data/record/general_records = null + +/datum/data/pda/app/crew_records/update_ui(mob/user as mob, list/data) + var/list/records[0] + + if(general_records && (general_records in data_core.general)) + data["records"] = records + records["general"] = general_records.fields + return records + else + for(var/A in sortRecord(data_core.general)) + var/datum/data/record/R = A + if(R) + records += list(list(Name = R.fields["name"], "ref" = "\ref[R]")) + data["recordsList"] = records + data["records"] = null + return null + +/datum/data/pda/app/crew_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("Records") + var/datum/data/record/R = locate(params["target"]) + if(R && (R in data_core.general)) + load_records(R) + return TRUE + if("Back") + general_records = null + has_back = 0 + return TRUE + +/datum/data/pda/app/crew_records/proc/load_records(datum/data/record/R) + general_records = R + has_back = 1 + +/datum/data/pda/app/crew_records/medical + name = "Medical Records" + icon = "heartbeat" + template = "pda_medical" + category = "Medical" + + var/datum/data/record/medical_records = null + +/datum/data/pda/app/crew_records/medical/update_ui(mob/user as mob, list/data) + var/list/records = ..() + if(!records) + return + + if(medical_records && (medical_records in data_core.medical)) + records["medical"] = medical_records.fields + + return records + +/datum/data/pda/app/crew_records/medical/load_records(datum/data/record/R) + ..(R) + for(var/A in data_core.medical) + var/datum/data/record/E = A + if(E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + medical_records = E + break + +/datum/data/pda/app/crew_records/security + name = "Security Records" + icon = "tags" + template = "pda_security" + category = "Security" + + var/datum/data/record/security_records = null + +/datum/data/pda/app/crew_records/security/update_ui(mob/user as mob, list/data) + var/list/records = ..() + if(!records) + return + + if(security_records && (security_records in data_core.security)) + records["security"] = security_records.fields + + return records + +/datum/data/pda/app/crew_records/security/load_records(datum/data/record/R) + ..(R) + for(var/A in data_core.security) + var/datum/data/record/E = A + if(E && (E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + security_records = E + break + +/datum/data/pda/app/supply + name = "Supply Records" + icon = "file-word-o" + template = "pda_supply" + category = "Quartermaster" + +/datum/data/pda/app/supply/update_ui(mob/user as mob, list/data) + var/supplyData[0] + var/datum/shuttle/autodock/ferry/supply/shuttle = SSsupply.shuttle + if (shuttle) + supplyData["shuttle_moving"] = shuttle.has_arrive_time() + supplyData["shuttle_eta"] = shuttle.eta_minutes() + supplyData["shuttle_loc"] = shuttle.at_station() ? "Station" : "Dock" + var/supplyOrderCount = 0 + var/supplyOrderData[0] + for(var/S in SSsupply.shoppinglist) + var/datum/supply_order/SO = S + + supplyOrderCount++ + supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment)) + + supplyData["approved"] = supplyOrderData + supplyData["approved_count"] = supplyOrderCount + + var/requestCount = 0 + var/requestData[0] + for(var/S in SSsupply.order_history) + var/datum/supply_order/SO = S + if(SO.status != SUP_ORDER_REQUESTED) + continue + + requestCount++ + requestData[++requestData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "OrderedBy" = SO.ordered_by, "Comment" = html_encode(SO.comment)) + + supplyData["requests"] = requestData + supplyData["requests_count"] = requestCount + + data["supply"] = supplyData + +/datum/data/pda/app/janitor + name = "Custodial Locator" + icon = "trash-alt-o" + template = "pda_janitor" + category = "Utilities" + +/datum/data/pda/app/janitor/update_ui(mob/user as mob, list/data) + var/JaniData[0] + var/turf/cl = get_turf(pda) + + if(cl) + JaniData["user_loc"] = list("x" = cl.x, "y" = cl.y) + else + JaniData["user_loc"] = list("x" = 0, "y" = 0) + + var/MopData[0] + for(var/obj/item/weapon/mop/M in GLOB.all_mops)//GLOB.janitorial_equipment) + var/turf/ml = get_turf(M) + if(ml) + if(ml.z != cl.z) + continue + var/direction = get_dir(pda, M) + MopData[++MopData.len] = list ("x" = ml.x, "y" = ml.y, "dir" = uppertext(dir2text(direction)), "status" = M.reagents.total_volume ? "Wet" : "Dry") + + var/BucketData[0] + for(var/obj/structure/mopbucket/B in GLOB.all_mopbuckets)//GLOB.janitorial_equipment) + var/turf/bl = get_turf(B) + if(bl) + if(bl.z != cl.z) + continue + var/direction = get_dir(pda,B) + BucketData[++BucketData.len] = list ("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "volume" = B.reagents.total_volume, "max_volume" = B.reagents.maximum_volume) + + var/CbotData[0] + for(var/mob/living/bot/cleanbot/B in mob_list) + var/turf/bl = get_turf(B) + if(bl) + if(bl.z != cl.z) + continue + var/direction = get_dir(pda,B) + CbotData[++CbotData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "status" = B.on ? "Online" : "Offline") + + var/CartData[0] + for(var/obj/structure/janitorialcart/B in GLOB.all_janitorial_carts)//GLOB.janitorial_equipment) + var/turf/bl = get_turf(B) + if(bl) + if(bl.z != cl.z) + continue + var/direction = get_dir(pda,B) + CartData[++CartData.len] = list("x" = bl.x, "y" = bl.y, "dir" = uppertext(dir2text(direction)), "volume" = B.reagents.total_volume, "max_volume" = B.reagents.maximum_volume) + + JaniData["mops"] = MopData.len ? MopData : null + JaniData["buckets"] = BucketData.len ? BucketData : null + JaniData["cleanbots"] = CbotData.len ? CbotData : null + JaniData["carts"] = CartData.len ? CartData : null + data["janitor"] = JaniData diff --git a/code/modules/pda/cart_vr.dm b/code/modules/pda/cart_vr.dm new file mode 100644 index 0000000000..1f1a1cbe52 --- /dev/null +++ b/code/modules/pda/cart_vr.dm @@ -0,0 +1,20 @@ +var/list/exploration_cartridges = list( + /obj/item/weapon/cartridge/explorer, + /obj/item/weapon/cartridge/sar + ) + +/obj/item/weapon/cartridge/explorer + name = "\improper Explorator cartridge" + icon_state = "cart-e" + programs = list( + new/datum/data/pda/utility/scanmode/reagent, + new/datum/data/pda/utility/scanmode/gas) + +/obj/item/weapon/cartridge/sar + name = "\improper Med-Exp cartridge" + icon_state = "cart-m" + programs = list( + new/datum/data/pda/app/crew_records/medical, + new/datum/data/pda/utility/scanmode/medical, + new/datum/data/pda/utility/scanmode/reagent, + new/datum/data/pda/utility/scanmode/gas) diff --git a/code/modules/pda/core_apps.dm b/code/modules/pda/core_apps.dm new file mode 100644 index 0000000000..4b561c9844 --- /dev/null +++ b/code/modules/pda/core_apps.dm @@ -0,0 +1,206 @@ +/datum/data/pda/app/main_menu + icon = "home" + template = "pda_main_menu" + hidden = 1 + +/datum/data/pda/app/main_menu/update_ui(mob/user as mob, list/data) + title = pda.name + + data["app"]["is_home"] = 1 + + data["apps"] = pda.shortcut_cache + data["categories"] = pda.shortcut_cat_order + data["pai"] = !isnull(pda.pai) // pAI inserted? + + var/list/notifying[0] + for(var/P in pda.notifying_programs) + notifying["\ref[P]"] = 1 + data["notifying"] = notifying + +/datum/data/pda/app/main_menu/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("UpdateInfo") + pda.ownjob = pda.id.assignment + pda.ownrank = pda.id.rank + pda.name = "PDA-[pda.owner] ([pda.ownjob])" + return TRUE + if("pai") + if(pda.pai) + if(pda.pai.loc != pda) + pda.pai = null + else + switch(text2num(params["option"])) + if(1) // Configure pAI device + pda.pai.attack_self(usr) + if(2) // Eject pAI device + var/turf/T = get_turf_or_move(pda.loc) + if(T) + pda.pai.loc = T + pda.pai = null + return TRUE + +/datum/data/pda/app/notekeeper + name = "Notekeeper" + icon = "sticky-note-o" + template = "pda_notekeeper" + + var/note = null + var/notehtml = "" + +/datum/data/pda/app/notekeeper/start() + . = ..() + if(!note) + note = "Congratulations, your station has chosen the [pda.model_name]!" + +/datum/data/pda/app/notekeeper/update_ui(mob/user as mob, list/data) + data["note"] = note // current pda notes + +/datum/data/pda/app/notekeeper/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("Edit") + var/n = input("Please enter message", name, notehtml) as message + if(pda.loc == usr) + note = adminscrub(n) + notehtml = html_decode(note) + note = replacetext(note, "\n", "
") + else + pda.close(usr) + return TRUE + +/datum/data/pda/app/manifest + name = "Crew Manifest" + icon = "user" + template = "pda_manifest" + +/datum/data/pda/app/manifest/update_ui(mob/user as mob, list/data) + if(data_core) + data_core.get_manifest_list() + data["manifest"] = PDA_Manifest + +/datum/data/pda/app/manifest/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + +/datum/data/pda/app/atmos_scanner + name = "Atmospheric Scan" + icon = "fire" + template = "pda_atmos_scan" + category = "Utilities" + +/datum/data/pda/app/atmos_scanner/update_ui(mob/user as mob, list/data) + var/list/results = list() + var/turf/T = get_turf(user) + if(!isnull(T)) + var/datum/gas_mixture/environment = T.return_air() + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles + if (total_moles) + var/o2_level = environment.gas["oxygen"]/total_moles + var/n2_level = environment.gas["nitrogen"]/total_moles + var/co2_level = environment.gas["carbon_dioxide"]/total_moles + var/phoron_level = environment.gas["phoron"]/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) + + // entry is what the element is describing + // Type identifies which unit or other special characters to use + // Val is the information reported + // Bad_high/_low are the values outside of which the entry reports as dangerous + // Poor_high/_low are the values outside of which the entry reports as unideal + // Values were extracted from the template itself + results = list( + list("entry" = "Pressure", "units" = "kPa", "val" = "[round(pressure,0.1)]", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80), + list("entry" = "Temperature", "units" = "°C", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5), + list("entry" = "Oxygen", "units" = "kPa", "val" = "[round(o2_level*100,0.1)]", "bad_high" = 140, "poor_high" = 135, "poor_low" = 19, "bad_low" = 17), + list("entry" = "Nitrogen", "units" = "kPa", "val" = "[round(n2_level*100,0.1)]", "bad_high" = 105, "poor_high" = 85, "poor_low" = 50, "bad_low" = 40), + list("entry" = "Carbon Dioxide", "units" = "kPa", "val" = "[round(co2_level*100,0.1)]", "bad_high" = 10, "poor_high" = 5, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Phoron", "units" = "kPa", "val" = "[round(phoron_level*100,0.01)]", "bad_high" = 0.5, "poor_high" = 0, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Other", "units" = "kPa", "val" = "[round(unknown_level, 0.01)]", "bad_high" = 1, "poor_high" = 0.5, "poor_low" = 0, "bad_low" = 0) + ) + + if(isnull(results)) + results = list(list("entry" = "pressure", "units" = "kPa", "val" = "0", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80)) + + data["aircontents"] = results + +/datum/data/pda/app/news + name = "News" + icon = "newspaper" + template = "pda_news" + + var/newsfeed_channel + +/datum/data/pda/app/news/update_ui(mob/user as mob, list/data) + data["feeds"] = compile_news() + data["latest_news"] = get_recent_news() + if(newsfeed_channel) + data["target_feed"] = data["feeds"][newsfeed_channel] + else + data["target_feed"] = null + +/datum/data/pda/app/news/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + switch(action) + if("newsfeed") + newsfeed_channel = text2num(params["newsfeed"]) + +/datum/data/pda/app/news/proc/compile_news() + var/list/feeds = list() + for(var/datum/feed_channel/channel in news_network.network_channels) + var/list/messages = list() + if(!channel.censored) + var/index = 0 + for(var/datum/feed_message/FM in channel.messages) + index++ + var/list/msgdata = list( + "author" = FM.author, + "body" = FM.body, + "img" = null, + "message_type" = FM.message_type, + "time_stamp" = FM.time_stamp, + "caption" = FM.caption, + "index" = index + ) + if(FM.img) + msgdata["img"] = icon2base64(FM.img) + messages[++messages.len] = msgdata + + feeds[++feeds.len] = list( + "name" = channel.channel_name, + "censored" = channel.censored, + "author" = channel.author, + "messages" = messages, + "index" = feeds.len + 1 + ) + return feeds + +/datum/data/pda/app/news/proc/get_recent_news() + var/list/news = list() + + // Compile all the newscasts + for(var/datum/feed_channel/channel in news_network.network_channels) + if(!channel.censored) + for(var/datum/feed_message/FM in channel.messages) + var/body = replacetext(FM.body, "\n", "
") + news[++news.len] = list( + "channel" = channel.channel_name, + "author" = FM.author, + "body" = body, + "message_type" = FM.message_type, + "time_stamp" = FM.time_stamp, + "has_image" = (FM.img != null), + "caption" = FM.caption, + "time" = FM.post_time + ) + + // Cut out all but the youngest three + if(news.len > 3) + sortByKey(news, "time") + news.Cut(1, news.len - 2) // Last three have largest timestamps, youngest posts + news.Swap(1, 3) // List is sorted in ascending order of timestamp, we want descending + + return news \ No newline at end of file diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm new file mode 100644 index 0000000000..a902bec3aa --- /dev/null +++ b/code/modules/pda/messenger.dm @@ -0,0 +1,247 @@ +/datum/data/pda/app/messenger + name = "Messenger" + icon = "comments-o" + notify_icon = "comments" + title = "SpaceMessenger V4.1.0" + template = "pda_messenger" + + var/toff = 0 //If 1, messenger disabled + var/list/tnote[0] //Current Texts + var/last_text //No text spamming + + var/m_hidden = 0 // Is the PDA hidden from the PDA list? + var/active_conversation = null // New variable that allows us to only view a single conversation. + var/list/conversations = list() // For keeping up with who we have PDA messsages from. + +/datum/data/pda/app/messenger/start() + . = ..() + unnotify() + +/datum/data/pda/app/messenger/update_ui(mob/user as mob, list/data) + data["silent"] = notify_silent // does the pda make noise when it receives a message? + data["toff"] = toff // is the messenger function turned off? + data["active_conversation"] = active_conversation // Which conversation are we following right now? + + has_back = active_conversation + if(active_conversation) + data["messages"] = tnote + for(var/c in tnote) + if(c["target"] == active_conversation) + data["convo_name"] = sanitize(c["owner"]) + data["convo_job"] = sanitize(c["job"]) + break + else + var/convopdas[0] + var/pdas[0] + for(var/A in PDAs) + var/obj/item/device/pda/P = A + var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) + + if(!P.owner || PM.toff || P == pda || PM.m_hidden) + continue + if(conversations.Find("\ref[P]")) + convopdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "1"))) + else + pdas.Add(list(list("Name" = "[P]", "Reference" = "\ref[P]", "Detonate" = "[P.detonate]", "inconvo" = "0"))) + + data["convopdas"] = convopdas + data["pdas"] = pdas + + var/list/plugins = list() + if(pda.cartridge) + for(var/A in pda.cartridge.messenger_plugins) + var/datum/data/pda/messenger_plugin/P = A + plugins += list(list(name = P.name, icon = P.icon, ref = "\ref[P]")) + data["plugins"] = plugins + + if(pda.cartridge) + data["charges"] = pda.cartridge.charges ? pda.cartridge.charges : 0 + +/datum/data/pda/app/messenger/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + unnotify() + + . = TRUE + switch(action) + if("Toggle Messenger") + toff = !toff + if("Toggle Ringer")//If viewing texts then erase them, if not then toggle silent status + notify_silent = !notify_silent + if("Clear")//Clears messages + if(params["option"] == "All") + tnote.Cut() + conversations.Cut() + if(params["option"] == "Convo") + var/new_tnote[0] + for(var/i in tnote) + if(i["target"] != active_conversation) + new_tnote[++new_tnote.len] = i + tnote = new_tnote + conversations.Remove(active_conversation) + + active_conversation = null + if("Message") + var/obj/item/device/pda/P = locate(params["target"]) + create_message(usr, P) + if(params["target"] in conversations) // Need to make sure the message went through, if not welp. + active_conversation = params["target"] + if("Select Conversation") + var/P = params["target"] + for(var/n in conversations) + if(P == n) + active_conversation = P + if("Messenger Plugin") + if(!params["target"] || !params["plugin"]) + return + + var/obj/item/device/pda/P = locate(params["target"]) + if(!P) + to_chat(usr, "PDA not found.") + + var/datum/data/pda/messenger_plugin/plugin = locate(params["plugin"]) + if(plugin && (plugin in pda.cartridge.messenger_plugins)) + plugin.messenger = src + plugin.user_act(usr, P) + if("Back") + active_conversation = null + +// Specifically here for the chat message. +/datum/data/pda/app/messenger/Topic(href, href_list) + if(!pda.can_use(usr)) + return + unnotify() + + switch(href_list["choice"]) + if("Message") + var/obj/item/device/pda/P = locate(href_list["target"]) + create_message(usr, P) + if(href_list["target"] in conversations) // Need to make sure the message went through, if not welp. + active_conversation = href_list["target"] + + +/datum/data/pda/app/messenger/proc/create_message(var/mob/living/U, var/obj/item/device/pda/P) + var/t = input(U, "Please enter message", name, null) as text|null + if(!t) + return + t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN)) + t = readd_quotes(t) + if(!t || !istype(P)) + return + if(!in_range(pda, U) && pda.loc != U) + return + + var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) + + if(!PM || PM.toff || toff) + return + + if(last_text && world.time < last_text + 5) + return + + if(!pda.can_use(usr)) + return + + last_text = world.time + // check if telecomms I/O route 1459 is stable + //var/telecomms_intact = telecomms_process(P.owner, owner, t) + var/obj/machinery/message_server/useMS = null + if(message_servers) + for(var/A in message_servers) + var/obj/machinery/message_server/MS = A + //PDAs are now dependent on the Message Server. + if(MS.active) + useMS = MS + break + + var/datum/signal/signal = pda.telecomms_process() + + var/useTC = 0 + if(signal) + if(signal.data["done"]) + useTC = 1 + var/turf/pos = get_turf(P) + // TODO: Make the radio system cooperate with the space manager + if(pos.z in signal.data["level"]) + useTC = 2 + //Let's make this barely readable + if(signal.data["compression"] > 0) + t = Gibberish(t, signal.data["compression"] + 50) + + if(useMS && useTC) // only send the message if it's stable + if(useTC != 2) // Does our recipient have a broadcaster on their level? + to_chat(U, "ERROR: Cannot reach recipient.") + return + useMS.send_pda_message("[P.owner]","[pda.owner]","[t]") + pda.investigate_log("PDA Message - [U.key] - [pda.owner] -> [P.owner]: ", "pda") + + receive_message(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]"), "\ref[P]") + PM.receive_message(list("sent" = 0, "owner" = "[pda.owner]", "job" = "[pda.ownjob]", "message" = "[t]", "target" = "\ref[pda]"), "\ref[pda]") + + SStgui.update_user_uis(U, P) // Update the sending user's PDA UI so that they can see the new message + log_pda("(PDA: [src.name]) sent \"[t]\" to [P.name]", usr) + else + to_chat(U, "ERROR: Messaging server is not responding.") + +/datum/data/pda/app/messenger/proc/available_pdas() + var/list/names = list() + var/list/plist = list() + var/list/namecounts = list() + + if(toff) + to_chat(usr, "Turn on your receiver in order to send messages.") + return + + for(var/A in PDAs) + var/obj/item/device/pda/P = A + var/datum/data/pda/app/messenger/PM = P.find_program(/datum/data/pda/app/messenger) + + if(!P.owner || !PM || PM.hidden || P == pda || PM.toff) + continue + + var/name = P.owner + if(name in names) + namecounts[name]++ + name = text("[name] ([namecounts[name]])") + else + names.Add(name) + namecounts[name] = 1 + + plist[text("[name]")] = P + return plist + +/datum/data/pda/app/messenger/proc/can_receive() + return pda.owner && !toff && !hidden + +/datum/data/pda/app/messenger/proc/receive_message(list/data, ref) + tnote.Add(list(data)) + if(!conversations.Find(ref)) + conversations.Add(ref) + if(!data["sent"]) + var/owner = data["owner"] + var/job = data["job"] + var/message = data["message"] + notify("Message from [owner] ([job]), \"[message]\" (Reply)") + +/datum/data/pda/app/messenger/multicast +/datum/data/pda/app/messenger/multicast/receive_message(list/data, ref) + . = ..() + + var/obj/item/device/pda/multicaster/M = pda + if(!istype(M)) + return + + var/list/modified_message = data.Copy() + modified_message["owner"] = modified_message["owner"] + " \[Relayed]" + modified_message["target"] = "\ref[M]" + + var/list/targets = list() + for(var/obj/item/device/pda/pda in PDAs) + if(pda.cartridge && pda.owner && is_type_in_list(pda.cartridge, M.cartridges_to_send_to)) + targets |= pda + if(targets.len) + for(var/obj/item/device/pda/target in targets) + var/datum/data/pda/app/messenger/P = target.find_program(/datum/data/pda/app/messenger) + if(P) + P.receive_message(modified_message, "\ref[M]") \ No newline at end of file diff --git a/code/modules/pda/messenger_plugins.dm b/code/modules/pda/messenger_plugins.dm new file mode 100644 index 0000000000..90cb9460a4 --- /dev/null +++ b/code/modules/pda/messenger_plugins.dm @@ -0,0 +1,91 @@ +/datum/data/pda/messenger_plugin + var/datum/data/pda/app/messenger/messenger + +/datum/data/pda/messenger_plugin/proc/user_act(mob/user as mob, obj/item/device/pda/P) + + +/datum/data/pda/messenger_plugin/virus + name = "*Send Virus*" + +/datum/data/pda/messenger_plugin/virus/user_act(mob/user as mob, obj/item/device/pda/P) + var/datum/data/pda/app/messenger/M = P.find_program(/datum/data/pda/app/messenger) + + if(M && !M.toff && pda.cartridge.charges > 0) + pda.cartridge.charges-- + return 1 + return 0 + + +/datum/data/pda/messenger_plugin/virus/clown + icon = "star" + +/datum/data/pda/messenger_plugin/virus/clown/user_act(mob/user as mob, obj/item/device/pda/P) + . = ..(user, P) + if(.) + user.show_message("Virus sent!", 1) + P.honkamt = (rand(15,20)) + P.ttone = "honk" + + +/datum/data/pda/messenger_plugin/virus/mime + icon = "arrow-circle-down" + +/datum/data/pda/messenger_plugin/virus/mime/user_act(mob/user as mob, obj/item/device/pda/P) + . = ..(user, P) + if(.) + user.show_message("Virus sent!", 1) + var/datum/data/pda/app/M = P.find_program(/datum/data/pda/app/messenger) + if(M) + M.notify_silent = 1 + P.ttone = "silence" + + +/datum/data/pda/messenger_plugin/virus/detonate + name = "*Detonate*" + icon = "exclamation-circle" + +/datum/data/pda/messenger_plugin/virus/detonate/user_act(mob/user as mob, obj/item/device/pda/P) + . = ..(user, P) + if(.) + var/difficulty = 0 + + if(pda.cartridge) + difficulty += pda.cartridge.programs.len / 2 + else + difficulty += 2 + + if(!P.detonate || P.hidden_uplink) + user.show_message("The target PDA does not seem to respond to the detonation command.", 1) + pda.cartridge.charges++ + else if(prob(difficulty * 12)) + user.show_message("An error flashes on your [pda].", 1) + else if(prob(difficulty * 3)) + user.show_message("Energy feeds back into your [pda]!", 1) + pda.close(user) + pda.explode() + log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up") + message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up", 1) + else + user.show_message("Success!", 1) + log_admin("[key_name(user)] just attempted to blow up [P] with the Detomatix cartridge and succeded") + message_admins("[key_name_admin(user)] just attempted to blow up [P] with the Detomatix cartridge and succeded", 1) + P.explode() + +/datum/data/pda/messenger_plugin/virus/frame + icon = "exclamation-circle" + +/datum/data/pda/messenger_plugin/virus/frame/user_act(mob/user, obj/item/device/pda/P) + . = ..(user, P) + if(.) + var/lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" + user.show_message("Virus Sent! The unlock code to the target is: [lock_code]") + if(!P.hidden_uplink) + var/obj/item/device/uplink/hidden/uplink = new(P) + P.hidden_uplink = uplink + P.lock_code = lock_code + // else + // P.hidden_uplink.hidden_crystals += P.hidden_uplink.uses //Temporarially hide the PDA's crystals, so you can't steal telecrystals. + var/obj/item/weapon/cartridge/frame/parent_cart = pda.cartridge + P.hidden_uplink.uses = parent_cart.telecrystals + parent_cart.telecrystals = 0 + P.hidden_uplink.active = TRUE diff --git a/code/modules/pda/pda.dm b/code/modules/pda/pda.dm new file mode 100644 index 0000000000..2c3b368730 --- /dev/null +++ b/code/modules/pda/pda.dm @@ -0,0 +1,494 @@ + +//The advanced pea-green monochrome lcd of tomorrow. + +var/global/list/obj/item/device/pda/PDAs = list() + +/obj/item/device/pda + name = "\improper PDA" + desc = "A portable microcomputer by Thinktronic Systems, LTD. Functionality determined by a preprogrammed ROM cartridge." + icon = 'icons/obj/pda.dmi' + icon_state = "pda" + item_state = "electronic" + w_class = ITEMSIZE_SMALL + slot_flags = SLOT_ID | SLOT_BELT + sprite_sheets = list(SPECIES_TESHARI = 'icons/mob/species/seromi/id.dmi') + + //Main variables + var/pdachoice = 1 + var/owner = null + var/default_cartridge = 0 // Access level defined by cartridge + var/obj/item/weapon/cartridge/cartridge = null //current cartridge + + //Secondary variables + var/model_name = "Thinktronic 5230 Personal Data Assistant" + var/datum/data/pda/utility/scanmode/scanmode = null + + var/lock_code = "" // Lockcode to unlock uplink + var/honkamt = 0 //How many honks left when infected with honk.exe + var/mimeamt = 0 //How many silence left when infected with mime.exe + var/detonate = 1 // Can the PDA be blown up? + var/ttone = "beep" //The ringtone! + var/list/ttone_sound = list("beep" = 'sound/machines/twobeep.ogg', + "boom" = 'sound/effects/explosionfar.ogg', + "slip" = 'sound/misc/slip.ogg', + "honk" = 'sound/items/bikehorn.ogg', + "SKREE" = 'sound/voice/shriek1.ogg', + // "holy" = 'sound/items/PDA/ambicha4-short.ogg', + "xeno" = 'sound/voice/hiss1.ogg') + var/hidden = 0 // Is the PDA hidden from the PDA list? + var/touch_silent = 0 //If 1, no beeps on interacting. + + var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. + var/ownjob = null //related to above - this is assignment (potentially alt title) + var/ownrank = null // this one is rank, never alt title + + var/obj/item/device/paicard/pai = null // A slot for a personal AI device + + var/spam_proof = FALSE // If true, it can't be spammed by random events. + + var/datum/data/pda/app/current_app = null + var/datum/data/pda/app/lastapp = null + var/list/programs = list( + new/datum/data/pda/app/main_menu, + new/datum/data/pda/app/notekeeper, + new/datum/data/pda/app/news, + new/datum/data/pda/app/messenger, + new/datum/data/pda/app/manifest, + new/datum/data/pda/app/atmos_scanner, + new/datum/data/pda/utility/scanmode/notes, + new/datum/data/pda/utility/flashlight) + var/list/shortcut_cache = list() + var/list/shortcut_cat_order = list() + var/list/notifying_programs = list() + var/retro_mode = 0 + +/obj/item/device/pda/examine(mob/user) + . = ..() + if(Adjacent(user)) + . += "The time [stationtime2text()] is displayed in the corner of the screen." + +/obj/item/device/pda/CtrlClick() + if(issilicon(usr)) + return + + if(can_use(usr)) + remove_pen() + return + ..() + +/obj/item/device/pda/AltClick() + if(issilicon(usr)) + return + + if ( can_use(usr) ) + if(id) + remove_id() + else + to_chat(usr, "This PDA does not have an ID in it.") + +/obj/item/device/pda/proc/play_ringtone() + var/S + + if(ttone in ttone_sound) + S = ttone_sound[ttone] + else + S = 'sound/machines/twobeep.ogg' + playsound(loc, S, 50, 1) + for(var/mob/O in hearers(3, loc)) + O.show_message(text("[bicon(src)] *[ttone]*")) + +/obj/item/device/pda/proc/set_ringtone() + var/t = input("Please enter new ringtone", name, ttone) as text + if(in_range(src, usr) && loc == usr) + if(t) + if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code))) + to_chat(usr, "The PDA softly beeps.") + close(usr) + else + t = sanitize(copytext(t, 1, 20)) + ttone = t + return 1 + else + close(usr) + return 0 + +/obj/item/device/pda/New(var/mob/living/carbon/human/H) + ..() + PDAs += src + PDAs = sortAtom(PDAs) + update_programs() + if(default_cartridge) + cartridge = new default_cartridge(src) + cartridge.update_programs(src) + new /obj/item/weapon/pen(src) + pdachoice = isnull(H) ? 1 : (ishuman(H) ? H.pdachoice : 1) + switch(pdachoice) + if(1) icon = 'icons/obj/pda.dmi' + if(2) icon = 'icons/obj/pda_slim.dmi' + if(3) icon = 'icons/obj/pda_old.dmi' + if(4) icon = 'icons/obj/pda_rugged.dmi' + if(5) icon = 'icons/obj/pda_holo.dmi' + if(6) + icon = 'icons/obj/pda_wrist.dmi' + item_state = icon_state + item_icons = list( + slot_belt_str = 'icons/mob/pda_wrist.dmi', + slot_wear_id_str = 'icons/mob/pda_wrist.dmi', + slot_gloves_str = 'icons/mob/pda_wrist.dmi' + ) + desc = "A portable microcomputer by Thinktronic Systems, LTD. This model is a wrist-bound version." + slot_flags = SLOT_ID | SLOT_BELT | SLOT_GLOVES + sprite_sheets = list( + SPECIES_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', + SPECIES_VR_TESHARI = 'icons/mob/species/seromi/pda_wrist.dmi', + ) + else + icon = 'icons/obj/pda_old.dmi' + log_debug("Invalid switch for PDA, defaulting to old PDA icons. [pdachoice] chosen.") + start_program(find_program(/datum/data/pda/app/main_menu)) + +/obj/item/device/pda/proc/can_use(mob/user) + return (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE) + +/obj/item/device/pda/GetAccess() + if(id) + return id.GetAccess() + else + return ..() + +/obj/item/device/pda/GetID() + return id + +/obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location) + var/mob/M = usr + if((!istype(over_object, /obj/screen)) && can_use(usr)) + return attack_self(M) + return + +/obj/item/device/pda/proc/close(mob/user) + SStgui.close_uis(src) + +/obj/item/device/pda/attack_self(mob/user as mob) + user.set_machine(src) + + if(active_uplink_check(user)) + return + + tgui_interact(user) + return + +/obj/item/device/pda/proc/start_program(datum/data/pda/P) + if(P && ((P in programs) || (cartridge && (P in cartridge.programs)))) + return P.start() + return 0 + +/obj/item/device/pda/proc/find_program(type) + var/datum/data/pda/A = locate(type) in programs + if(A) + return A + if(cartridge) + A = locate(type) in cartridge.programs + if(A) + return A + return null + +// force the cache to rebuild on update_ui +/obj/item/device/pda/proc/update_shortcuts() + shortcut_cache.Cut() + +/obj/item/device/pda/proc/update_programs() + for(var/A in programs) + var/datum/data/pda/P = A + P.pda = src + +/obj/item/device/pda/proc/detonate_act(var/obj/item/device/pda/P) + //TODO: sometimes these attacks show up on the message server + var/i = rand(1,100) + var/j = rand(0,1) //Possibility of losing the PDA after the detonation + var/message = "" + var/mob/living/M = null + if(ismob(P.loc)) + M = P.loc + + //switch(i) //Yes, the overlapping cases are intended. + if(i<=10) //The traditional explosion + P.explode() + j=1 + message += "Your [P] suddenly explodes!" + if(i>=10 && i<= 20) //The PDA burns a hole in the holder. + j=1 + if(M && isliving(M)) + M.apply_damage( rand(30,60) , BURN) + message += "You feel a searing heat! Your [P] is burning!" + if(i>=20 && i<=25) //EMP + empulse(P.loc, 1, 2, 4, 6, 1) + message += "Your [P] emits a wave of electromagnetic energy!" + if(i>=25 && i<=40) //Smoke + var/datum/effect/effect/system/smoke_spread/chem/S = new /datum/effect/effect/system/smoke_spread/chem + S.attach(P.loc) + S.set_up(P, 10, 0, P.loc) + playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3) + S.start() + message += "Large clouds of smoke billow forth from your [P]!" + if(i>=40 && i<=45) //Bad smoke + var/datum/effect/effect/system/smoke_spread/bad/B = new /datum/effect/effect/system/smoke_spread/bad + B.attach(P.loc) + B.set_up(P, 10, 0, P.loc) + playsound(P, 'sound/effects/smoke.ogg', 50, 1, -3) + B.start() + message += "Large clouds of noxious smoke billow forth from your [P]!" + if(i>=65 && i<=75) //Weaken + if(M && isliving(M)) + M.apply_effects(0,1) + message += "Your [P] flashes with a blinding white light! You feel weaker." + if(i>=75 && i<=85) //Stun and stutter + if(M && isliving(M)) + M.apply_effects(1,0,0,0,1) + message += "Your [P] flashes with a blinding white light! You feel weaker." + if(i>=85) //Sparks + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(2, 1, P.loc) + s.start() + message += "Your [P] begins to spark violently!" + if(i>45 && i<65 && prob(50)) //Nothing happens + message += "Your [P] bleeps loudly." + j = prob(10) + + if(j && detonate) //This kills the PDA + qdel(P) + if(message) + message += "It melts in a puddle of plastic." + else + message += "Your [P] shatters in a thousand pieces!" + + if(M && isliving(M)) + message = "[message]" + M.show_message(message, 1) + +/obj/item/device/pda/proc/remove_id() + if (id) + if (ismob(loc)) + var/mob/M = loc + M.put_in_hands(id) + to_chat(usr, "You remove the ID from the [name].") + playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) + else + id.loc = get_turf(src) + id = null + +/obj/item/device/pda/proc/remove_pen() + var/obj/item/weapon/pen/O = locate() in src + if(O) + if(istype(loc, /mob)) + var/mob/M = loc + if(M.get_active_hand() == null) + M.put_in_hands(O) + to_chat(usr, "You remove \the [O] from \the [src].") + return + O.loc = get_turf(src) + else + to_chat(usr, "This PDA does not have a pen in it.") + +/obj/item/device/pda/verb/verb_reset_pda() + set category = "Object" + set name = "Reset PDA" + set src in usr + + if(issilicon(usr)) + return + + if(can_use(usr)) + start_program(find_program(/datum/data/pda/app/main_menu)) + notifying_programs.Cut() + overlays -= image('icons/obj/pda.dmi', "pda-r") + to_chat(usr, "You press the reset button on \the [src].") + else + to_chat(usr, "You cannot do this while restrained.") + +/obj/item/device/pda/verb/verb_remove_id() + set category = "Object" + set name = "Remove id" + set src in usr + + if(issilicon(usr)) + return + + if ( can_use(usr) ) + if(id) + remove_id() + else + to_chat(usr, "This PDA does not have an ID in it.") + else + to_chat(usr, "You cannot do this while restrained.") + + +/obj/item/device/pda/verb/verb_remove_pen() + set category = "Object" + set name = "Remove pen" + set src in usr + + if(issilicon(usr)) + return + + if ( can_use(usr) ) + remove_pen() + else + to_chat(usr, "You cannot do this while restrained.") + +/obj/item/device/pda/verb/verb_remove_cartridge() + set category = "Object" + set name = "Remove cartridge" + set src in usr + + if(issilicon(usr)) + return + + if(!can_use(usr)) + to_chat(usr, "You cannot do this while restrained.") + return + + if(isnull(cartridge)) + to_chat(usr, "There's no cartridge to eject.") + return + + cartridge.forceMove(get_turf(src)) + if(ismob(loc)) + var/mob/M = loc + M.put_in_hands(cartridge) + // mode = 0 + // scanmode = 0 + if (cartridge.radio) + cartridge.radio.hostpda = null + to_chat(usr, "You remove \the [cartridge] from the [name].") + playsound(src, 'sound/machines/id_swipe.ogg', 100, 1) + cartridge = null + update_programs() + update_shortcuts() + start_program(find_program(/datum/data/pda/app/main_menu)) + + +/obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. + if(choice == 1) + if (id) + remove_id() + return 1 + else + var/obj/item/I = user.get_active_hand() + if (istype(I, /obj/item/weapon/card/id) && user.unEquip(I)) + I.loc = src + id = I + return 1 + else + var/obj/item/weapon/card/I = user.get_active_hand() + if (istype(I, /obj/item/weapon/card/id) && I:registered_name && user.unEquip(I)) + var/obj/old_id = id + I.loc = src + id = I + user.put_in_hands(old_id) + return 1 + return 0 + +// access to status display signals +/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob) + ..() + if(istype(C, /obj/item/weapon/cartridge) && !cartridge) + cartridge = C + user.drop_item() + cartridge.loc = src + cartridge.update_programs(src) + update_shortcuts() + to_chat(usr, "You insert [cartridge] into [src].") + if(cartridge.radio) + cartridge.radio.hostpda = src + + else if(istype(C, /obj/item/weapon/card/id)) + var/obj/item/weapon/card/id/idcard = C + if(!idcard.registered_name) + to_chat(user, "\The [src] rejects the ID.") + return + if(!owner) + owner = idcard.registered_name + ownjob = idcard.assignment + ownrank = idcard.rank + name = "PDA-[owner] ([ownjob])" + to_chat(user, "Card scanned.") + else + //Basic safety check. If either both objects are held by user or PDA is on ground and card is in hand. + if(((src in user.contents) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) ) + if(id_check(user, 2)) + to_chat(user, "You put the ID into \the [src]'s slot.") + updateSelfDialog()//Update self dialog on success. + return //Return in case of failed check or when successful. + updateSelfDialog()//For the non-input related code. + else if(istype(C, /obj/item/device/paicard) && !src.pai) + user.drop_item() + C.loc = src + pai = C + to_chat(user, "You slot \the [C] into \the [src].") + SStgui.update_uis(src) // update all UIs attached to src + else if(istype(C, /obj/item/weapon/pen)) + var/obj/item/weapon/pen/O = locate() in src + if(O) + to_chat(user, "There is already a pen in \the [src].") + else + user.drop_item() + C.loc = src + to_chat(user, "You slot \the [C] into \the [src].") + return + +/obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob) + if (istype(C, /mob/living/carbon) && scanmode) + scanmode.scan_mob(C, user) + +/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity) + if(proximity && scanmode) + scanmode.scan_atom(A, user) + +/obj/item/device/pda/proc/explode() //This needs tuning. //Sure did. + if(!src.detonate) return + var/turf/T = get_turf(src.loc) + if(T) + T.hotspot_expose(700,125) + explosion(T, 0, 0, 1, rand(1,2)) + return + +/obj/item/device/pda/Destroy() + PDAs -= src + if (src.id && prob(100) && !delete_id) //IDs are kept in 90% of the cases //VOREStation Edit - 100% of the cases, excpet when specified otherwise + src.id.forceMove(get_turf(src.loc)) + else + QDEL_NULL(src.id) + + current_app = null + scanmode = null + QDEL_NULL(pai) + QDEL_LIST(programs) + QDEL_NULL(cartridge) + return ..() + +//Some spare PDAs in a box +/obj/item/weapon/storage/box/PDAs + name = "box of spare PDAs" + desc = "A box of spare PDA microcomputers." + icon = 'icons/obj/pda.dmi' + icon_state = "pdabox" + +/obj/item/weapon/storage/box/PDAs/New() + ..() + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/weapon/cartridge/head(src) + + var/newcart = pick( /obj/item/weapon/cartridge/engineering, + /obj/item/weapon/cartridge/security, + /obj/item/weapon/cartridge/medical, + /obj/item/weapon/cartridge/signal/science, + /obj/item/weapon/cartridge/quartermaster) + new newcart(src) + +// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP +/obj/item/device/pda/emp_act(severity) + for(var/atom/A in src) + A.emp_act(severity) diff --git a/code/modules/pda/pda_subtypes.dm b/code/modules/pda/pda_subtypes.dm new file mode 100644 index 0000000000..11b684b678 --- /dev/null +++ b/code/modules/pda/pda_subtypes.dm @@ -0,0 +1,246 @@ + +/obj/item/device/pda/medical + default_cartridge = /obj/item/weapon/cartridge/medical + icon_state = "pda-m" + +/obj/item/device/pda/viro + default_cartridge = /obj/item/weapon/cartridge/medical + icon_state = "pda-v" + +/obj/item/device/pda/engineering + default_cartridge = /obj/item/weapon/cartridge/engineering + icon_state = "pda-e" + +/obj/item/device/pda/security + default_cartridge = /obj/item/weapon/cartridge/security + icon_state = "pda-s" + +/obj/item/device/pda/detective + default_cartridge = /obj/item/weapon/cartridge/detective + icon_state = "pda-det" + +/obj/item/device/pda/warden + default_cartridge = /obj/item/weapon/cartridge/security + icon_state = "pda-warden" + +/obj/item/device/pda/janitor + default_cartridge = /obj/item/weapon/cartridge/janitor + icon_state = "pda-j" + ttone = "slip" + +/obj/item/device/pda/science + default_cartridge = /obj/item/weapon/cartridge/signal/science + icon_state = "pda-tox" + ttone = "boom" + +/obj/item/device/pda/clown + default_cartridge = /obj/item/weapon/cartridge/clown + icon_state = "pda-clown" + desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings." + ttone = "honk" + +/obj/item/device/pda/mime + default_cartridge = /obj/item/weapon/cartridge/mime + icon_state = "pda-mime" + +/obj/item/device/pda/mime/New() + . = ..() + var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger) + if(M) + M.notify_silent = TRUE + +/obj/item/device/pda/heads + default_cartridge = /obj/item/weapon/cartridge/head + icon_state = "pda-h" + +/obj/item/device/pda/heads/hop + default_cartridge = /obj/item/weapon/cartridge/hop + icon_state = "pda-hop" + +/obj/item/device/pda/heads/hos + default_cartridge = /obj/item/weapon/cartridge/hos + icon_state = "pda-hos" + +/obj/item/device/pda/heads/ce + default_cartridge = /obj/item/weapon/cartridge/ce + icon_state = "pda-ce" + +/obj/item/device/pda/heads/cmo + default_cartridge = /obj/item/weapon/cartridge/cmo + icon_state = "pda-cmo" + +/obj/item/device/pda/heads/rd + default_cartridge = /obj/item/weapon/cartridge/rd + icon_state = "pda-rd" + +/obj/item/device/pda/captain + default_cartridge = /obj/item/weapon/cartridge/captain + icon_state = "pda-c" + detonate = 0 + //toff = 1 + +/obj/item/device/pda/ert + default_cartridge = /obj/item/weapon/cartridge/captain + icon_state = "pda-h" + detonate = 0 +// hidden = 1 + +/obj/item/device/pda/cargo + default_cartridge = /obj/item/weapon/cartridge/quartermaster + icon_state = "pda-cargo" + +/obj/item/device/pda/quartermaster + default_cartridge = /obj/item/weapon/cartridge/quartermaster + icon_state = "pda-q" + +/obj/item/device/pda/shaftminer + icon_state = "pda-miner" + default_cartridge = /obj/item/weapon/cartridge/miner + +/obj/item/device/pda/syndicate + default_cartridge = /obj/item/weapon/cartridge/syndicate + icon_state = "pda-syn" +// name = "Military PDA" // Vorestation Edit +// owner = "John Doe" + hidden = 1 + +/obj/item/device/pda/chaplain + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-holy" + ttone = "holy" + +/obj/item/device/pda/lawyer + default_cartridge = /obj/item/weapon/cartridge/lawyer + icon_state = "pda-lawyer" + ttone = "..." + +/obj/item/device/pda/botanist + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-hydro" + +/obj/item/device/pda/roboticist + default_cartridge = /obj/item/weapon/cartridge/signal/science + icon_state = "pda-robot" + +/obj/item/device/pda/librarian + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-libb" + desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader." + model_name = "Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant" + +/obj/item/device/pda/librarian/New() + . = ..() + var/datum/data/pda/app/M = find_program(/datum/data/pda/app/messenger) + if(M) + M.notify_silent = TRUE //Quiet in the library! + +/obj/item/device/pda/clear + icon_state = "pda-transp" + desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a special edition with a transparent case." + model_name = "Thinktronic 5230 Personal Data Assistant Deluxe Special Max Turbo Limited Edition" + +/obj/item/device/pda/chef + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-chef" + +/obj/item/device/pda/bar + default_cartridge = /obj/item/weapon/cartridge/service + icon_state = "pda-bar" + +/obj/item/device/pda/atmos + default_cartridge = /obj/item/weapon/cartridge/atmos + icon_state = "pda-atmo" + +/obj/item/device/pda/chemist + default_cartridge = /obj/item/weapon/cartridge/chemistry + icon_state = "pda-chem" + +/obj/item/device/pda/geneticist + default_cartridge = /obj/item/weapon/cartridge/medical + icon_state = "pda-gene" + + +// Used for the PDA multicaster, which mirrors messages sent to it to a specific department, +/obj/item/device/pda/multicaster + ownjob = "Relay" + icon_state = "NONE" + detonate = 0 + spam_proof = TRUE // Spam messages don't actually work and its difficult to disable these. + programs = list( + new/datum/data/pda/app/messenger/multicast + ) + var/list/cartridges_to_send_to = list() + +/obj/item/device/pda/multicaster/command/New() + ..() + owner = "Command Department" + name = "Command Department (Relay)" + cartridges_to_send_to = command_cartridges + +/obj/item/device/pda/multicaster/security/New() + ..() + owner = "Security Department" + name = "Security Department (Relay)" + cartridges_to_send_to = security_cartridges + +/obj/item/device/pda/multicaster/engineering/New() + ..() + owner = "Engineering Department" + name = "Engineering Department (Relay)" + cartridges_to_send_to = engineering_cartridges + +/obj/item/device/pda/multicaster/medical/New() + ..() + owner = "Medical Department" + name = "Medical Department (Relay)" + cartridges_to_send_to = medical_cartridges + +/obj/item/device/pda/multicaster/research/New() + ..() + owner = "Research Department" + name = "Research Department (Relay)" + cartridges_to_send_to = research_cartridges + +/obj/item/device/pda/multicaster/cargo/New() + ..() + owner = "Cargo Department" + name = "Cargo Department (Relay)" + cartridges_to_send_to = cargo_cartridges + +/obj/item/device/pda/multicaster/civilian/New() + ..() + owner = "Civilian Services Department" + name = "Civilian Services Department (Relay)" + cartridges_to_send_to = civilian_cartridges + +/obj/item/device/pda/clown/Crossed(atom/movable/AM as mob|obj) //Clown PDA is slippery. + if(AM.is_incorporeal()) + return + if (istype(AM, /mob/living)) + var/mob/living/M = AM + + if(M.slip("the PDA",8) && M.real_name != src.owner && istype(src.cartridge, /obj/item/weapon/cartridge/clown)) + if(src.cartridge.charges < 5) + src.cartridge.charges++ + +//Some spare PDAs in a box +/obj/item/weapon/storage/box/PDAs + name = "box of spare PDAs" + desc = "A box of spare PDA microcomputers." + icon = 'icons/obj/pda.dmi' + icon_state = "pdabox" + +/obj/item/weapon/storage/box/PDAs/New() + ..() + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/device/pda(src) + new /obj/item/weapon/cartridge/head(src) + + var/newcart = pick( /obj/item/weapon/cartridge/engineering, + /obj/item/weapon/cartridge/security, + /obj/item/weapon/cartridge/medical, + /obj/item/weapon/cartridge/signal/science, + /obj/item/weapon/cartridge/quartermaster) + new newcart(src) diff --git a/code/modules/pda/pda_tgui.dm b/code/modules/pda/pda_tgui.dm new file mode 100644 index 0000000000..6d57a6c25e --- /dev/null +++ b/code/modules/pda/pda_tgui.dm @@ -0,0 +1,116 @@ +// Self contained file for all things TGUI +/obj/item/device/pda/tgui_state(mob/user) + return GLOB.tgui_inventory_state + +/obj/item/device/pda/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Pda", "Personal Data Assistant", parent_ui) + ui.open() + +/obj/item/device/pda/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + data["owner"] = owner // Who is your daddy... + data["ownjob"] = ownjob // ...and what does he do? + + // update list of shortcuts, only if they changed + if(!shortcut_cache.len) + shortcut_cache = list() + shortcut_cat_order = list() + var/prog_list = programs.Copy() + if(cartridge) + prog_list |= cartridge.programs + + for(var/A in prog_list) + var/datum/data/pda/P = A + + if(P.hidden) + continue + var/list/cat + if(P.category in shortcut_cache) + cat = shortcut_cache[P.category] + else + cat = list() + shortcut_cache[P.category] = cat + shortcut_cat_order += P.category + cat |= list(list(name = P.name, icon = P.icon, notify_icon = P.notify_icon, ref = "\ref[P]")) + + // force the order of a few core categories + shortcut_cat_order = list("General") \ + + sortList(shortcut_cat_order - list("General", "Scanners", "Utilities")) \ + + list("Scanners", "Utilities") + + data["idInserted"] = (id ? 1 : 0) + data["idLink"] = (id ? text("[id.registered_name], [id.assignment]") : "--------") + + data["useRetro"] = retro_mode + data["touch_silent"] = touch_silent + + data["cartridge_name"] = cartridge ? cartridge.name : "" + data["stationTime"] = stationtime2text() //worldtime2stationtime(world.time) // Aaa which fucking one is canonical there's SO MANY + + data["app"] = list( + "name" = current_app.title, + "icon" = current_app.icon, + "template" = current_app.template, + "has_back" = current_app.has_back) + + current_app.update_ui(user, data) + + return data + +/obj/item/device/pda/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + add_fingerprint(usr) + usr.set_machine(src) + + if(!touch_silent) + playsound(src, 'sound/machines/pda_click.ogg', 20) + + . = TRUE + switch(action) + if("Home") //Go home, largely replaces the old Return + var/datum/data/pda/app/main_menu/A = find_program(/datum/data/pda/app/main_menu) + if(A) + start_program(A) + if("StartProgram") + if(params["program"]) + var/datum/data/pda/app/A = locate(params["program"]) + if(A) + start_program(A) + if("Eject")//Ejects the cart, only done from hub. + if(!isnull(cartridge)) + var/turf/T = loc + if(ismob(T)) + T = T.loc + var/obj/item/weapon/cartridge/C = cartridge + C.forceMove(T) + if(scanmode in C.programs) + scanmode = null + if(current_app in C.programs) + start_program(find_program(/datum/data/pda/app/main_menu)) + if(C.radio) + C.radio.hostpda = null + for(var/datum/data/pda/P in notifying_programs) + if(P in C.programs) + P.unnotify() + cartridge = null + update_shortcuts() + if("Authenticate")//Checks for ID + id_check(usr, 1) + if("Retro") + retro_mode = !retro_mode + if("TouchSounds") + touch_silent = !touch_silent + if("Ringtone") + return set_ringtone() + else + if(current_app) + . = current_app.tgui_act(action, params, ui, state) + + if((honkamt > 0) && (prob(60)))//For clown virus. + honkamt-- + playsound(loc, 'sound/items/bikehorn.ogg', 30, 1) diff --git a/code/game/objects/items/devices/PDA/PDA_vr.dm b/code/modules/pda/pda_vr.dm similarity index 100% rename from code/game/objects/items/devices/PDA/PDA_vr.dm rename to code/modules/pda/pda_vr.dm diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm new file mode 100644 index 0000000000..0d3b115a13 --- /dev/null +++ b/code/modules/pda/radio.dm @@ -0,0 +1,138 @@ +/obj/item/radio/integrated + name = "\improper PDA radio module" + desc = "An electronic radio system." + icon = 'icons/obj/module.dmi' + icon_state = "power_mod" + var/obj/item/device/pda/hostpda = null + + var/list/botlist = null // list of bots + var/mob/living/bot/active // the active bot; if null, show bot list + var/list/botstatus // the status signal sent by the bot + + var/bot_type //The type of bot it is. + var/bot_filter //Determines which radio filter to use. + + var/control_freq = BOT_FREQ + + var/on = 0 //Are we currently active?? + var/menu_message = "" + +/obj/item/radio/integrated/New() + ..() + if(istype(loc.loc, /obj/item/device/pda)) + hostpda = loc.loc + if(bot_filter) + spawn(5) + add_to_radio(bot_filter) + +/obj/item/radio/integrated/Destroy() + if(radio_controller) + radio_controller.remove_object(src, control_freq) + hostpda = null + return ..() + +/obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3, s_filter) + + //to_world("Post: [freq]: [key]=[value], [key2]=[value2]") + var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq) + + if(!frequency) + return + + var/datum/signal/signal = new() + signal.source = src + signal.transmission_method = TRANSMISSION_RADIO + signal.data[key] = value + if(key2) + signal.data[key2] = value2 + if(key3) + signal.data[key3] = value3 + + frequency.post_signal(src, signal, radio_filter = s_filter) + +/obj/item/radio/integrated/Topic(href, href_list) + ..() + switch(href_list["op"]) + if("control") + active = locate(href_list["bot"]) + spawn(0) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) + + if("scanbots") // find all bots + botlist = null + spawn(0) + post_signal(control_freq, "command", "bot_status", s_filter = bot_filter) + + if("botlist") + active = null + + if("stop", "go", "home") + spawn(0) + post_signal(control_freq, "command", href_list["op"], "active", active, s_filter = bot_filter) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) + + if("summon") + spawn(0) + post_signal(control_freq, "command", "summon", "active", active, "target", get_turf(hostpda), "useraccess", hostpda.GetAccess(), "user", usr, s_filter = bot_filter) + post_signal(control_freq, "command", "bot_status", "active", active, s_filter = bot_filter) + +/obj/item/radio/integrated/receive_signal(datum/signal/signal) + if(bot_type && istype(signal.source, /mob/living/bot) && signal.data["type"] == bot_type) + if(!botlist) + botlist = new() + + botlist |= signal.source + + if(active == signal.source) + var/list/b = signal.data + botstatus = b.Copy() + +/obj/item/radio/integrated/proc/add_to_radio(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots. + if(radio_controller) + radio_controller.add_object(src, control_freq, radio_filter = bot_filter) + +/* + * Radio Cartridge, essentially a signaler. + */ +/obj/item/radio/integrated/signal + var/frequency = 1457 + var/code = 30.0 + var/last_transmission + var/datum/radio_frequency/radio_connection + +/obj/item/radio/integrated/signal/Destroy() + if(radio_controller) + radio_controller.remove_object(src, frequency) + radio_connection = null + return ..() + +/obj/item/radio/integrated/signal/Initialize() + if(!radio_controller) + return + + if(src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ) + src.frequency = sanitize_frequency(src.frequency) + + set_frequency(frequency) + +/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency) + radio_controller.remove_object(src, frequency) + frequency = new_frequency + radio_connection = radio_controller.add_object(src, frequency) + +/obj/item/radio/integrated/signal/proc/send_signal(message="ACTIVATE") + if(last_transmission && world.time < (last_transmission + 5)) + return + last_transmission = world.time + + var/time = time2text(world.realtime,"hh:mm:ss") + var/turf/T = get_turf(src) + lastsignalers.Add("[time] : [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) : [format_frequency(frequency)]/[code]") + + var/datum/signal/signal = new + signal.source = src + signal.encryption = code + signal.data["message"] = message + + spawn(0) + radio_connection.post_signal(src, signal) diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm new file mode 100644 index 0000000000..be8bb8f444 --- /dev/null +++ b/code/modules/pda/utilities.dm @@ -0,0 +1,184 @@ +/datum/data/pda/utility/flashlight + name = "Enable Flashlight" + icon = "lightbulb-o" + + var/fon = 0 //Is the flashlight function on? + var/f_lum = 2 //Luminosity for the flashlight function + +/datum/data/pda/utility/flashlight/start() + fon = !fon + name = fon ? "Disable Flashlight" : "Enable Flashlight" + pda.update_shortcuts() + pda.set_light(fon ? f_lum : 0) + +/datum/data/pda/utility/honk + name = "Honk Synthesizer" + icon = "smile-o" + category = "Clown" + + var/last_honk //Also no honk spamming that's bad too + +/datum/data/pda/utility/honk/start() + if(!(last_honk && world.time < last_honk + 20)) + playsound(pda.loc, 'sound/items/bikehorn.ogg', 50, 1) + last_honk = world.time + +/datum/data/pda/utility/toggle_door + name = "Toggle Door" + icon = "external-link" + var/remote_door_id = "" + +// /datum/data/pda/utility/toggle_door/start() +// for(var/obj/machinery/door/poddoor/M in airlocks) +// if(M.id_tag == remote_door_id) +// if(M.density) +// M.open() +// else +// M.close() + +/datum/data/pda/utility/scanmode/medical + base_name = "Med Scanner" + icon = "heart-o" + +/datum/data/pda/utility/scanmode/medical/scan_mob(mob/living/C as mob, mob/living/user as mob) + C.visible_message("[user] has analyzed [C]'s vitals!") + + user.show_message("Analyzing Results for [C]:") + user.show_message(" Overall Status: [C.stat > 1 ? "dead" : "[C.health - C.halloss]% healthy"]", 1) + user.show_message(text(" Damage Specifics: []-[]-[]-[]", + (C.getOxyLoss() > 50) ? "warning" : "", C.getOxyLoss(), + (C.getToxLoss() > 50) ? "warning" : "", C.getToxLoss(), + (C.getFireLoss() > 50) ? "warning" : "", C.getFireLoss(), + (C.getBruteLoss() > 50) ? "warning" : "", C.getBruteLoss() + ), 1) + user.show_message(" Key: Suffocation/Toxin/Burns/Brute", 1) + user.show_message(" Body Temperature: [C.bodytemperature-T0C]°C ([C.bodytemperature*1.8-459.67]°F)", 1) + if(C.tod && (C.stat == DEAD || (C.status_flags & FAKEDEATH))) + user.show_message(" Time of Death: [C.tod]") + if(istype(C, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = C + var/list/damaged = H.get_damaged_organs(1,1) + user.show_message("Localized Damage, Brute/Burn:",1) + if(length(damaged)>0) + for(var/obj/item/organ/external/org in damaged) + user.show_message(text(" []: []-[]", + capitalize(org.name), (org.brute_dam > 0) ? "warning" : "notice", org.brute_dam, (org.burn_dam > 0) ? "warning" : "notice", org.burn_dam),1) + else + user.show_message(" Limbs are OK.",1) + +/datum/data/pda/utility/scanmode/dna + base_name = "DNA Scanner" + icon = "link" + +/datum/data/pda/utility/scanmode/dna/scan_mob(mob/living/C as mob, mob/living/user as mob) + if(istype(C, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = C + if(!istype(H.dna, /datum/dna)) + to_chat(user, "No fingerprints found on [H]") + else + to_chat(user, "[H]'s Fingerprints: [md5(H.dna.uni_identity)]") + scan_blood(C, user) + +/datum/data/pda/utility/scanmode/dna/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) + scan_blood(A, user) + +/datum/data/pda/utility/scanmode/dna/proc/scan_blood(atom/A, mob/user) + if(!A.blood_DNA) + to_chat(user, "No blood found on [A]") + if(A.blood_DNA) + qdel(A.blood_DNA) + else + to_chat(user, "Blood found on [A]. Analysing...") + spawn(15) + for(var/blood in A.blood_DNA) + to_chat(user, "Blood type: [A.blood_DNA[blood]]\nDNA: [blood]") + +/datum/data/pda/utility/scanmode/halogen + base_name = "Halogen Counter" + icon = "exclamation-circle" + +/datum/data/pda/utility/scanmode/halogen/scan_mob(mob/living/C as mob, mob/living/user as mob) + C.visible_message("[user] has analyzed [C]'s radiation levels!") + + user.show_message("Analyzing Results for [C]:") + if(C.radiation) + user.show_message("Radiation Level: [C.radiation > 0 ? "[C.radiation]" : "0"]") + else + user.show_message("No radiation detected.") + +/datum/data/pda/utility/scanmode/reagent + base_name = "Reagent Scanner" + icon = "flask" + +/datum/data/pda/utility/scanmode/reagent/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) + if(!isnull(A.reagents)) + if(A.reagents.reagent_list.len > 0) + var/reagents_length = A.reagents.reagent_list.len + to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.") + for(var/re in A.reagents.reagent_list) + to_chat(user, "\t [re]") + else + to_chat(user, "No active chemical agents found in [A].") + else + to_chat(user, "No significant chemical agents found in [A].") + +/datum/data/pda/utility/scanmode/gas + base_name = "Gas Scanner" + icon = "tachometer-alt" + +/datum/data/pda/utility/scanmode/gas/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) + pda.analyze_gases(A, user) + +/datum/data/pda/utility/scanmode/notes + base_name = "Note Scanner" + icon = "clipboard" + var/datum/data/pda/app/notekeeper/notes + +/datum/data/pda/utility/scanmode/notes/start() + . = ..() + notes = pda.find_program(/datum/data/pda/app/notekeeper) + +/datum/data/pda/utility/scanmode/notes/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) + if(notes && istype(A, /obj/item/weapon/paper)) + var/obj/item/weapon/paper/P = A + var/list/brlist = list("p", "/p", "br", "hr", "h1", "h2", "h3", "h4", "/h1", "/h2", "/h3", "/h4") + + // JMO 20140705: Makes scanned document show up properly in the notes. Not pretty for formatted documents, + // as this will clobber the HTML, but at least it lets you scan a document. You can restore the original + // notes by editing the note again. (Was going to allow you to edit, but scanned documents are too long.) + var/raw_scan = sanitize_simple(P.info, list("\t" = "", "ÿ" = "")) + var/formatted_scan = "" + // Scrub out the tags (replacing a few formatting ones along the way) + // Find the beginning and end of the first tag. + var/tag_start = findtext(raw_scan, "<") + var/tag_stop = findtext(raw_scan, ">") + // Until we run out of complete tags... + while(tag_start && tag_stop) + var/pre = copytext(raw_scan, 1, tag_start) // Get the stuff that comes before the tag + var/tag = lowertext(copytext(raw_scan, tag_start + 1, tag_stop)) // Get the tag so we can do intellegent replacement + var/tagend = findtext(tag, " ") // Find the first space in the tag if there is one. + // Anything that's before the tag can just be added as is. + formatted_scan = formatted_scan + pre + // If we have a space after the tag (and presumably attributes) just crop that off. + if(tagend) + tag = copytext(tag, 1, tagend) + if(tag in brlist) // Check if it's I vertical space tag. + formatted_scan = formatted_scan + "
" // If so, add some padding in. + raw_scan = copytext(raw_scan, tag_stop + 1) // continue on with the stuff after the tag + // Look for the next tag in what's left + tag_start = findtext(raw_scan, "<") + tag_stop = findtext(raw_scan, ">") + // Anything that is left in the page. just tack it on to the end as is + formatted_scan = formatted_scan + raw_scan + // If there is something in there already, pad it out. + if(length(notes.note) > 0) + notes.note += "
" + // Store the scanned document to the notes + notes.note += "Scanned Document. Edit to restore previous notes/delete scan.
----------
" + formatted_scan + "
" + // notehtml ISN'T set to allow user to get their old notes back. A better implementation would add a "scanned documents" + // feature to the PDA, which would better convey the availability of the feature, but this will work for now. + // Inform the user + to_chat(user, "Paper scanned and OCRed to notekeeper.")//concept of scanning paper copyright brainoblivion 2009 + + else + to_chat(user, "Error scanning [A].") diff --git a/code/modules/persistence/filth.dm b/code/modules/persistence/filth.dm index 2eea824f83..a7aa9e9cd4 100644 --- a/code/modules/persistence/filth.dm +++ b/code/modules/persistence/filth.dm @@ -6,6 +6,7 @@ random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7") color = "#464f33" persistent = TRUE + anchored = 1 /obj/effect/decal/cleanable/filth/Initialize() . = ..() diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index 2780c3b9a4..539b7b7a3b 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -8,6 +8,7 @@ blend_mode = BLEND_MULTIPLY color = "#000000" alpha = 120 + anchored = 1 var/message var/graffiti_age = 0 diff --git a/code/modules/power/apc_vr.dm b/code/modules/power/apc_vr.dm index c08c9b8db0..ec7d4dba09 100644 --- a/code/modules/power/apc_vr.dm +++ b/code/modules/power/apc_vr.dm @@ -6,4 +6,7 @@ NA.apc = src area = NA name = "[area.name] APC" - update() \ No newline at end of file + update() + +/obj/machinery/power/apc/get_cell() + return cell \ No newline at end of file diff --git a/code/modules/power/batteryrack.dm b/code/modules/power/batteryrack.dm index f6bc1c9ff6..dc1dbe7e58 100644 --- a/code/modules/power/batteryrack.dm +++ b/code/modules/power/batteryrack.dm @@ -25,6 +25,7 @@ var/equalise = 0 // If true try to equalise charge between cells var/icon_update = 0 // Timer in ticks for icon update. var/ui_tick = 0 + should_be_mapped = TRUE /obj/machinery/power/smes/batteryrack/New() @@ -113,6 +114,8 @@ if(equalise) // Now try to get least charged cell and use the power from it. var/obj/item/weapon/cell/CL = get_least_charged_cell() + if(!CL) + return amount -= CL.give(amount) if(!amount) return @@ -209,8 +212,43 @@ celldiff = min(min(celldiff, most.charge), least.maxcharge - least.charge) least.give(most.use(celldiff)) -/obj/machinery/power/smes/batteryrack/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - var/data[0] +/obj/machinery/power/smes/batteryrack/dismantle() + for(var/obj/item/weapon/cell/C in internal_cells) + C.forceMove(get_turf(src)) + internal_cells -= C + return ..() + +/obj/machinery/power/smes/batteryrack/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) + if(istype(W, /obj/item/weapon/cell)) // ID Card, try to insert it. + if(insert_cell(W, user)) + to_chat(user, "You insert \the [W] into \the [src].") + else + to_chat(user, "\The [src] has no empty slot for \the [W]") + if(!..()) + return 0 + if(default_deconstruction_crowbar(user, W)) + return + if(default_part_replacement(user, W)) + return + +/obj/machinery/power/smes/batteryrack/inputting() + return + +/obj/machinery/power/smes/batteryrack/outputting() + return + +/obj/machinery/power/smes/batteryrack/attack_hand(var/mob/user) + tgui_interact(user) + +/obj/machinery/power/smes/batteryrack/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Batteryrack", name) + ui.open() + +/obj/machinery/power/smes/batteryrack/tgui_data(mob/user) + // DO NOT CALL PARENT. + var/list/data = list() data["mode"] = mode data["transfer_max"] = max_transfer_rate @@ -238,75 +276,44 @@ cells += list(cell) data["cells_list"] = cells - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "psu.tmpl", "Cell Rack PSU", 500, 430) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data -/obj/machinery/power/smes/batteryrack/dismantle() - for(var/obj/item/weapon/cell/C in internal_cells) - C.forceMove(get_turf(src)) - internal_cells -= C - return ..() - -/obj/machinery/power/smes/batteryrack/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - if(!..()) - return 0 - if(default_deconstruction_crowbar(user, W)) - return - if(default_part_replacement(user, W)) - return - if(istype(W, /obj/item/weapon/cell)) // ID Card, try to insert it. - if(insert_cell(W, user)) - to_chat(user, "You insert \the [W] into \the [src].") - else - to_chat(user, "\The [src] has no empty slot for \the [W]") - -/obj/machinery/power/smes/batteryrack/attack_hand(var/mob/user) - ui_interact(user) - -/obj/machinery/power/smes/batteryrack/inputting() - return - -/obj/machinery/power/smes/batteryrack/outputting() - return - -/obj/machinery/power/smes/batteryrack/Topic(href, href_list) +/obj/machinery/power/smes/batteryrack/tgui_act(action, list/params) // ..() would respond to those topic calls, but we don't want to use them at all. // Calls to these shouldn't occur anyway, due to usage of different nanoUI, but // it's here in case someone decides to try hrefhacking/modified templates. - if(href_list["input"] || href_list["output"]) - return 1 + if(!(action in list("disable", "enable", "equaliseon", "equaliseoff", "ejectcell"))) + return TRUE if(..()) - return 1 - if( href_list["disable"] ) - update_io(0) - return 1 - else if( href_list["enable"] ) - update_io(between(1, text2num(href_list["enable"]), 3)) - return 1 - else if( href_list["equaliseon"] ) - equalise = 1 - return 1 - else if( href_list["equaliseoff"] ) - equalise = 0 - return 1 - else if( href_list["ejectcell"] ) - var/obj/item/weapon/cell/C - for(var/obj/item/weapon/cell/CL in internal_cells) - if(CL.c_uid == text2num(href_list["ejectcell"])) - C = CL - break + return TRUE - if(!istype(C)) - return 1 + switch(action) + if("disable") + update_io(0) + return TRUE + if("enable") + update_io(between(1, text2num(params["enable"]), 3)) + return TRUE + if("equaliseon") + equalise = 1 + return TRUE + if("equaliseoff") + equalise = 0 + return TRUE + if("ejectcell") + var/obj/item/weapon/cell/C + for(var/obj/item/weapon/cell/CL in internal_cells) + if(CL.c_uid == text2num(params["ejectcell"])) + C = CL + break - C.forceMove(get_turf(src)) - internal_cells -= C - update_icon() - RefreshParts() - update_maxcharge() - return 1 \ No newline at end of file + if(!istype(C)) + return TRUE + + C.forceMove(get_turf(src)) + internal_cells -= C + update_icon() + RefreshParts() + update_maxcharge() + return TRUE \ No newline at end of file diff --git a/code/modules/power/batteryrack_vr.dm b/code/modules/power/batteryrack_vr.dm new file mode 100644 index 0000000000..69a2cb5330 --- /dev/null +++ b/code/modules/power/batteryrack_vr.dm @@ -0,0 +1,9 @@ +/obj/item/weapon/module/power_control/attackby(var/obj/item/I, var/mob/user) + if(I.is_multitool()) + to_chat(user, SPAN_NOTICE("You begin tweaking the power control circuits to support a power cell rack.")) + if(do_after(user, 50 * I.toolspeed)) + var/obj/item/newcircuit = new/obj/item/weapon/circuitboard/batteryrack(get_turf(user)) + qdel(src) + user.put_in_hands(newcircuit) + return + return ..() diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index ecfbf00a5f..d77f8341a6 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -25,6 +25,8 @@ var/last_use = 0 // A tracker for use in self-charging var/charge_delay = 0 // How long it takes for the cell to start recharging after last use matter = list(DEFAULT_WALL_MATERIAL = 700, "glass" = 50) + drop_sound = 'sound/items/drop/component.ogg' + pickup_sound = 'sound/items/pickup/component.ogg' // Overlay stuff. var/overlay_half_state = "cell-o1" // Overlay used when not fully charged but not empty. diff --git a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm index 73543ead92..740ef842c2 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_assembly.dm @@ -19,7 +19,7 @@ /obj/item/weapon/fuel_assembly/Initialize() . = ..() - var/material/material = get_material_by_name(fuel_type) + var/datum/material/material = get_material_by_name(fuel_type) if(istype(material)) name = "[material.use_name] fuel rod assembly" desc = "A fuel rod for a fusion reactor. This one is made from [material.use_name]." diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm index d38fd76e86..71dcc7684f 100644 --- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm +++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm @@ -49,7 +49,7 @@ if(istype(thing, /obj/item/stack/material)) var/obj/item/stack/material/M = thing - var/material/mat = M.get_material() + var/datum/material/mat = M.get_material() if(!mat.is_fusion_fuel) to_chat(user, "It would be pointless to make a fuel rod out of [mat.use_name].") return diff --git a/code/modules/power/grid_checker.dm b/code/modules/power/grid_checker.dm index 224eade429..53766098f0 100644 --- a/code/modules/power/grid_checker.dm +++ b/code/modules/power/grid_checker.dm @@ -59,7 +59,7 @@ if(opened) wires.Interact(user) - return ui_interact(user) + return tgui_interact(user) /obj/machinery/power/grid_checker/proc/power_failure(var/announce = TRUE) if(announce) diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index 386437db0b..01fa9932d9 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -43,9 +43,12 @@ for(var/obj/item/I in contents) . += "\the [I]" +/obj/machinery/particle_smasher/atmosanalyze(var/mob/user) + return list("\The [src] reads an energy level of [energy].") + /obj/machinery/particle_smasher/attackby(obj/item/W as obj, mob/user as mob) if(W.type == /obj/item/device/analyzer) - to_chat(user, "\The [src] reads an energy level of [energy].") + return else if(istype(W, /obj/item/stack/material)) var/obj/item/stack/material/M = W if(M.uses_charge) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 2caa008f0c..1d5262044e 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -345,59 +345,59 @@ /obj/machinery/computer/turbine_computer/attack_hand(var/mob/user as mob) if((. = ..())) return - src.interact(user) + tgui_interact(user) -/obj/machinery/computer/turbine_computer/interact(mob/user) - return ui_interact(user) +/obj/machinery/computer/turbine_computer/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "TurbineControl", name) + ui.open() -/obj/machinery/computer/turbine_computer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/machinery/computer/turbine_computer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = list() data["connected"] = (compressor && compressor.turbine) ? TRUE : FALSE data["compressor_broke"] = (!compressor || (compressor.stat & BROKEN)) ? TRUE : FALSE data["turbine_broke"] = (!compressor || !compressor.turbine || (compressor.turbine.stat & BROKEN)) ? TRUE : FALSE data["broken"] = (data["compressor_broke"] || data["turbine_broke"]) data["door_status"] = door_status ? TRUE : FALSE + + data["online"] = FALSE + data["power"] = 0 + data["rpm"] = 0 + data["temp"] = 0 + if(compressor && compressor.turbine) data["online"] = compressor.starter - data["power"] = DisplayPower(compressor.turbine.lastgen) + data["power"] = compressor.turbine.lastgen // DisplayPower data["rpm"] = compressor.rpm data["temp"] = compressor.gas_contained.temperature - // update the ui if it exists, returns null if no ui is passed/found - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - // the ui does not exist, so we'll create a new() one - // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm - ui = new(user, src, ui_key, "turbine_computer.tmpl", name, 520, 440) - // when the ui is first opened this is the data it will use - ui.set_initial_data(data) - // open the new ui window - ui.open() - // auto update every Master Controller tick - ui.set_auto_update(TRUE) + return data -/obj/machinery/computer/turbine_computer/Topic(href, href_list) +/obj/machinery/computer/turbine_computer/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) if(..()) - return - if(href_list["power-on"]) - if(compressor && compressor.turbine) - compressor.starter = TRUE + return TRUE + + switch(action) + if("power-on") + if(compressor && compressor.turbine) + compressor.starter = TRUE + . = TRUE + if("power-off") + if(compressor && compressor.turbine) + compressor.starter = FALSE + . = TRUE + if("reconnect") + locate_machinery() . = TRUE - else if(href_list["power-off"]) - if(compressor && compressor.turbine) - compressor.starter = FALSE + if("doors") + door_status = !door_status + for(var/obj/machinery/door/blast/D in src.doors) + if (door_status) + spawn(0) D.close() + else + spawn(0)D.open() . = TRUE - else if(href_list["reconnect"]) - locate_machinery() - . = TRUE - else if(href_list["doors"]) - door_status = !door_status - for(var/obj/machinery/door/blast/D in src.doors) - if (door_status) - spawn(0) D.close() - else - spawn(0)D.open() - . = TRUE #undef COMPFRICTION #undef COMPSTARTERLOAD diff --git a/code/modules/projectiles/broken.dm b/code/modules/projectiles/broken.dm index a63f685ba1..15f63f4c54 100644 --- a/code/modules/projectiles/broken.dm +++ b/code/modules/projectiles/broken.dm @@ -37,7 +37,7 @@ var/res_name = "" if(ispath(res,/obj/item/stack/material)) var/obj/item/stack/material/mat_stack = res - var/material/mat = get_material_by_name("[initial(mat_stack.default_type)]") + var/datum/material/mat = get_material_by_name("[initial(mat_stack.default_type)]") if(material_needs[resource]>1) res_name = "[mat.use_name] [mat.sheet_plural_name]" else diff --git a/code/modules/projectiles/guns/energy/hooklauncher.dm b/code/modules/projectiles/guns/energy/hooklauncher.dm index 2c170544a0..79ddf7443d 100644 --- a/code/modules/projectiles/guns/energy/hooklauncher.dm +++ b/code/modules/projectiles/guns/energy/hooklauncher.dm @@ -5,12 +5,14 @@ /obj/item/weapon/gun/energy/hooklauncher name = "gravity whip" desc = "A large, strange gauntlet." + icon = 'icons/obj/gun2.dmi' icon_state = "gravwhip" item_state = "gravwhip" fire_sound_text = "laser blast" fire_delay = 15 charge_cost = 300 + charge_meter = FALSE cell_type = /obj/item/weapon/cell/device/weapon projectile_type = /obj/item/projectile/energy/hook @@ -29,7 +31,6 @@ cell_type = /obj/item/weapon/cell/device/weapon/recharge/alien battery_lock = TRUE charge_cost = 400 - charge_meter = FALSE projectile_type = /obj/item/projectile/energy/hook/ring diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm new file mode 100644 index 0000000000..0b0678894f --- /dev/null +++ b/code/modules/projectiles/guns/magic.dm @@ -0,0 +1,60 @@ +/* + * "Magic" "Guns" + */ + +/obj/item/weapon/gun/magic + name = "staff of nothing" + desc = "This staff is boring to watch because even though it came first you've seen everything it can do in other staves for years." + icon = 'icons/obj/wizard.dmi' + icon_state = "staffofnothing" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_magic.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_magic.dmi', + ) + fire_sound = 'sound/weapons/emitter.ogg' + w_class = ITEMSIZE_HUGE + projectile_type = null + var/checks_antimagic = TRUE + var/max_charges = 6 + var/charges = 0 + var/recharge_rate = 4 + var/charge_tick = 0 + var/can_charge = TRUE + +/obj/item/weapon/gun/magic/consume_next_projectile() + if(checks_antimagic && locate(/obj/item/weapon/nullrod) in usr) return null + if(!ispath(projectile_type)) return null + if(charges <= 0) return null + + charges -= 1 + + return new projectile_type(src) + +/obj/item/weapon/gun/magic/Initialize() + . = ..() + charges = max_charges + if(can_charge) + START_PROCESSING(SSobj, src) + +/obj/item/weapon/gun/magic/Destroy() + if(can_charge) + STOP_PROCESSING(SSobj, src) + return ..() + +/obj/item/weapon/gun/magic/process() + if (charges >= max_charges) + charge_tick = 0 + return + charge_tick++ + if(charge_tick < recharge_rate) + return 0 + charge_tick = 0 + charges++ + return 1 + +/obj/item/weapon/gun/magic/handle_click_empty(mob/user) + if (user) + user.visible_message("*wzhzhzh*", "The [name] whizzles quietly.") + else + src.visible_message("*wzhzh*") + playsound(src, 'sound/weapons/empty.ogg', 100, 1) diff --git a/code/modules/projectiles/guns/magic/fireball.dm b/code/modules/projectiles/guns/magic/fireball.dm new file mode 100644 index 0000000000..4abe3e286e --- /dev/null +++ b/code/modules/projectiles/guns/magic/fireball.dm @@ -0,0 +1,17 @@ + +/obj/item/weapon/gun/magic/firestaff + name = "flaming staff" + desc = "A long, everburning torch." + icon = 'icons/obj/wizard.dmi' + icon_state = "staffoffire" + item_state = "staff" + fire_sound = 'sound/weapons/emitter.ogg' + w_class = ITEMSIZE_HUGE + checks_antimagic = TRUE + max_charges = 6 + charges = 0 + recharge_rate = 4 + charge_tick = 0 + can_charge = TRUE + + projectile_type = /obj/item/projectile/energy/fireball diff --git a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm index 7745c9c623..8476e28bee 100644 --- a/code/modules/projectiles/guns/magnetic/magnetic_construction.dm +++ b/code/modules/projectiles/guns/magnetic/magnetic_construction.dm @@ -11,7 +11,7 @@ if(istype(thing, /obj/item/stack/material) && construction_stage == 1) var/obj/item/stack/material/reinforcing = thing - var/material/reinforcing_with = reinforcing.get_material() + var/datum/material/reinforcing_with = reinforcing.get_material() if(reinforcing_with.name == DEFAULT_WALL_MATERIAL) // Steel if(reinforcing.get_amount() < 5) to_chat(user, "You need at least 5 [reinforcing.singular_name]\s for this task.") diff --git a/code/modules/projectiles/guns/projectile/boltaction.dm b/code/modules/projectiles/guns/projectile/boltaction.dm index 9e93d46b8a..1aa8e83957 100644 --- a/code/modules/projectiles/guns/projectile/boltaction.dm +++ b/code/modules/projectiles/guns/projectile/boltaction.dm @@ -14,6 +14,7 @@ ammo_type = /obj/item/ammo_casing/a762 load_method = SINGLE_CASING|SPEEDLOADER action_sound = 'sound/weapons/riflebolt.ogg' + pump_animation = null /obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice // For target practice desc = "A bolt-action rifle with a lightweight synthetic wood stock, designed for competitive shooting. Comes shipped with practice rounds pre-loaded into the gun. Popular among professional marksmen. Uses 7.62mm rounds." @@ -66,4 +67,4 @@ desc = "An iconic manually operated lever action rifle, offering adequate stopping power due to it's still powerful cartridge while at the same time having a rather respectable firing rate due to it's mechanism. It is very probable this is a replica instead of a museum piece, but rifles of this pattern still see usage as colonist guns in some far off regions. Uses 7.62mm rounds." item_state = "levercarabine" // That isn't how carbine is spelled ya knob! :U icon_state = "levercarabine" - animated_pump = 1 + pump_animation = "levercarabine-cycling" diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 799c27ac54..6e69b65a6a 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -14,10 +14,10 @@ ammo_type = /obj/item/ammo_casing/a12g/beanbag projectile_type = /obj/item/projectile/bullet/shotgun handle_casings = HOLD_CASINGS - var/recentpump = 0 // to prevent spammage + var/recentpump = 0 //To prevent spammage var/action_sound = 'sound/weapons/shotgunpump.ogg' - var/animated_pump = 0 //This is for cyling animations. - var/empty_sprite = 0 //This is just a dirty var so it doesn't fudge up. + var/empty_sprite = 0 //This is just a dirty var so it doesn't fudge up. + var/pump_animation = "shotgun-pump" //You put the reference to the animation in question here. Frees up namming. Ex: "shotgun_old_pump" or "sniper_cycle" /obj/item/weapon/gun/projectile/shotgun/pump/consume_next_projectile() if(chambered) @@ -41,8 +41,8 @@ loaded -= AC //Remove casing from loaded list. chambered = AC - if(animated_pump)//This affects all bolt action and shotguns. - flick("[icon_state]-cycling", src)//This plays any pumping + if(pump_animation)//This affects all bolt action and shotguns. + flick("[pump_animation]", src)//This plays any pumping update_icon() @@ -60,6 +60,7 @@ /obj/item/weapon/gun/projectile/shotgun/pump/slug ammo_type = /obj/item/ammo_casing/a12g + pump_animation = null /obj/item/weapon/gun/projectile/shotgun/pump/combat name = "combat shotgun" @@ -71,6 +72,7 @@ max_shells = 7 //match the ammo box capacity, also it can hold a round in the chamber anyways, for a total of 8. ammo_type = /obj/item/ammo_casing/a12g load_method = SINGLE_CASING|SPEEDLOADER + pump_animation = "cshotgun-pump" /obj/item/weapon/gun/projectile/shotgun/pump/combat/empty ammo_type = null diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 8ef1bfe2a6..6cd885f0c1 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -739,6 +739,8 @@ shot_from = launcher.name silenced = launcher.silenced + if(user) + firer = user return launch_projectile(target, target_zone, user, params, angle_override, forced_spread) diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index e3ac4d0591..c72d9b35ea 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -119,7 +119,7 @@ icon_state = "bullet_chonk" //Ywedit fire_sound = 'sound/weapons/Gunshot_shotgun.ogg' damage = 50 - armor_penetration = 15 + armor_penetration = 20 /obj/item/projectile/bullet/shotgun/beanbag //because beanbags are not bullets name = "beanbag" diff --git a/code/modules/projectiles/projectile/hook.dm b/code/modules/projectiles/projectile/hook.dm index ee5fd6c471..3e98319ebd 100644 --- a/code/modules/projectiles/projectile/hook.dm +++ b/code/modules/projectiles/projectile/hook.dm @@ -27,13 +27,15 @@ var/list/help_messages = list("slaps", "pokes", "nudges", "bumps", "pinches") var/done_mob_unique = FALSE // Has the projectile already done something to a mob? + var/datum/beam/chain = null + /obj/item/projectile/energy/hook/launch_projectile(atom/target, target_zone, mob/user, params, angle_override, forced_spread = 0) var/expected_distance = get_dist(target, loc) range = expected_distance // So the hook hits the ground if no mob is hit. target_distance = expected_distance if(firer) // Needed to ensure later checks in impact and on hit function. launcher_intent = firer.a_intent - firer.Beam(src,icon_state=beam_state,icon='icons/effects/beam.dmi',time=60, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time=1) + chain = firer.Beam(src,icon_state=beam_state,icon='icons/effects/beam.dmi',time=60, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time=1) if(launcher_intent) switch(launcher_intent) @@ -58,10 +60,22 @@ ..() // Does the regular launching stuff. +/obj/item/projectile/energy/hook/after_move() + if(chain) + var/origin_turf = get_turf(firer) + var/target_turf = get_turf(src) + if(!chain.static_beam && (origin_turf != chain.origin_oldloc || target_turf != chain.target_oldloc)) + chain.origin_oldloc = origin_turf //so we don't keep checking against their initial positions, leading to endless Reset()+Draw() calls + chain.target_oldloc = target_turf + chain.Reset() + chain.Draw() + return + /obj/item/projectile/energy/hook/on_hit(var/atom/target, var/blocked = 0, var/def_zone = null) if(..()) perform_intent_unique(target) + /obj/item/projectile/energy/hook/on_impact(var/atom/A) perform_intent_unique(get_turf(A)) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm new file mode 100644 index 0000000000..9fcc1c1979 --- /dev/null +++ b/code/modules/projectiles/projectile/magic.dm @@ -0,0 +1,20 @@ + +/obj/item/projectile/energy/fireball + name = "fireball" + icon_state = "fireball2" + damage = 15 + damage_type = BURN + check_armour = "bomb" + armor_penetration = 25 // It's a great ball of fire. + + combustion = TRUE + +/obj/item/projectile/energy/fireball/on_hit(var/atom/target, var/blocked = 0) + new /obj/effect/explosion(get_turf(target)) + explosion(target, -1, 0, 2) + ..() + +/obj/item/projectile/energy/fireball/on_impact(var/atom/target) + new /obj/effect/explosion(get_turf(target)) + explosion(target, -1, 0, 2) + ..() diff --git a/code/modules/radiation/radiation.dm b/code/modules/radiation/radiation.dm index c107390094..cb701027d8 100644 --- a/code/modules/radiation/radiation.dm +++ b/code/modules/radiation/radiation.dm @@ -36,7 +36,7 @@ cached_rad_resistance += O.rad_resistance else if(O.density) //So open doors don't get counted - var/material/M = O.get_material() + var/datum/material/M = O.get_material() if(!M) continue cached_rad_resistance += (M.weight + M.radiation_resistance) / config.radiation_material_resistance_divisor // Looks like storing the contents length is meant to be a basic check if the cache is stale due to items enter/exiting. Better than nothing so I'm leaving it as is. ~Leshana diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index ae75e5ae89..b96e223ed9 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -493,4 +493,4 @@ trans_to(M, mobportion, multiplier, copy) trans_to(T, total_volume, multiplier, copy) if (total_volume <= 0) - qdel(src) + qdel(src) \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 212de66431..e636a28d0a 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -118,7 +118,7 @@ remove_self(volume) /datum/reagent/blood/synthblood - name = "Synthetic blood" + name = "synthetic blood" id = "synthblood" color = "#999966" volume_mod = 2 @@ -127,8 +127,16 @@ ..() if(data && !data["blood_type"]) data["blood_type"] = "O-" + if(data && data["species"]) + data["species"] = null return +/datum/reagent/blood/synthblood/dilute + name = "synthetic plasma" + id = "synthblood_dilute" + color = "#cacaaf" + volume_mod = 1.2 + // pure concentrated antibodies /datum/reagent/antibodies data = list("antibodies"=list()) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm index 9077b694d5..5185e5a8f4 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm @@ -18,11 +18,14 @@ return //add the new taste data - for(var/taste in newdata) - if(taste in data) - data[taste] += newdata[taste] - else - data[taste] = newdata[taste] + if(islist(data)) + for(var/taste in newdata) + if(taste in data) + data[taste] += newdata[taste] + else + data[taste] = newdata[taste] + else + initialize_data(newdata) //cull all tastes below 10% of total var/totalFlavor = 0 @@ -136,6 +139,8 @@ description = "More commonly known as fat, the third macronutrient, with over double the energy content of carbs and protein" reagent_state = SOLID + taste_description = "greasiness" + taste_mult = 0.1 nutriment_factor = 27//The caloric ratio of carb/protein/fat is 4:4:9 color = "#CCCCCC" @@ -145,6 +150,7 @@ id = "oil" description = "Oils are liquid fats." reagent_state = LIQUID + taste_description = "oil" color = "#c79705" touch_met = 1.5 var/lastburnmessage = 0 @@ -221,8 +227,6 @@ name = "Corn Oil" id = "cornoil" description = "An oil derived from various types of corn." - taste_description = "oil" - taste_mult = 0.1 reagent_state = LIQUID /datum/reagent/nutriment/triglyceride/oil/peanut @@ -588,7 +592,7 @@ //SYNNONO MEME FOODS EXPANSION - Credit to Synnono /datum/reagent/spacespice - name = "Space Spice" + name = "Wurmwoad" id = "spacespice" description = "An exotic blend of spices for cooking. Definitely not worms." reagent_state = SOLID @@ -676,7 +680,7 @@ var/mob/living/carbon/human/H = M if(!H.can_feel_pain()) return - + var/effective_dose = (dose * M.species.spice_mod) if((effective_dose < 5) && (dose == metabolism || prob(5))) to_chat(M, "Your insides feel uncomfortably hot!") diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index d2e6818701..15d471da7a 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2674,4 +2674,4 @@ id = "browniemix" result = "browniemix" required_reagents = list("flour" = 5, "coco" = 5, "sugar" = 5) - result_amount = 15 \ No newline at end of file + result_amount = 15 diff --git a/code/modules/reagents/Chemistry-Recipes_vr.dm b/code/modules/reagents/Chemistry-Recipes_vr.dm index 2bd766213e..fa4763f41d 100644 --- a/code/modules/reagents/Chemistry-Recipes_vr.dm +++ b/code/modules/reagents/Chemistry-Recipes_vr.dm @@ -77,6 +77,14 @@ /datum/chemical_reaction/foam/softdrink required_reagents = list("cola" = 1, "mint" = 1) + +/datum/chemical_reaction/firefightingfoam //TODO: Make it so we can add this to the foam tanks to refill them + name = "Firefighting Foam" + id = "firefighting foam" + result = "firefoam" + required_reagents = list("water" = 1) + catalysts = list("fluorine" = 10) + result_amount = 1 /////////////////////////////////////////////////////////////////////////////////// /// Vore Drugs diff --git a/code/modules/reagents/dispenser/dispenser2_energy.dm b/code/modules/reagents/dispenser/dispenser2_energy.dm index 84c5260c3f..b0dec9f65b 100644 --- a/code/modules/reagents/dispenser/dispenser2_energy.dm +++ b/code/modules/reagents/dispenser/dispenser2_energy.dm @@ -25,7 +25,7 @@ C.reagents.add_reagent(id, to_restore) . = 1 if(.) - SSnanoui.update_uis(src) + SStgui.update_uis(src) /obj/machinery/chemical_dispenser dispense_reagents = list( diff --git a/code/modules/reagents/distilling/Distilling-Recipes.dm b/code/modules/reagents/distilling/Distilling-Recipes.dm index a8ac2ee975..0736ac7e61 100644 --- a/code/modules/reagents/distilling/Distilling-Recipes.dm +++ b/code/modules/reagents/distilling/Distilling-Recipes.dm @@ -128,6 +128,17 @@ temp_range = list(T0C + 100, T0C + 120) +/datum/chemical_reaction/distilling/synthplas + name = "Distilling Synthplas" + id = "distill_synthplas" + result = "synthblood_dilute" + required_reagents = list("protein" = 2, "antibodies" = 1, "bicaridine" = 1) + result_amount = 3 + + reaction_rate = HALF_LIFE(15) + + temp_range = list(T0C + 110, T0C + 130) + // Alcohol /datum/chemical_reaction/distilling/beer name = "Distilling Beer" diff --git a/code/modules/reagents/distilling/distilling.dm b/code/modules/reagents/distilling/distilling.dm index 645f13c76b..5d37f8510c 100644 --- a/code/modules/reagents/distilling/distilling.dm +++ b/code/modules/reagents/distilling/distilling.dm @@ -19,7 +19,7 @@ var/target_temp = T20C - var/max_temp = T20C + 300 + var/max_temp = T0C + 300 var/min_temp = T0C - 10 var/current_temp = T20C @@ -86,6 +86,16 @@ update_icon() +/obj/machinery/portable_atmospherics/powered/reagent_distillery/RefreshParts() + var/total_laser_rating = 0 + for(var/obj/item/weapon/stock_parts/micro_laser/ML in component_parts) + total_laser_rating += ML.rating + + max_temp = initial(max_temp) + (50 * (total_laser_rating - 1)) + min_temp = max(1, initial(min_temp) - (30 * (total_laser_rating - 1))) + + return + /obj/machinery/portable_atmospherics/powered/reagent_distillery/proc/setup_overlay_vars() overlay_output_beaker = image(icon = src.icon, icon_state = "[base_state]-output") overlay_input_beaker = image(icon = src.icon, icon_state = "[base_state]-input") diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 223583f7dc..693330fef7 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -27,6 +27,7 @@ var/label_text = "" var/blood_type = null + var/reag_id = "blood" /obj/item/weapon/reagent_containers/blood/Initialize() . = ..() @@ -35,7 +36,7 @@ if(blood_type != null) label_text = "[blood_type]" update_iv_label() - reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) + reagents.add_reagent(reag_id, 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null)) update_icon() /obj/item/weapon/reagent_containers/blood/on_reagent_change() @@ -95,6 +96,14 @@ /obj/item/weapon/reagent_containers/blood/OMinus blood_type = "O-" +/obj/item/weapon/reagent_containers/blood/synthplas + blood_type = "O-" + reag_id = "synthblood_dilute" + +/obj/item/weapon/reagent_containers/blood/synthblood + blood_type = "O-" + reag_id = "synthblood" + /obj/item/weapon/reagent_containers/blood/empty name = "Empty BloodPack" desc = "Seems pretty useless... Maybe if there were a way to fill it?" diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghypo.dm similarity index 87% rename from code/modules/reagents/reagent_containers/borghydro.dm rename to code/modules/reagents/reagent_containers/borghypo.dm index 347c136e40..12a3df61df 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghypo.dm @@ -79,9 +79,11 @@ if(!affected) to_chat(user, "\The [H] is missing that limb!") return + /* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity. else if(affected.robotic >= ORGAN_ROBOT) to_chat(user, "You cannot inject a robotic limb.") return + */ if(M.can_inject(user, 1, ignore_thickness = bypass_protection)) to_chat(user, "You inject [M] with the injector.") @@ -133,7 +135,48 @@ recharge_time = 3 volume = 60 possible_transfer_amounts = list(5, 10, 20, 30) - reagent_ids = list("ale", "cider", "beer", "berryjuice", "bitters", "coffee", "cognac", "cola", "dr_gibb", "egg", "gin", "gingerale", "hot_coco", "ice", "icetea", "kahlua", "lemonjuice", "lemon_lime", "limejuice", "mead", "milk", "mint", "orangejuice", "rum", "sake", "sodawater", "soymilk", "space_up", "spacemountainwind", "specialwhiskey", "sugar", "tea", "tequilla", "tomatojuice", "tonic", "vermouth", "vodka", "water", "watermelonjuice", "whiskey", "wine") + reagent_ids = list("ale", + "cider", + "beer", + "berryjuice", + "bitters", + "coffee", + "cognac", + "cola", + "dr_gibb", + "egg", + "gin", + "gingerale", + "hot_coco", + "ice", + "icetea", + "kahlua", + "lemonjuice", + "lemon_lime", + "limejuice", + "mead", + "milk", + "mint", + "orangejuice", + "rum", + "sake", + "sodawater", + "soymilk", + "space_up", + "spacemountainwind", + "spacespice", + "specialwhiskey", + "sugar", + "tea", + "tequilla", + "tomatojuice", + "tonic", + "vermouth", + "vodka", + "water", + "watermelonjuice", + "whiskey", + "wine") /obj/item/weapon/reagent_containers/borghypo/service/attack(var/mob/M, var/mob/user) return diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 6b567f47f0..9e7eb5a575 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -135,7 +135,7 @@ update_name_label() if(istype(W,/obj/item/weapon/storage/bag)) ..() - if(W && W.w_class <= w_class && (flags & OPENCONTAINER)) + if(W && W.w_class <= w_class && (flags & OPENCONTAINER) && user.a_intent != I_HELP) to_chat(user, "You dip \the [W] into \the [src].") reagents.touch_obj(W, reagents.total_volume) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 9a1882e47b..80d0e1e34d 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -42,9 +42,11 @@ if(!affected) to_chat(user, "\The [H] is missing that limb!") return + /* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity. else if(affected.robotic >= ORGAN_ROBOT) to_chat(user, "You cannot inject a robotic limb.") return + */ //VOREStation Add Start - Adds Prototype Hypo functionality if(H != user && prototype) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 4bdf471989..fe50843852 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -170,9 +170,11 @@ if(!affected) to_chat(user, "\The [H] is missing that limb!") return + /* since synths have oil/coolant streams now, it only makes sense that you should be able to inject stuff. preserved for posterity. else if(affected.robotic >= ORGAN_ROBOT) to_chat(user, "You cannot inject a robotic limb.") return + */ var/cycle_time = injtime*0.33 //33% of the time slept between 5u doses var/warmup_time = 0 //0 for containers diff --git a/code/modules/research/designs/circuits/ai_modules_vr.dm b/code/modules/research/designs/circuits/ai_modules_vr.dm new file mode 100644 index 0000000000..d8bc3814ac --- /dev/null +++ b/code/modules/research/designs/circuits/ai_modules_vr.dm @@ -0,0 +1,41 @@ +/datum/design/aimodule/core/predator + name = "Predator" + id = "laws_predator_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/predator + sort_string = "XAVAA" + +/datum/design/aimodule/core/protective_shell + name = "Protective Shell" + id = "laws_protective_shell_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/protective_shell + sort_string = "XAVAB" + +/datum/design/aimodule/core/scientific_pursuer + name = "Scientific Pursuer" + id = "laws_scientific_pursuer_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/scientific_pursuer + sort_string = "XAVAC" + +/datum/design/aimodule/core/guard_dog + name = "Guard Dog" + id = "laws_guard_dog_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/guard_dog + sort_string = "XAVAD" + +/datum/design/aimodule/core/pleasurebot + name = "Pleasurebot" + id = "laws_pleasurebot_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 2, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/pleasurebot + sort_string = "XAVAE" + +/datum/design/aimodule/core/consuming_eradicator + name = "Consuming Eradicator" + id = "laws_consuming_eradicator_vr" + req_tech = list(TECH_DATA = 4, TECH_BIO = 3, TECH_ILLEGAL = 6, TECH_MATERIAL = 6) + build_path = /obj/item/weapon/aiModule/consuming_eradicator + sort_string = "XAVAF" diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 34b3510031..d12441c8fe 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -226,7 +226,7 @@ var/recursive = amount == -1 ? 1 : 0 material = lowertext(material) var/obj/item/stack/material/mattype - var/material/MAT = get_material_by_name(material) + var/datum/material/MAT = get_material_by_name(material) if(!MAT) return diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 5f58c50f3d..e317c665d0 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -18,7 +18,7 @@ return /obj/machinery/r_n_d/proc/getMaterialType(var/name) - var/material/M = get_material_by_name(name) + var/datum/material/M = get_material_by_name(name) if(M && M.stack_type) return M.stack_type return null diff --git a/code/modules/resleeving/infomorph.dm b/code/modules/resleeving/infomorph.dm index 7fd716bc96..fed79fe078 100644 --- a/code/modules/resleeving/infomorph.dm +++ b/code/modules/resleeving/infomorph.dm @@ -112,7 +112,10 @@ var/list/infomorph_emotions = list( pda.ownjob = "Sleevecard" pda.owner = text("[]", src) pda.name = pda.owner + " (" + pda.ownjob + ")" - pda.toff = 1 + + var/datum/data/pda/app/messenger/M = pda.find_program(/datum/data/pda/app/messenger) + if(M) + M.toff = TRUE ..() @@ -144,9 +147,9 @@ var/list/infomorph_emotions = list( return 0 ..() -/mob/living/silicon/infomorph/default_can_use_topic(var/src_object) +/mob/living/silicon/infomorph/default_can_use_tgui_topic(var/src_object) if(src_object in src) - return shared_nano_interaction() + return shared_tgui_interaction() /////////// DAMAGES /mob/living/silicon/infomorph/emp_act(severity) @@ -187,7 +190,7 @@ var/list/infomorph_emotions = list( medicalActive1 = null medicalActive2 = null medical_cannotfind = 0 - SSnanoui.update_uis(src) + SStgui.update_uis(src) to_chat(usr, "You reset your record-viewing software.") /* @@ -460,94 +463,81 @@ var/global/list/default_infomorph_software = list() set category = "Card Commands" set name = "Software Interface" - ui_interact(src) + tgui_interact(src) -/mob/living/silicon/infomorph/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, key_state = self_state) - if(user != src) - if(ui) ui.set_status(STATUS_CLOSE, 0) - return +/mob/living/silicon/infomorph/tgui_state(mob/user) + return GLOB.tgui_self_state - if(ui_key != "main") - var/datum/infomorph_software/S = software[ui_key] - if(S && !S.toggle) - S.on_ui_interact(src, ui, force_open) - else - if(ui) ui.set_status(STATUS_CLOSE, 0) - return - - var/data[0] +/mob/living/silicon/infomorph/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIInterface", "Card Software Interface") + ui.open() +/mob/living/silicon/infomorph/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + // Software we have bought - var/bought_software[0] + var/list/bought_software = list() // Software we have not bought - var/not_bought_software[0] + var/list/not_bought_software = list() for(var/key in infomorph_software_by_key) var/datum/infomorph_software/S = infomorph_software_by_key[key] - var/software_data[0] + var/list/software_data = list() software_data["name"] = S.name software_data["id"] = S.id if(key in software) software_data["on"] = S.is_active(src) - bought_software[++bought_software.len] = software_data + bought_software.Add(list(software_data)) else software_data["ram"] = S.ram_cost - not_bought_software[++not_bought_software.len] = software_data + not_bought_software.Add(list(software_data)) data["bought"] = bought_software data["not_bought"] = not_bought_software data["available_ram"] = ram // Emotions - var/emotions[0] + var/list/emotions = list() for(var/name in infomorph_emotions) - var/emote[0] + var/list/emote = list() emote["name"] = name emote["id"] = infomorph_emotions[name] - emotions[++emotions.len] = emote + emotions.Add(list(emote)) data["emotions"] = emotions data["current_emotion"] = card.current_emotion - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open, key_state) - if (!ui) - ui = new(user, src, ui_key, "pai_interface.tmpl", "Card Software Interface", 450, 600, state = key_state) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data -/mob/living/silicon/infomorph/Topic(href, href_list) - . = ..() - if(.) return +/mob/living/silicon/infomorph/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE - if(href_list["software"]) - var/soft = href_list["software"] - var/datum/infomorph_software/S = software[soft] - if(S.toggle) - S.toggle(src) - else - ui_interact(src, ui_key = soft) - return 1 + switch(action) + if("software") + var/soft = params["software"] + var/datum/infomorph_software/S = software[soft] + if(S.toggle) + S.toggle(src) + else + S.tgui_interact(src, parent_ui = ui) + return TRUE - else if(href_list["stopic"]) - var/soft = href_list["stopic"] - var/datum/infomorph_software/S = software[soft] - if(S) - return S.Topic(href, href_list) + if("purchase") + var/soft = params["purchase"] + var/datum/infomorph_software/S = infomorph_software_by_key[soft] + if(S && (ram >= S.ram_cost)) + ram -= S.ram_cost + software[S.id] = S + return TRUE - else if(href_list["purchase"]) - var/soft = href_list["purchase"] - var/datum/infomorph_software/S = infomorph_software_by_key[soft] - if(S && (ram >= S.ram_cost)) - ram -= S.ram_cost - software[S.id] = S - return 1 - - else if(href_list["image"]) - var/img = href_list["image"] - if(img) - card.setEmotion(img) - return 1 + if("image") + var/img = text2num(params["image"]) + if(img) + card.setEmotion(img) + return TRUE /mob/living/silicon/infomorph/examine(mob/user) . = ..(user, infix = ", personal AI") diff --git a/code/modules/resleeving/infomorph_software.dm b/code/modules/resleeving/infomorph_software.dm index 2d2439b614..67a2bd47f9 100644 --- a/code/modules/resleeving/infomorph_software.dm +++ b/code/modules/resleeving/infomorph_software.dm @@ -12,35 +12,38 @@ // Whether pAIs should automatically receive this module at no cost var/default = 0 - proc/on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - return +/datum/infomorph_software/tgui_state(mob/user) + return GLOB.tgui_always_state - proc/toggle(mob/living/silicon/infomorph/user) - return +/datum/infomorph_software/tgui_status(mob/user) + if(!istype(user, /mob/living/silicon/infomorph)) + return STATUS_CLOSE + return ..() - proc/is_active(mob/living/silicon/infomorph/user) - return 0 +/datum/infomorph_software/proc/toggle(mob/living/silicon/infomorph/user) + return + +/datum/infomorph_software/proc/is_active(mob/living/silicon/infomorph/user) + return 0 /datum/infomorph_software/crew_manifest name = "Crew Manifest" - ram_cost = 15 + ram_cost = 5 id = "manifest" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) +/datum/infomorph_software/crew_manifest/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "CrewManifest", name, parent_ui) + ui.open() + +/datum/infomorph_software/crew_manifest/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + if(data_core) data_core.get_manifest_list() - - var/data[0] - // This is dumb, but NanoUI breaks if it has no data to send - data["manifest"] = PDA_Manifest - - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_manifest.tmpl", "Crew Manifest", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + data["manifest"] = PDA_Manifest + return data /datum/infomorph_software/med_records name = "Medical Records" @@ -48,53 +51,55 @@ id = "med_records" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/med_records/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIMedrecords", name, parent_ui) + ui.open() - var/records[0] - for(var/datum/data/record/general in sortRecord(data_core.general)) - var/record[0] - record["name"] = general.fields["name"] - record["ref"] = "\ref[general]" - records[++records.len] = record +/datum/infomorph_software/med_records/tgui_data(mob/living/silicon/infomorph/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/list/records = list() + for(var/datum/data/record/general in sortRecord(data_core.general)) + var/list/record = list() + record["name"] = general.fields["name"] + record["ref"] = "\ref[general]" + records.Add(list(record)) - data["records"] = records + data["records"] = records - var/datum/data/record/G = user.medicalActive1 - var/datum/data/record/M = user.medicalActive2 - data["general"] = G ? G.fields : null - data["medical"] = M ? M.fields : null - data["could_not_find"] = user.medical_cannotfind + var/datum/data/record/G = user.medicalActive1 + var/datum/data/record/M = user.medicalActive2 + data["general"] = G ? G.fields : null + data["medical"] = M ? M.fields : null + data["could_not_find"] = user.medical_cannotfind - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_medrecords.tmpl", "Medical Records", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data - Topic(href, href_list) - var/mob/living/silicon/infomorph/P = usr - if(!istype(P)) return +/datum/infomorph_software/med_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + var/mob/living/silicon/infomorph/P = usr + if(!istype(P)) + return - if(href_list["select"]) - var/datum/data/record/record = locate(href_list["select"]) - if(record) - var/datum/data/record/R = record - var/datum/data/record/M = null - if (!( data_core.general.Find(R) )) - P.medical_cannotfind = 1 - else - P.medical_cannotfind = 0 - for(var/datum/data/record/E in data_core.medical) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - M = E - P.medicalActive1 = R - P.medicalActive2 = M - else + if(action == "select") + var/datum/data/record/record = locate(params["select"]) + if(record) + var/datum/data/record/R = record + var/datum/data/record/M = null + if (!( data_core.general.Find(R) )) P.medical_cannotfind = 1 - return 1 + else + P.medical_cannotfind = 0 + for(var/datum/data/record/E in data_core.medical) + if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + M = E + P.medicalActive1 = R + P.medicalActive2 = M + else + P.medical_cannotfind = 1 + return 1 /datum/infomorph_software/sec_records name = "Security Records" @@ -102,57 +107,59 @@ id = "sec_records" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/sec_records/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAISecrecords", name, parent_ui) + ui.open() - var/records[0] - for(var/datum/data/record/general in sortRecord(data_core.general)) - var/record[0] - record["name"] = general.fields["name"] - record["ref"] = "\ref[general]" - records[++records.len] = record +/datum/infomorph_software/sec_records/tgui_data(mob/living/silicon/infomorph/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/list/records = list() + for(var/datum/data/record/general in sortRecord(data_core.general)) + var/list/record = list() + record["name"] = general.fields["name"] + record["ref"] = "\ref[general]" + records.Add(list(record)) - data["records"] = records + data["records"] = records - var/datum/data/record/G = user.securityActive1 - var/datum/data/record/S = user.securityActive2 - data["general"] = G ? G.fields : null - data["security"] = S ? S.fields : null - data["could_not_find"] = user.security_cannotfind + var/datum/data/record/G = user.securityActive1 + var/datum/data/record/S = user.securityActive2 + data["general"] = G ? G.fields : null + data["security"] = S ? S.fields : null + data["could_not_find"] = user.security_cannotfind - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_secrecords.tmpl", "Security Records", 450, 600) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + return data - Topic(href, href_list) - var/mob/living/silicon/infomorph/P = usr - if(!istype(P)) return +/datum/infomorph_software/sec_records/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + var/mob/living/silicon/infomorph/P = usr + if(!istype(P)) + return - if(href_list["select"]) - var/datum/data/record/record = locate(href_list["select"]) - if(record) - var/datum/data/record/R = record - var/datum/data/record/S = null - if (!( data_core.general.Find(R) )) - P.securityActive1 = null - P.securityActive2 = null - P.security_cannotfind = 1 - else - P.security_cannotfind = 0 - for(var/datum/data/record/E in data_core.security) - if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) - S = E - P.securityActive1 = R - P.securityActive2 = S - else + if(action == "select") + var/datum/data/record/record = locate(params["select"]) + if(record) + var/datum/data/record/R = record + var/datum/data/record/S = null + if (!( data_core.general.Find(R) )) P.securityActive1 = null P.securityActive2 = null P.security_cannotfind = 1 - return 1 + else + P.security_cannotfind = 0 + for(var/datum/data/record/E in data_core.security) + if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"])) + S = E + P.securityActive1 = R + P.securityActive2 = S + else + P.securityActive1 = null + P.securityActive2 = null + P.security_cannotfind = 1 + return TRUE /datum/infomorph_software/door_jack name = "Door Jack" @@ -160,44 +167,45 @@ id = "door_jack" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/door_jack/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIDoorjack", "Door Jack", parent_ui) + ui.open() - data["cable"] = user.cable != null - data["machine"] = user.cable && (user.cable.machine != null) - data["inprogress"] = user.hackdoor != null - data["progress_a"] = round(user.hackprogress) - data["progress_b"] = user.hackprogress % 10 - data["aborted"] = user.hack_aborted +/datum/infomorph_software/door_jack/tgui_data(mob/living/silicon/infomorph/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_doorjack.tmpl", "Door Jack", 300, 150) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) + data["cable"] = user.cable != null + data["machine"] = user.cable && (user.cable.machine != null) + data["inprogress"] = user.hackdoor != null + data["progress_a"] = round(user.hackprogress / 10) + data["progress_b"] = user.hackprogress % 10 + data["aborted"] = user.hack_aborted - Topic(href, href_list) - var/mob/living/silicon/infomorph/P = usr - if(!istype(P)) return + return data - if(href_list["jack"]) +/datum/infomorph_software/door_jack/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + var/mob/living/silicon/infomorph/P = usr + if(!istype(P) || ..()) + return TRUE + + switch(action) + if("jack") if(P.cable && P.cable.machine) P.hackdoor = P.cable.machine P.hackloop() return 1 - else if(href_list["cancel"]) + if("cancel") P.hackdoor = null return 1 - else if(href_list["cable"]) + if("cable") var/turf/T = get_turf(P) P.hack_aborted = 0 P.cable = new /obj/item/weapon/pai_cable(T) - if(ishuman(P.card.loc)) - var/mob/living/carbon/human/H = P.card.loc - H.put_in_any_hand_if_possible(P.cable) - T.visible_message("A port on \the [P] opens to reveal \the [P.cable].") + for(var/mob/M in viewers(T)) + M.show_message("A port on [P] opens to reveal [P.cable], which promptly falls to the floor.", 3, + "You hear the soft click of something light and hard falling to the ground.", 2) return 1 /mob/living/silicon/infomorph/proc/hackloop() @@ -239,43 +247,54 @@ /datum/infomorph_software/atmosphere_sensor name = "Atmosphere Sensor" - ram_cost = 15 + ram_cost = 5 id = "atmos_sense" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/atmosphere_sensor/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "pAIAtmos", name, parent_ui) + ui.open() - var/turf/T = get_turf_or_move(user.loc) - if(!T) - data["reading"] = 0 - data["pressure"] = 0 - data["temperature"] = 0 - data["temperatureC"] = 0 - data["gas"] = list() - else - var/datum/gas_mixture/env = T.return_air() - data["reading"] = 1 - var/pres = env.return_pressure() * 10 - data["pressure"] = "[round(pres/10)].[pres%10]" - data["temperature"] = round(env.temperature) - data["temperatureC"] = round(env.temperature-T0C) +/datum/infomorph_software/atmosphere_sensor/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() - var/t_moles = env.total_moles - var/gases[0] - for(var/g in env.gas) - var/gas[0] - gas["name"] = gas_data.name[g] - gas["percent"] = round((env.gas[g] / t_moles) * 100) - gases[++gases.len] = gas - data["gas"] = gases + var/list/results = list() + var/turf/T = get_turf(user) + if(!isnull(T)) + var/datum/gas_mixture/environment = T.return_air() + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles + if (total_moles) + var/o2_level = environment.gas["oxygen"]/total_moles + var/n2_level = environment.gas["nitrogen"]/total_moles + var/co2_level = environment.gas["carbon_dioxide"]/total_moles + var/phoron_level = environment.gas["phoron"]/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_atmosphere.tmpl", "Atmosphere Sensor", 350, 300) - ui.set_initial_data(data) - ui.open() + // entry is what the element is describing + // Type identifies which unit or other special characters to use + // Val is the information reported + // Bad_high/_low are the values outside of which the entry reports as dangerous + // Poor_high/_low are the values outside of which the entry reports as unideal + // Values were extracted from the template itself + results = list( + list("entry" = "Pressure", "units" = "kPa", "val" = "[round(pressure,0.1)]", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80), + list("entry" = "Temperature", "units" = "°C", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5), + list("entry" = "Oxygen", "units" = "kPa", "val" = "[round(o2_level*100,0.1)]", "bad_high" = 140, "poor_high" = 135, "poor_low" = 19, "bad_low" = 17), + list("entry" = "Nitrogen", "units" = "kPa", "val" = "[round(n2_level*100,0.1)]", "bad_high" = 105, "poor_high" = 85, "poor_low" = 50, "bad_low" = 40), + list("entry" = "Carbon Dioxide", "units" = "kPa", "val" = "[round(co2_level*100,0.1)]", "bad_high" = 10, "poor_high" = 5, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Phoron", "units" = "kPa", "val" = "[round(phoron_level*100,0.01)]", "bad_high" = 0.5, "poor_high" = 0, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Other", "units" = "kPa", "val" = "[round(unknown_level, 0.01)]", "bad_high" = 1, "poor_high" = 0.5, "poor_low" = 0, "bad_low" = 0) + ) + + if(isnull(results)) + results = list(list("entry" = "pressure", "units" = "kPa", "val" = "0", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80)) + + data["aircontents"] = results + + return data /datum/infomorph_software/ar_hud name = "AR HUD" @@ -302,45 +321,56 @@ is_active(mob/living/silicon/infomorph/user) return user.translator.listening + /datum/infomorph_software/signaller - name = "Remote Signaller" - ram_cost = 15 + name = "Remote Signaler" + ram_cost = 5 id = "signaller" toggle = 0 - on_ui_interact(mob/living/silicon/infomorph/user, datum/nanoui/ui=null, force_open=1) - var/data[0] +/datum/infomorph_software/signaller/tgui_interact(mob/user, datum/tgui/ui, datum/tgui/parent_ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "Signaler", "Signaler", parent_ui) + ui.open() - data["frequency"] = format_frequency(user.sradio.frequency) - data["code"] = user.sradio.code +/datum/infomorph_software/signaller/tgui_data(mob/living/silicon/infomorph/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/obj/item/radio/integrated/signal/R = user.sradio - ui = SSnanoui.try_update_ui(user, user, id, ui, data, force_open) - if(!ui) - // Don't copy-paste this unless you're making a pAI software module! - ui = new(user, user, id, "pai_signaller.tmpl", "Signaller", 320, 150) - ui.set_initial_data(data) - ui.open() + data["frequency"] = R.frequency + data["minFrequency"] = RADIO_LOW_FREQ + data["maxFrequency"] = RADIO_HIGH_FREQ + data["code"] = R.code - Topic(href, href_list) - var/mob/living/silicon/infomorph/P = usr - if(!istype(P)) return + return data - if(href_list["send"]) - P.sradio.send_signal("ACTIVATE") - for(var/mob/O in hearers(1, P.loc)) - O.show_message("[bicon(P)] *beep* *beep*", 3, "*beep* *beep*", 2) - return 1 +/datum/infomorph_software/signaller/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE - else if(href_list["freq"]) - var/new_frequency = (P.sradio.frequency + text2num(href_list["freq"])) - if(new_frequency < PUBLIC_LOW_FREQ || new_frequency > PUBLIC_HIGH_FREQ) - new_frequency = sanitize_frequency(new_frequency) - P.sradio.set_frequency(new_frequency) - return 1 + var/mob/living/silicon/infomorph/user = usr + if(istype(user)) + var/obj/item/radio/integrated/signal/R = user.sradio - else if(href_list["code"]) - P.sradio.code += text2num(href_list["code"]) - P.sradio.code = round(P.sradio.code) - P.sradio.code = min(100, P.sradio.code) - P.sradio.code = max(1, P.sradio.code) - return 1 + switch(action) + if("signal") + spawn(0) + R.send_signal("ACTIVATE") + for(var/mob/O in hearers(1, R.loc)) + O.show_message("[bicon(R)] *beep* *beep*", 3, "*beep* *beep*", 2) + if("freq") + var/frequency = unformat_frequency(params["freq"]) + frequency = sanitize_frequency(frequency, RADIO_LOW_FREQ, RADIO_HIGH_FREQ) + R.set_frequency(frequency) + . = TRUE + if("code") + R.code = clamp(round(text2num(params["code"])), 1, 100) + . = TRUE + if("reset") + if(params["reset"] == "freq") + R.set_frequency(initial(R.frequency)) + else + R.code = initial(R.code) + . = TRUE diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index d7a7ab3c4d..8e8bb68a77 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -1,6 +1,9 @@ /obj/item/device/radio/sleevecard canhear_range = 0 +/obj/item/device/radio/sleevecard/tgui_state(mob/user) + return GLOB.tgui_always_state + /obj/item/device/sleevecard name = "sleevecard" desc = "This Vey-Med-upgraded pAI module has enough capacity to run a whole mind of human-level intelligence." diff --git a/code/modules/shuttles/shuttle_console_multi.dm b/code/modules/shuttles/shuttle_console_multi.dm index 9226caebfb..2e45441b1a 100644 --- a/code/modules/shuttles/shuttle_console_multi.dm +++ b/code/modules/shuttles/shuttle_console_multi.dm @@ -26,7 +26,7 @@ switch(action) if("pick") var/dest_key = input("Choose shuttle destination", "Shuttle Destination") as null|anything in shuttle.get_destinations() - if(dest_key && CanInteract(usr, global.default_state)) + if(dest_key && CanInteract(usr, GLOB.tgui_default_state)) shuttle.set_destination(dest_key, usr) return TRUE diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index 3b491a0c5b..f6f56cc7fd 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -175,84 +175,3 @@ /obj/machinery/computer/shuttle_control/emergency/attackby(obj/item/weapon/W as obj, mob/user as mob) read_authorization(W) ..() - -/obj/machinery/computer/shuttle_control/emergency/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - var/data[0] - var/datum/shuttle/autodock/ferry/emergency/shuttle = SSshuttles.shuttles[shuttle_tag] - if (!istype(shuttle)) - return - - var/shuttle_state - switch(shuttle.moving_status) - if(SHUTTLE_IDLE) shuttle_state = "idle" - if(SHUTTLE_WARMUP) shuttle_state = "warmup" - if(SHUTTLE_INTRANSIT) shuttle_state = "in_transit" - - var/shuttle_status - switch (shuttle.process_state) - if(IDLE_STATE) - if (shuttle.in_use) - shuttle_status = "Busy." - else if (!shuttle.location) - shuttle_status = "Standing by at [station_name()]." - else - shuttle_status = "Standing by at [using_map.dock_name]." - if(WAIT_LAUNCH, FORCE_LAUNCH) - shuttle_status = "Shuttle has received command and will depart shortly." - if(WAIT_ARRIVE) - shuttle_status = "Proceeding to destination." - if(WAIT_FINISH) - shuttle_status = "Arriving at destination now." - - //build a list of authorizations - var/list/auth_list[req_authorizations] - - if (!emagged) - var/i = 1 - for (var/dna_hash in authorized) - auth_list[i++] = list("auth_name"=authorized[dna_hash], "auth_hash"=dna_hash) - - while (i <= req_authorizations) //fill up the rest of the list with blank entries - auth_list[i++] = list("auth_name"="", "auth_hash"=null) - else - for (var/i = 1; i <= req_authorizations; i++) - auth_list[i] = list("auth_name"="ERROR", "auth_hash"=null) - - var/has_auth = has_authorization() - - data = list( - "shuttle_status" = shuttle_status, - "shuttle_state" = shuttle_state, - "has_docking" = shuttle.active_docking_controller? 1 : 0, - "docking_status" = shuttle.active_docking_controller? shuttle.active_docking_controller.get_docking_status() : null, - "docking_override" = shuttle.active_docking_controller? shuttle.active_docking_controller.override_enabled : null, - "can_launch" = shuttle.can_launch(src), - "can_cancel" = shuttle.can_cancel(src), - "can_force" = shuttle.can_force(src), - "auth_list" = auth_list, - "has_auth" = has_auth, - "user" = debug? user : null, - ) - - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - - if (!ui) - ui = new(user, src, ui_key, "escape_shuttle_control_console.tmpl", "Shuttle Control", 470, 420) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(1) - -/obj/machinery/computer/shuttle_control/emergency/Topic(href, href_list) - if(..()) - return 1 - - if(href_list["removeid"]) - var/dna_hash = href_list["removeid"] - authorized -= dna_hash - - if(!emagged && href_list["scanid"]) - //They selected an empty entry. Try to scan their id. - if (ishuman(usr)) - var/mob/living/carbon/human/H = usr - if (!read_authorization(H.get_active_hand())) //try to read what's in their hand first - read_authorization(H.wear_id) diff --git a/code/modules/tables/debug.dm b/code/modules/tables/debug.dm index d1b7a968a9..688758cace 100644 --- a/code/modules/tables/debug.dm +++ b/code/modules/tables/debug.dm @@ -7,7 +7,7 @@ material = get_material_by_name("debugium") ..() -/material/debug +/datum/material/debug name = "debugium" stack_type = /obj/item/stack/material/debug icon_base = "debug" diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index 2857d022a9..32aca8f090 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -20,8 +20,8 @@ var/list/table_icon_cache = list() var/can_plate = 1 var/manipulating = 0 - var/material/material = null - var/material/reinforced = null + var/datum/material/material = null + var/datum/material/reinforced = null // Gambling tables. I'd prefer reinforced with carpet/felt/cloth/whatever, but AFAIK it's either harder or impossible to get /obj/item/stack/material of those. // Convert if/when you can easily get stacks of these. @@ -237,7 +237,7 @@ var/list/table_icon_cache = list() // Returns the material to set the table to. /obj/structure/table/proc/common_material_add(obj/item/stack/material/S, mob/user, verb) // Verb is actually verb without 'e' or 'ing', which is added. Works for 'plate'/'plating' and 'reinforce'/'reinforcing'. - var/material/M = S.get_material() + var/datum/material/M = S.get_material() if(!istype(M)) to_chat(user, "You cannot [verb]e \the [src] with \the [S].") return null @@ -253,7 +253,7 @@ var/list/table_icon_cache = list() return M // Returns the material to set the table to. -/obj/structure/table/proc/common_material_remove(mob/user, material/M, delay, what, type_holding, sound) +/obj/structure/table/proc/common_material_remove(mob/user, datum/material/M, delay, what, type_holding, sound) if(!M.stack_type) to_chat(user, "You are unable to remove the [what] from this [src]!") return M @@ -322,7 +322,7 @@ var/list/table_icon_cache = list() if(full_return || prob(20)) new /obj/item/stack/material/steel(src.loc) else - var/material/M = get_material_by_name(DEFAULT_WALL_MATERIAL) + var/datum/material/M = get_material_by_name(DEFAULT_WALL_MATERIAL) S = M.place_shard(loc) if(S) shards += S qdel(src) diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 1119e565ef..d2a6a0a35a 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -6,7 +6,7 @@ circuit = /obj/item/weapon/circuitboard/telesci_console var/sending = 1 var/obj/machinery/telepad/telepad = null - var/temp_msg = "Telescience control console initialized.
Welcome." + var/temp_msg = "Telescience control console initialized. Welcome." // VARIABLES // var/teles_left // How many teleports left until it becomes uncalibrated @@ -83,16 +83,21 @@ /obj/machinery/computer/telescience/attack_hand(mob/user) if(..()) return - ui_interact(user) + tgui_interact(user) -/obj/machinery/computer/telescience/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) - user.set_machine(src) +/obj/machinery/computer/telescience/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "TelesciConsole", name) + ui.open() - var/data[0] +/obj/machinery/computer/telescience/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = list() if(!telepad) in_use = 0 //Yeah so if you deconstruct teleporter while its in the process of shooting it wont disable the console data["noTelepad"] = 1 else + data["noTelepad"] = 0 data["insertedGps"] = inserted_gps data["rotation"] = rotation data["currentZ"] = z_co @@ -110,6 +115,7 @@ //We'll base our options on connected z's or overmap data["sectorOptions"] = using_map.get_map_levels(z, TRUE, overmap_range) + data["lastTeleData"] = null if(last_tele_data) data["lastTeleData"] = list() data["lastTeleData"]["src_x"] = last_tele_data.src_x @@ -117,12 +123,61 @@ data["lastTeleData"]["distance"] = last_tele_data.distance data["lastTeleData"]["time"] = last_tele_data.time - ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open) - if (!ui) - ui = new(user, src, ui_key, "telescience_console.tmpl", src.name, 400, 450) - ui.set_initial_data(data) - ui.open() - ui.set_auto_update(5) + return data + +/obj/machinery/computer/telescience/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + if(!telepad || telepad.panel_open) + return TRUE + + switch(action) + if("setrotation") + rotation = CLAMP(text2num(params["val"]), -900, 900) + rotation = round(rotation, 0.01) + + if("setdistance") + distance = CLAMP(text2num(params["val"]), 1, get_max_allowed_distance()) + distance = FLOOR(distance, 1) + + if("setz") + var/new_z = text2num(params["setz"]) + if(new_z in using_map.player_levels) + z_co = new_z + + if("ejectGPS") + if(inserted_gps) + inserted_gps.forceMove(loc) + inserted_gps = null + + if("setMemory") + if(last_target && inserted_gps) + // TODO - What was this even supposed to do?? + //inserted_gps.locked_location = last_target + temp_msg = "Location saved." + else + temp_msg = "ERROR! No data was stored." + + if("send") + sending = 1 + teleport(usr) + + if("receive") + sending = 0 + teleport(usr) + + if("recal") + recalibrate() + sparks() + temp_msg = "NOTICE: Calibration successful." + + if("eject") + eject() + temp_msg = "NOTICE: Bluespace crystals ejected." + else + return FALSE + + return TRUE /obj/machinery/computer/telescience/proc/sparks() if(telepad) @@ -198,7 +253,7 @@ playsound(telepad, 'sound/weapons/flash.ogg', 50, 1) // Wait depending on the time the projectile took to get there teleporting = 1 - temp_msg = "Powering up bluespace crystals.
Please wait." + temp_msg = "Powering up bluespace crystals. Please wait." spawn(spawn_time) // in deciseconds if(!telepad) @@ -218,12 +273,12 @@ if(!A || (A.flags & BLUE_SHIELDED)) telefail() - temp_msg = "ERROR!
Target is shielded from bluespace intersection!" + temp_msg = "ERROR! Target is shielded from bluespace intersection!" return - temp_msg = "Teleport successful.
" + temp_msg = "Teleport successful. " if(teles_left < 10) - temp_msg += "Calibration required soon.
" + temp_msg += "Calibration required soon. " temp_msg += "Data printed below." var/sparks = get_turf(target) @@ -286,11 +341,11 @@ /obj/machinery/computer/telescience/proc/teleport(mob/user) distance = CLAMP(distance, 0, get_max_allowed_distance()) if(rotation == null || distance == null || z_co == null) - temp_msg = "ERROR!
Set a distance, rotation and sector." + temp_msg = "ERROR! Set a distance, rotation and sector." return if(distance <= 0) telefail() - temp_msg = "ERROR!
No distance selected!" + temp_msg = "ERROR! No distance selected!" return if(!(z_co in using_map.player_levels)) telefail() @@ -300,7 +355,7 @@ doteleport(user) else telefail() - temp_msg = "ERROR!
Calibration required." + temp_msg = "ERROR! Calibration required." return return @@ -310,64 +365,6 @@ crystals -= I distance = 0 -/obj/machinery/computer/telescience/Topic(href, href_list) - if(..()) - return - if(!telepad || telepad.panel_open) - updateDialog() - return - - if(href_list["setrotation"]) - var/new_rot = input("Please input desired bearing in degrees.", name, rotation) as num - if(..()) // Check after we input a value, as they could've moved after they entered something - return - rotation = CLAMP(new_rot, -900, 900) - rotation = round(rotation, 0.01) - - if(href_list["setdistance"]) - var/new_pow = input("Please input desired distance in meters.", name, rotation) as num - if(..()) // Check after we input a value, as they could've moved after they entered something - return - distance = CLAMP(new_pow, 1, get_max_allowed_distance()) - distance = FLOOR(distance, 1) - - if(href_list["setz"]) - var/new_z = text2num(href_list["setz"]) - if(new_z in using_map.player_levels) - z_co = new_z - - if(href_list["ejectGPS"]) - if(inserted_gps) - inserted_gps.forceMove(loc) - inserted_gps = null - - if(href_list["setMemory"]) - if(last_target && inserted_gps) - // TODO - What was this even supposed to do?? - //inserted_gps.locked_location = last_target - temp_msg = "Location saved." - else - temp_msg = "ERROR!
No data was stored." - - if(href_list["send"]) - sending = 1 - teleport(usr) - - if(href_list["receive"]) - sending = 0 - teleport(usr) - - if(href_list["recal"]) - recalibrate() - sparks() - temp_msg = "NOTICE:
Calibration successful." - - if(href_list["eject"]) - eject() - temp_msg = "NOTICE:
Bluespace crystals ejected." - - updateDialog() - /obj/machinery/computer/telescience/proc/recalibrate() teles_left = rand(40, 50) distance_off = rand(-4, 4) diff --git a/code/modules/tgui/modules/_base.dm b/code/modules/tgui/modules/_base.dm index 1a1027072d..7cece1c097 100644 --- a/code/modules/tgui/modules/_base.dm +++ b/code/modules/tgui/modules/_base.dm @@ -123,4 +123,7 @@ Code is pretty much ripped verbatim from nano modules, but with un-needed stuff . += new /obj/screen/plane_master{plane = PLANE_CH_BACKUP} //Backup implant status . += new /obj/screen/plane_master{plane = PLANE_CH_VANTAG} //Vore Antags . += new /obj/screen/plane_master{plane = PLANE_AUGMENTED} //Augmented reality - //VOREStation Add End \ No newline at end of file + //VOREStation Add End + +/datum/tgui_module/proc/relaymove(mob/user, direction) + return FALSE diff --git a/code/modules/tgui/modules/agentcard.dm b/code/modules/tgui/modules/agentcard.dm new file mode 100644 index 0000000000..7d35a9bc4a --- /dev/null +++ b/code/modules/tgui/modules/agentcard.dm @@ -0,0 +1,135 @@ +/datum/tgui_module/agentcard + name = "Agent Card" + tgui_id = "AgentCard" + +/datum/tgui_module/agentcard/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + var/obj/item/weapon/card/id/syndicate/S = tgui_host() + if(!istype(S)) + return list() + + var/list/entries = list() + entries += list(list("name" = "Age", "value" = S.age)) + entries += list(list("name" = "Appearance", "value" = "Set")) + entries += list(list("name" = "Assignment", "value" = S.assignment)) + entries += list(list("name" = "Blood Type", "value" = S.blood_type)) + entries += list(list("name" = "DNA Hash", "value" = S.dna_hash)) + entries += list(list("name" = "Fingerprint Hash", "value" = S.fingerprint_hash)) + entries += list(list("name" = "Name", "value" = S.registered_name)) + entries += list(list("name" = "Photo", "value" = "Update")) + entries += list(list("name" = "Sex", "value" = S.sex)) + entries += list(list("name" = "Factory Reset", "value" = "Use With Care")) + data["entries"] = entries + + data["electronic_warfare"] = S.electronic_warfare + + return data + +/datum/tgui_module/agentcard/tgui_status(mob/user, datum/tgui_state/state) + var/obj/item/weapon/card/id/syndicate/S = tgui_host() + if(!istype(S)) + return STATUS_CLOSE + if(user != S.registered_user) + return STATUS_CLOSE + return ..() + +/datum/tgui_module/agentcard/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + var/obj/item/weapon/card/id/syndicate/S = tgui_host() + switch(action) + if("electronic_warfare") + S.electronic_warfare = !S.electronic_warfare + to_chat(usr, "Electronic warfare [S.electronic_warfare ? "enabled" : "disabled"].") + . = TRUE + if("age") + var/new_age = input(usr,"What age would you like to put on this card?","Agent Card Age", S.age) as null|num + if(!isnull(new_age) && tgui_status(usr, state) == STATUS_INTERACTIVE) + if(new_age < 0) + S.age = initial(S.age) + else + S.age = new_age + to_chat(usr, "Age has been set to '[S.age]'.") + . = TRUE + if("appearance") + var/datum/card_state/choice = input(usr, "Select the appearance for this card.", "Agent Card Appearance") as null|anything in id_card_states() + if(choice && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.icon_state = choice.icon_state + S.item_state = choice.item_state + to_chat(usr, "Appearance changed to [choice].") + . = TRUE + if("assignment") + var/new_job = sanitize(input(usr,"What assignment would you like to put on this card?\nChanging assignment will not grant or remove any access levels.","Agent Card Assignment", S.assignment) as null|text) + if(!isnull(new_job) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.assignment = new_job + to_chat(usr, "Occupation changed to '[new_job]'.") + S.update_name() + . = TRUE + if("bloodtype") + var/default = S.blood_type + if(default == initial(S.blood_type) && ishuman(usr)) + var/mob/living/carbon/human/H = usr + if(H.dna) + default = H.dna.b_type + var/new_blood_type = sanitize(input(usr,"What blood type would you like to be written on this card?","Agent Card Blood Type",default) as null|text) + if(!isnull(new_blood_type) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.blood_type = new_blood_type + to_chat(usr, "Blood type changed to '[new_blood_type]'.") + . = TRUE + if("dnahash") + var/default = S.dna_hash + if(default == initial(S.dna_hash) && ishuman(usr)) + var/mob/living/carbon/human/H = usr + if(H.dna) + default = H.dna.unique_enzymes + var/new_dna_hash = sanitize(input(usr,"What DNA hash would you like to be written on this card?","Agent Card DNA Hash",default) as null|text) + if(!isnull(new_dna_hash) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.dna_hash = new_dna_hash + to_chat(usr, "DNA hash changed to '[new_dna_hash]'.") + . = TRUE + if("fingerprinthash") + var/default = S.fingerprint_hash + if(default == initial(S.fingerprint_hash) && ishuman(usr)) + var/mob/living/carbon/human/H = usr + if(H.dna) + default = md5(H.dna.uni_identity) + var/new_fingerprint_hash = sanitize(input(usr,"What fingerprint hash would you like to be written on this card?","Agent Card Fingerprint Hash",default) as null|text) + if(!isnull(new_fingerprint_hash) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.fingerprint_hash = new_fingerprint_hash + to_chat(usr, "Fingerprint hash changed to '[new_fingerprint_hash]'.") + . = TRUE + if("name") + var/new_name = sanitizeName(input(usr,"What name would you like to put on this card?","Agent Card Name", S.registered_name) as null|text) + if(!isnull(new_name) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.registered_name = new_name + S.update_name() + to_chat(usr, "Name changed to '[new_name]'.") + . = TRUE + if("photo") + S.set_id_photo(usr) + to_chat(usr, "Photo changed.") + . = TRUE + if("sex") + var/new_sex = sanitize(input(usr,"What sex would you like to put on this card?","Agent Card Sex", S.sex) as null|text) + if(!isnull(new_sex) && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.sex = new_sex + to_chat(usr, "Sex changed to '[new_sex]'.") + . = TRUE + if("factoryreset") + if(alert("This will factory reset the card, including access and owner. Continue?", "Factory Reset", "No", "Yes") == "Yes" && tgui_status(usr, state) == STATUS_INTERACTIVE) + S.age = initial(S.age) + S.access = syndicate_access.Copy() + S.assignment = initial(S.assignment) + S.blood_type = initial(S.blood_type) + S.dna_hash = initial(S.dna_hash) + S.electronic_warfare = initial(S.electronic_warfare) + S.fingerprint_hash = initial(S.fingerprint_hash) + S.icon_state = initial(S.icon_state) + S.name = initial(S.name) + S.registered_name = initial(S.registered_name) + S.unset_registered_user() + S.sex = initial(S.sex) + to_chat(usr, "All information has been deleted from \the [src].") + . = TRUE diff --git a/code/modules/tgui/modules/atmos_control.dm b/code/modules/tgui/modules/atmos_control.dm index 83d3db4d1e..4fd477a531 100644 --- a/code/modules/tgui/modules/atmos_control.dm +++ b/code/modules/tgui/modules/atmos_control.dm @@ -34,6 +34,11 @@ ui.set_map_z_level(params["mapZLevel"]) return TRUE +/datum/tgui_module/atmos_control/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/simple/nanomaps), + ) + /datum/tgui_module/atmos_control/tgui_interact(mob/user, datum/tgui/ui = null) ui = SStgui.try_update_ui(user, src, ui) if(!ui) diff --git a/code/modules/tgui/modules/communications.dm b/code/modules/tgui/modules/communications.dm new file mode 100644 index 0000000000..1af2a003cc --- /dev/null +++ b/code/modules/tgui/modules/communications.dm @@ -0,0 +1,486 @@ +#define COMM_SCREEN_MAIN 1 +#define COMM_SCREEN_STAT 2 +#define COMM_SCREEN_MESSAGES 3 + +#define COMM_AUTHENTICATION_NONE 0 +#define COMM_AUTHENTICATION_MIN 1 +#define COMM_AUTHENTICATION_MAX 2 + +#define COMM_MSGLEN_MINIMUM 6 +#define COMM_CCMSGLEN_MINIMUM 20 + +/datum/tgui_module/communications + name = "Command & Communications" + tgui_id = "CommunicationsConsole" + + var/emagged = FALSE + + var/current_viewing_message_id = 0 + var/current_viewing_message = null + + var/authenticated = COMM_AUTHENTICATION_NONE + var/menu_state = COMM_SCREEN_MAIN + var/ai_menu_state = COMM_SCREEN_MAIN + var/aicurrmsg + + var/message_cooldown + var/centcomm_message_cooldown + var/tmp_alertlevel = 0 + + var/stat_msg1 + var/stat_msg2 + var/display_type = "blank" + + var/datum/announcement/priority/crew_announcement + + var/datum/lore/atc_controller/ATC + + var/list/req_access = list() + +/datum/tgui_module/communications/New(host) + . = ..() + ATC = atc + crew_announcement = new() + crew_announcement.newscast = TRUE + +/datum/tgui_module/communications/tgui_interact(mob/user, datum/tgui/ui) + if(using_map && !(get_z(user) in using_map.contact_levels)) + to_chat(user, "Unable to establish a connection: You're too far away from the station!") + return FALSE + . = ..() + +/datum/tgui_module/communications/proc/is_authenticated(mob/user, message = TRUE) + if(authenticated == COMM_AUTHENTICATION_MAX) + return COMM_AUTHENTICATION_MAX + else if(isobserver(user)) + var/mob/observer/dead/D = user + if(D.can_admin_interact()) + return COMM_AUTHENTICATION_MAX + else if(authenticated) + return COMM_AUTHENTICATION_MIN + else + if(message) + to_chat(user, "Access denied.") + return COMM_AUTHENTICATION_NONE + +/datum/tgui_module/communications/proc/change_security_level(new_level) + tmp_alertlevel = new_level + var/old_level = security_level + if(!tmp_alertlevel) tmp_alertlevel = SEC_LEVEL_GREEN + if(tmp_alertlevel < SEC_LEVEL_GREEN) tmp_alertlevel = SEC_LEVEL_GREEN + if(tmp_alertlevel > SEC_LEVEL_BLUE) tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this + set_security_level(tmp_alertlevel) + if(security_level != old_level) + //Only notify the admins if an actual change happened + log_game("[key_name(usr)] has changed the security level to [get_security_level()].") + message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].") + switch(security_level) + if(SEC_LEVEL_GREEN) + feedback_inc("alert_comms_green",1) + if(SEC_LEVEL_YELLOW) + feedback_inc("alert_comms_yellow",1) + if(SEC_LEVEL_VIOLET) + feedback_inc("alert_comms_violet",1) + if(SEC_LEVEL_ORANGE) + feedback_inc("alert_comms_orange",1) + if(SEC_LEVEL_BLUE) + feedback_inc("alert_comms_blue",1) + tmp_alertlevel = 0 + +/datum/tgui_module/communications/tgui_data(mob/user) + var/list/data = ..() + data["is_ai"] = isAI(user) || isrobot(user) + data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state + data["emagged"] = emagged + data["authenticated"] = is_authenticated(user, 0) + data["authmax"] = data["authenticated"] == COMM_AUTHENTICATION_MAX ? TRUE : FALSE + data["atcsquelch"] = ATC.squelched + data["boss_short"] = using_map.boss_short + + data["stat_display"] = list( + "type" = display_type, + // "icon" = display_icon, + "line_1" = (stat_msg1 ? stat_msg1 : "-----"), + "line_2" = (stat_msg2 ? stat_msg2 : "-----"), + + "presets" = list( + list("name" = "blank", "label" = "Clear", "desc" = "Blank slate"), + list("name" = "shuttle", "label" = "Shuttle ETA", "desc" = "Display how much time is left."), + list("name" = "message", "label" = "Message", "desc" = "A custom message.") + ), + ) + + data["security_level"] = security_level + switch(security_level) + if(SEC_LEVEL_BLUE) + data["security_level_color"] = "blue"; + if(SEC_LEVEL_ORANGE) + data["security_level_color"] = "orange"; + if(SEC_LEVEL_VIOLET) + data["security_level_color"] = "violet"; + if(SEC_LEVEL_YELLOW) + data["security_level_color"] = "yellow"; + if(SEC_LEVEL_GREEN) + data["security_level_color"] = "green"; + if(SEC_LEVEL_RED) + data["security_level_color"] = "red"; + else + data["security_level_color"] = "purple"; + data["str_security_level"] = capitalize(get_security_level()) + data["levels"] = list( + list("id" = SEC_LEVEL_GREEN, "name" = "Green", "icon" = "dove"), + list("id" = SEC_LEVEL_YELLOW, "name" = "Yellow", "icon" = "exclamation-triangle"), + list("id" = SEC_LEVEL_BLUE, "name" = "Blue", "icon" = "eye"), + list("id" = SEC_LEVEL_ORANGE, "name" = "Orange", "icon" = "wrench"), + list("id" = SEC_LEVEL_VIOLET, "name" = "Violet", "icon" = "biohazard"), + ) + + var/datum/comm_message_listener/l = obtain_message_listener() + data["messages"] = l.messages + data["message_deletion_allowed"] = l != global_message_listener + data["message_current_id"] = current_viewing_message_id + data["message_current"] = current_viewing_message + + // data["lastCallLoc"] = SSshuttle.emergencyLastCallLoc ? format_text(SSshuttle.emergencyLastCallLoc.name) : null + data["msg_cooldown"] = message_cooldown ? (round((message_cooldown - world.time) / 10)) : 0 + data["cc_cooldown"] = centcomm_message_cooldown ? (round((centcomm_message_cooldown - world.time) / 10)) : 0 + + data["esc_callable"] = emergency_shuttle.location() && !emergency_shuttle.online() ? TRUE : FALSE + data["esc_recallable"] = emergency_shuttle.location() && emergency_shuttle.online() ? TRUE : FALSE + data["esc_status"] = FALSE + if(emergency_shuttle.has_eta()) + var/timeleft = emergency_shuttle.estimate_arrival_time() + data["esc_status"] = emergency_shuttle.online() ? "ETA:" : "RECALLING:" + data["esc_status"] += " [timeleft / 60 % 60]:[add_zero(num2text(timeleft % 60), 2)]" + return data + +/datum/tgui_module/communications/proc/setCurrentMessage(mob/user, value) + current_viewing_message_id = value + + var/datum/comm_message_listener/l = obtain_message_listener() + for(var/list/m in l.messages) + if(m["id"] == current_viewing_message_id) + current_viewing_message = m + +/datum/tgui_module/communications/proc/setMenuState(mob/user, value) + if(isAI(user) || isrobot(user)) + ai_menu_state = value + else + menu_state = value + +/datum/tgui_module/communications/proc/obtain_message_listener() + if(istype(host, /datum/computer_file/program/comm)) + var/datum/computer_file/program/comm/P = host + return P.message_core + return global_message_listener + +/proc/post_status(atom/source, command, data1, data2, mob/user = null) + var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) + + if(!frequency) + return + + var/datum/signal/status_signal = new + status_signal.source = source + status_signal.transmission_method = TRANSMISSION_RADIO + status_signal.data["command"] = command + + switch(command) + if("message") + status_signal.data["msg1"] = data1 + status_signal.data["msg2"] = data2 + log_admin("STATUS: [user] set status screen message: [data1] [data2]") + //message_admins("STATUS: [user] set status screen with [PDA]. Message: [data1] [data2]") + if("alert") + status_signal.data["picture_state"] = data1 + + frequency.post_signal(null, status_signal) + +/datum/tgui_module/communications/tgui_act(action, params) + if(..()) + return TRUE + if(using_map && !(get_z(usr) in using_map.contact_levels)) + to_chat(usr, "Unable to establish a connection: You're too far away from the station!") + return FALSE + + . = TRUE + if(action == "auth") + if(!ishuman(usr)) + to_chat(usr, "Access denied.") + return FALSE + // Logout function. + if(authenticated != COMM_AUTHENTICATION_NONE) + authenticated = COMM_AUTHENTICATION_NONE + crew_announcement.announcer = null + setMenuState(usr, COMM_SCREEN_MAIN) + return + // Login function. + if(check_access(usr, access_heads)) + authenticated = COMM_AUTHENTICATION_MIN + if(check_access(usr, access_captain)) + authenticated = COMM_AUTHENTICATION_MAX + var/mob/M = usr + var/obj/item/weapon/card/id = M.GetIdCard() + if(istype(id)) + crew_announcement.announcer = GetNameAndAssignmentFromId(id) + if(authenticated == COMM_AUTHENTICATION_NONE) + to_chat(usr, "You need to wear your ID.") + + // All functions below this point require authentication. + if(!is_authenticated(usr)) + return FALSE + + switch(action) + // main interface + if("main") + setMenuState(usr, COMM_SCREEN_MAIN) + + if("newalertlevel") + if(isAI(usr) || isrobot(usr)) + to_chat(usr, "Firewalls prevent you from changing the alert level.") + return + else if(isobserver(usr)) + var/mob/observer/dead/D = usr + if(D.can_admin_interact()) + change_security_level(text2num(params["level"])) + return TRUE + else if(!ishuman(usr)) + to_chat(usr, "Security measures prevent you from changing the alert level.") + return + + if(check_access(usr, access_captain)) + change_security_level(text2num(params["level"])) + else + to_chat(usr, "You are not authorized to do this.") + setMenuState(usr, COMM_SCREEN_MAIN) + + if("announce") + if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) + if(message_cooldown > world.time) + to_chat(usr, "Please allow at least one minute to pass between announcements.") + return + var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") as null|message + if(!input || message_cooldown > world.time || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + return + if(length(input) < COMM_MSGLEN_MINIMUM) + to_chat(usr, "Message '[input]' is too short. [COMM_MSGLEN_MINIMUM] character minimum.") + return + crew_announcement.Announce(input) + message_cooldown = world.time + 600 //One minute + + if("callshuttle") + if(!is_authenticated(usr)) + return + + call_shuttle_proc(usr) + if(emergency_shuttle.online()) + post_status(src, "shuttle", user = usr) + setMenuState(usr, COMM_SCREEN_MAIN) + + if("cancelshuttle") + if(isAI(usr) || isrobot(usr)) + to_chat(usr, "Firewalls prevent you from recalling the shuttle.") + return + var/response = alert("Are you sure you wish to recall the shuttle?", "Confirm", "Yes", "No") + if(response == "Yes") + cancel_call_proc(usr) + setMenuState(usr, COMM_SCREEN_MAIN) + + if("messagelist") + current_viewing_message = null + current_viewing_message_id = null + if(params["msgid"]) + setCurrentMessage(usr, text2num(params["msgid"])) + setMenuState(usr, COMM_SCREEN_MESSAGES) + + if("toggleatc") + ATC.squelched = !ATC.squelched + + if("delmessage") + var/datum/comm_message_listener/l = obtain_message_listener() + if(params["msgid"]) + setCurrentMessage(usr, text2num(params["msgid"])) + var/response = alert("Are you sure you wish to delete this message?", "Confirm", "Yes", "No") + if(response == "Yes") + if(current_viewing_message) + if(l != global_message_listener) + l.Remove(current_viewing_message) + current_viewing_message = null + setMenuState(usr, COMM_SCREEN_MESSAGES) + + if("status") + setMenuState(usr, COMM_SCREEN_STAT) + + // Status display stuff + if("setstat") + display_type = params["statdisp"] + switch(display_type) + if("message") + post_status(src, "message", stat_msg1, stat_msg2, user = usr) + if("alert") + post_status(src, "alert", params["alert"], user = usr) + else + post_status(src, params["statdisp"], user = usr) + + if("setmsg1") + stat_msg1 = reject_bad_text(sanitize(input("Line 1", "Enter Message Text", stat_msg1) as text|null, 40), 40) + setMenuState(usr, COMM_SCREEN_STAT) + + if("setmsg2") + stat_msg2 = reject_bad_text(sanitize(input("Line 2", "Enter Message Text", stat_msg2) as text|null, 40), 40) + setMenuState(usr, COMM_SCREEN_STAT) + + // OMG CENTCOMM LETTERHEAD + if("MessageCentCom") + if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX) + if(centcomm_message_cooldown > world.time) + to_chat(usr, "Arrays recycling. Please stand by.") + return + var/input = sanitize(input("Please choose a message to transmit to [using_map.boss_short] via quantum entanglement. \ + Please be aware that this process is very expensive, and abuse will lead to... termination. \ + Transmission does not guarantee a response. \ + There is a 30 second delay before you may send another message, be clear, full and concise.", "Central Command Quantum Messaging") as null|message) + if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + return + if(length(input) < COMM_CCMSGLEN_MINIMUM) + to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.") + return + CentCom_announce(input, usr) + to_chat(usr, "Message transmitted.") + log_game("[key_name(usr)] has made an IA [using_map.boss_short] announcement: [input]") + centcomm_message_cooldown = world.time + 300 // 30 seconds + setMenuState(usr, COMM_SCREEN_MAIN) + + // OMG SYNDICATE ...LETTERHEAD + if("MessageSyndicate") + if((is_authenticated(usr) == COMM_AUTHENTICATION_MAX) && (emagged)) + if(centcomm_message_cooldown > world.time) + to_chat(usr, "Arrays recycling. Please stand by.") + return + var/input = sanitize(input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response. There is a 30 second delay before you may send another message, be clear, full and concise.", "To abort, send an empty message.", "")) + if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)) + return + if(length(input) < COMM_CCMSGLEN_MINIMUM) + to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.") + return + Syndicate_announce(input, usr) + to_chat(usr, "Message transmitted.") + log_game("[key_name(usr)] has made an illegal announcement: [input]") + centcomm_message_cooldown = world.time + 300 // 30 seconds + + if("RestoreBackup") + to_chat(usr, "Backup routing data restored!") + emagged = FALSE + setMenuState(usr, COMM_SCREEN_MAIN) + +/datum/tgui_module/communications/ntos + ntos = TRUE + +/* Etc global procs */ +/proc/enable_prison_shuttle(var/mob/user) + for(var/obj/machinery/computer/prison_shuttle/PS in machines) + PS.allowedtocall = !(PS.allowedtocall) + +/proc/call_shuttle_proc(var/mob/user) + if ((!( ticker ) || !emergency_shuttle.location())) + return + + if(!universe.OnShuttleCall(usr)) + to_chat(user, "Cannot establish a bluespace connection.") + return + + if(deathsquad.deployed) + to_chat(user, "[using_map.boss_short] will not allow the shuttle to be called. Consider all contracts terminated.") + return + + if(emergency_shuttle.deny_shuttle) + to_chat(user, "The emergency shuttle may not be sent at this time. Please try again later.") + return + + if(world.time < 6000) // Ten minute grace period to let the game get going without lolmetagaming. -- TLE + to_chat(user, "The emergency shuttle is refueling. Please wait another [round((6000-world.time)/600)] minute\s before trying again.") + return + + if(emergency_shuttle.going_to_centcom()) + to_chat(user, "The emergency shuttle may not be called while returning to [using_map.boss_short].") + return + + if(emergency_shuttle.online()) + to_chat(user, "The emergency shuttle is already on its way.") + return + + if(ticker.mode.name == "blob") + to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") + return + + emergency_shuttle.call_evac() + log_game("[key_name(user)] has called the shuttle.") + message_admins("[key_name_admin(user)] has called the shuttle.", 1) + admin_chat_message(message = "Emergency evac beginning! Called by [key_name(user)]!", color = "#CC2222") //VOREStation Add + + return + +/proc/init_shift_change(var/mob/user, var/force = 0) + if ((!( ticker ) || !emergency_shuttle.location())) + return + + if(emergency_shuttle.going_to_centcom()) + to_chat(user, "The shuttle may not be called while returning to [using_map.boss_short].") + return + + if(emergency_shuttle.online()) + to_chat(user, "The shuttle is already on its way.") + return + + // if force is 0, some things may stop the shuttle call + if(!force) + if(emergency_shuttle.deny_shuttle) + to_chat(user, "[using_map.boss_short] does not currently have a shuttle available in your sector. Please try again later.") + return + + if(deathsquad.deployed == 1) + to_chat(user, "[using_map.boss_short] will not allow the shuttle to be called. Consider all contracts terminated.") + return + + if(world.time < 54000) // 30 minute grace period to let the game get going + to_chat(user, "The shuttle is refueling. Please wait another [round((54000-world.time)/60)] minutes before trying again.") + return + + if(ticker.mode.auto_recall_shuttle) + //New version pretends to call the shuttle but cause the shuttle to return after a random duration. + emergency_shuttle.auto_recall = 1 + + if(ticker.mode.name == "blob" || ticker.mode.name == "epidemic") + to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") + return + + emergency_shuttle.call_transfer() + + //delay events in case of an autotransfer + if (isnull(user)) + SSevents.delay_events(EVENT_LEVEL_MODERATE, 9000) //15 minutes + SSevents.delay_events(EVENT_LEVEL_MAJOR, 9000) + + log_game("[user? key_name(user) : "Autotransfer"] has called the shuttle.") + message_admins("[user? key_name_admin(user) : "Autotransfer"] has called the shuttle.", 1) + admin_chat_message(message = "Autotransfer shuttle dispatched, shift ending soon.", color = "#2277BB") //VOREStation Add + + return + +/proc/cancel_call_proc(var/mob/user) + if (!( ticker ) || !emergency_shuttle.can_recall()) + return + if((ticker.mode.name == "blob")||(ticker.mode.name == "Meteor")) + return + + if(!emergency_shuttle.going_to_centcom()) //check that shuttle isn't already heading to CentCom + emergency_shuttle.recall() + log_game("[key_name(user)] has recalled the shuttle.") + message_admins("[key_name_admin(user)] has recalled the shuttle.", 1) + return + +/proc/is_relay_online() + for(var/obj/machinery/telecomms/relay/M in world) + if(M.stat == 0) + return 1 + return 0 diff --git a/code/modules/tgui/modules/crew_manifest.dm b/code/modules/tgui/modules/crew_manifest.dm new file mode 100644 index 0000000000..7c4daf7f2a --- /dev/null +++ b/code/modules/tgui/modules/crew_manifest.dm @@ -0,0 +1,14 @@ +/datum/tgui_module/crew_manifest + name = "Crew Manifest" + tgui_id = "CrewManifest" + +/datum/tgui_module/crew_manifest/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + if(data_core) + data_core.get_manifest_list() + data["manifest"] = PDA_Manifest + return data + +/datum/tgui_module/crew_manifest/robot +/datum/tgui_module/crew_manifest/robot/tgui_state(mob/user) + return GLOB.tgui_self_state \ No newline at end of file diff --git a/code/modules/tgui/modules/crew_monitor.dm b/code/modules/tgui/modules/crew_monitor.dm index 9d4af68652..d24cd3414a 100644 --- a/code/modules/tgui/modules/crew_monitor.dm +++ b/code/modules/tgui/modules/crew_monitor.dm @@ -2,6 +2,11 @@ name = "Crew monitor" tgui_id = "CrewMonitor" +/datum/tgui_module/crew_monitor/ui_assets(mob/user) + return list( + get_asset_datum(/datum/asset/simple/nanomaps), + ) + /datum/tgui_module/crew_monitor/tgui_act(action, params, datum/tgui/ui) if(..()) return TRUE diff --git a/code/modules/tgui/modules/ntos-only/cardmod.dm b/code/modules/tgui/modules/ntos-only/cardmod.dm new file mode 100644 index 0000000000..c5aecd8808 --- /dev/null +++ b/code/modules/tgui/modules/ntos-only/cardmod.dm @@ -0,0 +1,235 @@ +// This really should be used for both regular ID computers and NTOS, but +// the data structures are just different enough right now that I can't be assed +/datum/tgui_module/cardmod + name = "ID card modification program" + ntos = TRUE + tgui_id = "IdentificationComputer" + var/mod_mode = 1 + var/is_centcom = 0 + +/datum/tgui_module/cardmod/tgui_static_data(mob/user) + var/list/data = ..() + if(data_core) + data_core.get_manifest_list() + data["manifest"] = PDA_Manifest + return data + +/datum/tgui_module/cardmod/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/datum/computer_file/program/card_mod/program = host + if(!istype(program)) + return 0 + var/list/data = ..() + data["station_name"] = station_name() + data["mode"] = mod_mode + data["printing"] = FALSE + if(program && program.computer) + data["have_id_slot"] = !!program.computer.card_slot + data["have_printer"] = !!program.computer.nano_printer + data["authenticated"] = program.can_run(user) + if(!program.computer.card_slot) + mod_mode = 0 //We can't modify IDs when there is no card reader + else + data["have_id_slot"] = 0 + data["have_printer"] = 0 + data["authenticated"] = 0 + data["centcom_access"] = is_centcom + + + data["has_modify"] = null + data["account_number"] = null + data["id_rank"] = null + data["target_owner"] = null + data["target_name"] = null + if(program && program.computer && program.computer.card_slot) + var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card + data["has_modify"] = !!id_card + data["account_number"] = id_card ? id_card.associated_account_number : null + data["id_rank"] = id_card && id_card.assignment ? id_card.assignment : "Unassigned" + data["target_owner"] = id_card && id_card.registered_name ? id_card.registered_name : "-----" + data["target_name"] = id_card ? id_card.name : "-----" + + var/list/departments = list() + for(var/D in SSjob.get_all_department_datums()) + var/datum/department/dept = D + if(!dept.assignable) // No AI ID cards for you. + continue + if(dept.centcom_only && !is_centcom) + continue + departments.Add(list(list( + "department_name" = dept.name, + "jobs" = format_jobs(SSjob.get_job_titles_in_department(dept.name)), + ))) + + data["departments"] = departments + + var/list/all_centcom_access = list() + var/list/regions = list() + if(program.computer.card_slot && program.computer.card_slot.stored_card) + var/obj/item/weapon/card/id/id_card = program.computer.card_slot.stored_card + if(is_centcom) + for(var/access in get_all_centcom_access()) + all_centcom_access.Add(list(list( + "desc" = replacetext(get_centcom_access_desc(access), " ", " "), + "ref" = access, + "allowed" = (access in id_card.access) ? 1 : 0))) + data["all_centcom_access"] = all_centcom_access + else + for(var/i in ACCESS_REGION_SECURITY to ACCESS_REGION_SUPPLY) + var/list/accesses = list() + for(var/access in get_region_accesses(i)) + if(get_access_desc(access)) + accesses.Add(list(list( + "desc" = replacetext(get_access_desc(access), " ", " "), + "ref" = access, + "allowed" = (access in id_card.access) ? 1 : 0))) + + regions.Add(list(list( + "name" = get_region_accesses_name(i), + "accesses" = accesses))) + data["regions"] = regions + + data["regions"] = regions + data["all_centcom_access"] = all_centcom_access + + return data + +/datum/tgui_module/cardmod/proc/format_jobs(list/jobs) + var/datum/computer_file/program/card_mod/program = host + if(!istype(program)) + return null + + var/obj/item/weapon/card/id/id_card = program.computer.card_slot ? program.computer.card_slot.stored_card : null + 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))) + + return formatted + +/datum/tgui_module/cardmod/tgui_act(action, list/params, datum/tgui/ui) + if(..()) + return TRUE + + + var/datum/computer_file/program/card_mod/program = host + if(!istype(program)) + return TRUE + var/obj/item/modular_computer/computer = tgui_host() + if(!istype(computer)) + return TRUE + + var/obj/item/weapon/card/id/user_id_card = usr.GetIdCard() + var/obj/item/weapon/card/id/id_card + if(computer.card_slot) + id_card = computer.card_slot.stored_card + + switch(action) + if("mode") + mod_mode = clamp(text2num(params["mode_target"]), 0, 1) + . = TRUE + if("print") + if(computer && computer.nano_printer) //This option should never be called if there is no printer + if(!mod_mode) + if(program.can_run(usr, 1)) + var/contents = {"
Access Report
+ Prepared By: [user_id_card.registered_name ? user_id_card.registered_name : "Unknown"]+ For: [id_card.registered_name ? id_card.registered_name : "Unregistered"]
+
+ Assignment: [id_card.assignment]
+ Account Number: #[id_card.associated_account_number]
+ Blood Type: [id_card.blood_type]
+ Access:
+ "} + + var/known_access_rights = get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM) + for(var/A in id_card.access) + if(A in known_access_rights) + contents += " [get_access_desc(A)]" + + if(!computer.nano_printer.print_text(contents,"access report")) + to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") + return + else + computer.visible_message("\The [computer] prints out paper.") + else + var/contents = {"
Crew Manifest
++ [data_core ? data_core.get_manifest(0) : ""] + "} + if(!computer.nano_printer.print_text(contents,text("crew manifest ([])", stationtime2text()))) + to_chat(usr, "Hardware error: Printer was unable to print the file. It may be out of paper.") + return + else + computer.visible_message("\The [computer] prints out paper.") + . = TRUE + if("modify") + if(computer && computer.card_slot) + if(id_card) + data_core.manifest_modify(id_card.registered_name, id_card.assignment) + computer.proc_eject_id(usr) + . = TRUE + if("terminate") + if(computer && program.can_run(usr, 1)) + id_card.assignment = "Dismissed" //VOREStation Edit: setting adjustment + id_card.access = list() + callHook("terminate_employee", list(id_card)) + . = TRUE + if("reg") + if(computer && program.can_run(usr, 1)) + var/temp_name = sanitizeName(params["reg"], allow_numbers = TRUE) + if(temp_name) + id_card.registered_name = temp_name + else + computer.visible_message("[computer] buzzes rudely.") + . = TRUE + if("account") + if(computer && program.can_run(usr, 1)) + var/account_num = text2num(params["account"]) + id_card.associated_account_number = account_num + . = TRUE + if("assign") + if(computer && program.can_run(usr, 1) && id_card) + var/t1 = params["assign_target"] + if(t1 == "Custom") + var/temp_t = sanitize(input("Enter a custom job assignment.","Assignment", id_card.assignment), 45) + //let custom jobs function as an impromptu alt title, mainly for sechuds + if(temp_t) + id_card.assignment = temp_t + else + var/list/access = list() + if(is_centcom) + access = get_centcom_access(t1) + else + var/datum/job/jobdatum + for(var/jobtype in typesof(/datum/job)) + var/datum/job/J = new jobtype + if(ckey(J.title) == ckey(t1)) + jobdatum = J + break + if(!jobdatum) + to_chat(usr, "No log exists for this job: [t1]") + return + + access = jobdatum.get_access() + + id_card.access = access + id_card.assignment = t1 + id_card.rank = t1 + + callHook("reassign_employee", list(id_card)) + . = TRUE + if("access") + if(computer && program.can_run(usr, 1)) + var/access_type = text2num(params["access_target"]) + var/access_allowed = text2num(params["allowed"]) + if(access_type in get_access_ids(ACCESS_TYPE_STATION|ACCESS_TYPE_CENTCOM)) + id_card.access -= access_type + if(!access_allowed) + id_card.access += access_type + . = TRUE + + if(id_card) + id_card.name = text("[id_card.registered_name]'s ID Card ([id_card.assignment])") + diff --git a/code/modules/tgui/modules/ntos-only/configurator.dm b/code/modules/tgui/modules/ntos-only/configurator.dm new file mode 100644 index 0000000000..263409f5e3 --- /dev/null +++ b/code/modules/tgui/modules/ntos-only/configurator.dm @@ -0,0 +1,48 @@ +/datum/tgui_module/computer_configurator + name = "NTOS Computer Configuration Tool" + ntos = TRUE + tgui_id = "Configuration" + var/obj/item/modular_computer/movable = null + +/datum/tgui_module/computer_configurator/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + movable = tgui_host() + // No computer connection, we can't get data from that. + if(!istype(movable)) + return 0 + + var/list/data = ..() + + data["disk_size"] = movable.hard_drive.max_capacity + data["disk_used"] = movable.hard_drive.used_capacity + data["power_usage"] = movable.last_power_usage + data["battery_exists"] = movable.battery_module ? 1 : 0 + if(movable.battery_module) + data["battery_rating"] = movable.battery_module.battery.maxcharge + data["battery_percent"] = round(movable.battery_module.battery.percent()) + + if(movable.battery_module && movable.battery_module.battery) + data["battery"] = list("max" = movable.battery_module.battery.maxcharge, "charge" = round(movable.battery_module.battery.charge)) + + var/list/hardware = movable.get_all_components() + var/list/all_entries[0] + for(var/obj/item/weapon/computer_hardware/H in hardware) + all_entries.Add(list(list( + "name" = H.name, + "desc" = H.desc, + "enabled" = H.enabled, + "critical" = H.critical, + "powerusage" = H.power_usage + ))) + + data["hardware"] = all_entries + return data + +/datum/tgui_module/computer_configurator/tgui_act(action, params) + if(..()) + return + switch(action) + if("PC_toggle_component") + var/obj/item/weapon/computer_hardware/H = movable.find_hardware_by_name(params["name"]) + if(H && istype(H)) + H.enabled = !H.enabled + . = TRUE \ No newline at end of file diff --git a/code/modules/tgui/modules/ntos-only/email.dm b/code/modules/tgui/modules/ntos-only/email.dm new file mode 100644 index 0000000000..8d8d1fbbc7 --- /dev/null +++ b/code/modules/tgui/modules/ntos-only/email.dm @@ -0,0 +1,476 @@ +/datum/tgui_module/email_client + name = "Email Client" + tgui_id = "NtosEmailClient" + + var/stored_login = "" + var/stored_password = "" + var/error = "" + + var/msg_title = "" + var/msg_body = "" + var/msg_recipient = "" + var/datum/computer_file/msg_attachment = null + var/folder = "Inbox" + var/addressbook = FALSE + var/new_message = FALSE + + var/last_message_count = 0 // How many messages were there during last check. + var/read_message_count = 0 // How many messages were there when user has last accessed the UI. + + var/datum/computer_file/downloading = null + var/download_progress = 0 + var/download_speed = 0 + + var/datum/computer_file/data/email_account/current_account = null + var/datum/computer_file/data/email_message/current_message = null + +/datum/tgui_module/email_client/proc/log_in() + for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts) + if(!account.can_login) + continue + if(account.login == stored_login) + if(account.password == stored_password) + if(account.suspended) + error = "This account has been suspended. Please contact the system administrator for assistance." + return 0 + current_account = account + return 1 + else + error = "Invalid Password" + return 0 + error = "Invalid Login" + return 0 + +// Returns 0 if no new messages were received, 1 if there is an unread message but notification has already been sent. +// and 2 if there is a new message that appeared in this tick (and therefore notification should be sent by the program). +/datum/tgui_module/email_client/proc/check_for_new_messages(var/messages_read = FALSE) + if(!current_account) + return 0 + + var/list/allmails = current_account.all_emails() + + if(allmails.len > last_message_count) + . = 2 + else if(allmails.len > read_message_count) + . = 1 + else + . = 0 + + last_message_count = allmails.len + if(messages_read) + read_message_count = allmails.len + +/datum/tgui_module/email_client/proc/log_out() + current_account = null + downloading = null + download_progress = 0 + last_message_count = 0 + read_message_count = 0 + +/datum/tgui_module/email_client/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + // Password has been changed by other client connected to this email account + if(current_account) + if(current_account.password != stored_password) + log_out() + error = "Invalid Password" + // Banned. + if(current_account.suspended) + log_out() + error = "This account has been suspended. Please contact the system administrator for assistance." + + // So, TGUI has a bug/feature where it just conveniently doesn't bother to clear out old data if it only gets + // a partial data update; as such, we have to make sure to null all of these out ourselves so the UI works properly. + data["accounts"] = null + data["addressbook"] = null + data["cur_attachment_filename"] = null + data["cur_attachment_size"] = null + data["cur_body"] = null + data["cur_hasattachment"] = null + data["cur_source"] = null + data["cur_timestamp"] = null + data["cur_title"] = null + data["cur_uid"] = null + data["current_account"] = null + data["down_filename"] = null + data["down_progress"] = null + data["down_size"] = null + data["down_speed"] = null + data["downloading"] = null + data["error"] = null + data["folder"] = null + data["label_deleted"] = null + data["label_inbox"] = null + data["label_spam"] = null + data["messagecount"] = null + data["messages"] = null + data["msg_attachment_filename"] = null + data["msg_attachment_size"] = null + data["msg_body"] = null + data["msg_hasattachment"] = null + data["msg_recipient"] = null + data["msg_title"] = null + data["new_message"] = null + data["stored_login"] = null + data["stored_password"] = null + + if(error) + data["error"] = error + else if(downloading) + data["downloading"] = 1 + data["down_filename"] = "[downloading.filename].[downloading.filetype]" + data["down_progress"] = download_progress + data["down_size"] = downloading.size + data["down_speed"] = download_speed + + else if(istype(current_account)) + data["current_account"] = current_account.login + if(addressbook) + var/list/all_accounts = list() + for(var/datum/computer_file/data/email_account/account in ntnet_global.email_accounts) + if(!account.can_login) + continue + all_accounts.Add(list(list( + "login" = account.login + ))) + data["addressbook"] = 1 + data["accounts"] = all_accounts + else if(new_message) + data["new_message"] = 1 + data["msg_title"] = msg_title + data["msg_body"] = pencode2html(msg_body) + data["msg_recipient"] = msg_recipient + if(msg_attachment) + data["msg_hasattachment"] = 1 + data["msg_attachment_filename"] = "[msg_attachment.filename].[msg_attachment.filetype]" + data["msg_attachment_size"] = msg_attachment.size + else if (current_message) + data["cur_title"] = current_message.title + data["cur_body"] = pencode2html(current_message.stored_data) + data["cur_timestamp"] = current_message.timestamp + data["cur_source"] = current_message.source + data["cur_uid"] = current_message.uid + if(istype(current_message.attachment)) + data["cur_hasattachment"] = 1 + data["cur_attachment_filename"] = "[current_message.attachment.filename].[current_message.attachment.filetype]" + data["cur_attachment_size"] = current_message.attachment.size + else + data["label_inbox"] = "Inbox ([current_account.inbox.len])" + data["label_spam"] = "Spam ([current_account.spam.len])" + data["label_deleted"] = "Deleted ([current_account.deleted.len])" + var/list/message_source + if(folder == "Inbox") + message_source = current_account.inbox + else if(folder == "Spam") + message_source = current_account.spam + else if(folder == "Deleted") + message_source = current_account.deleted + + if(message_source) + data["folder"] = folder + var/list/all_messages = list() + for(var/datum/computer_file/data/email_message/message in message_source) + all_messages.Add(list(list( + "title" = message.title, + "body" = pencode2html(message.stored_data), + "source" = message.source, + "timestamp" = message.timestamp, + "uid" = message.uid + ))) + data["messages"] = all_messages + data["messagecount"] = all_messages.len + else + data["stored_login"] = stored_login + data["stored_password"] = stars(stored_password, 0) + + return data + +/datum/tgui_module/email_client/proc/find_message_by_fuid(var/fuid) + if(!istype(current_account)) + return + + // params works with strings, so this makes it a bit easier for us + if(istext(fuid)) + fuid = text2num(fuid) + + for(var/datum/computer_file/data/email_message/message in current_account.all_emails()) + if(message.uid == fuid) + return message + +/datum/tgui_module/email_client/proc/clear_message() + new_message = FALSE + msg_title = "" + msg_body = "" + msg_recipient = "" + msg_attachment = null + current_message = null + +/datum/tgui_module/email_client/proc/relayed_process(var/netspeed) + download_speed = netspeed + if(!downloading) + return + download_progress = min(download_progress + netspeed, downloading.size) + if(download_progress >= downloading.size) + var/obj/item/modular_computer/MC = tgui_host() + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" + downloading = null + download_progress = 0 + return 1 + + if(MC.hard_drive.store_file(downloading)) + error = "File successfully downloaded to local device." + else + error = "Error saving file: I/O Error: The hard drive may be full or nonfunctional." + downloading = null + download_progress = 0 + return 1 + + +/datum/tgui_module/email_client/tgui_act(action, params) + if(..()) + return TRUE + + var/mob/living/user = usr + check_for_new_messages(1) // Any actual interaction (button pressing) is considered as acknowledging received message, for the purpose of notification icons. + + switch(action) + if("login") + log_in() + return 1 + + if("logout") + log_out() + return 1 + + if("reset") + error = "" + return 1 + + if("new_message") + new_message = TRUE + return 1 + + if("cancel") + if(addressbook) + addressbook = FALSE + else + clear_message() + return 1 + + if("addressbook") + addressbook = TRUE + return 1 + + if("set_recipient") + msg_recipient = sanitize(params["set_recipient"]) + addressbook = FALSE + return 1 + + if("edit_title") + var/newtitle = sanitize(params["val"], 100) + if(newtitle) + msg_title = newtitle + return 1 + + // This uses similar editing mechanism as the FileManager program, therefore it supports various paper tags and remembers formatting. + if("edit_body") + var/oldtext = html_decode(msg_body) + oldtext = replacetext(oldtext, "\[editorbr\]", "\n") + + var/newtext = sanitize(replacetext(input(usr, "Enter your message. You may use most tags from paper formatting", "Message Editor", oldtext) as message|null, "\n", "\[editorbr\]"), 20000) + if(newtext) + msg_body = newtext + return 1 + + if("edit_recipient") + var/newrecipient = sanitize(params["val"], 100) + if(newrecipient) + msg_recipient = newrecipient + return 1 + + if("edit_login") + var/newlogin = sanitize(params["val"], 100) + if(newlogin) + stored_login = newlogin + return 1 + + if("edit_password") + var/newpass = sanitize(params["val"], 100) + if(newpass) + stored_password = newpass + return 1 + + if("delete") + if(!istype(current_account)) + return 1 + var/datum/computer_file/data/email_message/M = find_message_by_fuid(params["delete"]) + if(!istype(M)) + return 1 + if(folder == "Deleted") + current_account.deleted.Remove(M) + qdel(M) + else + current_account.deleted.Add(M) + current_account.inbox.Remove(M) + current_account.spam.Remove(M) + if(current_message == M) + current_message = null + return 1 + + if("send") + if(!current_account) + return 1 + if((msg_title == "") || (msg_body == "") || (msg_recipient == "")) + error = "Error sending mail: Title or message body is empty!" + return 1 + + var/datum/computer_file/data/email_message/message = new() + message.title = msg_title + message.stored_data = msg_body + message.source = current_account.login + message.attachment = msg_attachment + if(!current_account.send_mail(msg_recipient, message)) + error = "Error sending email: this address doesn't exist." + return 1 + else + error = "Email successfully sent." + clear_message() + return 1 + + if("set_folder") + folder = params["set_folder"] + return 1 + + if("reply") + var/datum/computer_file/data/email_message/M = find_message_by_fuid(params["reply"]) + if(!istype(M)) + return 1 + + new_message = TRUE + msg_recipient = M.source + msg_title = "Re: [M.title]" + msg_body = "\[editorbr\]\[editorbr\]\[editorbr\]\[br\]==============================\[br\]\[editorbr\]" + msg_body += "Received by [current_account.login] at [M.timestamp]\[br\]\[editorbr\][M.stored_data]" + return 1 + + if("view") + var/datum/computer_file/data/email_message/M = find_message_by_fuid(params["view"]) + if(istype(M)) + current_message = M + return 1 + + if("changepassword") + var/oldpassword = sanitize(input(user,"Please enter your old password:", "Password Change"), 100) + if(!oldpassword) + return 1 + var/newpassword1 = sanitize(input(user,"Please enter your new password:", "Password Change"), 100) + if(!newpassword1) + return 1 + var/newpassword2 = sanitize(input(user,"Please re-enter your new password:", "Password Change"), 100) + if(!newpassword2) + return 1 + + if(!istype(current_account)) + error = "Please log in before proceeding." + return 1 + + if(current_account.password != oldpassword) + error = "Incorrect original password" + return 1 + + if(newpassword1 != newpassword2) + error = "The entered passwords do not match." + return 1 + + current_account.password = newpassword1 + stored_password = newpassword1 + error = "Your password has been successfully changed!" + return 1 + + // The following entries are Modular Computer framework only, and therefore won't do anything in other cases (like AI View) + + if("save") + // Fully dependant on modular computers here. + var/obj/item/modular_computer/MC = tgui_host() + + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error exporting file. Are you using a functional and NTOS-compliant device?" + return 1 + + var/filename = sanitize(input(user,"Please specify file name:", "Message export"), 100) + if(!filename) + return 1 + + var/datum/computer_file/data/email_message/M = find_message_by_fuid(params["save"]) + var/datum/computer_file/data/mail = istype(M) ? M.export() : null + if(!istype(mail)) + return 1 + mail.filename = filename + if(!MC.hard_drive || !MC.hard_drive.store_file(mail)) + error = "Internal I/O error when writing file, the hard drive may be full." + else + error = "Email exported successfully" + return 1 + + if("addattachment") + var/obj/item/modular_computer/MC = tgui_host() + msg_attachment = null + + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" + return 1 + + var/list/filenames = list() + for(var/datum/computer_file/CF in MC.hard_drive.stored_files) + if(CF.unsendable) + continue + filenames.Add(CF.filename) + var/picked_file = input(user, "Please pick a file to send as attachment (max 32GQ)") as null|anything in filenames + + if(!picked_file) + return 1 + + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error uploading file. Are you using a functional and NTOSv2-compliant device?" + return 1 + + for(var/datum/computer_file/CF in MC.hard_drive.stored_files) + if(CF.unsendable) + continue + if(CF.filename == picked_file) + msg_attachment = CF.clone() + break + if(!istype(msg_attachment)) + msg_attachment = null + error = "Unknown error when uploading attachment." + return 1 + + if(msg_attachment.size > 32) + error = "Error uploading attachment: File exceeds maximal permitted file size of 32GQ." + msg_attachment = null + else + error = "File [msg_attachment.filename].[msg_attachment.filetype] has been successfully uploaded." + return 1 + + if("downloadattachment") + if(!current_account || !current_message || !current_message.attachment) + return 1 + var/obj/item/modular_computer/MC = tgui_host() + if(!istype(MC) || !MC.hard_drive || !MC.hard_drive.check_functionality()) + error = "Error downloading file. Are you using a functional and NTOSv2-compliant device?" + return 1 + + downloading = current_message.attachment.clone() + download_progress = 0 + return 1 + + if("canceldownload") + downloading = null + download_progress = 0 + return 1 + + if("remove_attachment") + msg_attachment = null + return 1 \ No newline at end of file diff --git a/code/modules/tgui/modules/ntos-only/uav.dm b/code/modules/tgui/modules/ntos-only/uav.dm new file mode 100644 index 0000000000..f27a08eda9 --- /dev/null +++ b/code/modules/tgui/modules/ntos-only/uav.dm @@ -0,0 +1,241 @@ +/datum/tgui_module/uav + name = "UAV Control" + tgui_id = "UAV" + ntos = TRUE + var/obj/item/device/uav/current_uav = null //The UAV we're watching + var/signal_strength = 0 //Our last signal strength report (cached for a few seconds) + var/signal_test_counter = 0 //How long until next signal strength check + var/list/viewers //Who's viewing a UAV through us + var/adhoc_range = 30 //How far we can operate on a UAV without NTnet + +/datum/tgui_module/uav/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + if(current_uav) + if(QDELETED(current_uav)) + set_current(null) + else if(signal_test_counter-- <= 0) + signal_strength = get_signal_to(current_uav) + if(!signal_strength) + set_current(null) + else // Don't reset counter until we find a UAV that's actually in range we can stay connected to + signal_test_counter = 20 + + data["current_uav"] = null + if(current_uav) + data["current_uav"] = list("status" = current_uav.get_status_string(), "power" = current_uav.state == 1 ? 1 : null) + data["signal_strength"] = signal_strength ? signal_strength >= 2 ? "High" : "Low" : "None" + data["in_use"] = LAZYLEN(viewers) + + var/list/paired_map = list() + var/obj/item/modular_computer/mc_host = tgui_host() + if(istype(mc_host)) + for(var/puav in mc_host.paired_uavs) + var/weakref/wr = puav + var/obj/item/device/uav/U = wr.resolve() + paired_map.Add(list(list("name" = "[U ? U.nickname : "!!Missing!!"]", "uavref" = "\ref[U]"))) + + data["paired_uavs"] = paired_map + return data + +/datum/tgui_module/uav/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + switch(action) + if("switch_uav") + var/obj/item/device/uav/U = locate(params["switch_uav"]) //This is a \ref to the UAV itself + if(!istype(U)) + to_chat(usr,"Something is blocking the connection to that UAV. In-person investigation is required.") + return FALSE + + if(!get_signal_to(U)) + to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") + return FALSE + + set_current(U) + return TRUE + + if("del_uav") + var/refstring = params["del_uav"] //This is a \ref to the UAV itself + var/obj/item/modular_computer/mc_host = tgui_host() + //This is so we can really scrape up any weakrefs that can't resolve + for(var/weakref/wr in mc_host.paired_uavs) + if(wr.ref == refstring) + if(current_uav?.weakref == wr) + set_current(null) + LAZYREMOVE(mc_host.paired_uavs, wr) + return TRUE + + if("view_uav") + if(!current_uav) + return FALSE + + if(current_uav.check_eye(usr) < 0) + to_chat(usr,"The screen freezes for a moment, before returning to the UAV selection menu. It's not able to connect to that UAV.") + else + viewing_uav(usr) ? unlook(usr) : look(usr) + return TRUE + + if("power_uav") + if(!current_uav) + return FALSE + else if(current_uav.toggle_power()) + //Clean up viewers faster + if(LAZYLEN(viewers)) + for(var/weakref/W in viewers) + var/M = W.resolve() + if(M) + unlook(M) + return TRUE + +/datum/tgui_module/uav/proc/set_current(var/obj/item/device/uav/U) + if(current_uav == U) + return + + signal_strength = 0 + current_uav = U + + if(LAZYLEN(viewers)) + for(var/weakref/W in viewers) + var/M = W.resolve() + if(M) + if(current_uav) + to_chat(M, "You're disconnected from the UAV's camera!") + unlook(M) + else + look(M) + +//// +//// Finding signal strength between us and the UAV +//// +/datum/tgui_module/uav/proc/get_signal_to(atom/movable/AM) + // Following roughly the ntnet signal levels + // 0 is none + // 1 is weak + // 2 is strong + var/obj/item/modular_computer/host = tgui_host() //Better not add this to anything other than modular computers. + if(!istype(host)) + return + var/our_signal = host.get_ntnet_status() //1 low, 2 good, 3 wired, 0 none + var/their_z = get_z(AM) + + //If we have no NTnet connection don't bother getting theirs + if(!our_signal) + if(get_z(host) == their_z && (get_dist(host, AM) < adhoc_range)) + return 1 //We can connect (with weak signal) in same z without ntnet, within 30 turfs + else + return 0 + + var/list/zlevels_in_range = using_map.get_map_levels(their_z, FALSE) + var/list/zlevels_in_long_range = using_map.get_map_levels(their_z, TRUE, om_range = DEFAULT_OVERMAP_RANGE) - zlevels_in_range + var/their_signal = 0 + for(var/relay in ntnet_global.relays) + var/obj/machinery/ntnet_relay/R = relay + if(!R.operable()) + continue + if(R.z == their_z) + their_signal = 2 + break + if(R.z in zlevels_in_range) + their_signal = 2 + break + if(R.z in zlevels_in_long_range) + their_signal = 1 + break + + if(!their_signal) //They have no NTnet at all + if(get_z(host) == their_z && (get_dist(host, AM) < adhoc_range)) + return 1 //We can connect (with weak signal) in same z without ntnet, within 30 turfs + else + return 0 + else + return max(our_signal, their_signal) + +/* All handling viewers */ +/datum/tgui_module/uav/Destroy() + if(LAZYLEN(viewers)) + for(var/weakref/W in viewers) + var/M = W.resolve() + if(M) + unlook(M) + . = ..() + +/datum/tgui_module/uav/tgui_status(mob/user) + . = ..() + if(. > STATUS_DISABLED) + if(viewing_uav(user)) + look(user) + return + unlook(user) + +/datum/tgui_module/uav/tgui_close(mob/user) + . = ..() + unlook(user) + +/datum/tgui_module/uav/proc/viewing_uav(mob/user) + return (weakref(user) in viewers) + +/datum/tgui_module/uav/proc/look(mob/user) + if(issilicon(user)) //Too complicated for me to want to mess with at the moment + to_chat(user, "Regulations prevent you from controlling several corporeal forms at the same time!") + return + + if(!current_uav) + return + + if(user.machine != tgui_host()) + user.set_machine(tgui_host()) + user.reset_view(current_uav) + current_uav.add_master(user) + LAZYDISTINCTADD(viewers, weakref(user)) + +/datum/tgui_module/uav/proc/unlook(mob/user) + user.unset_machine() + user.reset_view() + if(current_uav) + current_uav.remove_master(user) + LAZYREMOVE(viewers, weakref(user)) + +/datum/tgui_module/uav/check_eye(mob/user) + if(get_dist(user, tgui_host()) > 1 || user.blinded || !current_uav) + unlook(user) + return -1 + + var/viewflag = current_uav.check_eye(user) + if(viewflag < 0) //camera doesn't work + unlook(user) + return -1 + + return viewflag + +//// +//// Relaying movements to the UAV +//// +/datum/tgui_module/uav/relaymove(var/mob/user, direction) + if(current_uav) + return current_uav.relaymove(user, direction, signal_strength) + +//// +//// The effects when looking through a UAV +//// +/datum/tgui_module/uav/apply_visual(mob/M) + if(!M.client) + return + if(weakref(M) in viewers) + M.overlay_fullscreen("fishbed",/obj/screen/fullscreen/fishbed) + M.overlay_fullscreen("scanlines",/obj/screen/fullscreen/scanline) + + if(signal_strength <= 1) + M.overlay_fullscreen("whitenoise",/obj/screen/fullscreen/noise) + else + M.clear_fullscreen("whitenoise", 0) + else + remove_visual(M) + +/datum/tgui_module/uav/remove_visual(mob/M) + if(!M.client) + return + M.clear_fullscreen("fishbed",0) + M.clear_fullscreen("scanlines",0) + M.clear_fullscreen("whitenoise",0) diff --git a/code/modules/tgui/modules/teleporter.dm b/code/modules/tgui/modules/teleporter.dm new file mode 100644 index 0000000000..9bba6a8659 --- /dev/null +++ b/code/modules/tgui/modules/teleporter.dm @@ -0,0 +1,85 @@ +/datum/tgui_module/teleport_control + name = "Teleporter Control" + tgui_id = "Teleporter" + var/locked_name = "Not Locked" + var/obj/item/locked = null + var/obj/machinery/teleport/station/station = null + var/obj/machinery/teleport/hub/hub = null + +/datum/tgui_module/teleport_control/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) + var/list/data = ..() + + data["locked_name"] = locked_name || "No Target" + data["station_connected"] = !!station + data["hub_connected"] = !!hub + data["calibrated"] = hub?.accurate + data["teleporter_on"] = station?.engaged + + return data + +/datum/tgui_module/teleport_control/tgui_act(action, params, datum/tgui/ui, datum/tgui_state/state) + if(..()) + return TRUE + + switch(action) + if("select_target") + var/list/L = list() + var/list/areaindex = list() + + for(var/obj/item/device/radio/beacon/R in GLOB.all_beacons) + var/turf/T = get_turf(R) + if(!T) + continue + if(!(T.z in using_map.player_levels)) + continue + var/tmpname = T.loc.name + if(areaindex[tmpname]) + tmpname = "[tmpname] ([++areaindex[tmpname]])" + else + areaindex[tmpname] = 1 + L[tmpname] = R + + for(var/obj/item/weapon/implant/tracking/I in GLOB.all_tracking_implants) + if(!I.implanted || !ismob(I.loc)) + continue + else + var/mob/M = I.loc + if(M.stat == 2) + if(M.timeofdeath + 6000 < world.time) + continue + var/turf/T = get_turf(M) + if(T) + continue + if(!(T in using_map.station_levels)) + continue + var/tmpname = M.real_name + if(areaindex[tmpname]) + tmpname = "[tmpname] ([++areaindex[tmpname]])" + else + areaindex[tmpname] = 1 + L[tmpname] = I + + var/desc = input("Please select a location to lock in.", "Locking Menu") in L|null + if(!desc) + return FALSE + if(tgui_status(usr, state) != STATUS_INTERACTIVE) + return FALSE + + locked = L[desc] + locked_name = desc + return TRUE + + if("test_fire") + station?.testfire() + return TRUE + + if("toggle_on") + if(!station) + return FALSE + + if(station.engaged) + station.disengage() + else + station.engage() + + return TRUE diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index 111ee9e30b..2973d51668 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -122,4 +122,4 @@ /mob/living/carbon/human/shared_living_tgui_distance(atom/movable/src_object) if((TK in mutations) && (get_dist(src, src_object) <= 2)) return STATUS_INTERACTIVE - return ..() + return ..() \ No newline at end of file diff --git a/code/modules/tgui/states/deep_inventory.dm b/code/modules/tgui/states/deep_inventory.dm index 137f262a0e..d8a5e699c2 100644 --- a/code/modules/tgui/states/deep_inventory.dm +++ b/code/modules/tgui/states/deep_inventory.dm @@ -9,4 +9,4 @@ GLOBAL_DATUM_INIT(tgui_deep_inventory_state, /datum/tgui_state/deep_inventory_st /datum/tgui_state/deep_inventory_state/can_use_topic(src_object, mob/user) if(!user.contains(src_object)) return STATUS_CLOSE - return user.shared_tgui_interaction(src_object) + return user.shared_tgui_interaction(src_object) \ No newline at end of file diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm index ba8d132e0b..a69295452b 100644 --- a/code/modules/tgui/states/default.dm +++ b/code/modules/tgui/states/default.dm @@ -68,12 +68,12 @@ GLOBAL_DATUM_INIT(tgui_default_state, /datum/tgui_state/default, new) /mob/living/silicon/pai/default_can_use_tgui_topic(src_object) // pAIs can only use themselves and the owner's radio. - if((src_object == src || src_object == radio) && !stat) + if((src_object == src || src_object == radio || src_object == communicator) && !stat) return STATUS_INTERACTIVE else return ..() /mob/observer/dead/default_can_use_tgui_topic() - if(check_rights(R_ADMIN, 0, src)) + if(can_admin_interact()) return STATUS_INTERACTIVE // Admins are more equal return STATUS_UPDATE // Ghosts can view updates diff --git a/code/modules/tgui/states/inventory_vr.dm b/code/modules/tgui/states/inventory_vr.dm index b8e3ea224c..bc0fe2c3e3 100644 --- a/code/modules/tgui/states/inventory_vr.dm +++ b/code/modules/tgui/states/inventory_vr.dm @@ -16,6 +16,21 @@ GLOBAL_DATUM_INIT(tgui_nif_state, /datum/tgui_state/nif_state, new) return STATUS_CLOSE +// This is slightly distinct from the module state, as it wants to update if not working +GLOBAL_DATUM_INIT(tgui_nif_main_state, /datum/tgui_state/nif_main_state, new) +/datum/tgui_state/nif_main_state/can_use_topic(var/src_object, var/mob/user) + if(ishuman(user)) + var/mob/living/carbon/human/H = user + if(!H.nif || src_object != H.nif) + return STATUS_CLOSE + + if(H.nif.stat == NIF_WORKING) + return user.shared_tgui_interaction() + else + return min(user.shared_tgui_interaction(), STATUS_UPDATE) + + return STATUS_CLOSE + GLOBAL_DATUM_INIT(tgui_commlink_state, /datum/tgui_state/commlink_state, new) /datum/tgui_state/commlink_state/can_use_topic(var/src_object, var/mob/user) if(ishuman(user)) diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 2f928ae6fa..eb128a129b 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -114,7 +114,6 @@ closing = TRUE for(var/datum/tgui/child in children) child.close(can_be_suspended, logout) - children.Cut() // If we don't have window_id, open proc did not have the opportunity // to finish, therefore it's safe to skip this whole block. if(window) @@ -126,6 +125,8 @@ src_object.tgui_close(user) SStgui.on_close(src) state = null + if(parent_ui) + parent_ui.children -= src parent_ui = null qdel(src) diff --git a/code/modules/vehicles/boat.dm b/code/modules/vehicles/boat.dm index ea17e29678..170ad4aa81 100644 --- a/code/modules/vehicles/boat.dm +++ b/code/modules/vehicles/boat.dm @@ -10,7 +10,7 @@ move_delay = 3 // Rather slow, but still faster than swimming, and won't get you wet. max_buckled_mobs = 2 anchored = FALSE - var/material/material = null + var/datum/material/material = null var/riding_datum_type = /datum/riding/boat/small /obj/vehicle/boat/sifwood/New(newloc, material_name) @@ -43,7 +43,7 @@ icon_state = "oar" item_state = "oar" force = 12 - var/material/material = null + var/datum/material/material = null /obj/item/weapon/oar/sifwood/New(newloc, material_name) ..(newloc, MAT_SIFWOOD) diff --git a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm index 1d610be51c..d2bed00deb 100644 --- a/code/modules/vore/appearance/sprite_accessories_taur_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_taur_vr.dm @@ -68,8 +68,13 @@ var/mob/living/carbon/human/H = M if(isTaurTail(H.tail_style)) - to_chat(src,"Too many legs. TOO MANY LEGS!!") - return FALSE + var/datum/sprite_accessory/tail/taur/ridertype = H.tail_style + if(ridertype.can_ride) + if(istype(ridertype, /datum/sprite_accessory/tail/taur/naga) || istype(ridertype, /datum/sprite_accessory/tail/taur/slug)) + to_chat(src,"Too few legs. TOO FEW LEGS!!") + return FALSE + to_chat(src,"Too many legs. TOO MANY LEGS!!") + return FALSE . = ..() if(.) @@ -126,7 +131,7 @@ var/icon/suit_sprites = null //File for suit sprites, if any. var/icon/under_sprites = null - var/icon_sprite_tag // This is where we put stuff like _Horse, so we can assign icons easier. + var/icon_sprite_tag // This is where we put stuff like _Horse, so we can assign icons easier. var/can_ride = 1 //whether we're real rideable taur or just in that category @@ -207,6 +212,12 @@ extra_overlay = "synthwolf_markings" //icon_sprite_tag = "synthwolf" +/datum/sprite_accessory/tail/taur/skunk + name = "Skunk (Taur)" + icon_state = "skunk_s" + extra_overlay = "skunk_markings" + icon_sprite_tag = "skunk" + /datum/sprite_accessory/tail/taur/naga name = "Naga (Taur)" icon_state = "naga_s" diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm index 32128c2708..f8ba23f341 100644 --- a/code/modules/vore/appearance/sprite_accessories_vr.dm +++ b/code/modules/vore/appearance/sprite_accessories_vr.dm @@ -41,6 +41,21 @@ // Ears avaliable to anyone +/datum/sprite_accessory/ears/hyena + name = "hyena ears, dual-color" + desc = "" + icon_state = "hyena" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "hyena-inner" + +/datum/sprite_accessory/ears/moth + name = "moth antennae" + desc = "" + icon_state = "moth" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/ears/squirrel_orange name = "squirel, orange" desc = "" diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 80cea8ae2e..967c894f9d 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -728,7 +728,7 @@ return var/list/nom = null - var/material/M = null + var/datum/material/M = null if(istype(I, /obj/item/weapon/ore)) //Raw unrefined ore. Some things are just better untempered! var/obj/item/weapon/ore/O = I //List in list, define by material property of ore in code/mining/modules/ore.dm. @@ -743,7 +743,7 @@ "silver" = list("nutrition" = 40, "remark" = "[O] tastes quite nice indeed as you munch on it. A little tarnished, but that's just fine aging.", "WTF" = FALSE), "gold" = list("nutrition" = 40, "remark" = "You taste supreme richness that exceeds expectations and satisfies your hunger.", "WTF" = FALSE), "diamond" = list("nutrition" = 50, "remark" = "The heavenly taste of [O] almost brings a tear to your eye. Its glimmering gloriousness is even better on the tongue than you imagined, so you savour it fondly.", "WTF" = FALSE), - "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectible.", "WTF" = FALSE), + "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE), "mhydrogen" = list("nutrition" = 30, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE), "rutile" = list("nutrition" = 50, "remark" = "A little... angular, you savour the light but chewy [O], finishing it quickly.", "WTF" = FALSE), MAT_VERDANTIUM = list("nutrition" = 50, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE), @@ -779,11 +779,11 @@ "borosilicate glass" = list("nutrition" = 10, "remark" = "With a satisfying crunch, you grind [O] down with ease and find it somewhat palatable due to a subtle but familiar rush of phoronic warmth.", "WTF" = FALSE), "reinforced borosilicate glass" = list("nutrition" = 15, "remark" = "With a satisfying crunch, you grind [O] down. It is quite palatable due to a subtle metallic tang and familiar rush of phoronic warmth.", "WTF" = FALSE), MAT_GRAPHITE = list("nutrition" = 30, "remark" = "Satisfyingly metallic with a mildly savoury tartness, you chew [O] until its flavour is no more but are left longing for another.", "WTF" = FALSE), - "osmium" = list("nutrition" = 45, "remark" = "Successive bites serve to almost chill your palate, a rush of rich and mildly sour flavour unlocked with the grinding of your powerful jaws. Delectible.", "WTF" = FALSE), + "osmium" = list("nutrition" = 45, "remark" = "Successive bites serve to almost chill your palate, a rush of rich and mildly sour flavour unlocked with the grinding of your powerful jaws. Delectable.", "WTF" = FALSE), "mhydrogen" = list("nutrition" = 35, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly.", "WTF" = FALSE), - "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectible.", "WTF" = FALSE), + "platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectable.", "WTF" = FALSE), "iron" = list("nutrition" = 15, "remark" = "The familiar texture and taste of [O] does the job but leaves little to the imagination and hardly sates your appetite.", "WTF" = FALSE), - MAT_LEAD = list("nutrition" = 0, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE), + MAT_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum.", "WTF" = FALSE), MAT_VERDANTIUM = list("nutrition" = 55, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment.", "WTF" = FALSE), MAT_MORPHIUM = list("nutrition" = 75, "remark" = "The question, the answer and the taste: It all floods your mouth and your mind to momentarily overwhelm the senses. What the hell was that? Your mouth and throat are left tingling for a while.", "WTF" = 10), "alienalloy" = list("nutrition" = 120, "remark" = "Working hard for so long to rend the material apart has left your jaw sore, but a veritable explosion of mind boggling indescribable flavour is unleashed. Completely alien sensations daze and overwhelm you while it feels like an interdimensional rift opened in your mouth, briefly numbing your face.", "WTF" = 15) diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index e8e0360555..482928985b 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -271,6 +271,18 @@ if("bellypick") host.vore_selected = locate(params["bellypick"]) return TRUE + if("move_belly") + var/dir = text2num(params["dir"]) + if(LAZYLEN(host.vore_organs) <= 1) + to_chat(usr, "You can't sort bellies with only one belly to sort...") + return TRUE + + var/current_index = host.vore_organs.Find(host.vore_selected) + if(current_index) + var/new_index = clamp(current_index + dir, 1, LAZYLEN(host.vore_organs)) + host.vore_organs.Swap(current_index, new_index) + unsaved_changes = TRUE + return TRUE if("set_attribute") return set_attr(usr, params) diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 8ae03765e9..ffff210dbc 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -2002,4 +2002,9 @@ Departamental Swimsuits, for general use flags_inv = HIDEHOLSTER icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "flintlock_mob" \ No newline at end of file + item_state = "flintlock_mob" + +//BobOfBoblandia: Charles Gettler +/obj/item/clothing/head/that/fluff/gettler + name = "Charles' Top-Hat" + desc = "A special hat, removed from its owner." \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index fa0acd60d6..b2d82a7066 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1274,3 +1274,34 @@ /obj/item/clothing/accessory/solgov/department/security/aurora name = "Old security insignia" desc = "Insignia denoting assignment to the security department. These fit Expeditionary Corps uniforms. This one seems to be from the 2100s..." + +//Tigercat2000 - Shadow Larkens +/obj/item/modular_computer/laptop/preset/custom_loadout/advanced/shadowlarkens + name = "Shadow's laptop computer" + desc = "A laptop with a different color scheme than usual!" + icon = 'icons/vore/custom_items_vr.dmi' + overlay_icon = 'icons/obj/modular_laptop.dmi' + icon_state_unpowered = "shadowlaptop-open" + icon_state = "shadowlaptop-open" + icon_state_closed = "shadowlaptop-closed" + +//Rboys2 - Clara Mali +/obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask + name = "Clara's Vacuum Flask" + desc = "A rose gold vacuum flask." + base_name = "Clara's Vacuum Flask" + base_icon = "claraflask" + icon = 'icons/vore/custom_items_vr.dmi' + center_of_mass = list("x" = 15,"y" = 4) + filling_states = list(15, 30, 50, 60, 80, 100) + volume = 60 + +/obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask/Initialize() + . = ..() + reagents.add_reagent("tea", 40) + reagents.add_reagent("milk", 20) + +/obj/item/weapon/reagent_containers/food/drinks/glass2/fluff/claraflask/update_icon() + ..() + name = initial(name) + desc = initial(desc) \ No newline at end of file diff --git a/code/unit_tests/research_tests.dm b/code/unit_tests/research_tests.dm index 24d307c5e6..9d0174cabe 100644 --- a/code/unit_tests/research_tests.dm +++ b/code/unit_tests/research_tests.dm @@ -54,7 +54,7 @@ design = new design_type() // Unfortunately we have to actually instantiate to get a list. for(var/material_name in design.materials) - var/material/material = get_material_by_name(material_name) + var/datum/material/material = get_material_by_name(material_name) if(!material) log_unit_test("The entry [design_type] has invalid material type [material_name]") number_of_issues++ diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 64ba396c77..c423c19e38 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -12,13 +12,6 @@ alphaprime1 - Protean bothnevarbackwards - Diona bricker98 - Protean crossexonar - Protean -<<<<<<< HEAD -======= -chillyfang - Black-Eyed Shadekin -cgr - Protean -draycu - Vox -flaktual - Vox ->>>>>>> e791692aea59a96b1b45c20d61974aa10493a7f6 funnyman2003 - Xenochimera flurriee - Protean hawkerthegreat - Vox diff --git a/config/example/config.txt b/config/example/config.txt index d56d60a5ae..dd07f7b73d 100644 --- a/config/example/config.txt +++ b/config/example/config.txt @@ -551,4 +551,7 @@ ENABLE_NIGHT_SHIFTS # Uncomment to allow links of the following kinds. # # ALLOW_BYOND_LINKS # ALLOW_DISCORD_LINKS -ALLOW_URL_LINKS \ No newline at end of file +ALLOW_URL_LINKS + +# Control which submaps are loaded for the Dynamic Engine system +ENGINE_MAP Supermatter Engine,Edison's Bane diff --git a/guides/Guide to Opening Your First PR.md b/guides/Guide to Opening Your First PR.md index 73d44dace5..58d28b1362 100644 --- a/guides/Guide to Opening Your First PR.md +++ b/guides/Guide to Opening Your First PR.md @@ -16,7 +16,7 @@ Everyone has their own preferred Github clients - I use Gitkraken because it’s **SourceTree:** https://www.sourcetreeapp.com/ **Github Desktop:** https://desktop.github.com/ -I recommend Gitkraken as it’s very good at handling things for you, and it comes with built-in darkmode. It DOES have paid features, but you don’t need them. +I recommend Gitkraken as it’s very good at handling things for you, and it comes with built-in darkmode. It does have paid features, but you don’t need them. Cloning your Repo: AKA “Progress bar time†I’ll give these instructions in relevance to Gitkraken as that’s what I use, but they should be relatively applicable to other platforms. diff --git a/html/changelog.html b/html/changelog.html index 7153910a42..1ddf4203de 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,52 @@ -->
+
06 September 2020
+Atermonera updated:
+-
+
- You can use Move Up/Down to traverse ladders. No popup 'Which way do you want to go?' windows required for bidirectional ladders!. +
Killian updated:
+-
+
- Added a bunch more random spawners for mapping use. +
- You can now inject reagents directly into a synth's 'blood' stream using syringes and hypos (inc. borg hypos). Taking oil/coolant samples is still impossible. +
Kot updated:
+-
+
- Mecha drills can now butcher dead mobs better. Like gibs and gore and guts stuff. +
Lorilili updated:
+-
+
- You can now pet borgs on help intent and punch on hurt intent. Old behavior is now grab intent. +
Lorilili (Port from Aurora) updated:
+-
+
- Added knee-high and thigh-high jackboots. +
- Replaced laceup and leather shoes with oxford shoes. +
- Replaced standard shoe and high-top sprites with newer ones. +
Mechoid updated:
+-
+
- Mapped distillery into Chemistry, beside the Grinder. +
- Moves wrapper, spacecleaner, and labeller from the grinder table to the Chem locker. +
- Added distilling recipe for Synthetic Plasma, which acts as a blood-restoration of 1.2 units per synthplas. Also orderable in cargo. +
Rykka Stormheart updated:
+-
+
- Adds Ambience Chance and Repeating Ambience Preferences into Globals, underneath Client FPS +
- Random-Ambience-Frequency controls how long before it checks if it can play ambience to you again. Setting it to 0 disables the random re-play of ambience. +
- Ambience Chance affects the % chance to play ambience to your client. It defaults to 35%, but can be set from 0 to 100 to disable it or always play every time you move into an area or have the Random Ambience check called. +
Shadow Larkens updated:
+-
+
- Added the ability to right click and lower preferences for jobs in the Occupation Menu. +
SplinterGP updated:
+-
+
- Adds new hailer masks with quotes with sound, allowing you to use a hailer on a face mask to combine them. +
- Adds new sound effects for hailer face masks. +
20 August 2020
Atermonera updated:
-
@@ -65,6 +111,11 @@
- You can now alt-click to turn on the washing machine.
- You can now alt-click on a mech while piloting it to toggle strafing.
Blinskot updated:
+-
+
- You can now alt-click on a mech while piloting it to toggle strafing. +
- You can now alt-click to turn on the washing machine. +
Cerebulon updated:
- Added extended flavour text to most things related to commercial vending machines and their contents. diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3a86bfb6b7..9444423465 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5315,3 +5315,42 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscdel: Removed monitor mask item(replaced by verb). Subber: - rscadd: 'Added a new prosthetic sprite set: Cyber Solutions - Outdated.' +2020-09-06: + Atermonera: + - tweak: You can use Move Up/Down to traverse ladders. No popup 'Which way do you + want to go?' windows required for bidirectional ladders!. + Killian: + - tweak: Added a bunch more random spawners for mapping use. + - tweak: You can now inject reagents directly into a synth's 'blood' stream using + syringes and hypos (inc. borg hypos). Taking oil/coolant samples is still impossible. + Kot: + - tweak: Mecha drills can now butcher dead mobs better. Like gibs and gore and guts + stuff. + Lorilili: + - rscadd: You can now pet borgs on help intent and punch on hurt intent. Old behavior + is now grab intent. + Lorilili (Port from Aurora): + - rscadd: Added knee-high and thigh-high jackboots. + - imageadd: Replaced laceup and leather shoes with oxford shoes. + - imageadd: Replaced standard shoe and high-top sprites with newer ones. + Mechoid: + - maptweak: Mapped distillery into Chemistry, beside the Grinder. + - maptweak: Moves wrapper, spacecleaner, and labeller from the grinder table to + the Chem locker. + - rscadd: Added distilling recipe for Synthetic Plasma, which acts as a blood-restoration + of 1.2 units per synthplas. Also orderable in cargo. + Rykka Stormheart: + - rscadd: Adds Ambience Chance and Repeating Ambience Preferences into Globals, + underneath Client FPS + - rscadd: Random-Ambience-Frequency controls how long before it checks if it can + play ambience to you again. Setting it to 0 disables the random re-play of ambience. + - rscadd: Ambience Chance affects the % chance to play ambience to your client. + It defaults to 35%, but can be set from 0 to 100 to disable it or always play + every time you move into an area or have the Random Ambience check called. + Shadow Larkens: + - rscadd: Added the ability to right click and lower preferences for jobs in the + Occupation Menu. + SplinterGP: + - rscadd: Adds new hailer masks with quotes with sound, allowing you to use a hailer + on a face mask to combine them. + - soundadd: Adds new sound effects for hailer face masks. diff --git a/html/changelogs/Lorilili - borgpet.yml b/html/changelogs/Lorilili - borgpet.yml deleted file mode 100644 index 6af4fa0c25..0000000000 --- a/html/changelogs/Lorilili - borgpet.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Lorilili -delete-after: True -changes: - - rscadd: "You can now pet borgs on help intent and punch on hurt intent. Old behavior is now grab intent." - diff --git a/html/changelogs/shadowlarkens - job preferences.yml b/html/changelogs/Mechoid - Encumbrance.yml similarity index 91% rename from html/changelogs/shadowlarkens - job preferences.yml rename to html/changelogs/Mechoid - Encumbrance.yml index 75a2fe7a28..f013a3bcad 100644 --- a/html/changelogs/shadowlarkens - job preferences.yml +++ b/html/changelogs/Mechoid - Encumbrance.yml @@ -22,7 +22,7 @@ ################################# # Your name. -author: Shadow Larkens +author: Mechoid # Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True @@ -33,4 +33,4 @@ delete-after: True # Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. # Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - - rscadd: "Added the ability to right click and lower preferences for jobs in the Occupation Menu." + - rscadd: "Added system for exosuit over-encumbrance. Combat mechs and Ripleys have higher than default." diff --git a/html/changelogs/Meghan Rossi - atmosanalyzer.yml b/html/changelogs/Meghan Rossi - atmosanalyzer.yml new file mode 100644 index 0000000000..336b875578 --- /dev/null +++ b/html/changelogs/Meghan Rossi - atmosanalyzer.yml @@ -0,0 +1,4 @@ +author: Meghan-Rossi +delete-after: True +changes: + - bugfix: "Fixed some objects giving duplicate results when an analyzer was used on them" \ No newline at end of file diff --git a/html/changelogs/Meghan Rossi - fix omni filters.yml b/html/changelogs/Meghan Rossi - fix omni filters.yml new file mode 100644 index 0000000000..595dd331e7 --- /dev/null +++ b/html/changelogs/Meghan Rossi - fix omni filters.yml @@ -0,0 +1,4 @@ +author: Meghan-Rossi +delete-after: True +changes: + - bugfix: "Fixed omni filters reacting incorrectly to configuration changes that swap ports." \ No newline at end of file diff --git a/html/changelogs/Meghan Rossi - stripping.yml b/html/changelogs/Meghan Rossi - stripping.yml new file mode 100644 index 0000000000..25a4e95bec --- /dev/null +++ b/html/changelogs/Meghan Rossi - stripping.yml @@ -0,0 +1,4 @@ +author: Meghan-Rossi +delete-after: True +changes: + - tweak: "If you try to put someone in one of their own slots using the stripping menu, now you will instead try to strip that slot." \ No newline at end of file diff --git a/html/changelogs/Meghan Rossi - triglyceride taste.yml b/html/changelogs/Meghan Rossi - triglyceride taste.yml new file mode 100644 index 0000000000..c18e6ff8e9 --- /dev/null +++ b/html/changelogs/Meghan Rossi - triglyceride taste.yml @@ -0,0 +1,4 @@ +author: Meghan-Rossi +delete-after: True +changes: + - bugfix: "Fat (triglyceride) now tastes greasy instead of bitter." \ No newline at end of file diff --git a/html/changelogs/Lorilili - footwear.yml b/html/changelogs/SubberTheFabulous-PR-7642.yml similarity index 84% rename from html/changelogs/Lorilili - footwear.yml rename to html/changelogs/SubberTheFabulous-PR-7642.yml index e7b727050d..23864c64b0 100644 --- a/html/changelogs/Lorilili - footwear.yml +++ b/html/changelogs/SubberTheFabulous-PR-7642.yml @@ -1,38 +1,36 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: Lorilili (Port from Aurora) - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Added knee-high and thigh-high jackboots." - - imageadd: "Replaced laceup and leather shoes with oxford shoes." - - imageadd: "Replaced standard shoe and high-top sprites with newer ones." +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Subber + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added two new antag augments to traitor uplink: armblade and handblade." diff --git a/html/changelogs/atermonera - move updown.yml b/html/changelogs/atermonera - move updown.yml deleted file mode 100644 index ceae85d35e..0000000000 --- a/html/changelogs/atermonera - move updown.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Atermonera -delete-after: True -changes: - - tweak: "You can use Move Up/Down to traverse ladders No popup "Which way do you want to go?" windows required for bidirectional ladders!." diff --git a/html/changelogs/rykka-stormheart - toy mechs.yml b/html/changelogs/mechoid - hydroupkeep.yml similarity index 75% rename from html/changelogs/rykka-stormheart - toy mechs.yml rename to html/changelogs/mechoid - hydroupkeep.yml index 5967df1bfa..66b4cea214 100644 --- a/html/changelogs/rykka-stormheart - toy mechs.yml +++ b/html/changelogs/mechoid - hydroupkeep.yml @@ -22,7 +22,7 @@ ################################# # Your name. -author: Rykka Stormheart +author: Mechoid # Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. delete-after: True @@ -33,6 +33,6 @@ delete-after: True # Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. # Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. changes: - - rscadd: "Adds a mech vs mech combat system for the toy mechs earned from arcades and found around the station." - - rscadd: "You can initiate combat with yourself by hitting a toy mech with another toy mech, or fight another player if you attack a player holding a mech with a mech." - - rscadd: "Each mech has its own health stat and special ability that they'll use in combat against each other." + - rscadd: "Adds Wurmwoad, a suspiciously worm-like plant that produces pods of spice." + - rscadd: "Adds Wurmwoad to the service borg synthesizer." + - bugfix: "Service borgs can work with kitchenware again." diff --git a/html/changelogs/rykka-stormheart - ambience prefs.yml b/html/changelogs/rykka-stormheart - ambience prefs.yml deleted file mode 100644 index c55ec992d7..0000000000 --- a/html/changelogs/rykka-stormheart - ambience prefs.yml +++ /dev/null @@ -1,38 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: Rykka Stormheart - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Adds Ambience Chance and Repeating Ambience Preferences into Globals, underneath Client FPS" - - rscadd: "Random-Ambience-Frequency controls how long before it checks if it can play ambience to you again. Setting it to 0 disables the random re-play of ambience." - - rscadd: "Ambience Chance affects the % chance to play ambience to your client. It defaults to 35%, but can be set from 0 to 100 to disable it or always play every time you move into an area or have the Random Ambience check called." diff --git a/icons/UI_Icons/Achievements/Boss/bbgum.png b/icons/UI_Icons/Achievements/Boss/bbgum.png new file mode 100644 index 0000000000..a0962fb1ce Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/bbgum.png differ diff --git a/icons/UI_Icons/Achievements/Boss/colossus.png b/icons/UI_Icons/Achievements/Boss/colossus.png new file mode 100644 index 0000000000..f544084786 Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/colossus.png differ diff --git a/icons/UI_Icons/Achievements/Boss/drake.png b/icons/UI_Icons/Achievements/Boss/drake.png new file mode 100644 index 0000000000..19ecc5ae94 Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/drake.png differ diff --git a/icons/UI_Icons/Achievements/Boss/hierophant.png b/icons/UI_Icons/Achievements/Boss/hierophant.png new file mode 100644 index 0000000000..a8f2e6a45e Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/hierophant.png differ diff --git a/icons/UI_Icons/Achievements/Boss/legion.png b/icons/UI_Icons/Achievements/Boss/legion.png new file mode 100644 index 0000000000..dc9470a8a9 Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/legion.png differ diff --git a/icons/UI_Icons/Achievements/Boss/miner.png b/icons/UI_Icons/Achievements/Boss/miner.png new file mode 100644 index 0000000000..5164dcfb10 Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/miner.png differ diff --git a/icons/UI_Icons/Achievements/Boss/swarmer.png b/icons/UI_Icons/Achievements/Boss/swarmer.png new file mode 100644 index 0000000000..bcc017af32 Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/swarmer.png differ diff --git a/icons/UI_Icons/Achievements/Boss/tendril.png b/icons/UI_Icons/Achievements/Boss/tendril.png new file mode 100644 index 0000000000..3b6b908d3e Binary files /dev/null and b/icons/UI_Icons/Achievements/Boss/tendril.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/assistant.png b/icons/UI_Icons/Achievements/Mafia/assistant.png new file mode 100644 index 0000000000..0cfc93b166 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/assistant.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/changeling.png b/icons/UI_Icons/Achievements/Mafia/changeling.png new file mode 100644 index 0000000000..9e44c90263 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/changeling.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/chaplain.png b/icons/UI_Icons/Achievements/Mafia/chaplain.png new file mode 100644 index 0000000000..ac48291282 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/chaplain.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/clown.png b/icons/UI_Icons/Achievements/Mafia/clown.png new file mode 100644 index 0000000000..4f2d919471 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/clown.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/detective.png b/icons/UI_Icons/Achievements/Mafia/detective.png new file mode 100644 index 0000000000..edeba8c402 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/detective.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/fugitive.png b/icons/UI_Icons/Achievements/Mafia/fugitive.png new file mode 100644 index 0000000000..86beb21b1b Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/fugitive.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/hated.png b/icons/UI_Icons/Achievements/Mafia/hated.png new file mode 100644 index 0000000000..00ea735200 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/hated.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/hop.png b/icons/UI_Icons/Achievements/Mafia/hop.png new file mode 100644 index 0000000000..f60719974d Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/hop.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/lawyer.png b/icons/UI_Icons/Achievements/Mafia/lawyer.png new file mode 100644 index 0000000000..1c9bba2036 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/lawyer.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/md.png b/icons/UI_Icons/Achievements/Mafia/md.png new file mode 100644 index 0000000000..32bc972a4a Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/md.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/nightmare.png b/icons/UI_Icons/Achievements/Mafia/nightmare.png new file mode 100644 index 0000000000..14c50b403a Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/nightmare.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/obsessed.png b/icons/UI_Icons/Achievements/Mafia/obsessed.png new file mode 100644 index 0000000000..b92ba5b582 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/obsessed.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/psychologist.png b/icons/UI_Icons/Achievements/Mafia/psychologist.png new file mode 100644 index 0000000000..60171ca723 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/psychologist.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/thoughtfeeder.png b/icons/UI_Icons/Achievements/Mafia/thoughtfeeder.png new file mode 100644 index 0000000000..009bac0d99 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/thoughtfeeder.png differ diff --git a/icons/UI_Icons/Achievements/Mafia/traitor.png b/icons/UI_Icons/Achievements/Mafia/traitor.png new file mode 100644 index 0000000000..28c8c52191 Binary files /dev/null and b/icons/UI_Icons/Achievements/Mafia/traitor.png differ diff --git a/icons/UI_Icons/Achievements/Misc/ascension.png b/icons/UI_Icons/Achievements/Misc/ascension.png new file mode 100644 index 0000000000..ca7e875bd3 Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/ascension.png differ diff --git a/icons/UI_Icons/Achievements/Misc/clownking.png b/icons/UI_Icons/Achievements/Misc/clownking.png new file mode 100644 index 0000000000..7260c34dcd Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/clownking.png differ diff --git a/icons/UI_Icons/Achievements/Misc/clownthanks.png b/icons/UI_Icons/Achievements/Misc/clownthanks.png new file mode 100644 index 0000000000..214a4e0a74 Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/clownthanks.png differ diff --git a/icons/UI_Icons/Achievements/Misc/featofstrength.png b/icons/UI_Icons/Achievements/Misc/featofstrength.png new file mode 100644 index 0000000000..5cfc5240bd Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/featofstrength.png differ diff --git a/icons/UI_Icons/Achievements/Misc/helbital.png b/icons/UI_Icons/Achievements/Misc/helbital.png new file mode 100644 index 0000000000..10b5efdd5e Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/helbital.png differ diff --git a/icons/UI_Icons/Achievements/Misc/jackpot.png b/icons/UI_Icons/Achievements/Misc/jackpot.png new file mode 100644 index 0000000000..e171c5cb7c Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/jackpot.png differ diff --git a/icons/UI_Icons/Achievements/Misc/longshift.png b/icons/UI_Icons/Achievements/Misc/longshift.png new file mode 100644 index 0000000000..5f511e21fd Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/longshift.png differ diff --git a/icons/UI_Icons/Achievements/Misc/meteors.png b/icons/UI_Icons/Achievements/Misc/meteors.png new file mode 100644 index 0000000000..5e6d4bc9bd Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/meteors.png differ diff --git a/icons/UI_Icons/Achievements/Misc/rule8.png b/icons/UI_Icons/Achievements/Misc/rule8.png new file mode 100644 index 0000000000..2bc518d5ab Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/rule8.png differ diff --git a/icons/UI_Icons/Achievements/Misc/snail.png b/icons/UI_Icons/Achievements/Misc/snail.png new file mode 100644 index 0000000000..f38c5165cb Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/snail.png differ diff --git a/icons/UI_Icons/Achievements/Misc/timewaste.png b/icons/UI_Icons/Achievements/Misc/timewaste.png new file mode 100644 index 0000000000..24d23025fb Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/timewaste.png differ diff --git a/icons/UI_Icons/Achievements/Misc/upgrade.png b/icons/UI_Icons/Achievements/Misc/upgrade.png new file mode 100644 index 0000000000..e73bb512eb Binary files /dev/null and b/icons/UI_Icons/Achievements/Misc/upgrade.png differ diff --git a/icons/UI_Icons/Achievements/Skills/mining.png b/icons/UI_Icons/Achievements/Skills/mining.png new file mode 100644 index 0000000000..7d87d135b4 Binary files /dev/null and b/icons/UI_Icons/Achievements/Skills/mining.png differ diff --git a/icons/UI_Icons/Achievements/baseboss.png b/icons/UI_Icons/Achievements/baseboss.png new file mode 100644 index 0000000000..df2227b391 Binary files /dev/null and b/icons/UI_Icons/Achievements/baseboss.png differ diff --git a/icons/UI_Icons/Achievements/basemafia.png b/icons/UI_Icons/Achievements/basemafia.png new file mode 100644 index 0000000000..b22676d891 Binary files /dev/null and b/icons/UI_Icons/Achievements/basemafia.png differ diff --git a/icons/UI_Icons/Achievements/basemisc.png b/icons/UI_Icons/Achievements/basemisc.png new file mode 100644 index 0000000000..1346d1c001 Binary files /dev/null and b/icons/UI_Icons/Achievements/basemisc.png differ diff --git a/icons/UI_Icons/Achievements/baseskill.png b/icons/UI_Icons/Achievements/baseskill.png new file mode 100644 index 0000000000..de6ff8a2e5 Binary files /dev/null and b/icons/UI_Icons/Achievements/baseskill.png differ diff --git a/icons/UI_Icons/Achievements/default.png b/icons/UI_Icons/Achievements/default.png new file mode 100644 index 0000000000..852298aa0c Binary files /dev/null and b/icons/UI_Icons/Achievements/default.png differ diff --git a/icons/UI_Icons/Arcade/boss1.gif b/icons/UI_Icons/Arcade/boss1.gif new file mode 100644 index 0000000000..4730ac0021 Binary files /dev/null and b/icons/UI_Icons/Arcade/boss1.gif differ diff --git a/icons/UI_Icons/Arcade/boss2.gif b/icons/UI_Icons/Arcade/boss2.gif new file mode 100644 index 0000000000..d95fd84f0e Binary files /dev/null and b/icons/UI_Icons/Arcade/boss2.gif differ diff --git a/icons/UI_Icons/Arcade/boss3.gif b/icons/UI_Icons/Arcade/boss3.gif new file mode 100644 index 0000000000..e97056998a Binary files /dev/null and b/icons/UI_Icons/Arcade/boss3.gif differ diff --git a/icons/UI_Icons/Arcade/boss4.gif b/icons/UI_Icons/Arcade/boss4.gif new file mode 100644 index 0000000000..6695b6cfbf Binary files /dev/null and b/icons/UI_Icons/Arcade/boss4.gif differ diff --git a/icons/UI_Icons/Arcade/boss5.gif b/icons/UI_Icons/Arcade/boss5.gif new file mode 100644 index 0000000000..a827fb8c4e Binary files /dev/null and b/icons/UI_Icons/Arcade/boss5.gif differ diff --git a/icons/UI_Icons/Arcade/boss6.gif b/icons/UI_Icons/Arcade/boss6.gif new file mode 100644 index 0000000000..7a926cf89d Binary files /dev/null and b/icons/UI_Icons/Arcade/boss6.gif differ diff --git a/icons/UI_Icons/chat/chat_icons.dmi b/icons/UI_Icons/chat/chat_icons.dmi new file mode 100644 index 0000000000..8cc4b2c559 Binary files /dev/null and b/icons/UI_Icons/chat/chat_icons.dmi differ diff --git a/icons/UI_Icons/tgui/ntosradar_background.png b/icons/UI_Icons/tgui/ntosradar_background.png new file mode 100644 index 0000000000..bac7647e3a Binary files /dev/null and b/icons/UI_Icons/tgui/ntosradar_background.png differ diff --git a/icons/UI_Icons/tgui/ntosradar_pointer.png b/icons/UI_Icons/tgui/ntosradar_pointer.png new file mode 100644 index 0000000000..e71823f391 Binary files /dev/null and b/icons/UI_Icons/tgui/ntosradar_pointer.png differ diff --git a/icons/UI_Icons/tgui/ntosradar_pointer_S.png b/icons/UI_Icons/tgui/ntosradar_pointer_S.png new file mode 100644 index 0000000000..51a0dd49d9 Binary files /dev/null and b/icons/UI_Icons/tgui/ntosradar_pointer_S.png differ diff --git a/icons/_nanomaps/mapbase1200.png b/icons/_nanomaps/mapbase1200.png new file mode 100644 index 0000000000..868adfe0d5 Binary files /dev/null and b/icons/_nanomaps/mapbase1200.png differ diff --git a/icons/_nanomaps/nanomapBackground.png b/icons/_nanomaps/nanomapBackground.png new file mode 100644 index 0000000000..f3ead01619 Binary files /dev/null and b/icons/_nanomaps/nanomapBackground.png differ diff --git a/icons/_nanomaps/southern_cross_nanomap_z1.png b/icons/_nanomaps/southern_cross_nanomap_z1.png new file mode 100644 index 0000000000..b367430200 Binary files /dev/null and b/icons/_nanomaps/southern_cross_nanomap_z1.png differ diff --git a/icons/_nanomaps/southern_cross_nanomap_z10.png b/icons/_nanomaps/southern_cross_nanomap_z10.png new file mode 100644 index 0000000000..b9645bb74b Binary files /dev/null and b/icons/_nanomaps/southern_cross_nanomap_z10.png differ diff --git a/icons/_nanomaps/southern_cross_nanomap_z2.png b/icons/_nanomaps/southern_cross_nanomap_z2.png new file mode 100644 index 0000000000..1f4830a884 Binary files /dev/null and b/icons/_nanomaps/southern_cross_nanomap_z2.png differ diff --git a/icons/_nanomaps/southern_cross_nanomap_z3.png b/icons/_nanomaps/southern_cross_nanomap_z3.png new file mode 100644 index 0000000000..6c9d9b5a61 Binary files /dev/null and b/icons/_nanomaps/southern_cross_nanomap_z3.png differ diff --git a/icons/_nanomaps/southern_cross_nanomap_z5.png b/icons/_nanomaps/southern_cross_nanomap_z5.png new file mode 100644 index 0000000000..b89543e9de Binary files /dev/null and b/icons/_nanomaps/southern_cross_nanomap_z5.png differ diff --git a/icons/_nanomaps/southern_cross_nanomap_z6.png b/icons/_nanomaps/southern_cross_nanomap_z6.png new file mode 100644 index 0000000000..b8fb0ebfc1 Binary files /dev/null and b/icons/_nanomaps/southern_cross_nanomap_z6.png differ diff --git a/icons/_nanomaps/templates/Casino_prize_dispenser_ch.tmpl b/icons/_nanomaps/templates/Casino_prize_dispenser_ch.tmpl new file mode 100644 index 0000000000..0e3ce09fdd --- /dev/null +++ b/icons/_nanomaps/templates/Casino_prize_dispenser_ch.tmpl @@ -0,0 +1,110 @@ + + +{{if data.mode == 0}} +
Prizes categories
+
+
+
+
+
+ {{if data.category_weapons >= 1}}
+ {{:helper.link('Select Weapons', 'star', { 'Select' : 'selected_weapons' })}}
+ {{else}}
+ {{:helper.link('Disabled Weapons', 'cancel', { "Select" : 1}, 'disabled')}}
+ {{/if}}
+
+
+
+
+
+
+ {{if data.category_gear >= 1}}
+ {{:helper.link('Select Gear', 'star', { "Select" : 'selected_gear' })}}
+ {{else}}
+ {{:helper.link('Disabled Gear', 'cancel', { "Select" : 1}, 'disabled')}}
+ {{/if}}
+
+
+
+
+
+
+ {{if data.category_clothing >= 1}}
+ {{:helper.link('Select Clothing', 'star', { "Select" : 'selected_clothing' })}}
+ {{else}}
+ {{:helper.link('Disabled Clothing', 'cancel', { "Select" : 1}, 'disabled')}}
+ {{/if}}
+
+
+
+
+
+
+ {{if data.category_misc >= 1}}
+ {{:helper.link('Select Miscellaneous', 'star', { "Select" : 'selected_misc' })}}
+ {{else}}
+ {{:helper.link('Disabled Miscellaneous', 'cancel', { "Select" : 1}, 'disabled')}}
+ {{/if}}
+
+
+
+
+
+
+ {{if data.category_drinks >= 1}}
+ {{:helper.link('Select Drinks', 'star', { "Select" : 'selected_drinks' })}}
+ {{else}}
+ {{:helper.link('Disabled Drinks', 'cancel', { "Select" : 1}, 'disabled')}}
+ {{/if}}
+
+
+
+{{/if}}
+
+{{if data.mode == 1}}
+
+
+
+ {{if data.category_pets >= 1}}
+ {{:helper.link('Select Pets', 'star', { "Select" : 'selected_pets' })}}
+ {{else}}
+ {{:helper.link('Disabled Pets', 'cancel', { "Select" : 1}, 'disabled')}}
+ {{/if}}
+
+ Prizes available
+
+ {{for data.products}}
+
+{{/if}}
+
+{{if data.mode == 2}}
+
+
+ {{empty}}
+ No prizes available!
+ {{/for}}
+
+ {{:helper.link('Vend', 'circle-arrow-s', { "vend" : value.key })}}
+
+
+ {{if value.color}}{{:value.name}}
+ {{else}}{{:value.name}}
+ {{/if}}
+
+ Prize selected
+
+
+{{/if}}
\ No newline at end of file
diff --git a/icons/_nanomaps/templates/phorochem.tmpl b/icons/_nanomaps/templates/phorochem.tmpl
new file mode 100644
index 0000000000..612f2228eb
--- /dev/null
+++ b/icons/_nanomaps/templates/phorochem.tmpl
@@ -0,0 +1,48 @@
+
+
+ Item selected:
{{:data.product}}
+ Charge:
{{:data.price}}
+
+ {{if data.message_err}} {{/if}} {{:data.message}}
+
+
+ {{:helper.link('Cancel', 'arrowreturn-1-w', {'cancelpurchase' : 1})}}
+
+Phorochemistry Control
+
+
+
+ Test Commands:
+
+
+ {{:helper.link('Recalibrate', null, { 'recalibrate': 1}, data.timeLeft == 0 ? null : 'disabled')}}
+ {{:helper.link('Begin Test', null, { 'beginTest' : 1}, data.timeLeft > 0 ? 'disabled' : null)}}
+ {{:helper.link('Abort Test', null, { 'abortTest' : 1}, data.timeLeft == 0 ? 'disabled' : null)}}
+
+
+
+
+
+ Intensity:
+
+
+ {{:helper.link('1', null, { 'intensity' : 1}, data.intensity == 1 ? 'selected' : null)}}
+ {{:helper.link('2', null, { 'intensity' : 2}, data.intensity == 2 ? 'selected' : null)}}
+ {{:helper.link('3', null, { 'intensity' : 3}, data.intensity == 3 ? 'selected' : null)}}
+ {{:helper.link('4', null, { 'intensity' : 4}, data.intensity == 4 ? 'selected' : null)}}
+ {{:helper.link('5', null, { 'intensity' : 5}, data.intensity == 5 ? 'selected' : null)}}
+
+
+
+
+ Phoron(moles):
+
+
+ {{if data.phoron < 40}}
+ {{:data.phoron}}
+ {{else}}
+ {{:data.phoron}}
+ {{/if}}
+
+
+
+
+
+ Time until next test:
+
+
+ {{:helper.displayBar(data.timeLeft, 0, data.timeLeftMax, 'bad')}}
+
+
+ {{:data.message}}
+
diff --git a/icons/_nanomaps/templates/server_shipping.tmpl b/icons/_nanomaps/templates/server_shipping.tmpl
new file mode 100644
index 0000000000..e774a0d0fc
--- /dev/null
+++ b/icons/_nanomaps/templates/server_shipping.tmpl
@@ -0,0 +1,87 @@
+{{if data.error == 1}}
+
+
+{{else}}
+
+ ERROR
+
+
+ {{:data.error_msg}}
+
+ {{:helper.link('Return', '', {'switch_menu' : 0}, 'selected')}} +
+ + {{:helper.link('Return', '', {'switch_menu' : 0}, 'selected')}} +
+ {{if data.screen == 0}}
+
+{{/if}}
diff --git a/icons/_nanomaps/templates/starcaster_ch.tmpl b/icons/_nanomaps/templates/starcaster_ch.tmpl
new file mode 100644
index 0000000000..02b4c08ab3
--- /dev/null
+++ b/icons/_nanomaps/templates/starcaster_ch.tmpl
@@ -0,0 +1,45 @@
+
+
+{{if data.article}}
+ Viewing: {{:data.title}}
+ Available Stations
+
+
+ {{for data.servers}}
+ {{:helper.link(value.name, '', {'select_station' : value.ref})}}
+ {{empty}}
+ No stations located.
+ {{/for}}
+
+ {{else data.screen == 1}}
+
+ Options for {{:data.server}}
+
+
+ {{:helper.link('Send Shipment', '', {'switch_menu' : 4})}}
+ {{:helper.link('Receive Shipments (' + data.requests + ')', '', {'switch_menu' : 2})}}
+ {{:helper.link('Messaging', '', {'switch_menu' : 5})}}
+
+ {{:helper.link('Back', '', {'switch_menu' : 0})}} +
+ {{else data.screen == 2}}
+ + {{:helper.link('Back', '', {'switch_menu' : 0})}} +
+ Shiptments for {{:data.server}}
+
+
+ {{for data.requests}}
+ {{:helper.link("ID: " + value.id + "," + value.item_count + " items", '', {'switch_menu' : 3, 'shipment' : value.ref})}}
+ {{empty}}
+ No shipments found.
+ {{/for}}
+
+ {{:helper.link('Back', '', {'switch_menu' : 1})}} +
+ {{else data.screen == 3}}
+ + {{:helper.link('Back', '', {'switch_menu' : 1})}} +
+ Shipment #{{:data.id}}
+
+
+ {{for data.items}}
+ {{:value.id}} x{{:value.count}}
+
+ {{empty}} + No items were sent.
+ Shipment is empty? + {{/for}} +
+ {{:helper.link('Confirm', '', {'confirm' : 1})}} + {{:helper.link('Deny', '', {'confirm' : 0})}} +
+ {{:helper.link('Back', '', {'switch_menu' : 2})}} +
+ {{else data.screen == 4}}
+ + {{empty}} + No items were sent.
+ Shipment is empty? + {{/for}} +
+ {{:helper.link('Confirm', '', {'confirm' : 1})}} + {{:helper.link('Deny', '', {'confirm' : 0})}} +
+ {{:helper.link('Back', '', {'switch_menu' : 2})}} +
+ Sending
+
+
+ TODO: Implement.
+
+ {{:helper.link('Back', '', {'switch_menu' : 0})}} +
+ {{else data.screen == 5}}
+ + {{:helper.link('Back', '', {'switch_menu' : 0})}} +
+ Messaging
+
+
+ TODO: Implement.
+
+ {{:helper.link('Back', '', {'switch_menu' : 0})}} +
+ {{/if}}
+ + {{:helper.link('Back', '', {'switch_menu' : 0})}} +
+ {{:helper.link('CLOSE', null, { "PRG_reset" : 1 })}} +
+ {{if data.cover}} +
Listing available files
+
+
+
+ Show archived files:
+
+
+ {{if data.showing_archived}}
+ {{:helper.link('YES', null, { "PRG_toggle_archived" : 1 })}}
+ {{else}}
+ {{:helper.link('NO', null, { "PRG_toggle_archived" : 1 })}}
+ {{/if}}
+
+ + {{for data.all_articles}} +
+
+ {{/for}}
+{{/if}}
\ No newline at end of file
diff --git a/icons/_nanomaps/tether_nanomap_z1.png b/icons/_nanomaps/tether_nanomap_z1.png
new file mode 100644
index 0000000000..03aad88117
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z1.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z10.png b/icons/_nanomaps/tether_nanomap_z10.png
new file mode 100644
index 0000000000..c12164d92e
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z10.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z13.png b/icons/_nanomaps/tether_nanomap_z13.png
new file mode 100644
index 0000000000..83792e9db4
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z13.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z14.png b/icons/_nanomaps/tether_nanomap_z14.png
new file mode 100644
index 0000000000..aa62758eb1
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z14.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z2.png b/icons/_nanomaps/tether_nanomap_z2.png
new file mode 100644
index 0000000000..8b52113523
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z2.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z3.png b/icons/_nanomaps/tether_nanomap_z3.png
new file mode 100644
index 0000000000..e3838796e0
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z3.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z4.png b/icons/_nanomaps/tether_nanomap_z4.png
new file mode 100644
index 0000000000..34759796d5
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z4.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z5.png b/icons/_nanomaps/tether_nanomap_z5.png
new file mode 100644
index 0000000000..394c1052a7
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z5.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z6.png b/icons/_nanomaps/tether_nanomap_z6.png
new file mode 100644
index 0000000000..6d67bae632
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z6.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z7.png b/icons/_nanomaps/tether_nanomap_z7.png
new file mode 100644
index 0000000000..8e03cc03fc
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z7.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z8.png b/icons/_nanomaps/tether_nanomap_z8.png
new file mode 100644
index 0000000000..3d2acaf6b4
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z8.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z9.png b/icons/_nanomaps/tether_nanomap_z9.png
new file mode 100644
index 0000000000..734f44dd95
Binary files /dev/null and b/icons/_nanomaps/tether_nanomap_z9.png differ
diff --git a/icons/effects/64x64.dmi b/icons/effects/64x64.dmi
index 79eabaac4f..e4ae33567f 100644
Binary files a/icons/effects/64x64.dmi and b/icons/effects/64x64.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 4419ed4772..e8905467f6 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/goonstation/turf/meatland.dmi b/icons/goonstation/turf/meatland.dmi
new file mode 100644
index 0000000000..ff3c9dc260
Binary files /dev/null and b/icons/goonstation/turf/meatland.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 5555d0e1ad..88f6dbf028 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/back_vr.dmi b/icons/mob/back_vr.dmi
index 21eb4cfdd2..cfd5604657 100644
Binary files a/icons/mob/back_vr.dmi and b/icons/mob/back_vr.dmi differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index 63e7f120ce..6320593c1a 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/feet_vr.dmi b/icons/mob/feet_vr.dmi
index 800d211b20..b1fbd831a1 100644
Binary files a/icons/mob/feet_vr.dmi and b/icons/mob/feet_vr.dmi differ
diff --git a/icons/mob/hud_jobs_vr.dmi b/icons/mob/hud_jobs_vr.dmi
index 9aa01e9ea5..431090e707 100644
Binary files a/icons/mob/hud_jobs_vr.dmi and b/icons/mob/hud_jobs_vr.dmi differ
diff --git a/icons/mob/human_face_vr_add.dmi b/icons/mob/human_face_vr_add.dmi
index 78d1b60e4c..029d1789c4 100644
Binary files a/icons/mob/human_face_vr_add.dmi and b/icons/mob/human_face_vr_add.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/unbranded/unbranded_teshari.dmi b/icons/mob/human_races/cyberlimbs/unbranded/unbranded_teshari.dmi
index e8eaf7d2c6..ef2b344a41 100644
Binary files a/icons/mob/human_races/cyberlimbs/unbranded/unbranded_teshari.dmi and b/icons/mob/human_races/cyberlimbs/unbranded/unbranded_teshari.dmi differ
diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi
index e9fcad5e63..873d455872 100644
Binary files a/icons/mob/human_races/markings_vr.dmi and b/icons/mob/human_races/markings_vr.dmi differ
diff --git a/icons/mob/humanoids.dmi b/icons/mob/humanoids.dmi
new file mode 100644
index 0000000000..f6dfdd2820
Binary files /dev/null and b/icons/mob/humanoids.dmi differ
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index 5403cac867..b707e2c742 100644
Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ
diff --git a/icons/mob/items/lefthand_magic.dmi b/icons/mob/items/lefthand_magic.dmi
new file mode 100644
index 0000000000..11552b79ff
Binary files /dev/null and b/icons/mob/items/lefthand_magic.dmi differ
diff --git a/icons/mob/items/lefthand_melee.dmi b/icons/mob/items/lefthand_melee.dmi
index fa92a768f3..6889aa22b1 100644
Binary files a/icons/mob/items/lefthand_melee.dmi and b/icons/mob/items/lefthand_melee.dmi differ
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi
index 1c92dc0afd..9e756bf9f0 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/mob/items/righthand_magic.dmi b/icons/mob/items/righthand_magic.dmi
new file mode 100644
index 0000000000..490deebcf4
Binary files /dev/null and b/icons/mob/items/righthand_magic.dmi differ
diff --git a/icons/mob/items/righthand_melee.dmi b/icons/mob/items/righthand_melee.dmi
index 916f610112..931b902bbe 100644
Binary files a/icons/mob/items/righthand_melee.dmi and b/icons/mob/items/righthand_melee.dmi differ
diff --git a/icons/mob/mask_vr.dmi b/icons/mob/mask_vr.dmi
index 0d3c0479b2..ec49d3cdb7 100644
Binary files a/icons/mob/mask_vr.dmi and b/icons/mob/mask_vr.dmi differ
diff --git a/icons/mob/modular_shiny_vr.dmi b/icons/mob/modular_shiny_vr.dmi
new file mode 100644
index 0000000000..7398b80193
Binary files /dev/null and b/icons/mob/modular_shiny_vr.dmi differ
diff --git a/icons/mob/robots_vr.dmi b/icons/mob/robots_vr.dmi
index e4a3a1f755..2e34ed66d5 100644
Binary files a/icons/mob/robots_vr.dmi and b/icons/mob/robots_vr.dmi differ
diff --git a/icons/mob/species/akula/mask_vr.dmi b/icons/mob/species/akula/mask_vr.dmi
index eb39252fa6..2fb104616f 100644
Binary files a/icons/mob/species/akula/mask_vr.dmi and b/icons/mob/species/akula/mask_vr.dmi differ
diff --git a/icons/mob/species/fennec/mask_vr.dmi b/icons/mob/species/fennec/mask_vr.dmi
index fff10b3696..e956562a59 100644
Binary files a/icons/mob/species/fennec/mask_vr.dmi and b/icons/mob/species/fennec/mask_vr.dmi differ
diff --git a/icons/mob/species/fox/mask_vr.dmi b/icons/mob/species/fox/mask_vr.dmi
index 515e91df11..aed2ae8ece 100644
Binary files a/icons/mob/species/fox/mask_vr.dmi and b/icons/mob/species/fox/mask_vr.dmi differ
diff --git a/icons/mob/species/nevrean/mask_vr.dmi b/icons/mob/species/nevrean/mask_vr.dmi
index 34f501aa49..6e3d6c35de 100644
Binary files a/icons/mob/species/nevrean/mask_vr.dmi and b/icons/mob/species/nevrean/mask_vr.dmi differ
diff --git a/icons/mob/species/sergal/mask_vr.dmi b/icons/mob/species/sergal/mask_vr.dmi
index 5f305fa81f..99d4a069ef 100644
Binary files a/icons/mob/species/sergal/mask_vr.dmi and b/icons/mob/species/sergal/mask_vr.dmi differ
diff --git a/icons/mob/species/seromi/ears.dmi b/icons/mob/species/seromi/ears.dmi
index b38829b05f..d41f5d871f 100644
Binary files a/icons/mob/species/seromi/ears.dmi and b/icons/mob/species/seromi/ears.dmi differ
diff --git a/icons/mob/species/seromi/eyes.dmi b/icons/mob/species/seromi/eyes.dmi
index 6ea9bfb05c..c1709e7a58 100644
Binary files a/icons/mob/species/seromi/eyes.dmi and b/icons/mob/species/seromi/eyes.dmi differ
diff --git a/icons/mob/species/seromi/head.dmi b/icons/mob/species/seromi/head.dmi
index 849b03718c..0055a2ca5d 100644
Binary files a/icons/mob/species/seromi/head.dmi and b/icons/mob/species/seromi/head.dmi differ
diff --git a/icons/mob/species/seromi/masks.dmi b/icons/mob/species/seromi/masks.dmi
index 83493f851a..afe787be11 100644
Binary files a/icons/mob/species/seromi/masks.dmi and b/icons/mob/species/seromi/masks.dmi differ
diff --git a/icons/mob/species/seromi/masks_vr.dmi b/icons/mob/species/seromi/masks_vr.dmi
index 52f2591087..3914b57a13 100644
Binary files a/icons/mob/species/seromi/masks_vr.dmi and b/icons/mob/species/seromi/masks_vr.dmi differ
diff --git a/icons/mob/species/seromi/ties.dmi b/icons/mob/species/seromi/ties.dmi
index 06eee815b1..9969e78109 100644
Binary files a/icons/mob/species/seromi/ties.dmi and b/icons/mob/species/seromi/ties.dmi differ
diff --git a/icons/mob/species/seromi/uniform.dmi b/icons/mob/species/seromi/uniform.dmi
index 76605857c8..88408e1f58 100644
Binary files a/icons/mob/species/seromi/uniform.dmi and b/icons/mob/species/seromi/uniform.dmi differ
diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi
index 0b68e98a67..15f0bf0fe9 100644
Binary files a/icons/mob/species/tajaran/mask.dmi and b/icons/mob/species/tajaran/mask.dmi differ
diff --git a/icons/mob/species/vox/masks.dmi b/icons/mob/species/vox/masks.dmi
index 6afaa10c22..29b7d76ef9 100644
Binary files a/icons/mob/species/vox/masks.dmi and b/icons/mob/species/vox/masks.dmi differ
diff --git a/icons/mob/taursuits_naga_vr.dmi b/icons/mob/taursuits_naga_vr.dmi
index 7df326318c..bfec658879 100644
Binary files a/icons/mob/taursuits_naga_vr.dmi and b/icons/mob/taursuits_naga_vr.dmi differ
diff --git a/icons/mob/taursuits_wolf_vr.dmi b/icons/mob/taursuits_wolf_vr.dmi
index 0f638ea6d3..140e6de426 100644
Binary files a/icons/mob/taursuits_wolf_vr.dmi and b/icons/mob/taursuits_wolf_vr.dmi differ
diff --git a/icons/mob/vore.dmi b/icons/mob/vore.dmi
index 396c6ef362..9fad9d332d 100644
Binary files a/icons/mob/vore.dmi and b/icons/mob/vore.dmi differ
diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi
index e2bb2c774f..19ca05582f 100644
Binary files a/icons/mob/vore/ears_vr.dmi and b/icons/mob/vore/ears_vr.dmi differ
diff --git a/icons/mob/vore/taurs_vr.dmi b/icons/mob/vore/taurs_vr.dmi
index 69d0a91388..7d283e6530 100644
Binary files a/icons/mob/vore/taurs_vr.dmi and b/icons/mob/vore/taurs_vr.dmi differ
diff --git a/icons/obj/closets/bases/wall.dmi b/icons/obj/closets/bases/wall.dmi
index 6689e59cfc..730574ba5d 100644
Binary files a/icons/obj/closets/bases/wall.dmi and b/icons/obj/closets/bases/wall.dmi differ
diff --git a/icons/obj/closets/decals/wall.dmi b/icons/obj/closets/decals/wall.dmi
index b9b207407e..8d34c97d1a 100644
Binary files a/icons/obj/closets/decals/wall.dmi and b/icons/obj/closets/decals/wall.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index da5436c8d7..e797e4d094 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 195662d14b..88fa471cfd 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/masks_vr.dmi b/icons/obj/clothing/masks_vr.dmi
index 0a09e048bc..7508f018e7 100644
Binary files a/icons/obj/clothing/masks_vr.dmi and b/icons/obj/clothing/masks_vr.dmi differ
diff --git a/icons/obj/clothing/modular_shiny_vr.dmi b/icons/obj/clothing/modular_shiny_vr.dmi
new file mode 100644
index 0000000000..df757d6aca
Binary files /dev/null and b/icons/obj/clothing/modular_shiny_vr.dmi differ
diff --git a/icons/obj/clothing/ranger.dmi b/icons/obj/clothing/ranger.dmi
index 5f810d2ea4..a61db90889 100644
Binary files a/icons/obj/clothing/ranger.dmi and b/icons/obj/clothing/ranger.dmi differ
diff --git a/icons/obj/clothing/shoes_vr.dmi b/icons/obj/clothing/shoes_vr.dmi
index c6662aa325..5b81be4b1f 100644
Binary files a/icons/obj/clothing/shoes_vr.dmi and b/icons/obj/clothing/shoes_vr.dmi differ
diff --git a/icons/obj/decals_vr.dmi b/icons/obj/decals_vr.dmi
index 391d37b918..41586b5f88 100644
Binary files a/icons/obj/decals_vr.dmi and b/icons/obj/decals_vr.dmi differ
diff --git a/icons/obj/drinks_vr.dmi b/icons/obj/drinks_vr.dmi
index 0f383a823f..3dca3dbfed 100644
Binary files a/icons/obj/drinks_vr.dmi and b/icons/obj/drinks_vr.dmi differ
diff --git a/icons/obj/flora/amayastuff.dmi b/icons/obj/flora/amayastuff.dmi
new file mode 100644
index 0000000000..ed5196cd86
Binary files /dev/null and b/icons/obj/flora/amayastuff.dmi differ
diff --git a/icons/obj/gun2.dmi b/icons/obj/gun2.dmi
index 38a4148c20..a5c13c95c4 100644
Binary files a/icons/obj/gun2.dmi and b/icons/obj/gun2.dmi differ
diff --git a/icons/obj/hydroponics_growing.dmi b/icons/obj/hydroponics_growing.dmi
index 9c10859527..52146b3793 100644
Binary files a/icons/obj/hydroponics_growing.dmi and b/icons/obj/hydroponics_growing.dmi differ
diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi
index 4c9fe0b29a..af1beb5679 100644
Binary files a/icons/obj/hydroponics_products.dmi and b/icons/obj/hydroponics_products.dmi differ
diff --git a/icons/obj/hydroponics_vines.dmi b/icons/obj/hydroponics_vines.dmi
index 2bad94b350..66aac4a88d 100644
Binary files a/icons/obj/hydroponics_vines.dmi and b/icons/obj/hydroponics_vines.dmi differ
diff --git a/icons/obj/machines/drone_fab.dmi b/icons/obj/machines/drone_fab.dmi
index 066b51c258..2bbef003b8 100644
Binary files a/icons/obj/machines/drone_fab.dmi and b/icons/obj/machines/drone_fab.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 40cec418bc..cb79babe03 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi
index d234aba525..2ed8360e95 100644
Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ
diff --git a/icons/obj/stacks.dmi b/icons/obj/stacks.dmi
index 0f5453bde0..7fc0482b1b 100644
Binary files a/icons/obj/stacks.dmi and b/icons/obj/stacks.dmi differ
diff --git a/icons/obj/storage_vr.dmi b/icons/obj/storage_vr.dmi
index bf884c2ded..674f7e0d9c 100644
Binary files a/icons/obj/storage_vr.dmi and b/icons/obj/storage_vr.dmi differ
diff --git a/icons/obj/wizard.dmi b/icons/obj/wizard.dmi
index b7d095f87a..0878311519 100644
Binary files a/icons/obj/wizard.dmi and b/icons/obj/wizard.dmi differ
diff --git a/icons/program_icons/alarm_green.gif b/icons/program_icons/alarm_green.gif
new file mode 100644
index 0000000000..7c2570c8ce
Binary files /dev/null and b/icons/program_icons/alarm_green.gif differ
diff --git a/icons/program_icons/alarm_red.gif b/icons/program_icons/alarm_red.gif
new file mode 100644
index 0000000000..327d58e4db
Binary files /dev/null and b/icons/program_icons/alarm_red.gif differ
diff --git a/icons/program_icons/batt_100.gif b/icons/program_icons/batt_100.gif
new file mode 100644
index 0000000000..ccdbd4333e
Binary files /dev/null and b/icons/program_icons/batt_100.gif differ
diff --git a/icons/program_icons/batt_20.gif b/icons/program_icons/batt_20.gif
new file mode 100644
index 0000000000..1d5e38fc88
Binary files /dev/null and b/icons/program_icons/batt_20.gif differ
diff --git a/icons/program_icons/batt_40.gif b/icons/program_icons/batt_40.gif
new file mode 100644
index 0000000000..d5cedb9967
Binary files /dev/null and b/icons/program_icons/batt_40.gif differ
diff --git a/icons/program_icons/batt_5.gif b/icons/program_icons/batt_5.gif
new file mode 100644
index 0000000000..ceac8f3a94
Binary files /dev/null and b/icons/program_icons/batt_5.gif differ
diff --git a/icons/program_icons/batt_60.gif b/icons/program_icons/batt_60.gif
new file mode 100644
index 0000000000..d39534c8cb
Binary files /dev/null and b/icons/program_icons/batt_60.gif differ
diff --git a/icons/program_icons/batt_80.gif b/icons/program_icons/batt_80.gif
new file mode 100644
index 0000000000..9c299773f0
Binary files /dev/null and b/icons/program_icons/batt_80.gif differ
diff --git a/icons/program_icons/charging.gif b/icons/program_icons/charging.gif
new file mode 100644
index 0000000000..cf19ca7287
Binary files /dev/null and b/icons/program_icons/charging.gif differ
diff --git a/icons/program_icons/downloader_finished.gif b/icons/program_icons/downloader_finished.gif
new file mode 100644
index 0000000000..f01b7c42af
Binary files /dev/null and b/icons/program_icons/downloader_finished.gif differ
diff --git a/icons/program_icons/downloader_running.gif b/icons/program_icons/downloader_running.gif
new file mode 100644
index 0000000000..68fb977c86
Binary files /dev/null and b/icons/program_icons/downloader_running.gif differ
diff --git a/icons/program_icons/ntnrc_idle.gif b/icons/program_icons/ntnrc_idle.gif
new file mode 100644
index 0000000000..d47c01d580
Binary files /dev/null and b/icons/program_icons/ntnrc_idle.gif differ
diff --git a/icons/program_icons/ntnrc_new.gif b/icons/program_icons/ntnrc_new.gif
new file mode 100644
index 0000000000..af72a8b332
Binary files /dev/null and b/icons/program_icons/ntnrc_new.gif differ
diff --git a/icons/program_icons/power_norm.gif b/icons/program_icons/power_norm.gif
new file mode 100644
index 0000000000..2b8d60edfa
Binary files /dev/null and b/icons/program_icons/power_norm.gif differ
diff --git a/icons/program_icons/power_warn.gif b/icons/program_icons/power_warn.gif
new file mode 100644
index 0000000000..0c85b3a85a
Binary files /dev/null and b/icons/program_icons/power_warn.gif differ
diff --git a/icons/program_icons/sig_high.gif b/icons/program_icons/sig_high.gif
new file mode 100644
index 0000000000..efb20f6730
Binary files /dev/null and b/icons/program_icons/sig_high.gif differ
diff --git a/icons/program_icons/sig_lan.gif b/icons/program_icons/sig_lan.gif
new file mode 100644
index 0000000000..07ba929f7f
Binary files /dev/null and b/icons/program_icons/sig_lan.gif differ
diff --git a/icons/program_icons/sig_low.gif b/icons/program_icons/sig_low.gif
new file mode 100644
index 0000000000..08f98baea8
Binary files /dev/null and b/icons/program_icons/sig_low.gif differ
diff --git a/icons/program_icons/sig_none.gif b/icons/program_icons/sig_none.gif
new file mode 100644
index 0000000000..79840d8a2b
Binary files /dev/null and b/icons/program_icons/sig_none.gif differ
diff --git a/icons/program_icons/sig_warning.gif b/icons/program_icons/sig_warning.gif
new file mode 100644
index 0000000000..17f6f61981
Binary files /dev/null and b/icons/program_icons/sig_warning.gif differ
diff --git a/icons/program_icons/smmon_0.gif b/icons/program_icons/smmon_0.gif
new file mode 100644
index 0000000000..7b716c4e1c
Binary files /dev/null and b/icons/program_icons/smmon_0.gif differ
diff --git a/icons/program_icons/smmon_1.gif b/icons/program_icons/smmon_1.gif
new file mode 100644
index 0000000000..bbe319b820
Binary files /dev/null and b/icons/program_icons/smmon_1.gif differ
diff --git a/icons/program_icons/smmon_2.gif b/icons/program_icons/smmon_2.gif
new file mode 100644
index 0000000000..9c58edd340
Binary files /dev/null and b/icons/program_icons/smmon_2.gif differ
diff --git a/icons/program_icons/smmon_3.gif b/icons/program_icons/smmon_3.gif
new file mode 100644
index 0000000000..dc7c8734ee
Binary files /dev/null and b/icons/program_icons/smmon_3.gif differ
diff --git a/icons/program_icons/smmon_4.gif b/icons/program_icons/smmon_4.gif
new file mode 100644
index 0000000000..8a75e6e118
Binary files /dev/null and b/icons/program_icons/smmon_4.gif differ
diff --git a/icons/program_icons/smmon_5.gif b/icons/program_icons/smmon_5.gif
new file mode 100644
index 0000000000..59356beda0
Binary files /dev/null and b/icons/program_icons/smmon_5.gif differ
diff --git a/icons/program_icons/smmon_6.gif b/icons/program_icons/smmon_6.gif
new file mode 100644
index 0000000000..aea2f87921
Binary files /dev/null and b/icons/program_icons/smmon_6.gif differ
diff --git a/icons/turf/areas_vr_talon.dmi b/icons/turf/areas_vr_talon.dmi
new file mode 100644
index 0000000000..0878adbfea
Binary files /dev/null and b/icons/turf/areas_vr_talon.dmi differ
diff --git a/icons/turf/shuttle_parts.dmi b/icons/turf/shuttle_parts.dmi
index 0604db6d7d..33d91a24d4 100644
Binary files a/icons/turf/shuttle_parts.dmi and b/icons/turf/shuttle_parts.dmi differ
diff --git a/icons/turf/wall_masks_vr.dmi b/icons/turf/wall_masks_vr.dmi
index 1e767e6994..dc4e2300f0 100644
Binary files a/icons/turf/wall_masks_vr.dmi and b/icons/turf/wall_masks_vr.dmi differ
diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi
index a16ebe46d9..4856d6c311 100644
Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 4750d0b91b..84b74d0d2f 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -564,6 +564,9 @@ macro "hotkeymode"
elem
name = "CTRL+Z"
command = "Activate-Held-Object"
+ elem
+ name = "U"
+ command = "Rest"
elem
name = "NUMPAD1"
command = "body-r-leg"
diff --git a/maps/offmap_vr/om_ships/curashuttle.dmm b/maps/offmap_vr/om_ships/curashuttle.dmm
index b6a9885353..6a54db8db6 100644
--- a/maps/offmap_vr/om_ships/curashuttle.dmm
+++ b/maps/offmap_vr/om_ships/curashuttle.dmm
@@ -1,1922 +1,1922 @@
-//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
-"aa" = (
-/turf/template_noop,
-/area/template_noop)
-"ab" = (
-/turf/simulated/wall/rdshull,
-/area/shuttle/curabitur/curashuttle/med)
-"ac" = (
-/obj/machinery/shipsensors{
- dir = 1
- },
-/obj/effect/floor_decal/techfloor/orange{
- dir = 4
- },
-/obj/effect/floor_decal/techfloor/orange{
- dir = 8
- },
-/turf/simulated/shuttle/plating/airless,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"ad" = (
-/turf/simulated/wall/rdshull,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"ae" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
- dir = 1;
- icon_state = "window"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "mediwindowshutters";
- name = "Window Blast Door";
- opacity = 0
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/shuttle/curabitur/curashuttle/med)
-"af" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
- dir = 1;
- icon_state = "window"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "mediwindowshutters";
- name = "Window Blast Door";
- opacity = 0
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"ag" = (
-/obj/structure/sign/redcross,
-/obj/machinery/vending/nifsoft_shop,
-/turf/simulated/wall/rdshull,
-/area/shuttle/curabitur/curashuttle/med)
-"ah" = (
-/obj/machinery/optable,
-/obj/machinery/oxygen_pump/anesthetic{
- pixel_x = -25
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"ai" = (
-/obj/machinery/computer/operating,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aj" = (
-/obj/machinery/vending/blood{
- density = 0;
- pixel_y = 18;
- req_access = newlist()
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"ak" = (
-/obj/machinery/body_scanconsole{
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"al" = (
-/obj/machinery/bodyscanner{
- dir = 4
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"am" = (
-/turf/simulated/wall/shull,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"an" = (
-/obj/machinery/computer/shuttle_control/explore/curashuttle{
- dir = 4;
- icon_state = "computer"
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"ao" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"ap" = (
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24;
- pixel_y = 0
- },
-/obj/structure/table/darkglass,
-/obj/item/weapon/paper_bin{
- pixel_x = 8;
- pixel_y = -2
- },
-/obj/item/weapon/pen/fountain,
-/obj/machinery/photocopier/faxmachine{
- department = "Curabitur Rescue Service";
- name = "curabitur fax machine";
- pixel_y = 6
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aq" = (
-/obj/structure/sign/redcross,
-/turf/simulated/wall/rdshull,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"ar" = (
-/obj/item/weapon/storage/firstaid/surgery,
-/obj/item/weapon/surgical/scalpel/manager,
-/obj/item/weapon/surgical/scalpel/ripper,
-/obj/item/weapon/surgical/circular_saw/manager,
-/obj/item/stack/nanopaste/advanced,
-/obj/item/stack/nanopaste/advanced,
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"as" = (
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"at" = (
-/obj/structure/closet/crate/large,
-/obj/item/weapon/gun/projectile/multi_cannon,
-/obj/item/weapon/gun/projectile/multi_cannon,
-/obj/item/ammo_casing/macrobattery/buff,
-/obj/item/ammo_casing/macrobattery/buff,
-/obj/item/ammo_casing/macrobattery/detox,
-/obj/item/ammo_casing/macrobattery/detox,
-/obj/item/ammo_casing/macrobattery/healie,
-/obj/item/ammo_casing/macrobattery/healie,
-/obj/item/ammo_casing/macrobattery/ouchie,
-/obj/item/ammo_casing/macrobattery/ouchie,
-/obj/item/ammo_casing/macrobattery/stabilize,
-/obj/item/ammo_casing/macrobattery/stabilize,
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"au" = (
-/obj/structure/medical_stand,
-/obj/machinery/vending/nifsoft_shop{
- categories = 3;
- emagged = 1;
- pixel_x = 23;
- pixel_y = -5
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"av" = (
-/obj/machinery/computer/ship/helm{
- dir = 4;
- req_one_access = null
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aw" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/structure/bed/chair/bay/comfy{
- dir = 1;
- icon_state = "bay_comfychair_preview"
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"ax" = (
-/obj/machinery/computer/ship/engines{
- dir = 8;
- icon_state = "computer"
- },
-/obj/structure/window/plastitanium{
- dir = 4;
- icon_state = "window"
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"ay" = (
-/obj/item/weapon/bedsheet/bluedouble,
-/obj/structure/bed/double/padded,
-/obj/structure/curtain/open/bed,
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"az" = (
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/med)
-"aA" = (
-/obj/item/weapon/storage/firstaid/adv,
-/obj/item/weapon/storage/firstaid/fire,
-/obj/item/weapon/storage/firstaid/o2,
-/obj/item/weapon/storage/firstaid/regular,
-/obj/item/weapon/storage/firstaid/toxin,
-/obj/item/weapon/storage/pill_bottle/spaceacillin,
-/obj/structure/table/standard,
-/obj/item/device/healthanalyzer/advanced,
-/obj/item/device/healthanalyzer/advanced,
-/obj/item/weapon/reagent_containers/spray/cleaner,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aB" = (
-/obj/item/weapon/surgical/scalpel/alien,
-/obj/item/weapon/surgical/retractor/alien,
-/obj/item/weapon/surgical/hemostat/alien,
-/obj/item/weapon/surgical/circular_saw/alien,
-/obj/item/weapon/surgical/cautery/alien,
-/obj/item/weapon/surgical/FixOVein/alien,
-/obj/item/weapon/surgical/surgicaldrill/alien,
-/obj/structure/table/standard,
-/obj/machinery/recharger{
- pixel_x = -8;
- pixel_y = 8
- },
-/obj/machinery/recharger{
- pixel_x = 2;
- pixel_y = 8
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aC" = (
-/obj/machinery/organ_printer/flesh/full,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aD" = (
-/obj/item/weapon/storage/backpack/dufflebag/syndie/med,
-/obj/item/weapon/storage/belt/medical,
-/obj/item/weapon/storage/belt/medical,
-/obj/item/weapon/storage/belt/medical,
-/obj/structure/table/rack,
-/obj/item/weapon/storage/backpack/dufflebag/syndie/med,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aE" = (
-/obj/machinery/computer/ship/sensors{
- dir = 4;
- icon_state = "computer"
- },
-/obj/machinery/firealarm{
- dir = 8;
- pixel_x = -29;
- pixel_y = 0
- },
-/obj/machinery/light{
- dir = 8;
- icon_state = "tube1";
- pixel_x = 0
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aF" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aG" = (
-/obj/machinery/button/remote/blast_door{
- id = "medihangar";
- name = "Hangar blast door control";
- pixel_x = 8;
- pixel_y = 8;
- plane = 0
- },
-/obj/structure/table/darkglass,
-/obj/machinery/button/remote/blast_door{
- id = "mediwindowshutters";
- name = "Window shutters";
- pixel_x = -9;
- pixel_y = 8
- },
-/obj/machinery/atmospherics/pipe/vent,
-/obj/structure/window/plastitanium{
- dir = 4;
- icon_state = "window"
- },
-/obj/machinery/button/remote/airlock/survival_pod{
- id = "curadocking";
- name = "Main airlock lock";
- pixel_y = 8
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aH" = (
-/obj/item/weapon/storage/secure/safe{
- pixel_x = 31
- },
-/obj/item/weapon/gun/projectile/automatic/mini_uzi,
-/obj/item/weapon/card/id/syndicate{
- access = list(616);
- assignment = "Curabitur Contractor";
- origin_tech = newlist()
- },
-/obj/item/weapon/card/id/syndicate{
- access = list(616);
- assignment = "Curabitur Contractor";
- origin_tech = newlist()
- },
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/obj/item/weapon/spacecash/c1000,
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aI" = (
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aJ" = (
-/obj/machinery/sleep_console{
- dir = 2;
- icon_state = "sleeperconsole";
- pixel_x = -1
- },
-/obj/machinery/light{
- dir = 8;
- icon_state = "tube1";
- pixel_x = 0
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aK" = (
-/obj/structure/table/standard,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/device/robotanalyzer,
-/obj/item/device/robotanalyzer,
-/obj/item/weapon/reagent_containers/spray/cleaner,
-/obj/item/weapon/reagent_containers/dropper,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aL" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- dir = 8;
- frequency = 1480;
- id_tag = "curadocking";
- pixel_x = 28;
- pixel_y = 0
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"aM" = (
-/obj/structure/table/rack,
-/obj/item/device/defib_kit/jumper_kit/loaded,
-/obj/item/device/defib_kit/compact/combat/loaded,
-/obj/item/device/defib_kit/compact/combat/loaded,
-/obj/item/device/mmi/radio_enabled{
- req_access = newlist()
- },
-/obj/machinery/light{
- dir = 4;
- icon_state = "tube1"
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aN" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/obj/structure/closet,
-/obj/item/clothing/under/rank/nurse,
-/obj/item/clothing/under/rank/nurse,
-/obj/item/clothing/under/rank/medical,
-/obj/item/clothing/shoes/blue,
-/obj/item/clothing/shoes/blue,
-/obj/item/clothing/suit/storage/toggle/bomber/pilot,
-/obj/item/clothing/suit/storage/toggle/labcoat,
-/obj/item/clothing/accessory/storage/white_drop_pouches,
-/obj/item/clothing/accessory/storage/white_drop_pouches,
-/obj/item/clothing/accessory/holster/machete,
-/obj/item/clothing/accessory/holster/hip,
-/obj/item/weapon/material/knife/machete,
-/obj/item/clothing/accessory/storage/white_drop_pouches,
-/obj/item/clothing/accessory/storage/white_drop_pouches,
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aO" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aP" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aQ" = (
-/obj/machinery/recharger/wallcharger{
- pixel_x = 31;
- pixel_y = -10
- },
-/obj/machinery/recharger/wallcharger{
- pixel_x = 31;
- pixel_y = -2
- },
-/obj/machinery/recharger/wallcharger{
- pixel_x = 31;
- pixel_y = 7
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aR" = (
-/obj/machinery/sleeper,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aS" = (
-/obj/structure/table/standard,
-/obj/item/wheelchair,
-/obj/item/roller/adv,
-/obj/item/roller/adv,
-/obj/item/roller/adv,
-/obj/item/bodybag/cryobag,
-/obj/item/bodybag/cryobag,
-/obj/item/bodybag/cryobag,
-/obj/item/bodybag/cryobag,
-/obj/item/bodybag/cryobag/robobag,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aT" = (
-/obj/structure/table/rack,
-/obj/item/wheelchair,
-/obj/item/wheelchair,
-/obj/item/weapon/cane/crutch,
-/obj/item/weapon/cane/crutch,
-/obj/item/weapon/cane/white/collapsible,
-/obj/item/clothing/accessory/stethoscope,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"aU" = (
-/obj/structure/window/plastitanium{
- dir = 8;
- icon_state = "window"
- },
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/shield_generator/charged{
- initial_shield_modes = 2133;
- input_cap = 50000
- },
-/obj/structure/curtain/black,
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aV" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aW" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aX" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/carpet/bcarpet,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"aY" = (
-/obj/machinery/atmospherics/pipe/simple/visible/blue{
- dir = 6;
- icon_state = "intact"
- },
-/obj/structure/table/standard,
-/obj/fiftyspawner/steel,
-/obj/item/weapon/storage/toolbox/syndicate/powertools,
-/obj/item/stack/nanopaste/advanced,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/stack/cable_coil,
-/obj/item/device/multitool,
-/obj/item/weapon/storage/box/metalfoam,
-/obj/item/bodybag/cryobag/robobag,
-/obj/item/bodybag/cryobag/robobag,
-/obj/item/weapon/storage/belt/utility,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"aZ" = (
-/obj/machinery/vending/medical{
- dir = 4;
- pixel_x = -14;
- req_access = newlist()
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"ba" = (
-/obj/structure/sink{
- dir = 4;
- icon_state = "sink";
- pixel_x = 12;
- pixel_y = 0
- },
-/obj/machinery/recharger/wallcharger{
- pixel_x = 31;
- pixel_y = 6
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"bb" = (
-/obj/structure/window/plastitanium,
-/obj/structure/window/plastitanium{
- dir = 1;
- icon_state = "window"
- },
-/obj/structure/window/reinforced/full,
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"bc" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/door/airlock/glass_command{
- name = "Rescue Ship Cockpit";
- req_one_access = null
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/cockpit)
-"bd" = (
-/obj/structure/curtain/medical,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"be" = (
-/turf/simulated/wall/shull,
-/area/shuttle/curabitur/curashuttle/med)
-"bf" = (
-/obj/structure/table/darkglass,
-/obj/machinery/recharger{
- pixel_x = -8;
- pixel_y = 8
- },
-/obj/machinery/recharger{
- pixel_x = 2;
- pixel_y = 8
- },
-/obj/item/device/gps/medical,
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bg" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bh" = (
-/obj/item/device/suit_cooling_unit,
-/obj/item/device/suit_cooling_unit,
-/obj/item/device/suit_cooling_unit,
-/obj/structure/table/rack,
-/obj/item/clothing/head/helmet/space/void/medical,
-/obj/item/clothing/head/helmet/space/void/medical,
-/obj/item/clothing/head/helmet/space/void/medical,
-/obj/item/clothing/suit/space/void/medical,
-/obj/item/clothing/suit/space/void/medical,
-/obj/item/clothing/suit/space/void/medical,
-/obj/item/weapon/tank/air,
-/obj/item/weapon/tank/air,
-/obj/item/weapon/tank/air,
-/obj/item/weapon/tank/jetpack/carbondioxide,
-/obj/item/weapon/tank/jetpack/carbondioxide,
-/obj/item/weapon/tank/jetpack/carbondioxide,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/shoes/magboots,
-/obj/item/clothing/shoes/magboots,
-/obj/item/device/gps/medical,
-/obj/item/device/gps/medical,
-/obj/item/device/gps/medical,
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bi" = (
-/obj/machinery/suit_cycler/medical,
-/obj/machinery/alarm{
- pixel_y = 25
- },
-/obj/machinery/firealarm{
- dir = 4;
- layer = 3.3;
- pixel_y = 26
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bj" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
- dir = 8;
- icon_state = "window"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "mediwindowshutters";
- name = "Window Blast Door";
- opacity = 0
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/shuttle/curabitur/curashuttle/med)
-"bk" = (
-/obj/machinery/smartfridge/chemistry{
- dir = 4;
- icon_state = "fridge_food"
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"bl" = (
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bm" = (
-/obj/structure/filingcabinet/medical,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"bn" = (
-/obj/structure/window/plastitanium/full,
-/obj/structure/window/plastitanium{
- dir = 4;
- icon_state = "window"
- },
-/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/regular{
- density = 0;
- dir = 4;
- icon_state = "pdoor0";
- id = "mediwindowshutters";
- name = "Window Blast Door";
- opacity = 0
- },
-/obj/structure/grille,
-/turf/simulated/floor/plating,
-/area/shuttle/curabitur/curashuttle/med)
-"bo" = (
-/obj/machinery/chem_master,
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"bp" = (
-/obj/structure/bed/chair/bay/comfy,
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"br" = (
-/obj/machinery/chemical_dispenser/ert/specialops,
-/obj/structure/table/standard,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"bs" = (
-/obj/structure/bed/chair/bay/comfy{
- dir = 8;
- icon_state = "bay_comfychair_preview"
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"bt" = (
-/obj/structure/reagent_dispensers/water_cooler/full{
- density = 0;
- pixel_x = 11
- },
-/turf/simulated/floor/carpet/sblucarpet,
-/area/shuttle/curabitur/curashuttle/med)
-"bu" = (
-/obj/structure/table/darkglass,
-/obj/machinery/atmospherics/pipe/vent,
-/obj/item/weapon/reagent_containers/food/snacks/bagelsunflower,
-/obj/item/weapon/reagent_containers/food/snacks/applepie,
-/obj/item/weapon/reagent_containers/food/snacks/carrotfries,
-/obj/item/weapon/reagent_containers/food/snacks/cube/nutriment,
-/obj/item/weapon/reagent_containers/food/snacks/cube/protein,
-/obj/item/weapon/reagent_containers/food/snacks/cube/protein,
-/obj/item/weapon/reagent_containers/food/snacks/cube/protein,
-/obj/item/weapon/reagent_containers/food/snacks/cracker,
-/turf/simulated/floor/carpet/sblucarpet,
-/area/shuttle/curabitur/curashuttle/med)
-"bv" = (
-/obj/structure/table/darkglass,
-/obj/item/weapon/reagent_containers/food/snacks/bangersandmash,
-/obj/item/weapon/reagent_containers/food/snacks/candiedapple,
-/obj/item/weapon/reagent_containers/food/snacks/chickenwing,
-/turf/simulated/floor/carpet/sblucarpet,
-/area/shuttle/curabitur/curashuttle/med)
-"bw" = (
-/obj/structure/closet/crate/bin,
-/turf/simulated/floor/carpet/sblucarpet,
-/area/shuttle/curabitur/curashuttle/med)
-"bx" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"by" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bA" = (
-/obj/structure/sign/redcross,
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/med)
-"bB" = (
-/obj/structure/table/standard,
-/obj/item/weapon/storage/bag/chemistry,
-/obj/item/weapon/storage/box/pillbottles,
-/obj/item/weapon/reagent_containers/dropper,
-/obj/item/weapon/reagent_containers/dropper,
-/obj/structure/cable{
- icon_state = "0-4"
- },
-/obj/machinery/power/apc{
- dir = 8;
- name = "west bump";
- pixel_x = -28;
- pixel_y = 0
- },
-/obj/machinery/power/terminal{
- dir = 8;
- icon_state = "term"
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"bC" = (
-/obj/structure/sign/department/eng{
- pixel_x = 0;
- pixel_y = -31
- },
-/obj/structure/table/standard,
-/obj/item/weapon/reagent_containers/glass/beaker/bluespace,
-/obj/item/weapon/reagent_containers/glass/beaker/bluespace,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"bD" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 6
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bE" = (
-/obj/structure/bed/chair/sofa/teal/left{
- dir = 1;
- icon_state = "sofaend_left"
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_y = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/light,
-/obj/structure/sign/directions/engineering{
- pixel_y = -32
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 4
- },
-/turf/simulated/floor/carpet/sblucarpet,
-/area/shuttle/curabitur/curashuttle/med)
-"bF" = (
-/obj/machinery/vending/wallmed1/public{
- dir = 1;
- icon_state = "wallmed";
- pixel_y = -28
- },
-/obj/structure/bed/chair/sofa/teal{
- dir = 1;
- icon_state = "sofamiddle"
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_y = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 4
- },
-/turf/simulated/floor/carpet/sblucarpet,
-/area/shuttle/curabitur/curashuttle/med)
-"bG" = (
-/obj/machinery/computer/ship/navigation/telescreen{
- pixel_y = -32
- },
-/obj/structure/bed/chair/sofa/teal{
- dir = 1;
- icon_state = "sofamiddle"
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_y = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 4
- },
-/turf/simulated/floor/carpet/sblucarpet,
-/area/shuttle/curabitur/curashuttle/med)
-"bH" = (
-/obj/machinery/vending/wallmed1/public{
- dir = 1;
- icon_state = "wallmed";
- pixel_y = -29
- },
-/obj/structure/bed/chair/sofa/teal/right{
- dir = 1;
- icon_state = "sofaend_right"
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_y = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 4
- },
-/turf/simulated/floor/carpet/sblucarpet,
-/area/shuttle/curabitur/curashuttle/med)
-"bI" = (
-/obj/structure/cable{
- icon_state = "2-8"
- },
-/obj/structure/cable{
- icon_state = "4-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 4;
- icon_state = "map-scrubbers"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bJ" = (
-/obj/machinery/recharger/wallcharger{
- pixel_x = 4;
- pixel_y = -26
- },
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/structure/handrail{
- dir = 1
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_y = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
- dir = 4
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bK" = (
-/obj/structure/extinguisher_cabinet{
- pixel_y = -26
- },
-/obj/machinery/light,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_y = 0
- },
-/obj/machinery/atmospherics/binary/pump/fuel{
- dir = 8;
- icon_state = "map_off-fuel"
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bL" = (
-/obj/effect/shuttle_landmark/shuttle_initializer/curashuttle,
-/obj/effect/overmap/visitable/ship/landable/curashuttle,
-/obj/structure/handrail{
- dir = 1
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_y = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8;
- icon_state = "intact-fuel"
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"bM" = (
-/obj/structure/fans/hardlight,
-/obj/machinery/door/airlock/external/glass/bolted{
- frequency = 1480;
- id_tag = "curadocking"
- },
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_y = 0
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
- dir = 8;
- icon_state = "intact-fuel"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/curabitur/curashuttle/med)
-"bN" = (
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/eng)
-"bO" = (
-/turf/simulated/wall/shull,
-/area/shuttle/curabitur/curashuttle/eng)
-"bP" = (
-/obj/machinery/door/airlock/voidcraft,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
-/turf/simulated/floor/tiled{
- icon_state = "monotile"
- },
-/area/shuttle/curabitur/curashuttle/eng)
-"bQ" = (
-/turf/simulated/wall/shull,
-/area/shuttle/curabitur/curashuttle/hangar)
-"bR" = (
-/obj/machinery/door/airlock/voidcraft,
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/door/firedoor/glass,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/hangar)
-"bS" = (
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/hangar)
-"bT" = (
-/obj/structure/handrail,
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_x = 0;
- pixel_y = 28
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/obj/structure/cable{
- icon_state = "0-6"
- },
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"bU" = (
-/obj/machinery/atmospherics/pipe/simple/visible/universal{
- dir = 4
- },
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"bV" = (
-/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/visible/supply{
- dir = 9;
- icon_state = "intact-supply"
- },
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 5
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"bX" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 8
- },
-/obj/machinery/portable_atmospherics/canister/phoron{
- start_pressure = 8000.25
- },
-/turf/simulated/floor/tiled/monofloor{
- dir = 8
- },
-/area/shuttle/curabitur/curashuttle/eng)
-"bY" = (
-/obj/structure/window/plastitanium{
- dir = 8;
- icon_state = "window"
- },
-/obj/structure/window/plastitanium{
- dir = 4;
- icon_state = "window"
- },
-/obj/structure/curtain/black,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"bZ" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"ca" = (
-/obj/structure/table/standard,
-/obj/item/device/survivalcapsule,
-/obj/item/device/survivalcapsule,
-/obj/item/clothing/gloves/sterile/nitrile,
-/obj/item/clothing/gloves/sterile/nitrile,
-/obj/item/clothing/suit/surgicalapron,
-/turf/simulated/floor/tiled/white,
-/area/shuttle/curabitur/curashuttle/med)
-"cb" = (
-/obj/structure/closet/crate/medical,
-/obj/item/weapon/surgical/scalpel/manager,
-/obj/item/weapon/surgical/scalpel/manager,
-/obj/item/weapon/surgical/circular_saw/manager,
-/obj/item/weapon/surgical/circular_saw/manager,
-/obj/item/stack/nanopaste/advanced,
-/obj/item/stack/nanopaste/advanced,
-/obj/item/device/defib_kit/compact/combat/loaded,
-/obj/item/device/defib_kit/compact/combat/loaded,
-/obj/item/device/healthanalyzer/advanced,
-/obj/item/weapon/storage/backpack/dufflebag/syndie/med,
-/obj/item/weapon/surgical/bone_clamp,
-/obj/item/weapon/surgical/bone_clamp,
-/obj/item/weapon/surgical/scalpel/ripper,
-/obj/machinery/firealarm{
- pixel_y = 24
- },
-/obj/machinery/atmospherics/pipe/vent,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cc" = (
-/obj/structure/table/rack,
-/obj/item/mecha_parts/mecha_equipment/crisis_drone,
-/obj/item/mecha_parts/mecha_equipment/crisis_drone/rad,
-/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/medigun,
-/obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables,
-/obj/item/mecha_parts/mecha_equipment/tool/powertool/medanalyzer,
-/obj/item/mecha_parts/mecha_equipment/tool/powertool/prybar,
-/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cd" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 1
- },
-/obj/structure/fireaxecabinet{
- pixel_x = -31
- },
-/obj/structure/handrail{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"ce" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cf" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{
- dir = 4;
- icon_state = "map-scrubbers"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cg" = (
-/obj/fiftyspawner/tritium,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"ch" = (
-/obj/structure/cable{
- icon_state = "6-9"
- },
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cj" = (
-/obj/machinery/mech_recharger,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 5;
- icon_state = "intact-supply"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 5;
- icon_state = "intact-scrubbers"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"ck" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cl" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cm" = (
-/obj/structure/table/rack,
-/obj/item/mecha_parts/mecha_equipment/tool/passenger,
-/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
-/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
-/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
-/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cn" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 1
- },
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/floor/tiled/monofloor{
- dir = 1
- },
-/area/shuttle/curabitur/curashuttle/eng)
-"co" = (
-/obj/structure/fuel_port,
-/turf/simulated/floor/tiled/monofloor{
- dir = 1
- },
-/area/shuttle/curabitur/curashuttle/eng)
-"cp" = (
-/obj/machinery/atmospherics/pipe/simple/visible/universal,
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cq" = (
-/obj/machinery/portable_atmospherics/canister/phoron{
- start_pressure = 8000.25
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cr" = (
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cs" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"ct" = (
-/obj/structure/fans/hardlight,
-/obj/machinery/door/blast/regular{
- id = "medihangar"
- },
-/turf/simulated/floor/plating,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cu" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 4
- },
-/obj/machinery/portable_atmospherics/canister/empty,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_x = 0
- },
-/turf/simulated/floor/tiled/monofloor,
-/area/shuttle/curabitur/curashuttle/eng)
-"cv" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 8
- },
-/obj/machinery/light/small,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8";
- pixel_x = 0
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cw" = (
-/obj/machinery/atmospherics/pipe/simple/visible/red{
- dir = 9
- },
-/obj/machinery/autolathe,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cx" = (
-/obj/machinery/computer/ship/engines{
- dir = 1;
- icon_state = "computer"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cy" = (
-/obj/machinery/light/small,
-/obj/machinery/atmospherics/binary/pump,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"cz" = (
-/obj/machinery/vending/fitness{
- density = 0;
- pixel_y = 16
- },
-/turf/simulated/floor/tiled,
-/area/shuttle/curabitur/curashuttle/med)
-"cA" = (
-/obj/structure/cable,
-/obj/machinery/power/apc{
- dir = 2;
- name = "south bump";
- pixel_x = 0;
- pixel_y = -28
- },
-/obj/structure/handrail{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cB" = (
-/obj/machinery/light,
-/obj/machinery/alarm{
- dir = 1;
- icon_state = "alarm0";
- pixel_y = -32
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cC" = (
-/obj/structure/sign/redcross,
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/eng)
-"cD" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 6
- },
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/eng)
-"cE" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
- dir = 1
- },
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/eng)
-"cF" = (
-/obj/machinery/button/remote/blast_door{
- id = "medihangar";
- name = "Hangar blast door control";
- pixel_x = -7;
- pixel_y = 24
- },
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/structure/table/standard,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/item/device/flashlight/flare,
-/obj/machinery/cell_charger{
- pixel_x = -3;
- pixel_y = 13
- },
-/obj/item/weapon/cell/high,
-/obj/item/weapon/cell/high,
-/obj/item/weapon/storage/briefcase/inflatable,
-/obj/item/weapon/storage/briefcase/inflatable,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cG" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/eng)
-"cI" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
- dir = 1
- },
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cJ" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 10
- },
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cK" = (
-/obj/structure/sign/redcross,
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cL" = (
-/obj/mecha/combat/fighter/pinnace{
- desc = "A modified Pinnace made to be able to fit a wide arsenal of equipment for rescue missions in space.";
- health = 200;
- max_equip = 1;
- max_hull_equip = 2;
- max_special_equip = 1;
- max_universal_equip = 2;
- max_utility_equip = 3;
- maxhealth = 200;
- name = "Curabitur Pinnace"
- },
-/obj/machinery/mech_recharger,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cM" = (
-/obj/machinery/atmospherics/unary/engine{
- dir = 1
- },
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/curabitur/curashuttle/eng)
-"cN" = (
-/obj/structure/handrail{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/hangar)
-"cO" = (
-/obj/machinery/atmospherics/unary/engine{
- dir = 1
- },
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/curabitur/curashuttle/eng)
-"cP" = (
-/obj/machinery/ion_engine{
- dir = 1;
- icon_state = "nozzle"
- },
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/curabitur/curashuttle/eng)
-"dF" = (
-/obj/structure/handrail,
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"ic" = (
-/obj/machinery/power/terminal{
- dir = 4
- },
-/obj/structure/cable{
- icon_state = "0-6"
- },
-/obj/machinery/atmospherics/pipe/simple/visible/yellow,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"qN" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 4
- },
-/turf/simulated/wall/rpshull,
-/area/shuttle/curabitur/curashuttle/eng)
-"tI" = (
-/obj/machinery/power/smes/buildable/point_of_interest,
-/obj/structure/cable{
- icon_state = "0-9"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"MI" = (
-/obj/machinery/power/port_gen/pacman/mrs{
- anchored = 1
- },
-/obj/structure/cable{
- icon_state = "0-9"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/curabitur/curashuttle/eng)
-"OD" = (
-/obj/machinery/light/small{
- dir = 4
- },
-/obj/machinery/atmospherics/portables_connector{
- dir = 8
- },
-/obj/machinery/portable_atmospherics/canister/phoron{
- start_pressure = 8000.25
- },
-/turf/simulated/floor/tiled/monofloor{
- dir = 8
- },
-/area/shuttle/curabitur/curashuttle/eng)
-
-(1,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
-(2,1,1) = {"
-aa
-aa
-aa
-ag
-az
-az
-az
-az
-az
-az
-bj
-bj
-bj
-az
-bN
-bN
-bN
-bN
-bN
-cC
-aa
-aa
-aa
-"}
-(3,1,1) = {"
-aa
-ab
-ab
-ab
-ar
-aA
-aJ
-aR
-aZ
-bd
-bk
-bo
-br
-bB
-bO
-aY
-cd
-cn
-cu
-bN
-bN
-aa
-aa
-"}
-(4,1,1) = {"
-aa
-aa
-ae
-ah
-as
-as
-as
-as
-as
-bd
-as
-as
-bs
-bC
-bO
-bU
-ce
-co
-cv
-cD
-cO
-aa
-aa
-"}
-(5,1,1) = {"
-aa
-aa
-ae
-ai
-as
-aB
-aK
-aS
-as
-bd
-bl
-bl
-bl
-bD
-bP
-bV
-cf
-cp
-cw
-cE
-cM
-aa
-aa
-"}
-(6,1,1) = {"
-aa
-aa
-ab
-aj
-as
-aC
-ca
-bm
-as
-bd
-bl
-bl
-bt
-bE
-bO
-bT
-cg
-cq
-cx
-cE
-cM
-aa
-aa
-"}
-(7,1,1) = {"
-aa
-ab
-ab
-ak
-as
-as
-as
-as
-as
-bd
-bl
-bp
-bu
-bF
-bO
-dF
-ch
-ic
-cy
-cG
-cP
-aa
-aa
-"}
-(8,1,1) = {"
-aa
-ac
-ab
-al
-au
-aD
-aM
-aT
-ba
-bd
-bl
-bl
-bv
-bG
-bO
-bX
-OD
-tI
-MI
-qN
-bN
-aa
-aa
-"}
-(9,1,1) = {"
-aa
-ad
-ad
-am
-am
-am
-am
-aU
-am
-be
-cz
-bl
-bw
-bH
-bQ
-bY
-bO
-bO
-bO
-qN
-cP
-aa
-aa
-"}
-(10,1,1) = {"
-aa
-aa
-af
-an
-av
-aE
-at
-aV
-bb
-bf
-bl
-bl
-bx
-bI
-bR
-bZ
-cj
-cr
-cL
-cI
-cM
-aa
-aa
-"}
-(11,1,1) = {"
-aa
-aa
-af
-ao
-aw
-aF
-aO
-aW
-bc
-bg
-bg
-bg
-by
-bJ
-bQ
-cF
-ck
-cs
-cA
-cI
-cM
-aa
-aa
-"}
-(12,1,1) = {"
-aa
-aa
-af
-ap
-ax
-aG
-aP
-aX
-bb
-bh
-bl
-bl
-bl
-bK
-bQ
-cb
-cl
-cr
-cB
-cJ
-cO
-aa
-aa
-"}
-(13,1,1) = {"
-aa
-ad
-ad
-ad
-ay
-aH
-aQ
-aN
-aI
-bi
-bl
-bl
-aL
-bL
-bQ
-cc
-cm
-cr
-cN
-bS
-bN
-aa
-aa
-"}
-(14,1,1) = {"
-aa
-aa
-aa
-aq
-aI
-aI
-aI
-aI
-aI
-az
-bn
-bn
-bA
-bM
-bS
-bS
-bS
-ct
-ct
-cK
-aa
-aa
-aa
-"}
-(15,1,1) = {"
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-"}
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/template_noop,
+/area/template_noop)
+"ab" = (
+/turf/simulated/wall/rdshull,
+/area/shuttle/curabitur/curashuttle/med)
+"ac" = (
+/obj/machinery/shipsensors{
+ dir = 1
+ },
+/obj/effect/floor_decal/techfloor/orange{
+ dir = 4
+ },
+/obj/effect/floor_decal/techfloor/orange{
+ dir = 8
+ },
+/turf/simulated/shuttle/plating/airless,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"ad" = (
+/turf/simulated/wall/rdshull,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"ae" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+ dir = 1;
+ icon_state = "window"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "mediwindowshutters";
+ name = "Window Blast Door";
+ opacity = 0
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/shuttle/curabitur/curashuttle/med)
+"af" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+ dir = 1;
+ icon_state = "window"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "mediwindowshutters";
+ name = "Window Blast Door";
+ opacity = 0
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"ag" = (
+/obj/structure/sign/redcross,
+/obj/machinery/vending/nifsoft_shop,
+/turf/simulated/wall/rdshull,
+/area/shuttle/curabitur/curashuttle/med)
+"ah" = (
+/obj/machinery/optable,
+/obj/machinery/oxygen_pump/anesthetic{
+ pixel_x = -25
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"ai" = (
+/obj/machinery/computer/operating,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aj" = (
+/obj/machinery/vending/blood{
+ density = 0;
+ pixel_y = 18;
+ req_access = newlist()
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"ak" = (
+/obj/machinery/body_scanconsole{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"al" = (
+/obj/machinery/bodyscanner{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"am" = (
+/turf/simulated/wall/shull,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"an" = (
+/obj/machinery/computer/shuttle_control/explore/curashuttle{
+ dir = 4;
+ icon_state = "computer"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"ao" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"ap" = (
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 24;
+ pixel_y = 0
+ },
+/obj/structure/table/darkglass,
+/obj/item/weapon/paper_bin{
+ pixel_x = 8;
+ pixel_y = -2
+ },
+/obj/item/weapon/pen/fountain,
+/obj/machinery/photocopier/faxmachine{
+ department = "Curabitur Rescue Service";
+ name = "curabitur fax machine";
+ pixel_y = 6
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aq" = (
+/obj/structure/sign/redcross,
+/turf/simulated/wall/rdshull,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"ar" = (
+/obj/item/weapon/storage/firstaid/surgery,
+/obj/item/weapon/surgical/scalpel/manager,
+/obj/item/weapon/surgical/scalpel/ripper,
+/obj/item/weapon/surgical/circular_saw/manager,
+/obj/item/stack/nanopaste/advanced,
+/obj/item/stack/nanopaste/advanced,
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"as" = (
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"at" = (
+/obj/structure/closet/crate/large,
+/obj/item/weapon/gun/projectile/multi_cannon,
+/obj/item/weapon/gun/projectile/multi_cannon,
+/obj/item/ammo_casing/macrobattery/buff,
+/obj/item/ammo_casing/macrobattery/buff,
+/obj/item/ammo_casing/macrobattery/detox,
+/obj/item/ammo_casing/macrobattery/detox,
+/obj/item/ammo_casing/macrobattery/healie,
+/obj/item/ammo_casing/macrobattery/healie,
+/obj/item/ammo_casing/macrobattery/ouchie,
+/obj/item/ammo_casing/macrobattery/ouchie,
+/obj/item/ammo_casing/macrobattery/stabilize,
+/obj/item/ammo_casing/macrobattery/stabilize,
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"au" = (
+/obj/structure/medical_stand,
+/obj/machinery/vending/nifsoft_shop{
+ categories = 3;
+ emagged = 1;
+ pixel_x = 23;
+ pixel_y = -5
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"av" = (
+/obj/machinery/computer/ship/helm{
+ dir = 4;
+ req_one_access = null
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aw" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/bed/chair/bay/comfy{
+ dir = 1;
+ icon_state = "bay_comfychair_preview"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"ax" = (
+/obj/machinery/computer/ship/engines{
+ dir = 8;
+ icon_state = "computer"
+ },
+/obj/structure/window/plastitanium{
+ dir = 4;
+ icon_state = "window"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"ay" = (
+/obj/item/weapon/bedsheet/bluedouble,
+/obj/structure/bed/double/padded,
+/obj/structure/curtain/open/bed,
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"az" = (
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/med)
+"aA" = (
+/obj/item/weapon/storage/firstaid/adv,
+/obj/item/weapon/storage/firstaid/fire,
+/obj/item/weapon/storage/firstaid/o2,
+/obj/item/weapon/storage/firstaid/regular,
+/obj/item/weapon/storage/firstaid/toxin,
+/obj/item/weapon/storage/pill_bottle/spaceacillin,
+/obj/structure/table/standard,
+/obj/item/device/healthanalyzer/advanced,
+/obj/item/device/healthanalyzer/advanced,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aB" = (
+/obj/item/weapon/surgical/scalpel/alien,
+/obj/item/weapon/surgical/retractor/alien,
+/obj/item/weapon/surgical/hemostat/alien,
+/obj/item/weapon/surgical/circular_saw/alien,
+/obj/item/weapon/surgical/cautery/alien,
+/obj/item/weapon/surgical/FixOVein/alien,
+/obj/item/weapon/surgical/surgicaldrill/alien,
+/obj/structure/table/standard,
+/obj/machinery/recharger{
+ pixel_x = -8;
+ pixel_y = 8
+ },
+/obj/machinery/recharger{
+ pixel_x = 2;
+ pixel_y = 8
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aC" = (
+/obj/machinery/organ_printer/flesh/full,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aD" = (
+/obj/item/weapon/storage/backpack/dufflebag/syndie/med,
+/obj/item/weapon/storage/belt/medical,
+/obj/item/weapon/storage/belt/medical,
+/obj/item/weapon/storage/belt/medical,
+/obj/structure/table/rack,
+/obj/item/weapon/storage/backpack/dufflebag/syndie/med,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aE" = (
+/obj/machinery/computer/ship/sensors{
+ dir = 4;
+ icon_state = "computer"
+ },
+/obj/machinery/firealarm{
+ dir = 8;
+ pixel_x = -29;
+ pixel_y = 0
+ },
+/obj/machinery/light{
+ dir = 8;
+ icon_state = "tube1";
+ pixel_x = 0
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aF" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aG" = (
+/obj/machinery/button/remote/blast_door{
+ id = "medihangar";
+ name = "Hangar blast door control";
+ pixel_x = 8;
+ pixel_y = 8;
+ plane = 0
+ },
+/obj/structure/table/darkglass,
+/obj/machinery/button/remote/blast_door{
+ id = "mediwindowshutters";
+ name = "Window shutters";
+ pixel_x = -9;
+ pixel_y = 8
+ },
+/obj/machinery/atmospherics/pipe/vent,
+/obj/structure/window/plastitanium{
+ dir = 4;
+ icon_state = "window"
+ },
+/obj/machinery/button/remote/airlock/survival_pod{
+ id = "curadocking";
+ name = "Main airlock lock";
+ pixel_y = 8
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aH" = (
+/obj/item/weapon/storage/secure/safe{
+ pixel_x = 31
+ },
+/obj/item/weapon/gun/projectile/automatic/mini_uzi,
+/obj/item/weapon/card/id/syndicate{
+ access = list(616);
+ assignment = "Curabitur Contractor";
+ origin_tech = newlist()
+ },
+/obj/item/weapon/card/id/syndicate{
+ access = list(616);
+ assignment = "Curabitur Contractor";
+ origin_tech = newlist()
+ },
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/obj/item/weapon/spacecash/c1000,
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aI" = (
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aJ" = (
+/obj/machinery/sleep_console{
+ dir = 2;
+ icon_state = "sleeperconsole";
+ pixel_x = -1
+ },
+/obj/machinery/light{
+ dir = 8;
+ icon_state = "tube1";
+ pixel_x = 0
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aK" = (
+/obj/structure/table/standard,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/device/robotanalyzer,
+/obj/item/device/robotanalyzer,
+/obj/item/weapon/reagent_containers/spray/cleaner,
+/obj/item/weapon/reagent_containers/dropper,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aL" = (
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ dir = 8;
+ frequency = 1480;
+ id_tag = "curadocking";
+ pixel_x = 28;
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"aM" = (
+/obj/structure/table/rack,
+/obj/item/device/defib_kit/jumper_kit/loaded,
+/obj/item/device/defib_kit/compact/combat/loaded,
+/obj/item/device/defib_kit/compact/combat/loaded,
+/obj/item/device/mmi/radio_enabled{
+ req_access = newlist()
+ },
+/obj/machinery/light{
+ dir = 4;
+ icon_state = "tube1"
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aN" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/obj/structure/closet,
+/obj/item/clothing/under/rank/nurse,
+/obj/item/clothing/under/rank/nurse,
+/obj/item/clothing/under/rank/medical,
+/obj/item/clothing/shoes/blue,
+/obj/item/clothing/shoes/blue,
+/obj/item/clothing/suit/storage/toggle/bomber/pilot,
+/obj/item/clothing/suit/storage/toggle/labcoat,
+/obj/item/clothing/accessory/storage/white_drop_pouches,
+/obj/item/clothing/accessory/storage/white_drop_pouches,
+/obj/item/clothing/accessory/holster/machete,
+/obj/item/clothing/accessory/holster/hip,
+/obj/item/weapon/material/knife/machete,
+/obj/item/clothing/accessory/storage/white_drop_pouches,
+/obj/item/clothing/accessory/storage/white_drop_pouches,
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aO" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aP" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aQ" = (
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 31;
+ pixel_y = -10
+ },
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 31;
+ pixel_y = -2
+ },
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 31;
+ pixel_y = 7
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aR" = (
+/obj/machinery/sleeper,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aS" = (
+/obj/structure/table/standard,
+/obj/item/wheelchair,
+/obj/item/roller/adv,
+/obj/item/roller/adv,
+/obj/item/roller/adv,
+/obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag,
+/obj/item/bodybag/cryobag/robobag,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aT" = (
+/obj/structure/table/rack,
+/obj/item/wheelchair,
+/obj/item/wheelchair,
+/obj/item/weapon/cane/crutch,
+/obj/item/weapon/cane/crutch,
+/obj/item/weapon/cane/white/collapsible,
+/obj/item/clothing/accessory/stethoscope,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"aU" = (
+/obj/structure/window/plastitanium{
+ dir = 8;
+ icon_state = "window"
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/shield_generator/charged{
+ initial_shield_modes = 2133;
+ input_cap = 50000
+ },
+/obj/structure/curtain/black,
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aV" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aW" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aX" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"aY" = (
+/obj/machinery/atmospherics/pipe/simple/visible/blue{
+ dir = 6;
+ icon_state = "intact"
+ },
+/obj/structure/table/standard,
+/obj/fiftyspawner/steel,
+/obj/item/weapon/storage/toolbox/syndicate/powertools,
+/obj/item/stack/nanopaste/advanced,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/stack/cable_coil,
+/obj/item/device/multitool,
+/obj/item/weapon/storage/box/metalfoam,
+/obj/item/bodybag/cryobag/robobag,
+/obj/item/bodybag/cryobag/robobag,
+/obj/item/weapon/storage/belt/utility,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"aZ" = (
+/obj/machinery/vending/medical{
+ dir = 4;
+ pixel_x = -14;
+ req_access = newlist()
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"ba" = (
+/obj/structure/sink{
+ dir = 4;
+ icon_state = "sink";
+ pixel_x = 12;
+ pixel_y = 0
+ },
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 31;
+ pixel_y = 6
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"bb" = (
+/obj/structure/window/plastitanium,
+/obj/structure/window/plastitanium{
+ dir = 1;
+ icon_state = "window"
+ },
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"bc" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/door/airlock/glass_command{
+ name = "Rescue Ship Cockpit";
+ req_one_access = null
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/cockpit)
+"bd" = (
+/obj/structure/curtain/medical,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"be" = (
+/turf/simulated/wall/shull,
+/area/shuttle/curabitur/curashuttle/med)
+"bf" = (
+/obj/structure/table/darkglass,
+/obj/machinery/recharger{
+ pixel_x = -8;
+ pixel_y = 8
+ },
+/obj/machinery/recharger{
+ pixel_x = 2;
+ pixel_y = 8
+ },
+/obj/item/device/gps/medical,
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bg" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bh" = (
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/item/device/suit_cooling_unit,
+/obj/structure/table/rack,
+/obj/item/clothing/head/helmet/space/void/medical,
+/obj/item/clothing/head/helmet/space/void/medical,
+/obj/item/clothing/head/helmet/space/void/medical,
+/obj/item/clothing/suit/space/void/medical,
+/obj/item/clothing/suit/space/void/medical,
+/obj/item/clothing/suit/space/void/medical,
+/obj/item/weapon/tank/air,
+/obj/item/weapon/tank/air,
+/obj/item/weapon/tank/air,
+/obj/item/weapon/tank/jetpack/carbondioxide,
+/obj/item/weapon/tank/jetpack/carbondioxide,
+/obj/item/weapon/tank/jetpack/carbondioxide,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots,
+/obj/item/clothing/shoes/magboots,
+/obj/item/device/gps/medical,
+/obj/item/device/gps/medical,
+/obj/item/device/gps/medical,
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bi" = (
+/obj/machinery/suit_cycler/medical,
+/obj/machinery/alarm{
+ pixel_y = 25
+ },
+/obj/machinery/firealarm{
+ dir = 4;
+ layer = 3.3;
+ pixel_y = 26
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bj" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+ dir = 8;
+ icon_state = "window"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "mediwindowshutters";
+ name = "Window Blast Door";
+ opacity = 0
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/shuttle/curabitur/curashuttle/med)
+"bk" = (
+/obj/machinery/smartfridge/chemistry{
+ dir = 4;
+ icon_state = "fridge_food"
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"bl" = (
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bm" = (
+/obj/structure/filingcabinet/medical,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"bn" = (
+/obj/structure/window/plastitanium/full,
+/obj/structure/window/plastitanium{
+ dir = 4;
+ icon_state = "window"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "mediwindowshutters";
+ name = "Window Blast Door";
+ opacity = 0
+ },
+/obj/structure/grille,
+/turf/simulated/floor/plating,
+/area/shuttle/curabitur/curashuttle/med)
+"bo" = (
+/obj/machinery/chem_master,
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"bp" = (
+/obj/structure/bed/chair/bay/comfy,
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"br" = (
+/obj/machinery/chemical_dispenser/ert/specialops,
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"bs" = (
+/obj/structure/bed/chair/bay/comfy{
+ dir = 8;
+ icon_state = "bay_comfychair_preview"
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"bt" = (
+/obj/structure/reagent_dispensers/water_cooler/full{
+ density = 0;
+ pixel_x = 11
+ },
+/turf/simulated/floor/carpet/sblucarpet,
+/area/shuttle/curabitur/curashuttle/med)
+"bu" = (
+/obj/structure/table/darkglass,
+/obj/machinery/atmospherics/pipe/vent,
+/obj/item/weapon/reagent_containers/food/snacks/bagelsunflower,
+/obj/item/weapon/reagent_containers/food/snacks/applepie,
+/obj/item/weapon/reagent_containers/food/snacks/carrotfries,
+/obj/item/weapon/reagent_containers/food/snacks/cube/nutriment,
+/obj/item/weapon/reagent_containers/food/snacks/cube/protein,
+/obj/item/weapon/reagent_containers/food/snacks/cube/protein,
+/obj/item/weapon/reagent_containers/food/snacks/cube/protein,
+/obj/item/weapon/reagent_containers/food/snacks/cracker,
+/turf/simulated/floor/carpet/sblucarpet,
+/area/shuttle/curabitur/curashuttle/med)
+"bv" = (
+/obj/structure/table/darkglass,
+/obj/item/weapon/reagent_containers/food/snacks/bangersandmash,
+/obj/item/weapon/reagent_containers/food/snacks/candiedapple,
+/obj/item/weapon/reagent_containers/food/snacks/chickenwing,
+/turf/simulated/floor/carpet/sblucarpet,
+/area/shuttle/curabitur/curashuttle/med)
+"bw" = (
+/obj/structure/closet/crate/bin,
+/turf/simulated/floor/carpet/sblucarpet,
+/area/shuttle/curabitur/curashuttle/med)
+"bx" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"by" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bA" = (
+/obj/structure/sign/redcross,
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/med)
+"bB" = (
+/obj/structure/table/standard,
+/obj/item/weapon/storage/bag/chemistry,
+/obj/item/weapon/storage/box/pillbottles,
+/obj/item/weapon/reagent_containers/dropper,
+/obj/item/weapon/reagent_containers/dropper,
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "west bump";
+ pixel_x = -28;
+ pixel_y = 0
+ },
+/obj/machinery/power/terminal{
+ dir = 8;
+ icon_state = "term"
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"bC" = (
+/obj/structure/sign/department/eng{
+ pixel_x = 0;
+ pixel_y = -31
+ },
+/obj/structure/table/standard,
+/obj/item/weapon/reagent_containers/glass/beaker/bluespace,
+/obj/item/weapon/reagent_containers/glass/beaker/bluespace,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"bD" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 6
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bE" = (
+/obj/structure/bed/chair/sofa/teal/left{
+ dir = 1;
+ icon_state = "sofaend_left"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/light,
+/obj/structure/sign/directions/engineering{
+ pixel_y = -32
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/sblucarpet,
+/area/shuttle/curabitur/curashuttle/med)
+"bF" = (
+/obj/machinery/vending/wallmed1/public{
+ dir = 1;
+ icon_state = "wallmed";
+ pixel_y = -28
+ },
+/obj/structure/bed/chair/sofa/teal{
+ dir = 1;
+ icon_state = "sofamiddle"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/sblucarpet,
+/area/shuttle/curabitur/curashuttle/med)
+"bG" = (
+/obj/machinery/computer/ship/navigation/telescreen{
+ pixel_y = -32
+ },
+/obj/structure/bed/chair/sofa/teal{
+ dir = 1;
+ icon_state = "sofamiddle"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/sblucarpet,
+/area/shuttle/curabitur/curashuttle/med)
+"bH" = (
+/obj/machinery/vending/wallmed1/public{
+ dir = 1;
+ icon_state = "wallmed";
+ pixel_y = -29
+ },
+/obj/structure/bed/chair/sofa/teal/right{
+ dir = 1;
+ icon_state = "sofaend_right"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/sblucarpet,
+/area/shuttle/curabitur/curashuttle/med)
+"bI" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4;
+ icon_state = "map-scrubbers"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bJ" = (
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 4;
+ pixel_y = -26
+ },
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/structure/handrail{
+ dir = 1
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bK" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -26
+ },
+/obj/machinery/light,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/binary/pump/fuel{
+ dir = 8;
+ icon_state = "map_off-fuel"
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bL" = (
+/obj/effect/shuttle_landmark/shuttle_initializer/curashuttle,
+/obj/effect/overmap/visitable/ship/landable/curashuttle,
+/obj/structure/handrail{
+ dir = 1
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"bM" = (
+/obj/structure/fans/hardlight,
+/obj/machinery/door/airlock/external/glass/bolted{
+ frequency = 1480;
+ id_tag = "curadocking"
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
+ dir = 8;
+ icon_state = "intact-fuel"
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/curabitur/curashuttle/med)
+"bN" = (
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/eng)
+"bO" = (
+/turf/simulated/wall/shull,
+/area/shuttle/curabitur/curashuttle/eng)
+"bP" = (
+/obj/machinery/door/airlock/voidcraft,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
+/turf/simulated/floor/tiled{
+ icon_state = "monotile"
+ },
+/area/shuttle/curabitur/curashuttle/eng)
+"bQ" = (
+/turf/simulated/wall/shull,
+/area/shuttle/curabitur/curashuttle/hangar)
+"bR" = (
+/obj/machinery/door/airlock/voidcraft,
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/hangar)
+"bS" = (
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/hangar)
+"bT" = (
+/obj/structure/handrail,
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_x = 0;
+ pixel_y = 28
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/obj/structure/cable{
+ icon_state = "0-6"
+ },
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"bU" = (
+/obj/machinery/atmospherics/pipe/simple/visible/universal{
+ dir = 4
+ },
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"bV" = (
+/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/visible/supply{
+ dir = 9;
+ icon_state = "intact-supply"
+ },
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"bX" = (
+/obj/machinery/atmospherics/portables_connector{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/phoron{
+ start_pressure = 8000.25
+ },
+/turf/simulated/floor/tiled/monofloor{
+ dir = 8
+ },
+/area/shuttle/curabitur/curashuttle/eng)
+"bY" = (
+/obj/structure/window/plastitanium{
+ dir = 8;
+ icon_state = "window"
+ },
+/obj/structure/window/plastitanium{
+ dir = 4;
+ icon_state = "window"
+ },
+/obj/structure/curtain/black,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"bZ" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"ca" = (
+/obj/structure/table/standard,
+/obj/item/device/survivalcapsule,
+/obj/item/device/survivalcapsule,
+/obj/item/clothing/gloves/sterile/nitrile,
+/obj/item/clothing/gloves/sterile/nitrile,
+/obj/item/clothing/suit/surgicalapron,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/curabitur/curashuttle/med)
+"cb" = (
+/obj/structure/closet/crate/medical,
+/obj/item/weapon/surgical/scalpel/manager,
+/obj/item/weapon/surgical/scalpel/manager,
+/obj/item/weapon/surgical/circular_saw/manager,
+/obj/item/weapon/surgical/circular_saw/manager,
+/obj/item/stack/nanopaste/advanced,
+/obj/item/stack/nanopaste/advanced,
+/obj/item/device/defib_kit/compact/combat/loaded,
+/obj/item/device/defib_kit/compact/combat/loaded,
+/obj/item/device/healthanalyzer/advanced,
+/obj/item/weapon/storage/backpack/dufflebag/syndie/med,
+/obj/item/weapon/surgical/bone_clamp,
+/obj/item/weapon/surgical/bone_clamp,
+/obj/item/weapon/surgical/scalpel/ripper,
+/obj/machinery/firealarm{
+ pixel_y = 24
+ },
+/obj/machinery/atmospherics/pipe/vent,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cc" = (
+/obj/structure/table/rack,
+/obj/item/mecha_parts/mecha_equipment/crisis_drone,
+/obj/item/mecha_parts/mecha_equipment/crisis_drone/rad,
+/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/medigun,
+/obj/item/mecha_parts/mecha_equipment/tool/powertool/inflatables,
+/obj/item/mecha_parts/mecha_equipment/tool/powertool/medanalyzer,
+/obj/item/mecha_parts/mecha_equipment/tool/powertool/prybar,
+/obj/item/mecha_parts/mecha_equipment/weapon/energy/taser,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cd" = (
+/obj/machinery/atmospherics/binary/pump{
+ dir = 1
+ },
+/obj/structure/fireaxecabinet{
+ pixel_x = -31
+ },
+/obj/structure/handrail{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"ce" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cf" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers{
+ dir = 4;
+ icon_state = "map-scrubbers"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cg" = (
+/obj/fiftyspawner/tritium,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"ch" = (
+/obj/structure/cable{
+ icon_state = "6-9"
+ },
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cj" = (
+/obj/machinery/mech_recharger,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5;
+ icon_state = "intact-supply"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5;
+ icon_state = "intact-scrubbers"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"ck" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cl" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cm" = (
+/obj/structure/table/rack,
+/obj/item/mecha_parts/mecha_equipment/tool/passenger,
+/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
+/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
+/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
+/obj/item/mecha_parts/mecha_equipment/tool/sleeper,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cn" = (
+/obj/machinery/atmospherics/portables_connector{
+ dir = 1
+ },
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/tiled/monofloor{
+ dir = 1
+ },
+/area/shuttle/curabitur/curashuttle/eng)
+"co" = (
+/obj/structure/fuel_port,
+/turf/simulated/floor/tiled/monofloor{
+ dir = 1
+ },
+/area/shuttle/curabitur/curashuttle/eng)
+"cp" = (
+/obj/machinery/atmospherics/pipe/simple/visible/universal,
+/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cq" = (
+/obj/machinery/portable_atmospherics/canister/phoron{
+ start_pressure = 8000.25
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cr" = (
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cs" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"ct" = (
+/obj/structure/fans/hardlight,
+/obj/machinery/door/blast/regular{
+ id = "medihangar"
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cu" = (
+/obj/machinery/atmospherics/portables_connector{
+ dir = 4
+ },
+/obj/machinery/portable_atmospherics/canister/empty,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/turf/simulated/floor/tiled/monofloor,
+/area/shuttle/curabitur/curashuttle/eng)
+"cv" = (
+/obj/machinery/atmospherics/binary/pump{
+ dir = 8
+ },
+/obj/machinery/light/small,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cw" = (
+/obj/machinery/atmospherics/pipe/simple/visible/red{
+ dir = 9
+ },
+/obj/machinery/autolathe,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cx" = (
+/obj/machinery/computer/ship/engines{
+ dir = 1;
+ icon_state = "computer"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cy" = (
+/obj/machinery/light/small,
+/obj/machinery/atmospherics/binary/pump,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"cz" = (
+/obj/machinery/vending/fitness{
+ density = 0;
+ pixel_y = 16
+ },
+/turf/simulated/floor/tiled,
+/area/shuttle/curabitur/curashuttle/med)
+"cA" = (
+/obj/structure/cable,
+/obj/machinery/power/apc{
+ dir = 2;
+ name = "south bump";
+ pixel_x = 0;
+ pixel_y = -28
+ },
+/obj/structure/handrail{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cB" = (
+/obj/machinery/light,
+/obj/machinery/alarm{
+ dir = 1;
+ icon_state = "alarm0";
+ pixel_y = -32
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cC" = (
+/obj/structure/sign/redcross,
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/eng)
+"cD" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 6
+ },
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/eng)
+"cE" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+ dir = 1
+ },
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/eng)
+"cF" = (
+/obj/machinery/button/remote/blast_door{
+ id = "medihangar";
+ name = "Hangar blast door control";
+ pixel_x = -7;
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/table/standard,
+/obj/item/device/flashlight/flare,
+/obj/item/device/flashlight/flare,
+/obj/item/device/flashlight/flare,
+/obj/machinery/cell_charger{
+ pixel_x = -3;
+ pixel_y = 13
+ },
+/obj/item/weapon/cell/high,
+/obj/item/weapon/cell/high,
+/obj/item/weapon/storage/briefcase/inflatable,
+/obj/item/weapon/storage/briefcase/inflatable,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cG" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow,
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/eng)
+"cI" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+ dir = 1
+ },
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cJ" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 10
+ },
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cK" = (
+/obj/structure/sign/redcross,
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cL" = (
+/obj/mecha/combat/fighter/pinnace{
+ desc = "A modified Pinnace made to be able to fit a wide arsenal of equipment for rescue missions in space.";
+ health = 200;
+ max_equip = 1;
+ max_hull_equip = 2;
+ max_special_equip = 1;
+ max_universal_equip = 2;
+ max_utility_equip = 3;
+ maxhealth = 200;
+ name = "Curabitur Pinnace"
+ },
+/obj/machinery/mech_recharger,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cM" = (
+/obj/machinery/atmospherics/unary/engine{
+ dir = 1
+ },
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/curabitur/curashuttle/eng)
+"cN" = (
+/obj/structure/handrail{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/hangar)
+"cO" = (
+/obj/machinery/atmospherics/unary/engine{
+ dir = 1
+ },
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/curabitur/curashuttle/eng)
+"cP" = (
+/obj/machinery/ion_engine{
+ dir = 1;
+ icon_state = "nozzle"
+ },
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/curabitur/curashuttle/eng)
+"dF" = (
+/obj/structure/handrail,
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"ic" = (
+/obj/machinery/power/terminal{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-6"
+ },
+/obj/machinery/atmospherics/pipe/simple/visible/yellow,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"qN" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ dir = 4
+ },
+/turf/simulated/wall/rpshull,
+/area/shuttle/curabitur/curashuttle/eng)
+"tI" = (
+/obj/machinery/power/smes/buildable/point_of_interest,
+/obj/structure/cable{
+ icon_state = "0-9"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"MI" = (
+/obj/machinery/power/port_gen/pacman/mrs{
+ anchored = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-9"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/curabitur/curashuttle/eng)
+"OD" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/machinery/atmospherics/portables_connector{
+ dir = 8
+ },
+/obj/machinery/portable_atmospherics/canister/phoron{
+ start_pressure = 8000.25
+ },
+/turf/simulated/floor/tiled/monofloor{
+ dir = 8
+ },
+/area/shuttle/curabitur/curashuttle/eng)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(2,1,1) = {"
+aa
+aa
+aa
+ag
+az
+az
+az
+az
+az
+az
+bj
+bj
+bj
+az
+bN
+bN
+bN
+bN
+bN
+cC
+aa
+aa
+aa
+"}
+(3,1,1) = {"
+aa
+ab
+ab
+ab
+ar
+aA
+aJ
+aR
+aZ
+bd
+bk
+bo
+br
+bB
+bO
+aY
+cd
+cn
+cu
+bN
+bN
+aa
+aa
+"}
+(4,1,1) = {"
+aa
+aa
+ae
+ah
+as
+as
+as
+as
+as
+bd
+as
+as
+bs
+bC
+bO
+bU
+ce
+co
+cv
+cD
+cO
+aa
+aa
+"}
+(5,1,1) = {"
+aa
+aa
+ae
+ai
+as
+aB
+aK
+aS
+as
+bd
+bl
+bl
+bl
+bD
+bP
+bV
+cf
+cp
+cw
+cE
+cM
+aa
+aa
+"}
+(6,1,1) = {"
+aa
+aa
+ab
+aj
+as
+aC
+ca
+bm
+as
+bd
+bl
+bl
+bt
+bE
+bO
+bT
+cg
+cq
+cx
+cE
+cM
+aa
+aa
+"}
+(7,1,1) = {"
+aa
+ab
+ab
+ak
+as
+as
+as
+as
+as
+bd
+bl
+bp
+bu
+bF
+bO
+dF
+ch
+ic
+cy
+cG
+cP
+aa
+aa
+"}
+(8,1,1) = {"
+aa
+ac
+ab
+al
+au
+aD
+aM
+aT
+ba
+bd
+bl
+bl
+bv
+bG
+bO
+bX
+OD
+tI
+MI
+qN
+bN
+aa
+aa
+"}
+(9,1,1) = {"
+aa
+ad
+ad
+am
+am
+am
+am
+aU
+am
+be
+cz
+bl
+bw
+bH
+bQ
+bY
+bO
+bO
+bO
+qN
+cP
+aa
+aa
+"}
+(10,1,1) = {"
+aa
+aa
+af
+an
+av
+aE
+at
+aV
+bb
+bf
+bl
+bl
+bx
+bI
+bR
+bZ
+cj
+cr
+cL
+cI
+cM
+aa
+aa
+"}
+(11,1,1) = {"
+aa
+aa
+af
+ao
+aw
+aF
+aO
+aW
+bc
+bg
+bg
+bg
+by
+bJ
+bQ
+cF
+ck
+cs
+cA
+cI
+cM
+aa
+aa
+"}
+(12,1,1) = {"
+aa
+aa
+af
+ap
+ax
+aG
+aP
+aX
+bb
+bh
+bl
+bl
+bl
+bK
+bQ
+cb
+cl
+cr
+cB
+cJ
+cO
+aa
+aa
+"}
+(13,1,1) = {"
+aa
+ad
+ad
+ad
+ay
+aH
+aQ
+aN
+aI
+bi
+bl
+bl
+aL
+bL
+bQ
+cc
+cm
+cr
+cN
+bS
+bN
+aa
+aa
+"}
+(14,1,1) = {"
+aa
+aa
+aa
+aq
+aI
+aI
+aI
+aI
+aI
+az
+bn
+bn
+bA
+bM
+bS
+bS
+bS
+ct
+ct
+cK
+aa
+aa
+aa
+"}
+(15,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
diff --git a/nano/templates/agent_id_card.tmpl b/nano/templates/agent_id_card.tmpl
index 7a41dcdf1b..a802efbc82 100644
--- a/nano/templates/agent_id_card.tmpl
+++ b/nano/templates/agent_id_card.tmpl
@@ -1,21 +1,21 @@
-
-{{:helper.syndicateMode()}}
-
+ Name:
+
+
+ {{:value.name}}
+
+
+ Actions:
+
+
+ {{:helper.link('OPEN', null, { "PRG_openarticle" : value.uid })}}
+
+ Available Entries
-| {{:helper.link('', 'gear', {'set' : value.name})}} | {{:value.name}} | {{:value.value}} | -
| Electronic warfare: | -{{:helper.link('Enabled', null, {'electronic_warfare' : 1}, data.electronic_warfare ? 'selected' : null)}} | -{{:helper.link('Disabled',null, {'electronic_warfare' : 0}, data.electronic_warfare ? null : 'selected')}} | -
Available Entries
+| {{:helper.link('', 'gear', {'set' : value.name})}} | {{:value.name}} | {{:value.value}} | +
| Electronic warfare: | +{{:helper.link('Enabled', null, {'electronic_warfare' : 1}, data.electronic_warfare ? 'selected' : null)}} | +{{:helper.link('Disabled',null, {'electronic_warfare' : 0}, data.electronic_warfare ? null : 'selected')}} | +
-
-
-
- Main power is
- {{if data.main_power_loss == 0}}
- online
- {{else data.main_power_loss == -1}}
- offline
- {{else}}
- offline for {{:data.main_power_loss}} second{{:data.main_power_loss == 1 ? '' : 's'}}
- {{/if}}.
-
-
- {{:helper.link(data.main_power_loss ? 'Disabled' : 'Disable', null, {'command' : 'main_power'}, data.main_power_loss == 0 ? null : 'disabled', data.main_power_loss == 0 ? 'redButton' : null)}}
-
-
-
-
-
- Backup power is
- {{if data.backup_power_loss == 0}}
- online
- {{else data.backup_power_loss == -1}}
- offline
- {{else}}
- offline for {{:data.backup_power_loss}} second{{:data.backup_power_loss == 1 ? '' : 's'}}
- {{/if}}.
-
-
- {{:helper.link(data.backup_power_loss ? 'Disabled' : 'Disable', null, {'command' : 'backup_power'}, data.backup_power_loss == 0 ? null : 'disabled', data.backup_power_loss == 0 ? 'redButton' : null)}}
-
-
-
-
-
- Electrified Status:
-
-
- {{:helper.link('Offline' , null, {'command' : 'electrify_permanently', 'activate' : "0" }, data.electrified == 0 ? 'selected' : null)}}
- {{:helper.link(data.electrified <= 0 ? 'Temporary (30s)' : 'Temporary (' + data.electrified +'s)', null, {'command' : 'electrify_temporary', 'activate' : "1"}, data.electrified > 0 ? 'redButton' : null)}}
- {{:helper.link('Permanent', null, {'command' : 'electrify_permanently', 'activate' : "1"}, data.electrified == -1 ? 'redButton' : null)}}
-
-- -
| {{:value.name}}: | -{{:helper.link(value.enabled, null, {'command' : value.command, 'activate' : value.act ? 1 : 0}, value.active ? 'selected' : null)}} | -{{:helper.link(value.disabled,null, {'command' : value.command, 'activate' : value.act ? 0 : 1}, !value.active ? (value.danger ? 'redButton' : 'selected') : null)}} | -
+
+
+
+ Main power is
+ {{if data.main_power_loss == 0}}
+ online
+ {{else data.main_power_loss == -1}}
+ offline
+ {{else}}
+ offline for {{:data.main_power_loss}} second{{:data.main_power_loss == 1 ? '' : 's'}}
+ {{/if}}.
+
+
+ {{:helper.link(data.main_power_loss ? 'Disabled' : 'Disable', null, {'command' : 'main_power'}, data.main_power_loss == 0 ? null : 'disabled', data.main_power_loss == 0 ? 'redButton' : null)}}
+
+
+
+
+
+ Backup power is
+ {{if data.backup_power_loss == 0}}
+ online
+ {{else data.backup_power_loss == -1}}
+ offline
+ {{else}}
+ offline for {{:data.backup_power_loss}} second{{:data.backup_power_loss == 1 ? '' : 's'}}
+ {{/if}}.
+
+
+ {{:helper.link(data.backup_power_loss ? 'Disabled' : 'Disable', null, {'command' : 'backup_power'}, data.backup_power_loss == 0 ? null : 'disabled', data.backup_power_loss == 0 ? 'redButton' : null)}}
+
+
+
+
+
+ Electrified Status:
+
+
+ {{:helper.link('Offline' , null, {'command' : 'electrify_permanently', 'activate' : "0" }, data.electrified == 0 ? 'selected' : null)}}
+ {{:helper.link(data.electrified <= 0 ? 'Temporary (30s)' : 'Temporary (' + data.electrified +'s)', null, {'command' : 'electrify_temporary', 'activate' : "1"}, data.electrified > 0 ? 'redButton' : null)}}
+ {{:helper.link('Permanent', null, {'command' : 'electrify_permanently', 'activate' : "1"}, data.electrified == -1 ? 'redButton' : null)}}
+
++ +
| {{:value.name}}: | +{{:helper.link(value.enabled, null, {'command' : value.command, 'activate' : value.act ? 1 : 0}, value.active ? 'selected' : null)}} | +{{:helper.link(value.disabled,null, {'command' : value.command, 'activate' : value.act ? 0 : 1}, !value.active ? (value.danger ? 'redButton' : 'selected') : null)}} | +
Shuttle Blast Door Control
- -
- {{:helper.link('Open all doors', 'radio-on', {'cartridge_topic' : 1, 'all_blast_doors' : "open"})}}
- {{:helper.link('Close all doors', 'radio-off', {'cartridge_topic' : 1, 'all_blast_doors' : "close"})}}
-
-
- {{:helper.link('Scan for doors', 'refresh', {'cartridge_topic' : 1, 'scan_blast_doors' : 1})}}
-
-
-{{for data.blast_door}}
-
-
-{{empty}}
-
- {{:value.name}} #{{:index}}
-
-
- {{:helper.link('On', 'radio-on', {'cartridge_topic' : 1, 'toggle_blast_door' : value.ref}, value.open ? 'selected' : null)}}
- {{:helper.link('Off', 'radio-off', {'cartridge_topic' : 1, 'toggle_blast_door' : value.ref}, value.open ? null : 'selected')}}
-
- No doors detected!
+Shuttle Blast Door Control
+ +
+ {{:helper.link('Open all doors', 'radio-on', {'cartridge_topic' : 1, 'all_blast_doors' : "open"})}}
+ {{:helper.link('Close all doors', 'radio-off', {'cartridge_topic' : 1, 'all_blast_doors' : "close"})}}
+
+
+ {{:helper.link('Scan for doors', 'refresh', {'cartridge_topic' : 1, 'scan_blast_doors' : 1})}}
+
+
+{{for data.blast_door}}
+
+
+{{empty}}
+
+ {{:value.name}} #{{:index}}
+
+
+ {{:helper.link('On', 'radio-on', {'cartridge_topic' : 1, 'toggle_blast_door' : value.ref}, value.open ? 'selected' : null)}}
+ {{:helper.link('Off', 'radio-off', {'cartridge_topic' : 1, 'toggle_blast_door' : value.ref}, value.open ? null : 'selected')}}
+
+ No doors detected!
{{/for}} \ No newline at end of file diff --git a/nano/templates/photocopier.tmpl b/nano/templates/photocopier.tmpl index 9ced6b63d1..99442fa32a 100644 --- a/nano/templates/photocopier.tmpl +++ b/nano/templates/photocopier.tmpl @@ -1,45 +1,45 @@ - - -{{if data.copyItem || data.assPresent}} -
- {{:helper.link('Remove Item', 'eject', {'remove' : 1})}}
- {{if data.toner}}
- {{:helper.link('Copy', 'copy', {'copy' : 1})}}
-
-
-{{else data.toner}}
-
-
-
- Printing:
-
-
-
-
- {{:helper.link('-', null, {'min' : 1}, data.copies == 1 ? 'linkOff' : null)}}
-
- {{:data.copies}}
- {{:helper.link('+', null, {'add' : 1}, data.copies == data.maxCopies ? 'linkOff' : null)}}
- -
-
- {{else}}
- Please insert a new toner cartridge!
- {{/if}}
- Current toner level:
- {{:data.toner}}u
- Please insert something to copy.
- {{if data.isSilicon}} - {{:helper.link('Print photo from database', 'image', {'aipic' : 1})}} - {{/if}} -
-
-{{else}}
- Current toner level:
- {{:data.toner}}u
-
- Please insert a new toner cartridge!
-
+
+
+{{if data.copyItem || data.assPresent}}
+
+ {{:helper.link('Remove Item', 'eject', {'remove' : 1})}}
+ {{if data.toner}}
+ {{:helper.link('Copy', 'copy', {'copy' : 1})}}
+
+
+{{else data.toner}}
+
+
+
+ Printing:
+
+
+
+
+ {{:helper.link('-', null, {'min' : 1}, data.copies == 1 ? 'linkOff' : null)}}
+
+ {{:data.copies}}
+ {{:helper.link('+', null, {'add' : 1}, data.copies == data.maxCopies ? 'linkOff' : null)}}
+ +
+
+ {{else}}
+ Please insert a new toner cartridge!
+ {{/if}}
+ Current toner level:
+ {{:data.toner}}u
+ Please insert something to copy.
+ {{if data.isSilicon}} + {{:helper.link('Print photo from database', 'image', {'aipic' : 1})}} + {{/if}} +
+
+{{else}}
+ Current toner level:
+ {{:data.toner}}u
+
+ Please insert a new toner cartridge!
+
{{/if}}
\ No newline at end of file
diff --git a/nano/templates/stat_display_access.tmpl b/nano/templates/stat_display_access.tmpl
index 20655bb709..1f1c8e0492 100644
--- a/nano/templates/stat_display_access.tmpl
+++ b/nano/templates/stat_display_access.tmpl
@@ -1,57 +1,57 @@
-Station Status Display Interlink
- -
-
-
- Code
-
-
- {{:helper.link('Clear Message', 'trash', {'cartridge_topic' : "1", 'stat_display' : "blank"}, (data.stat_display.active == "blank") ? 'selected' : null)}}
- {{:helper.link('Clear Alert', 'alert', {'cartridge_topic' : "1", 'choice' : "Status", 'stat_display' : "alert", 'alert' : "default"}, (data.stat_display.active == "default") ? 'selected' : null)}}
-
-
-
-
- Message
-
-
- {{:helper.link('Shuttle ETA', 'gear', {'cartridge_topic' : "1", 'stat_display' : "shuttle"}, (data.stat_display.active == "shuttle") ? 'selected' : null)}}
- {{:helper.link('Set Message', 'gear', {'cartridge_topic' : "1", 'stat_display' : "message"}, (data.stat_display.active == "message") ? 'selected' : null)}}
-
-
-
-{{if data.stat_display.line1 != data.stat_display.active_line1 || data.stat_display.line2 != data.stat_display.active_line2}}
-
- Alert
-
-
- {{:helper.link('Red Alert', 'alert', {'cartridge_topic' : "1", 'choice' : "Status", 'stat_display' : "alert", 'alert' : "redalert"}, (data.stat_display.active == "redalert") ? 'selected' : null)}}
- {{:helper.link('Lockdown', 'caution', {'cartridge_topic' : "1", 'choice' : "Status", 'stat_display' : "alert", 'alert' : "lockdown"}, (data.stat_display.active == "lockdown") ? 'selected' : null)}}
- {{:helper.link('Biohazard', 'radiation', {'cartridge_topic' : "1", 'choice' : "Status", 'stat_display' : "alert", 'alert' : "biohazard"}, (data.stat_display.active == "biohazard") ? 'selected' : null)}}
-
-
-
-{{/if}}
-
- Active Message:
-
-
- {{:data.stat_display.active_line1}}
- {{:data.stat_display.active_line2}} -
- - {{:data.stat_display.active_line2}} -
-
-
- Stored line 1
-
-
- {{:helper.link(data.stat_display.line1 + ' (set)', 'pencil', {'cartridge_topic' : "1", 'stat_display' : "setmsg", 'line' : "1"}, null, null)}}
-
-
-
+
- Stored line 2
-
-
- {{:helper.link(data.stat_display.line2 + ' (set)', 'pencil', {'cartridge_topic' : "1", 'stat_display' : "setmsg", 'line' : "2"}, null, null)}}
-
-Station Status Display Interlink
+ +
+
+
+ Code
+
+
+ {{:helper.link('Clear Message', 'trash', {'cartridge_topic' : "1", 'stat_display' : "blank"}, (data.stat_display.active == "blank") ? 'selected' : null)}}
+ {{:helper.link('Clear Alert', 'alert', {'cartridge_topic' : "1", 'choice' : "Status", 'stat_display' : "alert", 'alert' : "default"}, (data.stat_display.active == "default") ? 'selected' : null)}}
+
+
+
+
+ Message
+
+
+ {{:helper.link('Shuttle ETA', 'gear', {'cartridge_topic' : "1", 'stat_display' : "shuttle"}, (data.stat_display.active == "shuttle") ? 'selected' : null)}}
+ {{:helper.link('Set Message', 'gear', {'cartridge_topic' : "1", 'stat_display' : "message"}, (data.stat_display.active == "message") ? 'selected' : null)}}
+
+
+
+{{if data.stat_display.line1 != data.stat_display.active_line1 || data.stat_display.line2 != data.stat_display.active_line2}}
+
+ Alert
+
+
+ {{:helper.link('Red Alert', 'alert', {'cartridge_topic' : "1", 'choice' : "Status", 'stat_display' : "alert", 'alert' : "redalert"}, (data.stat_display.active == "redalert") ? 'selected' : null)}}
+ {{:helper.link('Lockdown', 'caution', {'cartridge_topic' : "1", 'choice' : "Status", 'stat_display' : "alert", 'alert' : "lockdown"}, (data.stat_display.active == "lockdown") ? 'selected' : null)}}
+ {{:helper.link('Biohazard', 'radiation', {'cartridge_topic' : "1", 'choice' : "Status", 'stat_display' : "alert", 'alert' : "biohazard"}, (data.stat_display.active == "biohazard") ? 'selected' : null)}}
+
+
+
+{{/if}}
+
+ Active Message:
+
+
+ {{:data.stat_display.active_line1}}
+ {{:data.stat_display.active_line2}} +
+ + {{:data.stat_display.active_line2}} +
+
+
+ Stored line 1
+
+
+ {{:helper.link(data.stat_display.line1 + ' (set)', 'pencil', {'cartridge_topic' : "1", 'stat_display' : "setmsg", 'line' : "1"}, null, null)}}
+
+
+
diff --git a/nano/templates/turret_control.tmpl b/nano/templates/turret_control.tmpl
index a529bcbb10..944f4a73d3 100644
--- a/nano/templates/turret_control.tmpl
+++ b/nano/templates/turret_control.tmpl
@@ -1,41 +1,41 @@
-
+ Stored line 2
+
+
+ {{:helper.link(data.stat_display.line2 + ' (set)', 'pencil', {'cartridge_topic' : "1", 'stat_display' : "setmsg", 'line' : "2"}, null, null)}}
+
+
-
-
- Behaviour controls are {{:data.locked ? "locked" : "unlocked"}}.
-
--{{if data.access}} -
-
-
- {{if data.is_lethal}}
-
- Turret Status:
-
-
- {{:helper.link('Enabled', null, {'command' : 'enable', 'value' : 1}, data.enabled ?'redButton' : null)}}
- {{:helper.link('Disabled',null, {'command' : 'enable', 'value' : 0}, !data.enabled ? 'selected' : null)}}
-
-
-
- {{/if}}
-
- {{for data.settings}}
-
- Lethal Mode:
-
-
- {{:helper.link('On', null, {'command' : 'lethal', 'value' : 1}, data.lethal ?'redButton' : null)}}
- {{:helper.link('Off',null, {'command' : 'lethal', 'value' : 0}, !data.lethal ? 'selected' : null)}}
-
-
-
- {{/for}}
-{{/if}}
+
- {{:value.category}}
-
-
- {{:helper.link('On', null, {'command' : value.setting, 'value' : 1}, value.value ? 'selected' : null)}}
- {{:helper.link('Off',null, {'command' : value.setting, 'value' : 0}, !value.value ? 'selected' : null)}}
-
-
+
+
+ Behaviour controls are {{:data.locked ? "locked" : "unlocked"}}.
+
++{{if data.access}} +
+
+
+ {{if data.is_lethal}}
+
+ Turret Status:
+
+
+ {{:helper.link('Enabled', null, {'command' : 'enable', 'value' : 1}, data.enabled ?'redButton' : null)}}
+ {{:helper.link('Disabled',null, {'command' : 'enable', 'value' : 0}, !data.enabled ? 'selected' : null)}}
+
+
+
+ {{/if}}
+
+ {{for data.settings}}
+
+ Lethal Mode:
+
+
+ {{:helper.link('On', null, {'command' : 'lethal', 'value' : 1}, data.lethal ?'redButton' : null)}}
+ {{:helper.link('Off',null, {'command' : 'lethal', 'value' : 0}, !data.lethal ? 'selected' : null)}}
+
+
+
+ {{/for}}
+{{/if}}
diff --git a/nano/templates/uplink.tmpl b/nano/templates/uplink.tmpl
index 0773883d70..10991da754 100644
--- a/nano/templates/uplink.tmpl
+++ b/nano/templates/uplink.tmpl
@@ -1,177 +1,177 @@
-
-
-{{:helper.syndicateMode()}}
-
-
-
-
+ {{:value.category}}
+
+
+ {{:helper.link('On', null, {'command' : value.setting, 'value' : 1}, value.value ? 'selected' : null)}}
+ {{:helper.link('Off',null, {'command' : value.setting, 'value' : 0}, !value.value ? 'selected' : null)}}
+
+ {{:data.welcome}}
--
-
-
- Functions:
-
-
-
-
- {{:helper.link('Request Items', 'gear', {'menu' : 0}, null, 'fixedLeftWider')}}
- {{:helper.link('Exploitable Information', 'gear', {'menu' : 2}, null, 'fixedLeftWider')}}
-
-
- {{:helper.link('Return', 'arrowreturn-1-w', {'return' : 1}, null, 'fixedLeft')}}
- {{:helper.link('Close', 'gear', {'lock' : "1"}, null, 'fixedLeft')}}
-
- - -
-
-
-
-{{if data.menu == 0}}
- {{if data.discount_amount < 100}}
-
- Tele-Crystals:
-
-
- {{:data.crystals}}
-
-
-
- {{/if}}
-
-
- Currently discounted:
-
-
- {{:data.discount_name}} - {{:data.discount_amount}}% off. Offer will expire at: {{:data.offer_expiry}}
-
-
-
-
- Categories
- {{for data.categories}}
-
- {{:helper.link(value.name, 'gear', {'category' : value.ref}, (value.name == data.current_category) ? 'categoryActive' : '', 'category')}}
-
- {{/for}}
-
-
-
-{{else data.menu == 2}}
-
- Request Items
-
-
-
-
-
-
- {{for data.items}}
-
-
-
- {{/for}}
-
-
-
- {{:helper.link(value.name, 'gear', {'buy_item' : value.ref}, value.can_buy ? null : 'disabled')}}
-
- {{:value.cost}} points
- Information Record List:
--
- Select a Record
-
- - {{for data.exploit_records}} -
- {{:helper.link(value.Name, 'gear', {'menu' : 21, 'id' : value.id}, null, null)}}
-
- {{/for}}
-{{else data.menu == 21}}
- Information Record:
--
-
-{{/if}}
+
+
+{{:helper.syndicateMode()}}
+
+
+
+
-
-
- {{if data.exploit_exists == 1}}
- Name: {{:data.exploit.name}}
- Sex: {{:data.exploit.sex}}
- Species: {{:data.exploit.species}}
- Age: {{:data.exploit.age}}
- Rank: {{:data.exploit.rank}}
- Home System: {{:data.exploit.home_system}}
- Citizenship: {{:data.exploit.citizenship}}
- Faction: {{:data.exploit.faction}}
- Religion: {{:data.exploit.religion}}
- Fingerprint: {{:data.exploit.fingerprint}}
- Other Affiliation: {{:data.exploit.antagfaction}}
- -
Acquired Information:
- Notes:
{{:data.exploit.nanoui_exploit_record}}
- {{else}} - - No exploitative information acquired! -
-
- - {{/if}} -
- - Sex: {{:data.exploit.sex}}
- Species: {{:data.exploit.species}}
- Age: {{:data.exploit.age}}
- Rank: {{:data.exploit.rank}}
- Home System: {{:data.exploit.home_system}}
- Citizenship: {{:data.exploit.citizenship}}
- Faction: {{:data.exploit.faction}}
- Religion: {{:data.exploit.religion}}
- Fingerprint: {{:data.exploit.fingerprint}}
- Other Affiliation: {{:data.exploit.antagfaction}}
- -
Acquired Information:
- Notes:
{{:data.exploit.nanoui_exploit_record}}
- {{else}} - - No exploitative information acquired! -
-
- - {{/if}} -
{{:data.welcome}}
++
+
+
+ Functions:
+
+
+
+
+ {{:helper.link('Request Items', 'gear', {'menu' : 0}, null, 'fixedLeftWider')}}
+ {{:helper.link('Exploitable Information', 'gear', {'menu' : 2}, null, 'fixedLeftWider')}}
+
+
+ {{:helper.link('Return', 'arrowreturn-1-w', {'return' : 1}, null, 'fixedLeft')}}
+ {{:helper.link('Close', 'gear', {'lock' : "1"}, null, 'fixedLeft')}}
+
+ + +
+
+
+
+{{if data.menu == 0}}
+ {{if data.discount_amount < 100}}
+
+ Tele-Crystals:
+
+
+ {{:data.crystals}}
+
+
+
+ {{/if}}
+
+
+ Currently discounted:
+
+
+ {{:data.discount_name}} - {{:data.discount_amount}}% off. Offer will expire at: {{:data.offer_expiry}}
+
+
+
+
+ Categories
+ {{for data.categories}}
+
+ {{:helper.link(value.name, 'gear', {'category' : value.ref}, (value.name == data.current_category) ? 'categoryActive' : '', 'category')}}
+
+ {{/for}}
+
+
+
+{{else data.menu == 2}}
+
+ Request Items
+
+
+
+
+
+
+ {{for data.items}}
+
+
+
+ {{/for}}
+
+
+
+ {{:helper.link(value.name, 'gear', {'buy_item' : value.ref}, value.can_buy ? null : 'disabled')}}
+
+ {{:value.cost}} points
+ Information Record List:
++
+ Select a Record
+
+ + {{for data.exploit_records}} +
+ {{:helper.link(value.Name, 'gear', {'menu' : 21, 'id' : value.id}, null, null)}}
+
+ {{/for}}
+{{else data.menu == 21}}
+ Information Record:
++
+
+{{/if}}
diff --git a/sound/items/drop/generic1.ogg b/sound/items/drop/generic1.ogg
new file mode 100644
index 0000000000..c2195b1e24
Binary files /dev/null and b/sound/items/drop/generic1.ogg differ
diff --git a/sound/items/drop/generic2.ogg b/sound/items/drop/generic2.ogg
new file mode 100644
index 0000000000..ac0bd3710f
Binary files /dev/null and b/sound/items/drop/generic2.ogg differ
diff --git a/sound/items/pickup/clothing.ogg b/sound/items/pickup/clothing.ogg
new file mode 100644
index 0000000000..568fe73341
Binary files /dev/null and b/sound/items/pickup/clothing.ogg differ
diff --git a/sound/items/pickup/generic1.ogg b/sound/items/pickup/generic1.ogg
new file mode 100644
index 0000000000..64f37c6dd9
Binary files /dev/null and b/sound/items/pickup/generic1.ogg differ
diff --git a/sound/items/pickup/generic2.ogg b/sound/items/pickup/generic2.ogg
new file mode 100644
index 0000000000..57092778f2
Binary files /dev/null and b/sound/items/pickup/generic2.ogg differ
diff --git a/sound/items/pickup/generic3.ogg b/sound/items/pickup/generic3.ogg
new file mode 100644
index 0000000000..be46e77242
Binary files /dev/null and b/sound/items/pickup/generic3.ogg differ
diff --git a/sound/items/pickup/soda.ogg b/sound/items/pickup/soda.ogg
index f19a06ec75..5a342af320 100644
Binary files a/sound/items/pickup/soda.ogg and b/sound/items/pickup/soda.ogg differ
diff --git a/sound/voice/complionator/asshole.ogg b/sound/voice/complionator/asshole.ogg
new file mode 100644
index 0000000000..9ee40942c4
Binary files /dev/null and b/sound/voice/complionator/asshole.ogg differ
diff --git a/sound/voice/complionator/bash.ogg b/sound/voice/complionator/bash.ogg
new file mode 100644
index 0000000000..e79a2cd1e1
Binary files /dev/null and b/sound/voice/complionator/bash.ogg differ
diff --git a/sound/voice/complionator/bobby.ogg b/sound/voice/complionator/bobby.ogg
new file mode 100644
index 0000000000..4bc8f8df94
Binary files /dev/null and b/sound/voice/complionator/bobby.ogg differ
diff --git a/sound/voice/complionator/compliance.ogg b/sound/voice/complionator/compliance.ogg
new file mode 100644
index 0000000000..fcfb608202
Binary files /dev/null and b/sound/voice/complionator/compliance.ogg differ
diff --git a/sound/voice/complionator/dontmove.ogg b/sound/voice/complionator/dontmove.ogg
new file mode 100644
index 0000000000..09cefea9d6
Binary files /dev/null and b/sound/voice/complionator/dontmove.ogg differ
diff --git a/sound/voice/complionator/dredd.ogg b/sound/voice/complionator/dredd.ogg
new file mode 100644
index 0000000000..ab434dbfde
Binary files /dev/null and b/sound/voice/complionator/dredd.ogg differ
diff --git a/sound/voice/complionator/floor.ogg b/sound/voice/complionator/floor.ogg
new file mode 100644
index 0000000000..996dd0f54a
Binary files /dev/null and b/sound/voice/complionator/floor.ogg differ
diff --git a/sound/voice/complionator/freeze.ogg b/sound/voice/complionator/freeze.ogg
new file mode 100644
index 0000000000..d4224be839
Binary files /dev/null and b/sound/voice/complionator/freeze.ogg differ
diff --git a/sound/voice/complionator/god.ogg b/sound/voice/complionator/god.ogg
new file mode 100644
index 0000000000..8e1a54d268
Binary files /dev/null and b/sound/voice/complionator/god.ogg differ
diff --git a/sound/voice/complionator/halt.ogg b/sound/voice/complionator/halt.ogg
new file mode 100644
index 0000000000..81563b928f
Binary files /dev/null and b/sound/voice/complionator/halt.ogg differ
diff --git a/sound/voice/complionator/harry.ogg b/sound/voice/complionator/harry.ogg
new file mode 100644
index 0000000000..eae132675e
Binary files /dev/null and b/sound/voice/complionator/harry.ogg differ
diff --git a/sound/voice/complionator/imperial.ogg b/sound/voice/complionator/imperial.ogg
new file mode 100644
index 0000000000..903cf1197c
Binary files /dev/null and b/sound/voice/complionator/imperial.ogg differ
diff --git a/sound/voice/complionator/justice.ogg b/sound/voice/complionator/justice.ogg
new file mode 100644
index 0000000000..2aef43b150
Binary files /dev/null and b/sound/voice/complionator/justice.ogg differ
diff --git a/sound/voice/complionator/robocop.ogg b/sound/voice/complionator/robocop.ogg
new file mode 100644
index 0000000000..4dec421ed0
Binary files /dev/null and b/sound/voice/complionator/robocop.ogg differ
diff --git a/sound/voice/complionator/running.ogg b/sound/voice/complionator/running.ogg
new file mode 100644
index 0000000000..3711ce6ccf
Binary files /dev/null and b/sound/voice/complionator/running.ogg differ
diff --git a/sound/voice/complionator/shutup.ogg b/sound/voice/complionator/shutup.ogg
new file mode 100644
index 0000000000..ecd2b02015
Binary files /dev/null and b/sound/voice/complionator/shutup.ogg differ
diff --git a/sound/voice/complionator/stfu.ogg b/sound/voice/complionator/stfu.ogg
new file mode 100644
index 0000000000..9c3fcf675b
Binary files /dev/null and b/sound/voice/complionator/stfu.ogg differ
diff --git a/sound/voice/complionator/super.ogg b/sound/voice/complionator/super.ogg
new file mode 100644
index 0000000000..8bae406dea
Binary files /dev/null and b/sound/voice/complionator/super.ogg differ
diff --git a/tgui/packages/common/string.js b/tgui/packages/common/string.js
index a3da0885a1..405693a0d2 100644
--- a/tgui/packages/common/string.js
+++ b/tgui/packages/common/string.js
@@ -120,10 +120,11 @@ export const decodeHtmlEntities = str => {
if (!str) {
return str;
}
- const translate_re = /&(nbsp|amp|quot|lt|gt|apos|trade);/g;
+ const translate_re = /&(nbsp|amp|deg|quot|lt|gt|apos|trade);/g;
const translate = {
nbsp: ' ',
amp: '&',
+ deg: '°',
quot: '"',
lt: '<',
gt: '>',
diff --git a/tgui/packages/tgui/components/Box.js b/tgui/packages/tgui/components/Box.js
index a53fa1e8fd..31bade2634 100644
--- a/tgui/packages/tgui/components/Box.js
+++ b/tgui/packages/tgui/components/Box.js
@@ -104,6 +104,7 @@ const styleMapperByPropName = {
verticalAlign: mapRawPropTo('vertical-align'),
textTransform: mapRawPropTo('text-transform'),
wordWrap: mapRawPropTo('word-wrap'),
+ unselectable: mapRawPropTo('unselectable'),
// Boolean props
inline: mapBooleanPropTo('display', 'inline-block'),
bold: mapBooleanPropTo('font-weight', 'bold'),
diff --git a/tgui/packages/tgui/components/Button.js b/tgui/packages/tgui/components/Button.js
index ced7bd13bd..876435c892 100644
--- a/tgui/packages/tgui/components/Button.js
+++ b/tgui/packages/tgui/components/Button.js
@@ -20,6 +20,10 @@ export const Button = props => {
className,
fluid,
icon,
+ iconRotation,
+ iconSpin,
+ iconColor,
+ iconSize,
color,
disabled,
selected,
@@ -27,11 +31,9 @@ export const Button = props => {
tooltipPosition,
tooltipScale,
ellipsis,
+ compact,
+ circular,
content,
- iconRotation,
- iconSpin,
- iconColor,
- iconSize,
children,
onclick,
onClick,
@@ -57,6 +59,8 @@ export const Button = props => {
selected && 'Button--selected',
hasContent && 'Button--hasContent',
ellipsis && 'Button--ellipsis',
+ circular && 'Button--circular',
+ compact && 'Button--compact',
(color && typeof color === 'string')
? 'Button--color--' + color
: 'Button--color--default',
diff --git a/tgui/packages/tgui/components/NanoMap.js b/tgui/packages/tgui/components/NanoMap.js
index 261fb8b1d3..2d7f969890 100644
--- a/tgui/packages/tgui/components/NanoMap.js
+++ b/tgui/packages/tgui/components/NanoMap.js
@@ -1,38 +1,44 @@
-import { Box, Icon, Tooltip } from '.';
import { Component } from 'inferno';
+import { Box, Button, Icon, Tooltip, LabeledList, Slider } from '.';
import { useBackend } from "../backend";
-import { resolveAsset } from '../assets';
-import { logger } from '../logging';
+
+const pauseEvent = e => {
+ if (e.stopPropagation) { e.stopPropagation(); }
+ if (e.preventDefault) { e.preventDefault(); }
+ e.cancelBubble = true;
+ e.returnValue = false;
+ return false;
+};
export class NanoMap extends Component {
constructor(props) {
super(props);
// Auto center based on window size
+ const Xcenter = (window.innerWidth / 2) - 256;
+ const Ycenter = (window.innerHeight / 2) - 256;
+
this.state = {
- offsetX: 0,
- offsetY: 0,
+ offsetX: Xcenter,
+ offsetY: Ycenter,
transform: 'none',
dragging: false,
originX: null,
originY: null,
+ zoom: 1,
};
+ // Dragging
this.handleDragStart = e => {
- document.body.style['pointer-events'] = 'none';
this.ref = e.target;
this.setState({
dragging: false,
originX: e.screenX,
originY: e.screenY,
});
- this.timer = setTimeout(() => {
- this.setState({
- dragging: true,
- });
- }, 250);
document.addEventListener('mousemove', this.handleDragMove);
document.addEventListener('mouseup', this.handleDragEnd);
+ pauseEvent(e);
};
this.handleDragMove = e => {
@@ -41,8 +47,8 @@ export class NanoMap extends Component {
const newOffsetX = e.screenX - state.originX;
const newOffsetY = e.screenY - state.originY;
if (prevState.dragging) {
- state.offsetX += (newOffsetX / this.props.zoom);
- state.offsetY += (newOffsetY / this.props.zoom);
+ state.offsetX += newOffsetX;
+ state.offsetY += newOffsetY;
state.originX = e.screenX;
state.originY = e.screenY;
} else {
@@ -50,11 +56,10 @@ export class NanoMap extends Component {
}
return state;
});
+ pauseEvent(e);
};
this.handleDragEnd = e => {
- document.body.style['pointer-events'] = 'auto';
- clearTimeout(this.timer);
this.setState({
dragging: false,
originX: null,
@@ -62,28 +67,54 @@ export class NanoMap extends Component {
});
document.removeEventListener('mousemove', this.handleDragMove);
document.removeEventListener('mouseup', this.handleDragEnd);
+ pauseEvent(e);
};
+
+ this.handleZoom = (_e, value) => {
+ this.setState(state => {
+ const newZoom = Math.min(Math.max(value, 1), 8);
+ let zoomDiff = (newZoom - state.zoom) * 1.5;
+ state.zoom = newZoom;
+
+ let newOffsetX = state.offsetX - 262 * zoomDiff;
+ if (newOffsetX < -500) { newOffsetX = -500; }
+ if (newOffsetX > 500) { newOffsetX = 500; }
+
+ let newOffsetY = state.offsetY - 256 * zoomDiff;
+ if (newOffsetY < -200) { newOffsetY = -200; }
+ if (newOffsetY > 200) { newOffsetY = 200; }
+
+ state.offsetX = newOffsetX;
+ state.offsetY = newOffsetY;
+ if (props.onZoom) {
+ props.onZoom(state.zoom);
+ }
+ return state;
+ });
+ };
+
}
render() {
const { config } = useBackend(this.context);
- const { offsetX, offsetY } = this.state;
- const { children, zoom, reset } = this.props;
+ const { dragging, offsetX, offsetY, zoom = 1 } = this.state;
+ const { children } = this.props;
- let matrix
- = `matrix(${zoom}, 0, 0, ${zoom}, ${offsetX * zoom}, ${offsetY * zoom})`;
-
+ const mapUrl = config.map + "_nanomap_z" + config.mapZLevel + ".png";
+ // (x * zoom), x Needs to be double the turf- map size. (for virgo, 140x140)
+ const mapSize = (280 * zoom) + 'px';
const newStyle = {
- width: '560px',
- height: '560px',
+ width: mapSize,
+ height: mapSize,
+ "margin-top": offsetY + "px",
+ "margin-left": offsetX + "px",
"overflow": "hidden",
"position": "relative",
- "padding": "0px",
- "background-image":
- "url("+config.map+"_nanomap_z"+config.mapZLevel+".png)",
+ "background-image": "url(" + mapUrl + ")",
"background-size": "cover",
+ "background-repeat": "no-repeat",
"text-align": "center",
- "transform": matrix,
+ "cursor": dragging ? "move" : "auto",
};
return (
@@ -96,6 +127,7 @@ export class NanoMap extends Component {
{children}
+
+
+
+ {{if data.exploit_exists == 1}}
+ Name: {{:data.exploit.name}}
+ Sex: {{:data.exploit.sex}}
+ Species: {{:data.exploit.species}}
+ Age: {{:data.exploit.age}}
+ Rank: {{:data.exploit.rank}}
+ Home System: {{:data.exploit.home_system}}
+ Citizenship: {{:data.exploit.citizenship}}
+ Faction: {{:data.exploit.faction}}
+ Religion: {{:data.exploit.religion}}
+ Fingerprint: {{:data.exploit.fingerprint}}
+ Other Affiliation: {{:data.exploit.antagfaction}}
+ +
Acquired Information:
+ Notes:
{{:data.exploit.nanoui_exploit_record}}
+ {{else}} + + No exploitative information acquired! +
+
+ + {{/if}} +
+ + Sex: {{:data.exploit.sex}}
+ Species: {{:data.exploit.species}}
+ Age: {{:data.exploit.age}}
+ Rank: {{:data.exploit.rank}}
+ Home System: {{:data.exploit.home_system}}
+ Citizenship: {{:data.exploit.citizenship}}
+ Faction: {{:data.exploit.faction}}
+ Religion: {{:data.exploit.religion}}
+ Fingerprint: {{:data.exploit.fingerprint}}
+ Other Affiliation: {{:data.exploit.antagfaction}}
+ +
Acquired Information:
+ Notes:
{{:data.exploit.nanoui_exploit_record}}
+ {{else}} + + No exploitative information acquired! +
+
+ + {{/if}} +
+
+
+
);
};
NanoMap.Marker = NanoMapMarker;
+
+const NanoMapZoomer = (props, context) => {
+ const { act, config, data } = useBackend(context);
+ return (
+