Total power: [powernet.avail] W" - - //user << browse(t, "window=powcomp;size=420x900") - //onclose(user, "powcomp") - var/datum/browser/popup = new(user, "powcomp", name, 500, 450) - popup.set_content(t) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - -/obj/machinery/computer/monitor/Topic(href, href_list) - if(..()) - return - if( href_list["close"] ) - usr << browse(null, "window=powcomp") - usr.unset_machine() - return - if( href_list["update"] ) - src.updateDialog() - return \ No newline at end of file diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index a4d72f15c59..70442f0dbbc 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -13,7 +13,7 @@ ui = new(user, src, ui_key, "station_alert", name, 300, 500, master_ui, state) ui.open() -/obj/machinery/computer/station_alert/get_ui_data(mob/user) +/obj/machinery/computer/station_alert/ui_data(mob/user) var/list/data = list() data["alarms"] = list() diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index f1e00b5aa5b..9771c917638 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -12,7 +12,7 @@ ui = new(user, src, ui_key, "airlock_electronics", name, 975, 420, master_ui, state) ui.open() -/obj/item/weapon/electronics/airlock/get_ui_data() +/obj/item/weapon/electronics/airlock/ui_data() var/list/data = list() var/list/regions = list() diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index f5bc1cbad20..0965843654a 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -107,7 +107,7 @@ ui = new(user, src, ui_key, "firealarm", name, 300, 150, master_ui, state) ui.open() -/obj/machinery/firealarm/get_ui_data(mob/user) +/obj/machinery/firealarm/ui_data(mob/user) var/list/data = list() data["emagged"] = emagged data["seclevel"] = get_security_level() diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index ee18baacda4..42383ec471a 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -45,7 +45,7 @@ codes = new() - var/list/entries = text2list(codes_txt, ";") // entries are separated by semicolons + var/list/entries = splittext(codes_txt, ";") // entries are separated by semicolons for(var/e in entries) var/index = findtext(e, "=") // format is "key=value" diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 910bd136256..05915bc884c 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -240,6 +240,21 @@ var/global/list/pipeID2State = list( qdel(src) +/obj/item/pipe/suicide_act(mob/user) + if (pipe_type in list(PIPE_PUMP, PIPE_PASSIVE_GATE, PIPE_VOLUME_PUMP)) + user.visible_message("[user] shoved the [src] in \his mouth and turned it on! It looks like \he's trying to commit suicide.") + if(istype(user, /mob/living/carbon)) + var/mob/living/carbon/C = user + for(var/i=1 to 20) + C.vomit(0,1,0,4,0) + sleep(5) + if(istype(user, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = C + H.vessel.remove_reagent("blood",560) + return(OXYLOSS|BRUTELOSS) + else + return ..() + /obj/item/pipe_meter name = "meter" desc = "A meter that can be laid on pipes" diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 9e83915fa7c..fa9ef9f6b21 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -173,7 +173,7 @@ ui = new(user, src, ui_key, "space_heater", name, 400, 305, master_ui, state) ui.open() -/obj/machinery/space_heater/get_ui_data() +/obj/machinery/space_heater/ui_data() var/list/data = list() data["open"] = panel_open data["on"] = on diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f3a0089d1b9..097ca74cc44 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -290,13 +290,13 @@ return /obj/machinery/suit_storage_unit/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \ - datum/tgui/master_ui = null, datum/ui_state/state = physical_state) + datum/tgui/master_ui = null, datum/ui_state/state = notcontained_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "suit_storage_unit", name, 400, 305, master_ui, state) ui.open() -/obj/machinery/suit_storage_unit/get_ui_data() +/obj/machinery/suit_storage_unit/ui_data() var/list/data = list() data["locked"] = locked data["open"] = state_open diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 23d4b36cbc5..21b238c95ea 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -71,7 +71,7 @@ build_inventory(contraband, 1) build_inventory(premium, 0, 1) - slogan_list = text2list(product_slogans, ";") + slogan_list = splittext(product_slogans, ";") // So not all machines speak at the exact same time. // The first time this machine says something will be at slogantime + this random value, // so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated. diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index c6a3a347726..1dc45391ca1 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -29,8 +29,9 @@ /obj/mecha/combat/honker/get_stats_part() var/integrity = health/initial(health)*100 var/cell_charge = get_charge() - var/tank_pressure = internal_tank ? round(internal_tank.return_pressure(),0.01) : "None" - var/tank_temperature = internal_tank ? internal_tank.return_temperature() : "Unknown" + var/datum/gas_mixture/int_tank_air = internal_tank.return_air() + var/tank_pressure = internal_tank ? round(int_tank_air.return_pressure(),0.01) : "None" + var/tank_temperature = internal_tank ? int_tank_air.temperature : "Unknown" var/cabin_pressure = round(return_pressure(),0.01) var/output = {"[report_internal_damage()] [integrity<30?"DAMAGE LEVEL CRITICAL
Total load: [num2text(powernet.viewload,10)] W
" - - t += "" - - if(L.len > 0) - - t += "Area Eqp./Lgt./Env. Load Cell
" - - var/list/S = list(" Off","AOff"," On", " AOn") - var/list/chg = list("N","C","F") - - var/percent = 0 - var/c = "" - - for(var/obj/machinery/power/apc/A in L) - - t += copytext(add_tspace("[format_text(A.area.name)]", 30), 1, 30) - t += " [S[A.equipment+1]] [S[A.lighting+1]] [S[A.environ+1]] [add_lspace(A.lastused_total, 6)]" - - if (A.cell) - percent = round(A.cell.percent()) - - c = "bad" - if (percent > 50) - c = "good" - else if (percent > 25) - c = "average" - - t += "[add_lspace(percent, 4)]% [chg[A.charging+1]]
" - else - t += " N/C
" - - t += "
Total power: [powmonitor.powernet.avail] W
Total load: [num2text(powmonitor.powernet.viewload,10)] W
" + menu += "Total power: [powmonitor.attached.powernet.viewavail] W
Total load: [num2text(powmonitor.attached.powernet.viewload,10)] W
" menu += "" diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 19fec171d6d..ebc9d68c184 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -44,7 +44,7 @@ ui = new(user, src, ui_key, "intellicard", name, 500, 500, master_ui, state) ui.open() -/obj/item/device/aicard/get_ui_data() +/obj/item/device/aicard/ui_data() var/list/data = list() if(AI) data["name"] = AI.name diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 4dbf44c4ea5..ec2b3e47140 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -61,8 +61,7 @@ return if(M == user) //they're using it on themselves - if(!M.eye_blind) - flick("flash", M.flash) + if(M.flash_eyes(visual = 1)) M.visible_message("[M] directs [src] to \his eyes.", \ "You wave the light in front of your eyes! Trippy!") else @@ -80,8 +79,7 @@ else if(M.dna.check_mutation(XRAY)) //mob has X-RAY vision user << "[M] pupils give an eerie glow!" else //they're okay! - if(!M.eye_blind) - flick("flash", M.flash) //flash the affected mob + if(M.flash_eyes(visual = 1)) user << "[M]'s pupils narrow." else return ..() diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 12107b3cdfc..a5a5e2f5d0b 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -119,7 +119,7 @@ var/mob/living/silicon/S = target //20% chance to actually hit the sensors if(prob(effectchance * diode.rating)) - flick("e_flash", S.flash) + S.flash_eyes(affect_silicon = 1) S.Weaken(rand(5,10)) S << "Your sensors were overloaded by a laser!" outmsg = "You overload [S] by shining [src] at their sensors." diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index ad64b7a7390..bf69eb8bada 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -120,7 +120,7 @@ ui = new(user, src, ui_key, "radio", name, 370, 220 + channels.len * 22, master_ui, state) ui.open() -/obj/item/device/radio/get_ui_data(mob/user) +/obj/item/device/radio/ui_data(mob/user) var/list/data = list() data["broadcasting"] = broadcasting diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 7c9eb724098..ae8d23b9ecb 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -121,7 +121,7 @@ MASS SPECTROMETER var/tox_loss = M.getToxLoss() var/fire_loss = M.getFireLoss() var/brute_loss = M.getBruteLoss() - var/mob_status = (M.stat > 1 ? "Deceased" : "[M.health] % healthy") + var/mob_status = (M.stat > 1 ? "Deceased" : "[round(M.health/M.maxHealth,0.01)*100] % healthy") if(M.status_flags & FAKEDEATH) mob_status = "Deceased" @@ -409,7 +409,7 @@ MASS SPECTROMETER else if (T.nutrition < T.get_hunger_nutrition()) user << "Warning: slime is hungry" user << "Electric change strength: [T.powerlevel]" - user << "Health: [T.health]" + user << "Health: [round(T.health/T.maxHealth,0.01)*100]" if (T.slime_mutation[4] == T.colour) user << "This slime does not evolve any further." else diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 434f2715ecd..390ab2612bd 100755 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -384,12 +384,12 @@ dat = "" /obj/item/toy/crayon/proc/crayon_text_strip(text) - var/list/base = text2list(lowertext(text),"") + var/list/base = splittext(lowertext(text),"") var/list/out = list() for(var/a in base) if(a in (letters|numerals)) out += a - return list2text(out) + return jointext(out, null) /obj/item/toy/crayon/Topic(href, href_list, hsrc) var/temp = "a" diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index c761431995a..1f79d8c98d9 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -113,7 +113,7 @@ ui = new(user, src, ui_key, "tanks", name, 420, 200, master_ui, state) ui.open() -/obj/item/weapon/tank/get_ui_data() +/obj/item/weapon/tank/ui_data() var/list/data = list() data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0) data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0) @@ -127,16 +127,16 @@ else if(istype(loc.loc, /mob/living/carbon)) user = loc.loc - if(user && user.internal == src) - data["valveOpen"] = TRUE - else - data["valveOpen"] = FALSE + data["valveOpen"] = FALSE + data["maskConnected"] = FALSE + if(!istype(user)) + return data + + if(user.internal == src) + data["valveOpen"] = TRUE + if(user.wear_mask && (user.wear_mask.flags & MASKINTERNALS) && user.internal == src) + data["maskConnected"] = TRUE - if(user.wear_mask && (user.wear_mask.flags & MASKINTERNALS)) - if(data["valveOpen"] || ((src in user) && !user.internal)) - data["maskConnected"] = TRUE - else - data["maskConnected"] = FALSE return data /obj/item/weapon/tank/ui_act(action, params) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index b497f7e3e6b..0e40cd810a7 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -84,10 +84,10 @@ for(var/line in lines) //world << line - for(var/beat in text2list(lowertext(line), ",")) + for(var/beat in splittext(lowertext(line), ",")) //world << "beat: [beat]" - var/list/notes = text2list(beat, "/") - for(var/note in text2list(notes[1], "-")) + var/list/notes = splittext(beat, "/") + for(var/note in splittext(notes[1], "-")) //world << "note: [note]" if(!playing || shouldStopPlaying(user))//If the instrument is playing, or special case playing = 0 @@ -204,7 +204,7 @@ //split into lines spawn() - lines = text2list(t, "\n") + lines = splittext(t, "\n") if(copytext(lines[1],1,6) == "BPM: ") tempo = sanitize_tempo(600 / text2num(copytext(lines[1],6))) lines.Cut(1,2) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 91b38217e01..7e6793ca1bb 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -44,16 +44,28 @@ smooth_icon_neighbors(src) /obj/structure/table/ex_act(severity, target) - ..() - if(severity == 3) - if(prob(25)) - table_destroy(1) + switch(severity) + if(1) + qdel(src) + if(2) + if(prob(50)) + table_destroy(1) + else + qdel(src) + if(3) + if(prob(25)) + table_destroy(1) /obj/structure/table/blob_act() if(prob(75)) table_destroy(1) return +/obj/structure/table/mech_melee_attack(obj/mecha/M) + visible_message("[M.name] smashes [src] apart!") + playsound(src.loc, 'sound/weapons/punch4.ogg', 50, 1) + table_destroy(1) + /obj/structure/table/attack_alien(mob/living/user) user.do_attack_animation(src) playsound(src.loc, 'sound/weapons/bladeslice.ogg', 50, 1) @@ -447,6 +459,10 @@ rack_destroy() return +/obj/structure/rack/mech_melee_attack(obj/mecha/M) + visible_message("[M.name] smashes [src] apart!") + rack_destroy(1) + /obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0) if(height==0) return 1 if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!| diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index bdcf195fce7..c3a46195ab1 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -68,7 +68,7 @@ ui = new(user, src, ui_key, "tank_dispenser", name, 275, 100, master_ui, state) ui.open() -/obj/structure/tank_dispenser/get_ui_data(mob/user) +/obj/structure/tank_dispenser/ui_data(mob/user) var/list/data = list() data["oxygen"] = oxygentanks data["plasma"] = plasmatanks diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index 28e788c0c2f..1928b6be6e7 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -262,7 +262,7 @@ obj/structure/transit_tube/ex_act(severity, target) if(text in direction_table) return direction_table[text] - var/list/split_text = text2list(text, "-") + var/list/split_text = splittext(text, "-") // If the first token is D, the icon_state represents // a purely decorative tube, and doesn't actually diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index d10ffe89303..efc12760e79 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -16,19 +16,19 @@ //wrapper for turn that changes the transit tube formatted icon_state instead of the dir /obj/structure/c_transit_tube/proc/tube_turn(angle) var/list/badtubes = list("W-E", "W-E-Pass", "S-N", "S-N-Pass", "SW-NE", "SE-NW") - var/list/split_text = text2list(icon_state, "-") + var/list/split_text = splittext(icon_state, "-") for(var/i=1; i<=split_text.len; i++) var/curdir = text2dir_extended(split_text[i]) //0 if not a valid direction (e.g. Pass, Block) if(curdir) split_text[i] = dir2text_short(turn(curdir, angle)) - var/newdir = list2text(split_text, "-") + var/newdir = jointext(split_text, "-") if(badtubes.Find(newdir)) split_text.Swap(1,2) - newdir = list2text(split_text, "-") + newdir = jointext(split_text, "-") icon_state = newdir /obj/structure/c_transit_tube/proc/tube_flip() - var/list/split_text = text2list(icon_state, "-") + var/list/split_text = splittext(icon_state, "-") //skip straight pipes if(length(split_text[2]) < 2) return @@ -44,7 +44,7 @@ split_text[2] = copytext(split_text[2],1,2) + ((copytext(split_text[2],2,3) == "E") ? "W" : "E") else split_text[2] = ((copytext(split_text[2],1,2) == "N") ? "S" : "N") + copytext(split_text[2],2,3) - icon_state = list2text(split_text, "-") + icon_state = jointext(split_text, "-") // disposals-style flip and rotate verbs /obj/structure/c_transit_tube/verb/rotate() diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index 499e28d8823..8eb131f5648 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -13,6 +13,14 @@ icon_state = "bcircuit" floor_tile = /obj/item/stack/tile/plasteel +/turf/simulated/floor/bluegrid/New() + ..() + nuke_tiles += src + +/turf/simulated/floor/bluegrid/Destroy() + nuke_tiles -= src + return ..() + /turf/simulated/floor/greengrid icon = 'icons/turf/floors.dmi' icon_state = "gcircuit" diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index d7ad8f5fbc3..3d7f31004cf 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -91,7 +91,7 @@ if(M.damtype == "brute") playsound(src, 'sound/weapons/punch4.ogg', 50, 1) visible_message("[M.name] has hit [src]!") - if(prob(5) && M.force > 20) + if(prob(hardness) && M.force > 20) dismantle_wall(1) visible_message("[src.name] smashes through the wall!") playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index 0df0147c3e4..22b33f93b1d 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -177,7 +177,7 @@ var/list/admin_ranks = list() //list of all admin_rank datums continue //Split the line at every "=" - var/list/List = text2list(line, "=") + var/list/List = splittext(line, "=") if(!List.len) continue diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index b878b5d5ccc..cab1e1afa9f 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -596,7 +596,7 @@ var/list/admin_verbs_hideable = list( //load text from file var/list/Lines = file2list("config/admins.txt") for(var/line in Lines) - var/list/splitline = text2list(line, " = ") + var/list/splitline = splittext(line, " = ") if(ckey(splitline[1]) == ckey) if(splitline.len >= 2) rank = ckeyEx(splitline[2]) diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index 0f7fdd5c6e0..d2f35bb1a80 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -2,7 +2,7 @@ /datum/admins/proc/create_mob(mob/user) if (!create_mob_html) var/mobjs = null - mobjs = list2text(typesof(/mob), ";") + mobjs = jointext(typesof(/mob), ";") create_mob_html = file2text('html/create_object.html') create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"") diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 9c6e54335e9..708b6a9e74b 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -7,7 +7,7 @@ var/list/create_object_forms = list( /datum/admins/proc/create_object(mob/user) if (!create_object_html) var/objectjs = null - objectjs = list2text(typesof(/obj), ";") + objectjs = jointext(typesof(/obj), ";") create_object_html = file2text('html/create_object.html') create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"") @@ -19,7 +19,7 @@ var/list/create_object_forms = list( var/html_form = create_object_forms[path] if (!html_form) - var/objectjs = list2text(typesof(path), ";") + var/objectjs = jointext(typesof(path), ";") html_form = file2text('html/create_object.html') html_form = replacetext(html_form, "null /* object types */", "\"[objectjs]\"") create_object_forms[path] = html_form diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index c9e5f1f69f3..4bfa6a0a09d 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -2,7 +2,7 @@ /datum/admins/proc/create_turf(mob/user) if (!create_turf_html) var/turfjs = null - turfjs = list2text(typesof(/turf), ";") + turfjs = jointext(typesof(/turf), ";") create_turf_html = file2text('html/create_object.html') create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"") diff --git a/code/modules/admin/sql_notes.dm b/code/modules/admin/sql_notes.dm index 89d3fbdef51..c38ed7d242b 100644 --- a/code/modules/admin/sql_notes.dm +++ b/code/modules/admin/sql_notes.dm @@ -169,9 +169,6 @@ output += ruler usr << browse(output, "window=show_notes;size=900x500") -/proc/regex_note_sql_extract(str, exp) - return new /datum/regex(str, exp, call(LIBREGEX_LIBRARY, "regEx_find")(str, exp)) - #define NOTESFILE "data/player_notes.sav" //if the AUTOCONVERT_NOTES is turned on, anytime a player connects this will be run to try and add all their notes to the databas /proc/convert_notes_sql(ckey) @@ -184,13 +181,13 @@ var/notetext notesfile >> notetext var/server - if (config && config.server_name) + if(config && config.server_name) server = config.server_name - var/regex = "^(\\d{2}-\\w{3}-\\d{4}) \\| (.+) ~(\\w+)$" - var/datum/regex/results = regex_note_sql_extract(notetext, regex) - var/timestamp = results.str(2) - notetext = results.str(3) - var/adminckey = results.str(4) + var/regex/note = new("^(\\d{2}-\\w{3}-\\d{4}) \\| (.+) ~(\\w+)$", "i") + note.Find(notetext) + var/timestamp = note.group[2] + notetext = note.group[3] + var/adminckey = note.group[4] var/DBQuery/query_convert_time = dbcon.NewQuery("SELECT ADDTIME(STR_TO_DATE('[timestamp]','%d-%b-%Y'), '0')") if(!query_convert_time.Execute()) var/err = query_convert_time.ErrorMsg() @@ -217,4 +214,4 @@ this proc can take several minutes to execute fully if converting and cause DD t world << "Deleting NOTESFILE" fdel(NOTESFILE) world << "Finished mass note conversion, remember to turn off AUTOCONVERT_NOTES"*/ -#undef NOTESFILE +#undef NOTESFILE \ No newline at end of file diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 7723a138bdb..e570fa89fb3 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -175,10 +175,10 @@ if (!ban) return null . = params2list(ban) - .["keys"] = text2list(.["keys"], ",") - .["type"] = text2list(.["type"], ",") - .["IP"] = text2list(.["IP"], ",") - .["computer_id"] = text2list(.["computer_id"], ",") + .["keys"] = splittext(.["keys"], ",") + .["type"] = splittext(.["type"], ",") + .["IP"] = splittext(.["IP"], ",") + .["computer_id"] = splittext(.["computer_id"], ",") /proc/list2stickyban(var/list/ban) @@ -186,13 +186,13 @@ return null . = ban.Copy() if (.["keys"]) - .["keys"] = list2text(.["keys"], ",") + .["keys"] = jointext(.["keys"], ",") if (.["type"]) - .["type"] = list2text(.["type"], ",") + .["type"] = jointext(.["type"], ",") if (.["IP"]) - .["IP"] = list2text(.["IP"], ",") + .["IP"] = jointext(.["IP"], ",") if (.["computer_id"]) - .["computer_id"] = list2text(.["computer_id"], ",") + .["computer_id"] = jointext(.["computer_id"], ",") . = list2params(.) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 7c0501aa0fd..32615dd8fdc 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1882,7 +1882,7 @@ alert("Select fewer object types, (max 5)") return - var/list/offset = text2list(href_list["offset"],",") + var/list/offset = splittext(href_list["offset"],",") var/number = Clamp(text2num(href_list["object_count"]), 1, 100) var/X = offset.len > 0 ? text2num(offset[1]) : 0 var/Y = offset.len > 1 ? text2num(offset[2]) : 0 diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 6c119205314..5215f9cc485 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -4,7 +4,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as", "i") //explode the input msg into a list - var/list/msglist = text2list(msg, " ") + var/list/msglist = splittext(msg, " ") //generate keywords lookup var/list/surnames = list() @@ -16,7 +16,7 @@ indexing += M.mind.name for(var/string in indexing) - var/list/L = text2list(string, " ") + var/list/L = splittext(string, " ") var/surname_found = 0 //surnames for(var/i=L.len, i>=1, i--) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 8ed8d72c737..eecfb9537d1 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -688,19 +688,19 @@ var/global/list/g_fancy_list_of_types = null switch(input("Which list?") in list("Players","Admins","Mobs","Living Mobs","Dead Mobs","Clients","Joined Clients")) if("Players") - usr << list2text(player_list,",") + usr << jointext(player_list,",") if("Admins") - usr << list2text(admins,",") + usr << jointext(admins,",") if("Mobs") - usr << list2text(mob_list,",") + usr << jointext(mob_list,",") if("Living Mobs") - usr << list2text(living_mob_list,",") + usr << jointext(living_mob_list,",") if("Dead Mobs") - usr << list2text(dead_mob_list,",") + usr << jointext(dead_mob_list,",") if("Clients") - usr << list2text(clients,",") + usr << jointext(clients,",") if("Joined Clients") - usr << list2text(joined_player_list,",") + usr << jointext(joined_player_list,",") /client/proc/cmd_display_del_log() set category = "Debug" diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index b37bfe16618..dea173e1ac0 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -8,91 +8,92 @@ What are the archived variables for? once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */ var/list/meta_gas_info = meta_gas_list() //see ATMOSPHERICS/gas_types.dm -var/list/cached_gases_list = null -/proc/gaslist(gasid) - if(!cached_gases_list) - cached_gases_list = new /list(meta_gas_info.len) +var/list/gaslist_cache = null +/proc/gaslist(id) + var/list/cached_gas - if(!cached_gases_list[gasid]) - if(!meta_gas_info[gasid]) - CRASH("Error: no such gas type! Type : [gasid]") + if(!gaslist_cache) + gaslist_cache = new(meta_gas_info.len) - var/list/new_gas_list = new(3) - new_gas_list[MOLES] = 0 - new_gas_list[ARCHIVE] = 0 - new_gas_list[GAS_META] = meta_gas_info[gasid] - cached_gases_list[gasid] = new_gas_list + if(!gaslist_cache[id]) + if(!meta_gas_info[id]) + CRASH("Gas [id] does not exist!") + cached_gas = new(3) + gaslist_cache[id] = cached_gas - var/list/gas = cached_gases_list[gasid] - . = gas.Copy() + cached_gas[MOLES] = 0 + cached_gas[ARCHIVE] = 0 + cached_gas[GAS_META] = meta_gas_info[id] + else + cached_gas = gaslist_cache[id] + return cached_gas.Copy() /datum/gas_mixture var/list/gases - var/temperature //in Kelvin + var/temperature // degrees Kelvin var/tmp/temperature_archived var/volume var/last_share var/tmp/fuel_burnt -/datum/gas_mixture/New(Volume = CELL_VOLUME) - . = ..() +/datum/gas_mixture/New(volume = CELL_VOLUME) + ..() gases = new temperature = 0 temperature_archived = 0 - volume = Volume + src.volume = volume last_share = 0 fuel_burnt = 0 - //listmos procs +//listmos procs - //assert_gas(gas_id) - used to guarantee that the gas list for this id exists. - //Must be used before adding to a gas. May be used before reading from a gas. +//assert_gas(gas_id) - used to guarantee that the gas list for this id exists. +//Must be used before adding to a gas. May be used before reading from a gas. /datum/gas_mixture/proc/assert_gas(gas_id) var/cached_gases = gases if(cached_gases[gas_id]) return cached_gases[gas_id] = gaslist(gas_id) //see ATMOSPHERICS/gas_types.dm - //assert_gases(args) - shorthand for calling assert_gas() once for each gas type. +//assert_gases(args) - shorthand for calling assert_gas() once for each gas type. /datum/gas_mixture/proc/assert_gases() for(var/id in args) assert_gas(id) - //add_gas(gas_id) - similar to assert_gas(), but does not check for an existing - //gas list for this id. - //Used instead of assert_gas() when you know the gas does not exist. Faster than assert_gas(). +//add_gas(gas_id) - similar to assert_gas(), but does not check for an existing +//gas list for this id. This can clobber existing gases. +//Used instead of assert_gas() when you know the gas does not exist. Faster than assert_gas(). /datum/gas_mixture/proc/add_gas(gas_id) gases[gas_id] = gaslist(gas_id) - //add_gases(args) - shorthand for calling add_gas() once for each gas_type. +//add_gases(args) - shorthand for calling add_gas() once for each gas_type. /datum/gas_mixture/proc/add_gases() for(var/id in args) add_gas(id) - //garbage_collect() - removes any gas list which is empty. - //Must be used after subtracting from a gas. Must be used after assert_gas() - //if assert_gas() was called only to read from the gas. - //By removing empty gases, processing speed is increased. +//garbage_collect() - removes any gas list which is empty. +//Must be used after subtracting from a gas. Must be used after assert_gas() +//if assert_gas() was called only to read from the gas. +//By removing empty gases, processing speed is increased. /datum/gas_mixture/proc/garbage_collect() var/list/cached_gases = gases for(var/id in cached_gases) - var/gas = cached_gases[id] - if(QUANTIZE(gas[MOLES]) <= 0 && QUANTIZE(gas[ARCHIVE]) <= 0) + if(cached_gases[id][MOLES] <= 0 && cached_gases[id][ARCHIVE] <= 0) cached_gases -= id - //PV=nRT - related procedures +//PV = nRT /datum/gas_mixture/proc/heat_capacity() var/list/cached_gases = gases . = 0 for(var/id in cached_gases) - . += cached_gases[id][MOLES]*cached_gases[id][GAS_META][META_GAS_SPECIFIC_HEAT] + . += cached_gases[id][MOLES] * cached_gases[id][GAS_META][META_GAS_SPECIFIC_HEAT] /datum/gas_mixture/proc/heat_capacity_archived() var/list/cached_gases = gases . = 0 for(var/id in cached_gases) - . += cached_gases[id][ARCHIVE]*cached_gases[id][GAS_META][META_GAS_SPECIFIC_HEAT] + . += cached_gases[id][ARCHIVE] * cached_gases[id][GAS_META][META_GAS_SPECIFIC_HEAT] /datum/gas_mixture/proc/total_moles() var/list/cached_gases = gases @@ -101,40 +102,38 @@ var/list/cached_gases_list = null . += cached_gases[id][MOLES] /datum/gas_mixture/proc/return_pressure() - if(volume>0) - return total_moles()*R_IDEAL_GAS_EQUATION*temperature/volume + if(volume > 0) // to prevent division by zero + return total_moles() * R_IDEAL_GAS_EQUATION * temperature / volume return 0 /datum/gas_mixture/proc/return_temperature() return temperature - /datum/gas_mixture/proc/return_volume() return max(0, volume) - /datum/gas_mixture/proc/thermal_energy() - return temperature*heat_capacity() - + return temperature * heat_capacity() //Procedures used for very specific events - /datum/gas_mixture/proc/react(atom/dump_location) - var/list/procgases = gases //this speeds things up because >byond + var/list/cached_gases = gases //this speeds things up because >byond var/reacting = 0 //set to 1 if a notable reaction occured (used by pipe_network) + if(temperature < TCMB) temperature = TCMB - if(procgases["agent_b"] && temperature > 900 && procgases["plasma"] && procgases["co2"]) - if(procgases["plasma"][MOLES] > MINIMUM_HEAT_CAPACITY && procgases["co2"][MOLES] > MINIMUM_HEAT_CAPACITY) - var/reaction_rate = min(procgases["co2"][MOLES]*0.75, procgases["plasma"][MOLES]*0.25, procgases["agent_b"][MOLES]*0.05) - procgases["co2"][MOLES] -= reaction_rate + if(cached_gases["agent_b"] && temperature > 900 && cached_gases["plasma"] && cached_gases["co2"]) + if(cached_gases["plasma"][MOLES] > MINIMUM_HEAT_CAPACITY && cached_gases["co2"][MOLES] > MINIMUM_HEAT_CAPACITY) + var/reaction_rate = min(cached_gases["co2"][MOLES]*0.75, cached_gases["plasma"][MOLES]*0.25, cached_gases["agent_b"][MOLES]*0.05) + + cached_gases["co2"][MOLES] -= reaction_rate assert_gas("o2") //only need to assert oxygen, as this reaction doesn't occur without the other gases existing - procgases["o2"][MOLES] += reaction_rate + cached_gases["o2"][MOLES] += reaction_rate - procgases["agent_b"][MOLES] -= reaction_rate*0.05 + cached_gases["agent_b"][MOLES] -= reaction_rate*0.05 temperature -= (reaction_rate*20000)/heat_capacity() @@ -143,26 +142,26 @@ var/list/cached_gases_list = null reacting = 1 /* if(thermal_energy() > (PLASMA_BINDING_ENERGY*10)) - if(procgases["plasma"] && procgases["co2"] && procgases["plasma"][MOLES] > MINIMUM_HEAT_CAPACITY && procgases["co2"][MOLES] > MINIMUM_HEAT_CAPACITY && (procgases["plasma"][MOLES]+procgases["co2"][MOLES])/total_moles() >= FUSION_PURITY_THRESHOLD)//Fusion wont occur if the level of impurities is too high. - //world << "pre [temperature, [procgases["plasma"][MOLES]], [procgases["co2"][MOLES]] + if(cached_gases["plasma"] && cached_gases["co2"] && cached_gases["plasma"][MOLES] > MINIMUM_HEAT_CAPACITY && cached_gases["co2"][MOLES] > MINIMUM_HEAT_CAPACITY && (cached_gases["plasma"][MOLES]+cached_gases["co2"][MOLES])/total_moles() >= FUSION_PURITY_THRESHOLD)//Fusion wont occur if the level of impurities is too high. + //world << "pre [temperature, [cached_gases["plasma"][MOLES]], [cached_gases["co2"][MOLES]] var/old_heat_capacity = heat_capacity() - var/carbon_efficency = min(procgases["plasma"][MOLES]/procgases["co2"][MOLES],MAX_CARBON_EFFICENCY) + var/carbon_efficency = min(cached_gases["plasma"][MOLES]/cached_gases["co2"][MOLES],MAX_CARBON_EFFICENCY) var/reaction_energy = thermal_energy() - var/moles_impurities = total_moles()-(procgases["plasma"][MOLES]+procgases["co2"][MOLES]) + var/moles_impurities = total_moles()-(cached_gases["plasma"][MOLES]+cached_gases["co2"][MOLES]) var/plasma_fused = (PLASMA_FUSED_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY) var/carbon_catalyzed = (CARBON_CATALYST_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY) var/oxygen_added = carbon_catalyzed var/nitrogen_added = (plasma_fused-oxygen_added)-(thermal_energy()/PLASMA_BINDING_ENERGY) - reaction_energy = max(reaction_energy+((carbon_efficency*procgases["plasma"][MOLES])/((moles_impurities/carbon_efficency)+2)*10)+((plasma_fused/(moles_impurities/carbon_efficency))*PLASMA_BINDING_ENERGY),0) + reaction_energy = max(reaction_energy+((carbon_efficency*cached_gases["plasma"][MOLES])/((moles_impurities/carbon_efficency)+2)*10)+((plasma_fused/(moles_impurities/carbon_efficency))*PLASMA_BINDING_ENERGY),0) assert_gases("o2", "n2") - procgases["plasma"][MOLES] -= plasma_fused - procgases["co2"][MOLES] -= carbon_catalyzed - procgases["o2"][MOLES] += oxygen_added - procgases["n2"][MOLES] += nitrogen_added + cached_gases["plasma"][MOLES] -= plasma_fused + cached_gases["co2"][MOLES] -= carbon_catalyzed + cached_gases["o2"][MOLES] += oxygen_added + cached_gases["n2"][MOLES] += nitrogen_added garbage_collect() @@ -172,45 +171,46 @@ var/list/cached_gases_list = null if(new_heat_capacity > MINIMUM_HEAT_CAPACITY) temperature = max(((temperature*old_heat_capacity + reaction_energy)/new_heat_capacity),TCMB) //Prevents whatever mechanism is causing it to hit negative temperatures. - //world << "post [temperature], [procgases["plasma"][MOLES]], [procgases["co2"][MOLES]] + //world << "post [temperature], [cached_gases["plasma"][MOLES]], [cached_gases["co2"][MOLES]] */ fuel_burnt = 0 if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) - //world << "pre [temperature], [procgases["o2"][MOLES]], [procgases["plasma"][MOLES]]" + //world << "pre [temperature], [cached_gases["o2"][MOLES]], [cached_gases["plasma"][MOLES]]" if(fire()) reacting = 1 - //world << "post [temperature], [procgases["o2"][MOLES]], [procgases["plasma"][MOLES]]" + //world << "post [temperature], [cached_gases["o2"][MOLES]], [cached_gases["plasma"][MOLES]]" return reacting /datum/gas_mixture/proc/fire() var/energy_released = 0 var/old_heat_capacity = heat_capacity() - var/list/procgases = gases //this speeds things up because accessing datum vars is slow + var/list/cached_gases = gases //this speeds things up because accessing datum vars is slow - if(procgases["v_fuel"] && procgases["v_fuel"][MOLES]) //General volatile gas burn + //General volatile gas burn + if(cached_gases["v_fuel"] && cached_gases["v_fuel"][MOLES]) var/burned_fuel - if(!procgases["o2"]) + if(!cached_gases["o2"]) burned_fuel = 0 - else if(procgases["o2"][MOLES] < procgases["v_fuel"][MOLES]) - burned_fuel = procgases["o2"][MOLES] - procgases["v_fuel"][MOLES] -= burned_fuel - procgases["o2"][MOLES] = 0 + else if(cached_gases["o2"][MOLES] < cached_gases["v_fuel"][MOLES]) + burned_fuel = cached_gases["o2"][MOLES] + cached_gases["v_fuel"][MOLES] -= burned_fuel + cached_gases["o2"][MOLES] = 0 else - burned_fuel = procgases["v_fuel"][MOLES] - procgases["o2"][MOLES] -= procgases["v_fuel"][MOLES] + burned_fuel = cached_gases["v_fuel"][MOLES] + cached_gases["o2"][MOLES] -= cached_gases["v_fuel"][MOLES] if(burned_fuel) energy_released += FIRE_CARBON_ENERGY_RELEASED * burned_fuel assert_gas("co2") - procgases["co2"][MOLES] += burned_fuel + cached_gases["co2"][MOLES] += burned_fuel fuel_burnt += burned_fuel //Handle plasma burning - if(procgases["plasma"] && procgases["plasma"][MOLES] > MINIMUM_HEAT_CAPACITY) + if(cached_gases["plasma"] && cached_gases["plasma"][MOLES] > MINIMUM_HEAT_CAPACITY) var/plasma_burn_rate = 0 var/oxygen_burn_rate = 0 //more plasma released at higher temperatures @@ -221,16 +221,16 @@ var/list/cached_gases_list = null temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE) if(temperature_scale > 0) assert_gas("o2") - assert_gas("co2") oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale - if(procgases["o2"][MOLES] > procgases["plasma"][MOLES]*PLASMA_OXYGEN_FULLBURN) - plasma_burn_rate = (procgases["plasma"][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA + if(cached_gases["o2"][MOLES] > cached_gases["plasma"][MOLES]*PLASMA_OXYGEN_FULLBURN) + plasma_burn_rate = (cached_gases["plasma"][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA else - plasma_burn_rate = (temperature_scale*(procgases["o2"][MOLES]/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA + plasma_burn_rate = (temperature_scale*(cached_gases["o2"][MOLES]/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY) - procgases["plasma"][MOLES] -= plasma_burn_rate - procgases["o2"][MOLES] -= plasma_burn_rate*oxygen_burn_rate - procgases["co2"][MOLES] += plasma_burn_rate + assert_gas("co2") + cached_gases["plasma"][MOLES] = QUANTIZE(cached_gases["plasma"][MOLES] - plasma_burn_rate) + cached_gases["o2"][MOLES] = QUANTIZE(cached_gases["o2"][MOLES] - (plasma_burn_rate * oxygen_burn_rate)) + cached_gases["co2"][MOLES] += plasma_burn_rate energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate) @@ -260,12 +260,20 @@ var/list/cached_gases_list = null //Proportionally removes amount of gas from the gas_mixture //Returns: gas_mixture with the gases removed +/datum/gas_mixture/proc/copy() + //Creates new, identical gas mixture + //Returns: duplicate gas mixture + /datum/gas_mixture/proc/copy_from(datum/gas_mixture/sample) //Copies variables from sample +/datum/gas_mixture/proc/copy_from_turf(turf/model) + //Copies all gas info from the turf into the gas list along with temperature + /datum/gas_mixture/proc/share(datum/gas_mixture/sharer) //Performs air sharing calculations between two gas_mixtures assuming only 1 boundary length //Return: amount of gas exchanged (+ if sharer received) + /datum/gas_mixture/proc/mimic(turf/model) //Similar to share(...), except the model is not modified //Return: amount of gas exchanged @@ -283,138 +291,148 @@ var/list/cached_gases_list = null //Compares sample to self to see if within acceptable ranges that group processing may be enabled //returns: a string indicating what check failed, or "" if check passes -/datum/gas_mixture/proc/copy_from_turf(turf/model) - //Copies all gas info from the turf into the gas list along with copying temperature, then archives - /datum/gas_mixture/archive() var/list/cached_gases = gases + + temperature_archived = temperature for(var/id in cached_gases) cached_gases[id][ARCHIVE] = cached_gases[id][MOLES] - temperature_archived = temperature - . = 1 + + return 1 /datum/gas_mixture/merge(datum/gas_mixture/giver) if(!giver) return 0 - if(abs(temperature-giver.temperature)>MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + if(abs(temperature - giver.temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) var/self_heat_capacity = heat_capacity() var/giver_heat_capacity = giver.heat_capacity() var/combined_heat_capacity = giver_heat_capacity + self_heat_capacity if(combined_heat_capacity) - temperature = (giver.temperature*giver_heat_capacity + temperature*self_heat_capacity)/combined_heat_capacity + temperature = (giver.temperature * giver_heat_capacity + temperature * self_heat_capacity) / combined_heat_capacity + var/list/cached_gases = gases //accessing datum vars is slower than proc vars var/list/giver_gases = giver.gases for(var/giver_id in giver_gases) assert_gas(giver_id) cached_gases[giver_id][MOLES] += giver_gases[giver_id][MOLES] - . = 1 + return 1 /datum/gas_mixture/remove(amount) - var/sum = total_moles() - amount = min(amount,sum) //Can not take more air than tile has! - + amount = min(amount, sum) //Can not take more air than tile has! if(amount <= 0) return null + var/list/cached_gases = gases var/datum/gas_mixture/removed = new var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars - var/list/cached_gases = gases - - for(var/id in cached_gases) - removed.assert_gas(id) - removed_gases[id][MOLES] = QUANTIZE((cached_gases[id][MOLES]/sum)*amount) - cached_gases[id][MOLES] -= removed_gases[id][MOLES] removed.temperature = temperature - + for(var/id in cached_gases) + removed.add_gas(id) + removed_gases[id][MOLES] = QUANTIZE((cached_gases[id][MOLES] / sum) * amount) + cached_gases[id][MOLES] -= removed_gases[id][MOLES] garbage_collect() - . = removed + return removed /datum/gas_mixture/remove_ratio(ratio) if(ratio <= 0) return null - ratio = min(ratio, 1) + var/list/cached_gases = gases var/datum/gas_mixture/removed = new var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars - var/list/cached_gases = gases - - for(var/id in cached_gases) - removed.assert_gas(id) - removed_gases[id][MOLES] = QUANTIZE(cached_gases[id][MOLES]*ratio) - cached_gases[id][MOLES] -= removed_gases[id][MOLES] removed.temperature = temperature - + for(var/id in cached_gases) + removed.add_gas(id) + removed_gases[id][MOLES] = QUANTIZE(cached_gases[id][MOLES] * ratio) + cached_gases[id][MOLES] -= removed_gases[id][MOLES] garbage_collect() - . = removed + return removed + +/datum/gas_mixture/copy() + var/list/cached_gases = gases + var/datum/gas_mixture/copy = new + var/list/copy_gases = copy.gases + + copy.temperature = temperature + for(var/id in cached_gases) + add_gas(id) + copy_gases[id][MOLES] = cached_gases[id][MOLES] + + return copy /datum/gas_mixture/copy_from(datum/gas_mixture/sample) var/list/cached_gases = gases //accessing datum vars is slower than proc vars var/list/sample_gases = sample.gases - var/list/copied_gases = list() - for(var/sample_id in sample_gases) - assert_gas(sample_id) - cached_gases[sample_id][MOLES] = sample_gases[sample_id][MOLES] - copied_gases += sample_id - for(var/id in cached_gases-copied_gases) - assert_gas(id) - cached_gases[id][MOLES] = 0 - - garbage_collect() temperature = sample.temperature + for(var/id in sample_gases) + assert_gas(id) + cached_gases[id][MOLES] = sample_gases[id][MOLES] + cached_gases &= sample_gases + + return 1 + +/datum/gas_mixture/copy_from_turf(turf/model) + var/list/cached_gases = gases + + temperature = model.temperature + assert_gases(arglist(hardcoded_gases)) + cached_gases["o2"][MOLES] = model.oxygen + cached_gases["n2"][MOLES] = model.nitrogen + cached_gases["plasma"][MOLES] = model.toxins + cached_gases["co2"][MOLES] = model.carbon_dioxide + cached_gases &= hardcoded_gases return 1 /datum/gas_mixture/check_turf(turf/model, atmos_adjacent_turfs = 4) var/datum/gas_mixture/copied = new copied.copy_from_turf(model) - . = compare(copied, datatype = ARCHIVE, adjacents = atmos_adjacent_turfs) + return compare(copied, datatype = ARCHIVE, adjacents = atmos_adjacent_turfs) /datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4) - . = 0 if(!sharer) - return + return 0 - var/moved_moles = 0 - var/abs_moved_moles = 0 - //make this local to the proc for sanic speed - var/list/sharercache = sharer.gases - var/list/selfcache = gases + var/list/cached_gases = gases + var/list/sharer_gases = sharer.gases - var/delta_temperature = (temperature_archived - sharer.temperature_archived) + var/temperature_delta = temperature_archived - sharer.temperature_archived + var/abs_temperature_delta = abs(temperature_delta) var/old_self_heat_capacity = 0 var/old_sharer_heat_capacity = 0 - - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) old_self_heat_capacity = heat_capacity() old_sharer_heat_capacity = sharer.heat_capacity() var/heat_capacity_self_to_sharer = 0 //heat capacity of the moles transferred from us to the sharer var/heat_capacity_sharer_to_self = 0 //heat capacity of the moles transferred from the sharer to us - for(var/sharer_id in sharercache-selfcache) - add_gas(sharer_id) //we can use add_gas() because we're looping only through the IDs not in our cache + var/moved_moles = 0 + var/abs_moved_moles = 0 //GAS TRANSFER - for(var/id in selfcache) - if(!sharercache[id]) //checking here prevents an uneeded proc call if the check fails. + for(var/id in sharer_gases - cached_gases) // create gases not in our cache + add_gas(id) + for(var/id in cached_gases) // transfer gases + if(!sharer_gases[id]) //checking here prevents an uneeded proc call if the check fails. sharer.add_gas(id) - var/gas = selfcache[id] - var/sharergas = sharercache[id] + var/gas = cached_gases[id] + var/sharergas = sharer_gases[id] var/delta = QUANTIZE(gas[ARCHIVE] - sharergas[ARCHIVE])/(atmos_adjacent_turfs+1) //the amount of gas that gets moved between the mixtures - if(delta && abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + if(delta && abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) var/gas_heat_capacity = delta * gas[GAS_META][META_GAS_SPECIFIC_HEAT] if(delta > 0) heat_capacity_self_to_sharer += gas_heat_capacity @@ -429,7 +447,7 @@ var/list/cached_gases_list = null last_share = abs_moved_moles //THERMAL ENERGY TRANSFER - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + if(abs_temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) var/new_self_heat_capacity = old_self_heat_capacity + heat_capacity_sharer_to_self - heat_capacity_self_to_sharer var/new_sharer_heat_capacity = old_sharer_heat_capacity + heat_capacity_self_to_sharer - heat_capacity_sharer_to_self @@ -445,9 +463,9 @@ var/list/cached_gases_list = null if(abs(new_sharer_heat_capacity/old_sharer_heat_capacity - 1) < 0.10) // <10% change in sharer heat capacity temperature_share(sharer, OPEN_HEAT_TRANSFER_COEFFICIENT) - if((delta_temperature > MINIMUM_TEMPERATURE_TO_MOVE) || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE) + if(temperature_delta > MINIMUM_TEMPERATURE_TO_MOVE || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE) var/delta_pressure = temperature_archived*(total_moles() + moved_moles) - sharer.temperature_archived*(sharer.total_moles() - moved_moles) - . = delta_pressure*R_IDEAL_GAS_EQUATION/volume + . = delta_pressure * R_IDEAL_GAS_EQUATION / volume garbage_collect() sharer.garbage_collect() @@ -455,17 +473,17 @@ var/list/cached_gases_list = null /datum/gas_mixture/mimic(turf/model, atmos_adjacent_turfs = 4) var/datum/gas_mixture/copied = new copied.copy_from_turf(model) - . = share(copied, atmos_adjacent_turfs) + return share(copied, atmos_adjacent_turfs) /datum/gas_mixture/temperature_share(datum/gas_mixture/sharer, conduction_coefficient) //transfer of thermal energy (via conduction) between self and sharer - var/delta_temperature = (temperature_archived - sharer.temperature_archived) - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/temperature_delta = temperature_archived - sharer.temperature_archived + if(abs(temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) var/self_heat_capacity = heat_capacity_archived() var/sharer_heat_capacity = sharer.heat_capacity_archived() if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) - var/heat = conduction_coefficient*delta_temperature* \ + var/heat = conduction_coefficient*temperature_delta* \ (self_heat_capacity*sharer_heat_capacity/(self_heat_capacity+sharer_heat_capacity)) temperature = max(temperature - heat/self_heat_capacity, TCMB) @@ -473,39 +491,38 @@ var/list/cached_gases_list = null //thermal energy of the system (self and sharer) is unchanged /datum/gas_mixture/temperature_mimic(turf/model, conduction_coefficient) - var/delta_temperature = (temperature - model.temperature) - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/temperature_delta = temperature - model.temperature + if(abs(temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) var/self_heat_capacity = heat_capacity() if((model.heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) - var/heat = conduction_coefficient*delta_temperature* \ + var/heat = conduction_coefficient*temperature_delta* \ (self_heat_capacity*model.heat_capacity/(self_heat_capacity+model.heat_capacity)) temperature = max(temperature - heat/self_heat_capacity, TCMB) /datum/gas_mixture/temperature_turf_share(turf/simulated/sharer, conduction_coefficient) - var/delta_temperature = (temperature_archived - sharer.temperature) - if(abs(delta_temperature) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) + var/temperature_delta = temperature_archived - sharer.temperature + if(abs(temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER) var/self_heat_capacity = heat_capacity() if((sharer.heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY)) - var/heat = conduction_coefficient*delta_temperature* \ + var/heat = conduction_coefficient*temperature_delta* \ (self_heat_capacity*sharer.heat_capacity/(self_heat_capacity+sharer.heat_capacity)) temperature = max(temperature - heat/self_heat_capacity, TCMB) sharer.temperature = max(sharer.temperature + heat/sharer.heat_capacity, TCMB) /datum/gas_mixture/compare(datum/gas_mixture/sample, datatype = MOLES, adjacents = 0) - . = "" var/list/sample_gases = sample.gases //accessing datum vars is slower than proc vars var/list/cached_gases = gases - for(var/id in cached_gases|sample_gases) + for(var/id in cached_gases | sample_gases) // compare gases from either mixture var/gas_moles = cached_gases[id] ? cached_gases[id][datatype] : 0 var/sample_moles = sample_gases[id] ? sample_gases[id][datatype] : 0 var/delta = abs(gas_moles - sample_moles)/(adjacents+1) if(delta > MINIMUM_AIR_TO_SUSPEND && \ - delta > gas_moles*MINIMUM_AIR_RATIO_TO_SUSPEND) + delta > gas_moles * MINIMUM_AIR_RATIO_TO_SUSPEND) return id if(total_moles() > MINIMUM_AIR_TO_SUSPEND) @@ -520,50 +537,30 @@ var/list/cached_gases_list = null temp = temperature_archived sample_temp = sample.temperature_archived - var/delta_temperature = abs(temp-sample_temp) - if((delta_temperature > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) && \ - delta_temperature > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND*temp) + var/temperature_delta = abs(temp - sample_temp) + if((temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND) && \ + temperature_delta > MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND * temp) return "temp" -/datum/gas_mixture/copy_from_turf(turf/model) - assert_gases(arglist(hardcoded_gases)) - var/list/cached_gases = gases + return "" - cached_gases["o2"][MOLES] = model.oxygen - cached_gases["n2"][MOLES] = model.nitrogen - cached_gases["plasma"][MOLES] = model.toxins - cached_gases["co2"][MOLES] = model.carbon_dioxide - - for(var/id in cached_gases-hardcoded_gases) - cached_gases[id][MOLES] = 0 //turfs don't account for anything other than the four old hardcoded gases - - temperature = model.temperature - - garbage_collect() //Takes the amount of the gas you want to PP as an argument //So I don't have to do some hacky switches/defines/magic strings - //eg: //Tox_PP = get_partial_pressure(gas_mixture.toxins) //O2_PP = get_partial_pressure(gas_mixture.oxygen) - //Does handle trace gases! - /datum/gas_mixture/proc/get_breath_partial_pressure(gas_pressure) - return (gas_pressure*R_IDEAL_GAS_EQUATION*temperature)/BREATH_VOLUME - - -//Reverse of the above -/datum/gas_mixture/proc/get_true_breath_pressure(breath_pp) - return (breath_pp*BREATH_VOLUME)/(R_IDEAL_GAS_EQUATION*temperature) + return (gas_pressure * R_IDEAL_GAS_EQUATION * temperature) / BREATH_VOLUME +//inverse +/datum/gas_mixture/proc/get_true_breath_pressure(partial_pressure) + return (partial_pressure * BREATH_VOLUME) / (R_IDEAL_GAS_EQUATION * temperature) //Mathematical proofs: /* - get_breath_partial_pressure(gas_pp) --> gas_pp/total_moles()*breath_pp = pp get_true_breath_pressure(pp) --> gas_pp = pp/breath_pp*total_moles() 10/20*5 = 2.5 10 = 2.5/5*20 - */ diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm index a7c40accf62..5a3871292d6 100644 --- a/code/modules/atmospherics/gasmixtures/gas_types.dm +++ b/code/modules/atmospherics/gasmixtures/gas_types.dm @@ -1,19 +1,17 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases, which were at one time hardcoded /proc/meta_gas_list() - var/meta_list = new /list + . = new /list for(var/gas_path in subtypesof(/datum/gas)) var/list/gas_info = new(4) - var/datum/gas/g = gas_path + var/datum/gas/gas = gas_path - gas_info[META_GAS_SPECIFIC_HEAT] = initial(g.specific_heat) - gas_info[META_GAS_NAME] = initial(g.name) - gas_info[META_GAS_MOLES_VISIBLE] = initial(g.moles_visible) - if(gas_info[META_GAS_MOLES_VISIBLE] != null) - gas_info[META_GAS_OVERLAY] = new /obj/effect/overlay/gas(initial(g.gas_overlay)) - - meta_list[initial(g.id)] = gas_info - . = meta_list + gas_info[META_GAS_SPECIFIC_HEAT] = initial(gas.specific_heat) + gas_info[META_GAS_NAME] = initial(gas.name) + gas_info[META_GAS_MOLES_VISIBLE] = initial(gas.moles_visible) + if(initial(gas.moles_visible) != null) + gas_info[META_GAS_OVERLAY] = new /obj/effect/overlay/gas(initial(gas.gas_overlay)) + .[initial(gas.id)] = gas_info /*||||||||||||||/----------\||||||||||||||*\ ||||||||||||||||[GAS DATUMS]|||||||||||||||| diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 1ed8eee6826..d1dd417493d 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -42,12 +42,6 @@ #define AALARM_MODE_CONTAMINATED 8 //Turns on all filtering and widenet scrubbing. #define AALARM_MODE_REFILL 9 //just like normal, but with triple the air output -#define AALARM_SCREEN_MAIN 1 -#define AALARM_SCREEN_VENT 2 -#define AALARM_SCREEN_SCRUB 3 -#define AALARM_SCREEN_MODE 4 -#define AALARM_SCREEN_SENSORS 5 - #define AALARM_REPORT_TIMEOUT 100 /obj/machinery/airalarm @@ -74,7 +68,6 @@ var/mode = AALARM_MODE_SCRUBBING - var/screen = AALARM_SCREEN_MAIN var/area_uid var/area/alarm_area var/danger_level = 0 @@ -179,148 +172,126 @@ ui = new(user, src, ui_key, "airalarm", name, 440, 650, master_ui, state) ui.open() -/obj/machinery/airalarm/get_ui_data(mob/user) +/obj/machinery/airalarm/ui_data(mob/user) var/data = list( "locked" = locked, "siliconUser" = user.has_unlimited_silicon_privilege, - "screen" = screen, - "emagged" = emagged + "emagged" = emagged, + "atmos_alarm" = alarm_area.atmosalm, + "fire_alarm" = alarm_area.fire, + "danger_level" = danger_level, ) - populate_status(data) + + var/turf/T = get_turf(src) + var/datum/gas_mixture/environment = T.return_air() + var/datum/tlv/cur_tlv + + data["environment_data"] = list() + var/pressure = environment.return_pressure() + cur_tlv = TLV["pressure"] + data["environment_data"] += list(list( + "name" = "Pressure", + "value" = pressure, + "unit" = "kPa", + "danger_level" = cur_tlv.get_danger_level(pressure) + )) + var/temperature = environment.temperature + cur_tlv = TLV["temperature"] + data["environment_data"] += list(list( + "name" = "Temperature", + "value" = temperature, + "unit" = "K ([round(temperature - T0C, 0.1)]C)", + "danger_level" = cur_tlv.get_danger_level(temperature) + )) + var/total_moles = environment.total_moles() + var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.temperature / environment.volume + for(var/gas_id in environment.gases) + if(!(gas_id in TLV)) // We're not interested in this gas, it seems. + continue + cur_tlv = TLV[gas_id] + data["environment_data"] += list(list( + "name" = environment.gases[gas_id][GAS_META][META_GAS_NAME], + "value" = environment.gases[gas_id][MOLES] / total_moles * 100, + "unit" = "%", + "danger_level" = cur_tlv.get_danger_level(environment.gases[gas_id][MOLES] * partial_pressure) + )) + if(!locked || user.has_unlimited_silicon_privilege) - populate_controls(data) - return data + data["vents"] = list() + for(var/id_tag in alarm_area.air_vent_names) + var/long_name = alarm_area.air_vent_names[id_tag] + var/list/info = alarm_area.air_vent_info[id_tag] + if(!info || info["frequency"] != frequency) + continue + data["vents"] += list(list( + "id_tag" = id_tag, + "long_name" = sanitize(long_name), + "power" = info["power"], + "checks" = info["checks"], + "excheck" = info["checks"]&1, + "incheck" = info["checks"]&2, + "direction" = info["direction"], + "external" = info["external"], + "extdefault"= (info["external"] == ONE_ATMOSPHERE) + )) + data["scrubbers"] = list() + for(var/id_tag in alarm_area.air_scrub_names) + var/long_name = alarm_area.air_scrub_names[id_tag] + var/list/info = alarm_area.air_scrub_info[id_tag] + if(!info || info["frequency"] != frequency) + continue + data["scrubbers"] += list(list( + "id_tag" = id_tag, + "long_name" = sanitize(long_name), + "power" = info["power"], + "scrubbing" = info["scrubbing"], + "widenet" = info["widenet"], + "filter_co2" = info["filter_co2"], + "filter_toxins" = info["filter_toxins"], + "filter_n2o" = info["filter_n2o"] + )) + data["mode"] = mode + data["modes"] = list() + data["modes"] += list(list("name" = "Filtering - Scrubs out contaminants", "mode" = AALARM_MODE_SCRUBBING, "selected" = mode == AALARM_MODE_SCRUBBING, "danger" = 0)) + data["modes"] += list(list("name" = "Contaminated - Scrubs out ALL contaminants quickly","mode" = AALARM_MODE_CONTAMINATED, "selected" = mode == AALARM_MODE_CONTAMINATED, "danger" = 0)) + data["modes"] += list(list("name" = "Draught - Siphons out air while replacing", "mode" = AALARM_MODE_VENTING, "selected" = mode == AALARM_MODE_VENTING, "danger" = 0)) + data["modes"] += list(list("name" = "Refill - Triple vent output", "mode" = AALARM_MODE_REFILL, "selected" = mode == AALARM_MODE_REFILL, "danger" = 0)) + data["modes"] += list(list("name" = "Cycle - Siphons air before replacing", "mode" = AALARM_MODE_REPLACEMENT, "selected" = mode == AALARM_MODE_REPLACEMENT, "danger" = 1)) + data["modes"] += list(list("name" = "Siphon - Siphons air out of the room", "mode" = AALARM_MODE_SIPHON, "selected" = mode == AALARM_MODE_SIPHON, "danger" = 1)) + data["modes"] += list(list("name" = "Panic Siphon - Siphons air out of the room quickly","mode" = AALARM_MODE_PANIC, "selected" = mode == AALARM_MODE_PANIC, "danger" = 1)) + data["modes"] += list(list("name" = "Off - Shuts off vents and scrubbers", "mode" = AALARM_MODE_OFF, "selected" = mode == AALARM_MODE_OFF, "danger" = 0)) + if(emagged) + data["modes"] += list(list("name" = "Flood - Shuts off scrubbers and opens vents", "mode" = AALARM_MODE_FLOOD, "selected" = mode == AALARM_MODE_FLOOD, "danger" = 1)) -/obj/machinery/airalarm/proc/populate_status(list/data) - var/turf/location = get_turf(src) - if(!location) - return - var/datum/gas_mixture/environment = location.return_air() - var/list/env_gases = environment.gases - var/total = environment.total_moles() + var/datum/tlv/selected + var/list/thresholds = list() - var/list/environment_data = list() - data["atmos_alarm"] = alarm_area.atmosalm - data["fire_alarm"] = (alarm_area.fire != null && alarm_area.fire) - data["danger_level"] = danger_level - if(total) - var/datum/tlv/cur_tlv + selected = TLV["pressure"] + thresholds += list(list("name" = "Pressure", "settings" = list())) + thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "min2", "selected" = selected.min2)) + thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "min1", "selected" = selected.min1)) + thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "max1", "selected" = selected.max1)) + thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "max2", "selected" = selected.max2)) - var/partial_pressure = R_IDEAL_GAS_EQUATION * environment.temperature / environment.volume + selected = TLV["temperature"] + thresholds += list(list("name" = "Temperature", "settings" = list())) + thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "min2", "selected" = selected.min2)) + thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "min1", "selected" = selected.min1)) + thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max1", "selected" = selected.max1)) + thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max2", "selected" = selected.max2)) - var/pressure = environment.return_pressure() - cur_tlv = TLV["pressure"] - environment_data += list(list( - "name" = "Pressure", - "value" = pressure, - "unit" = "kPa", - "danger_level" = cur_tlv.get_danger_level(pressure) - )) - - var/temperature = environment.temperature - cur_tlv = TLV["temperature"] - environment_data += list(list( - "name" = "Temperature", - "value" = temperature, - "unit" = "K ([round(temperature - T0C, 0.1)]C)", - "danger_level" = cur_tlv.get_danger_level(temperature) - )) - - for(var/gas_id in env_gases) + for(var/gas_id in meta_gas_info) if(!(gas_id in TLV)) // We're not interested in this gas, it seems. continue - cur_tlv = TLV[gas_id] - environment_data += list(list( - "name" = env_gases[gas_id][GAS_META][META_GAS_NAME], - "value" = env_gases[gas_id][MOLES] / total * 100, - "unit" = "%", - "danger_level" = cur_tlv.get_danger_level(env_gases[gas_id][MOLES] * partial_pressure) - )) + selected = TLV[gas_id] + thresholds += list(list("name" = meta_gas_info[gas_id][META_GAS_NAME], "settings" = list())) + thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min2", "selected" = selected.min2)) + thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min1", "selected" = selected.min1)) + thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "max1", "selected" = selected.max1)) + thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "max2", "selected" = selected.max2)) - - data["environment_data"] = environment_data - -/obj/machinery/airalarm/proc/populate_controls(list/data) - switch(screen) - if(AALARM_SCREEN_MAIN) - data["mode"] = mode - if(AALARM_SCREEN_VENT) - data["vents"] = list() - for(var/id_tag in alarm_area.air_vent_names) - var/long_name = alarm_area.air_vent_names[id_tag] - var/list/info = alarm_area.air_vent_info[id_tag] - if(!info || info["frequency"] != frequency) - continue - data["vents"] += list(list( - "id_tag" = id_tag, - "long_name" = sanitize(long_name), - "power" = info["power"], - "checks" = info["checks"], - "excheck" = info["checks"]&1, - "incheck" = info["checks"]&2, - "direction" = info["direction"], - "external" = info["external"], - "extdefault"= (info["external"] == ONE_ATMOSPHERE) - )) - if(AALARM_SCREEN_SCRUB) - data["scrubbers"] = list() - for(var/id_tag in alarm_area.air_scrub_names) - var/long_name = alarm_area.air_scrub_names[id_tag] - var/list/info = alarm_area.air_scrub_info[id_tag] - if(!info || info["frequency"] != frequency) - continue - data["scrubbers"] += list(list( - "id_tag" = id_tag, - "long_name" = sanitize(long_name), - "power" = info["power"], - "scrubbing" = info["scrubbing"], - "widenet" = info["widenet"], - "filter_co2" = info["filter_co2"], - "filter_toxins" = info["filter_toxins"], - "filter_n2o" = info["filter_n2o"] - )) - if(AALARM_SCREEN_MODE) - data["mode"] = mode - data["modes"] = list() - data["modes"] += list(list("name" = "Filtering - Scrubs out contaminants", "mode" = AALARM_MODE_SCRUBBING, "selected" = mode == AALARM_MODE_SCRUBBING, "danger" = 0)) - data["modes"] += list(list("name" = "Contaminated - Scrubs out ALL contaminants quickly","mode" = AALARM_MODE_CONTAMINATED, "selected" = mode == AALARM_MODE_CONTAMINATED, "danger" = 0)) - data["modes"] += list(list("name" = "Draught - Siphons out air while replacing", "mode" = AALARM_MODE_VENTING, "selected" = mode == AALARM_MODE_VENTING, "danger" = 0)) - data["modes"] += list(list("name" = "Refill - Triple vent output", "mode" = AALARM_MODE_REFILL, "selected" = mode == AALARM_MODE_REFILL, "danger" = 0)) - data["modes"] += list(list("name" = "Cycle - Siphons air before replacing", "mode" = AALARM_MODE_REPLACEMENT, "selected" = mode == AALARM_MODE_REPLACEMENT, "danger" = 1)) - data["modes"] += list(list("name" = "Siphon - Siphons air out of the room", "mode" = AALARM_MODE_SIPHON, "selected" = mode == AALARM_MODE_SIPHON, "danger" = 1)) - data["modes"] += list(list("name" = "Panic Siphon - Siphons air out of the room quickly","mode" = AALARM_MODE_PANIC, "selected" = mode == AALARM_MODE_PANIC, "danger" = 1)) - data["modes"] += list(list("name" = "Off - Shuts off vents and scrubbers", "mode" = AALARM_MODE_OFF, "selected" = mode == AALARM_MODE_OFF, "danger" = 0)) - if (src.emagged) - data["modes"] += list(list("name" = "Flood - Shuts off scrubbers and opens vents", "mode" = AALARM_MODE_FLOOD, "selected" = mode == AALARM_MODE_FLOOD, "danger" = 1)) - if(AALARM_SCREEN_SENSORS) - var/datum/tlv/selected - var/list/thresholds = list() - - selected = TLV["pressure"] - thresholds += list(list("name" = "Pressure", "settings" = list())) - thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "min2", "selected" = selected.min2)) - thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "min1", "selected" = selected.min1)) - thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "max1", "selected" = selected.max1)) - thresholds[thresholds.len]["settings"] += list(list("env" = "pressure", "val" = "max2", "selected" = selected.max2)) - - selected = TLV["temperature"] - thresholds += list(list("name" = "Temperature", "settings" = list())) - thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "min2", "selected" = selected.min2)) - thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "min1", "selected" = selected.min1)) - thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max1", "selected" = selected.max1)) - thresholds[thresholds.len]["settings"] += list(list("env" = "temperature", "val" = "max2", "selected" = selected.max2)) - - for (var/gas_id in meta_gas_info) - if(!(gas_id in TLV)) // We're not interested in this gas, it seems. - continue - selected = TLV[gas_id] - thresholds += list(list("name" = meta_gas_info[gas_id][META_GAS_NAME], "settings" = list())) - thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min2", "selected" = selected.min2)) - thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "min1", "selected" = selected.min1)) - thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "max1", "selected" = selected.max1)) - thresholds[thresholds.len]["settings"] += list(list("env" = gas_id, "val" = "max2", "selected" = selected.max2)) - - data["thresholds"] = thresholds + data["thresholds"] = thresholds + return data /obj/machinery/airalarm/ui_act(action, params) if(..() || buildstage != 2) @@ -363,9 +334,6 @@ else tlv.vars[name] = round(value, 0.01) . = TRUE - if("screen") - screen = text2num(params["screen"]) - . = TRUE if("mode") mode = text2num(params["mode"]) apply_mode() @@ -667,7 +635,6 @@ if(src.allowed(usr) && !wires.is_cut(WIRE_IDSCAN)) locked = !locked user << "You [ locked ? "lock" : "unlock"] the air alarm interface." - src.updateUsrDialog() else user << "Access denied." return @@ -727,19 +694,12 @@ return ..() /obj/machinery/airalarm/power_change() - if(powered(power_channel)) - stat &= ~NOPOWER - else - stat |= NOPOWER - spawn(rand(0,15)) - if(loc) - update_icon() - + ..() + update_icon() /obj/machinery/airalarm/emag_act(mob/user) - if(!emagged) - src.emagged = 1 - if(user) - user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.") - playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1) + if(emagged) return + emagged = TRUE + visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.") + playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1) \ No newline at end of file diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index da9a5d86b74..b73d3aa5dea 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -27,10 +27,11 @@ Pipelines + Other Objects -> Pipe network var/device_type = 0 var/list/obj/machinery/atmospherics/nodes = list() -/obj/machinery/atmospherics/New() +/obj/machinery/atmospherics/New(process = TRUE) nodes.len = device_type ..() - SSair.atmos_machinery += src + if(process) + SSair.atmos_machinery += src SetInitDirections() if(can_unwrench) stored = new(src, make_from=src) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm index 7a9f04b041f..7ddc1f518c9 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm @@ -99,7 +99,7 @@ Passive gate is similar to the regular pump except: ui = new(user, src, ui_key, "atmos_pump", name, 335, 115, master_ui, state) ui.open() -/obj/machinery/atmospherics/components/binary/passive_gate/get_ui_data() +/obj/machinery/atmospherics/components/binary/passive_gate/ui_data() var/data = list() data["on"] = on data["pressure"] = round(target_pressure) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 83922c7fcdd..1304c1b12ca 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -26,14 +26,15 @@ Thus, the two variables affect pump operation are set in New(): var/id = null var/datum/radio_frequency/radio_connection +/obj/machinery/atmospherics/components/binary/pump/on + on = 1 + /obj/machinery/atmospherics/components/binary/pump/Destroy() if(SSradio) SSradio.remove_object(src,frequency) if(radio_connection) radio_connection = null return ..() -/obj/machinery/atmospherics/components/binary/pump/on - on = 1 /obj/machinery/atmospherics/components/binary/pump/update_icon_nopipes() if(stat & NOPOWER) @@ -105,7 +106,7 @@ Thus, the two variables affect pump operation are set in New(): ui = new(user, src, ui_key, "atmos_pump", name, 335, 115, master_ui, state) ui.open() -/obj/machinery/atmospherics/components/binary/pump/get_ui_data() +/obj/machinery/atmospherics/components/binary/pump/ui_data() var/data = list() data["on"] = on data["pressure"] = round(target_pressure) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index 6407033909f..8a09e99b93e 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -101,7 +101,7 @@ Thus, the two variables affect pump operation are set in New(): ui = new(user, src, ui_key, "atmos_pump", name, 310, 115, master_ui, state) ui.open() -/obj/machinery/atmospherics/components/binary/volume_pump/get_ui_data() +/obj/machinery/atmospherics/components/binary/volume_pump/ui_data() var/data = list() data["on"] = on data["rate"] = round(transfer_rate) diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index f18d2189278..7f2d1f39187 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -112,7 +112,7 @@ ui = new(user, src, ui_key, "atmos_filter", name, 470, 140, master_ui, state) ui.open() -/obj/machinery/atmospherics/components/trinary/filter/get_ui_data() +/obj/machinery/atmospherics/components/trinary/filter/ui_data() var/data = list() data["on"] = on data["pressure"] = round(target_pressure) @@ -146,10 +146,10 @@ if("filter") filter_type = "" var/filter_name = "nothing" - var/mode = params["mode"] - if(mode in meta_gas_info) - filter_type = mode - filter_name = meta_gas_info[mode][META_GAS_NAME] + var/gas = params["mode"] + if(gas in meta_gas_info) + filter_type = gas + filter_name = meta_gas_info[gas][META_GAS_NAME] investigate_log("was set to filter [filter_name] by [key_name(usr)]", "atmos") . = TRUE update_icon() diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index dcf452b93cb..9b14d15087b 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -123,7 +123,7 @@ ui = new(user, src, ui_key, "atmos_mixer", name, 370, 165, master_ui, state) ui.open() -/obj/machinery/atmospherics/components/trinary/mixer/get_ui_data() +/obj/machinery/atmospherics/components/trinary/mixer/ui_data() var/data = list() data["on"] = on data["set_pressure"] = round(target_pressure) diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 7882568fe07..bead3040a35 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -162,7 +162,7 @@ user << "[src] seems empty." /obj/machinery/atmospherics/components/unary/cryo_cell/MouseDrop_T(mob/target, mob/user) - if(user.stat || user.lying || !Adjacent(user) || !Adjacent(target)) + if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target)) return close_machine(target) @@ -198,7 +198,7 @@ ui = new(user, src, ui_key, "cryo", name, 400, 550, master_ui, state) ui.open() -/obj/machinery/atmospherics/components/unary/cryo_cell/get_ui_data() +/obj/machinery/atmospherics/components/unary/cryo_cell/ui_data() var/list/data = list() data["isOperating"] = on data["hasOccupant"] = occupant ? 1 : 0 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index eac0c535cbd..3ac314d3b6b 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -116,7 +116,7 @@ ui = new(user, src, ui_key, "thermomachine", name, 400, 240, master_ui, state) ui.open() -/obj/machinery/atmospherics/components/unary/thermomachine/get_ui_data(mob/user) +/obj/machinery/atmospherics/components/unary/thermomachine/ui_data(mob/user) var/list/data = list() data["on"] = on diff --git a/code/modules/atmospherics/machinery/other/area_atmos_computer.dm b/code/modules/atmospherics/machinery/other/area_atmos_computer.dm deleted file mode 100644 index 53aa393b48d..00000000000 --- a/code/modules/atmospherics/machinery/other/area_atmos_computer.dm +++ /dev/null @@ -1,176 +0,0 @@ -/obj/machinery/computer/area_atmos - name = "area air control computer" - desc = "A computer used to control the stationary scrubbers and pumps in the area." - icon_screen = "area_atmos" - icon_keyboard = "atmos_key" - circuit = "/obj/item/weapon/circuitboard/area_atmos" - - var/list/connectedscrubbers = new() - var/status = "" - - var/range = 25 - - //Simple variable to prevent me from doing attack_hand in both this and the child computer - var/zone = "This computer is working on a wireless range, the range is currently limited to 25 meters." - -/obj/machinery/computer/area_atmos/New() - ..() - //So the scrubbers have time to spawn - spawn(10) - scanscrubbers() - -/obj/machinery/computer/area_atmos/attack_hand(mob/user) - if(..()) - return - src.add_fingerprint(usr) - var/dat = {" - - - - - -- [status] Area Air Control
- Scan -
| [scrubber.name] | -Turn On Turn Off | -
"
dat += "General Settings" dat += "UI Style: [UI_style]" + dat += "Keybindings: [(hotkeys) ? "Hotkeys" : "Default"] " dat += "tgui Style: [(tgui_fancy) ? "Fancy" : "No Frills"] " dat += "tgui Monitors: [(tgui_lock) ? "Primary" : "All"] " dat += "Play admin midis: [(toggles & SOUND_MIDI) ? "Yes" : "No"] " @@ -1021,6 +1023,9 @@ var/list/preferences_datums = list() else UI_style = "Midnight" + if("hotkeys") + hotkeys = !hotkeys + if("tgui_fancy") tgui_fancy = !tgui_fancy if("tgui_lock") diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 2ebae5c1065..cc0bad052bf 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -194,6 +194,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["ooccolor"] >> ooccolor S["lastchangelog"] >> lastchangelog S["UI_style"] >> UI_style + S["hotkeys"] >> hotkeys S["tgui_fancy"] >> tgui_fancy S["tgui_lock"] >> tgui_lock @@ -222,6 +223,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car ooccolor = sanitize_ooccolor(sanitize_hexcolor(ooccolor, 6, 1, initial(ooccolor))) lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog)) UI_style = sanitize_inlist(UI_style, list("Midnight", "Plasmafire", "Retro", "Slimecore", "Operative"), initial(UI_style)) + hotkeys = sanitize_integer(hotkeys, 0, 1, initial(hotkeys)) tgui_fancy = sanitize_integer(tgui_fancy, 0, 1, initial(tgui_fancy)) tgui_lock = sanitize_integer(tgui_lock, 0, 1, initial(tgui_lock)) default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot)) @@ -245,6 +247,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["ooccolor"] << ooccolor S["lastchangelog"] << lastchangelog S["UI_style"] << UI_style + S["hotkeys"] << hotkeys S["tgui_fancy"] << tgui_fancy S["tgui_lock"] << tgui_lock S["be_special"] << be_special diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 01a41abc9fd..fdb4d7eb748 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -25,7 +25,7 @@ var/obj/item/weapon/paper/P = new(get_turf(src)) P.name = "paper- 'Scanner Report'" P.info = " " - P.info += list2text(log, " ") + P.info += jointext(log, " ") P.info += " Notes: " P.info_links = P.info diff --git a/code/modules/flufftext/TextFilters.dm b/code/modules/flufftext/TextFilters.dm index f7f6929d2e1..b529aec9059 100644 --- a/code/modules/flufftext/TextFilters.dm +++ b/code/modules/flufftext/TextFilters.dm @@ -4,7 +4,7 @@ /proc/NewStutter(phrase,stunned) phrase = html_decode(phrase) - var/list/split_phrase = text2list(phrase," ") //Split it up into words. + var/list/split_phrase = splittext(phrase," ") //Split it up into words. var/list/unstuttered_words = split_phrase.Copy() var/i = rand(1,3) @@ -35,7 +35,7 @@ split_phrase[index] = word - return sanitize(list2text(split_phrase," ")) + return sanitize(jointext(split_phrase," ")) /proc/Stagger(mob/M,d) //Technically not a filter, but it relates to drunkenness. step(M, pick(d,turn(d,90),turn(d,-90))) @@ -45,7 +45,7 @@ if(chance >= 100) return original_msg var/list - words = text2list(original_msg," ") + words = splittext(original_msg," ") new_words = list() var/new_msg = "" @@ -57,6 +57,6 @@ continue new_words += w - new_msg = list2text(new_words," ") + new_msg = jointext(new_words," ") return new_msg diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index 6f31a22f717..5f08f86d952 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -150,29 +150,25 @@ /obj/machinery/computer/holodeck/Topic(href, list/href_list) if(..()) return - if(Adjacent(usr) || istype(usr, /mob/living/silicon)) - usr.set_machine(src) - src.add_fingerprint(usr) - if(href_list["loadarea"]) - var/typepath = text2path(href_list["loadarea"]) - if(ispath(typepath,/area)) - var/area/target = locate(typepath) - if(istype(target)) - load_program(target) - else - world.log << "area not ready: [typepath]" - else - world.log << "bad area argument: [href_list["loadarea"]]" - else if("safety" in href_list) - var/oe = emagged - emagged = !text2num(href_list["safety"]) - if(oe == emagged) return - if(program && !stat) - if(!emagged && program.restricted) - load_program(offline_program) - else - nerf(!emagged) - src.updateUsrDialog() + if(!Adjacent(usr) && !istype(usr, /mob/living/silicon)) + return + usr.set_machine(src) + src.add_fingerprint(usr) + if(href_list["loadarea"]) + var/areapath = text2path(href_list["loadarea"]) + if(!ispath(areapath, /area/holodeck)) + return + var/area/holodeck/area = locate(areapath) + if(!istype(area)) + return + if((area in program_cache) || (emagged && (area in emag_programs))) + load_program(area) + else if("safety" in href_list) + var/safe = text2num(href_list["safety"]) + if(!program) + return + nerf(safe) + src.updateUsrDialog() /obj/machinery/computer/holodeck/proc/nerf(active) for(var/obj/item/I in spawned) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 92a623c69f7..64bef84887e 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -124,7 +124,7 @@ if(!src.req_access) src.req_access = list() if(src.req_access_txt) - var/list/req_access_str = text2list(req_access_txt,";") + var/list/req_access_str = splittext(req_access_txt,";") for(var/x in req_access_str) var/n = text2num(x) if(n) @@ -133,7 +133,7 @@ if(!src.req_one_access) src.req_one_access = list() if(src.req_one_access_txt) - var/list/req_one_access_str = text2list(req_one_access_txt,";") + var/list/req_one_access_str = splittext(req_one_access_txt,";") for(var/x in req_one_access_str) var/n = text2num(x) if(n) diff --git a/code/modules/jobs/job_types/civilian_chaplain.dm b/code/modules/jobs/job_types/civilian_chaplain.dm index ba69cf1c3af..f614fec9b14 100644 --- a/code/modules/jobs/job_types/civilian_chaplain.dm +++ b/code/modules/jobs/job_types/civilian_chaplain.dm @@ -15,8 +15,8 @@ Chaplain outfit = /datum/outfit/job/chaplain - access = list(access_morgue, access_chapel_office, access_crematorium) - minimal_access = list(access_morgue, access_chapel_office, access_crematorium) + access = list(access_morgue, access_chapel_office, access_crematorium, access_theatre) + minimal_access = list(access_morgue, access_chapel_office, access_crematorium, access_theatre) /datum/outfit/job/chaplain name = "Chaplain" diff --git a/code/modules/json/json.dm b/code/modules/json/json.dm deleted file mode 100644 index d3b80d6792d..00000000000 --- a/code/modules/json/json.dm +++ /dev/null @@ -1,284 +0,0 @@ -/* Usage: - JSON.stringify(obj) - Converts lists and values into a JSON string. - JSON.parse(json) - Converts a JSON string into lists and values. -*/ - -/var/datum/jsonHelper/JSON = new // A namespace for procs. - -// ************************************ WRITER ************************************ -/datum/jsonHelper/proc/stringify(value) - return list2text(WriteValue(list(), value)) - -/datum/jsonHelper/proc/WriteValue(list/json, value) - . = json - if(isnum(value)) - json += value // Consider num2text(value, 20) for maximum accuracy. - else if(isnull(value)) - json += "null" - else if(istext(value)) - WriteString(json, value) - else if(istype(value, /list)) - WriteList(json, value) - else - throw EXCEPTION("Datums cannot be converted to JSON.") - -/datum/jsonHelper/proc/WriteString(list/json, str) - . = json - var/quotePos = findtextEx(str, "\"") - var/bsPos = findtextEx(str, "\\") - if (quotePos == 0 && bsPos == 0) - json.Add("\"", str, "\"") - else - json += "\"" - var/lastStop = 1 - while(quotePos != 0 || bsPos != 0) - var/escPos - if(quotePos < bsPos && quotePos != 0 || bsPos == 0) - escPos = quotePos - else - escPos = bsPos - json.Add(copytext(str, lastStop, escPos), "\\") - lastStop = escPos - if(escPos == quotePos) - quotePos = findtextEx(str, "\"", escPos + 1) - else if(escPos == bsPos) - bsPos = findtextEx(str, "\\", escPos + 1) - json.Add(copytext(str, lastStop), "\"") - -/datum/jsonHelper/proc/WriteList(list/json, list/listVal) - . = json - #define Either 0 - #define CannotBeArray 1 - #define CannotBeObject 2 - #define BadList (CannotBeArray | CannotBeObject) - var/listType = Either - for(var/key in listVal) - if(istext(key)) - if(!isnull(listVal[key])) - listType |= CannotBeArray - else - if(!isnum(key) && !isnull(listVal[key])) - listType = BadList - else - listType |= CannotBeObject - - if(listType == BadList) - throw EXCEPTION("The given list cannot be converted to JSON.") - - if(listType == CannotBeArray) - json += "{" - var/addComma - for(var/key in listVal) - if(addComma) - json += "," - else - addComma = TRUE - WriteString(json, key) - json += ":" - WriteValue(json, listVal[key]) - json += "}" - else - json += "\[" - var/addComma - for(var/key in listVal) - if(addComma) - json += "," - else - addComma = TRUE - WriteValue(json, key) - json += "]" - #undef Either - #undef CannotBeFlat - #undef CannotBeAssoc - #undef BadList - -// ************************************ READER ************************************ -#define aBackspace 0x08 -#define aTab 0x09 -#define aLineBreak 0x0A -#define aVertTab 0x0B -#define aFormFeed 0x0C -#define aCarriageReturn 0x0D -#define aSpace 0x20 -#define aZero 0x30 -#define aNonBreakSpace 0xA0 - -#define Advance if(++readPos > jsonLen) { curAscii = 0; curChar = "" } else { curAscii = text2ascii(json, readPos); curChar = ascii2text(curAscii) } // Deal with it. -#define SkipWhitespace while(curAscii in whitespace) Advance -#define AdvanceWS Advance; SkipWhitespace - -/datum/jsonHelper/var - readPos - jsonLen - json - curAscii - curChar - static/list/whitespace = list(aTab, aLineBreak, aVertTab, aFormFeed, aCarriageReturn, aSpace, aNonBreakSpace) - -/datum/jsonHelper/proc/parse(json) - readPos = 0 - jsonLen = length(json) - src.json = json - curAscii = 0 - curChar = "" - AdvanceWS - var/value = ParseValue() - if(readPos < jsonLen) - throw EXCEPTION("Expected: End of JSON") - return value - -/datum/jsonHelper/proc/ParseValue() - if(curChar == "\"") - return ParseString() - else if(curChar == "-" || (curAscii >= aZero && curAscii <= aZero + 9)) - return ParseNumber() - else if(curChar == "{") - return ParseObject() - else if(curChar == "\[") - return ParseArray() - else if(curChar == "t") - if(copytext(json, readPos, readPos+4) == "true") - readPos += 3 - AdvanceWS - return TRUE - else - throw EXCEPTION("Expected: 'true'") - else if(curChar == "f") - if(copytext(json, readPos, readPos+5) == "false") - readPos += 4 - AdvanceWS - return FALSE - else - throw EXCEPTION("Expected: 'false'") - else if(curChar == "n") - if(copytext(json, readPos, readPos+4) == "null") - readPos += 3 - AdvanceWS - return null - else - throw EXCEPTION("Expected: 'null'") - else if(curChar == "") - throw EXCEPTION("Unexpected: End of JSON") - else - throw EXCEPTION("Unexpected: '[curChar]'") - - - -/datum/jsonHelper/proc/ParseString() - ASSERT(curChar == "\"") - Advance - var/list/chars = list() - while(readPos <= jsonLen) - if(curChar == "\"") - AdvanceWS - return list2text(chars) - else if(curChar == "\\") - Advance - switch(curChar) - if("\"", "\\", "/") - chars += ascii2text(curAscii) - if("b") - chars += ascii2text(aBackspace) - if("f") - chars += ascii2text(aFormFeed) - if("n") - chars += "\n" - if("r") - chars += ascii2text(aCarriageReturn) // Should we ignore these? - if("t") - chars += "\t" - if("u") - throw EXCEPTION("JSON \\uXXXX escape sequence not supported") - else - throw EXCEPTION("Invalid escape sequence") - Advance - else - chars += ascii2text(curAscii) - Advance - throw EXCEPTION("Unterminated string") - -/datum/jsonHelper/proc/ParseNumber() - var/firstPos = readPos - if(curChar == "-") - Advance - if(curAscii >= aZero + 1 && curAscii <= aZero + 9) - do - Advance - while(curAscii >= aZero && curAscii <= aZero + 9) - else if(curAscii == aZero) - Advance - else - throw EXCEPTION("Expected: digit") - - if(curChar == ".") - Advance - var/found = FALSE - while(curAscii >= aZero && curAscii <= aZero + 9) - found = TRUE - Advance - if(!found) - throw EXCEPTION("Expected: digit") - - if(curChar == "E" || curChar == "e") - Advance - var/found = FALSE - if(curChar == "-") - Advance - else if(curChar == "+") - Advance - while(curAscii >= aZero && curAscii <= aZero + 9) - found = TRUE - Advance - if(!found) - throw EXCEPTION("Expected: digit") - - SkipWhitespace - return text2num(copytext(json, firstPos, readPos)) - -/datum/jsonHelper/proc/ParseObject() - ASSERT(curChar == "{") - var/list/object = list() - AdvanceWS - while(curChar == "\"") - var/key = ParseString() - if(curChar != ":") - throw EXCEPTION("Expected: ':'") - AdvanceWS - object[key] = ParseValue() - if(curChar == ",") - AdvanceWS - else - break - if(curChar != "}") - throw EXCEPTION("Expected: string or '}'") - AdvanceWS - return object - -/datum/jsonHelper/proc/ParseArray() - ASSERT(curChar == "\[") - var/list/array = list() - AdvanceWS - while(curChar != "]") - array += list(ParseValue()) // Wrapped in a list in case ParseValue() returns a list. - if(curChar == ",") - AdvanceWS - else - break - if(curChar != "]") - throw EXCEPTION("Expected: ']'") - AdvanceWS - return array - -#undef aBackspace -#undef aTab -#undef aLineBreak -#undef aVertTab -#undef aFormFeed -#undef aCarriageReturn -#undef aSpace -#undef aZero -#undef aNonBreakSpace - -#undef Advance -#undef SkipWhitespace -#undef AdvanceWS \ No newline at end of file diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index e97420afbde..26e7677aa91 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -167,9 +167,11 @@ playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) -/mob/living/carbon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0) +/mob/living/carbon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0) var/damage = intensity - check_eye_prot() if(..()) // we've been flashed + if(visual) + return if(weakeyes) Stun(2) switch(damage) @@ -200,7 +202,6 @@ else src << "Your eyes are really starting to hurt. This can't be good for you!" return 1 - else if(damage == 0) // just enough protection if(prob(20)) src << "Something bright flashes in the corner of your vision!" @@ -583,31 +584,44 @@ var/const/GALOSHES_DONT_HELP = 4 add_abilities_to_panel() -/mob/living/carbon/proc/vomit(var/lost_nutrition = 10, var/blood) +/mob/living/carbon/proc/vomit(var/lost_nutrition = 10, var/blood = 0, var/stun = 1, var/distance = 0, var/message = 1) if(src.is_muzzled()) - src << "The muzzle prevents you from vomiting!" + if(message) + src << "The muzzle prevents you from vomiting!" return 0 - Stun(4) + if(stun) + Stun(4) if(nutrition < 100 && !blood) - visible_message("[src] dry heaves!", \ - "You try to throw up, but there's nothing your stomach!") - Weaken(10) + if(message) + visible_message("[src] dry heaves!", \ + "You try to throw up, but there's nothing your stomach!") + if(stun) + Weaken(10) else - visible_message("[src] throws up!", \ - "You throw up!") + if(message) + visible_message("[src] throws up!", \ + "You throw up!") playsound(get_turf(src), 'sound/effects/splat.ogg', 50, 1) var/turf/T = get_turf(src) - if(blood) - if(T) - T.add_blood_floor(src) - adjustBruteLoss(3) - else - if(T) - T.add_vomit_floor(src) - nutrition -= lost_nutrition - adjustToxLoss(-3) + for(var/i=0 to distance) + if(blood) + if(T) + T.add_blood_floor(src) + if(stun) + adjustBruteLoss(3) + else + if(T) + T.add_vomit_floor(src) + nutrition -= lost_nutrition + if(stun) + adjustToxLoss(-3) + T = get_step(T, dir) + if (is_blocked_turf(T)) + break return 1 + + /mob/living/carbon/fully_replace_character_name(oldname,newname) ..() if(dna) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 4810de6cf47..33ac914b274 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -29,7 +29,7 @@ if(!gibbed) emote("deathgasp") //let the world KNOW WE ARE DEAD - dna.species.spec_death(gibbed,src) + dna.species.spec_death(gibbed, src) if(ticker && ticker.mode) sql_report_death(src) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 272222dc8ef..4f2ef525153 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -12,7 +12,7 @@ message = dna.species.handle_speech(message,src) if(viruses.len) for(var/datum/disease/pierrot_throat/D in viruses) - var/list/temp_message = text2list(message, " ") //List each word in the message + var/list/temp_message = splittext(message, " ") //List each word in the message var/list/pick_list = list() for(var/i = 1, i <= temp_message.len, i++) //Create a second list for excluding words down the line pick_list += i @@ -22,7 +22,7 @@ if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue temp_message[H] = "HONK" pick_list -= H //Make sure that you dont HONK the same word twice - message = list2text(temp_message, " ") + message = jointext(temp_message, " ") message = ..(message) message = dna.mutations_say_mods(message) return message diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm index 0d18c49084e..ba054ec21bf 100644 --- a/code/modules/mob/living/carbon/human/species_types.dm +++ b/code/modules/mob/living/carbon/human/species_types.dm @@ -74,14 +74,12 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) return randname +var/regex/lizard_hiss = new("s+", "g") +var/regex/lizard_hiSS = new("S+", "g") /datum/species/lizard/handle_speech(message) - if(copytext(message, 1, 2) != "*") - message = regEx_replaceall(message, "(? 0, i--) @@ -427,7 +425,7 @@ datum/species/human/spec_death(gibbed, mob/living/carbon/human/H) if(prob(20) && message_list.len > 3) message_list.Insert(insertpos, "[pick("BRAINS", "Brains", "Braaaiinnnsss", "BRAAAIIINNSSS")]...") - return list2text(message_list, " ") + return jointext(message_list, " ") /datum/species/cosmetic_zombie name = "Human" diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 98b621f8671..60915c1b544 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -56,9 +56,9 @@ sleeping = 0 update_sight() update_vision_overlays() + clear_fullscreens() update_damage_hud() update_health_hud() - update_canmove() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 3dcc0f30172..a9270b6e601 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -193,8 +193,7 @@ Sorry Giacom. Please don't be mad :( /mob/living/ex_act(severity, target) ..() - if(client && !eye_blind) - flick("flash", src.flash) + flash_eyes() /mob/living/proc/updatehealth() if(status_flags & GODMODE) @@ -720,9 +719,10 @@ Sorry Giacom. Please don't be mad :( floating = 0 //called when the mob receives a bright flash -/mob/living/proc/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0) +/mob/living/proc/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash) if(check_eye_prot() < intensity && (override_blindness_check || !(disabilities & BLIND))) - flick("e_flash", flash) + overlay_fullscreen("flash", type) + addtimer(src, "clear_fullscreen", 25, FALSE, "flash", 25) return 1 //this returns the mob's protection against eye damage (number between -1 and 2) diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index 55f068eba59..4b94f89d3ac 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -15,8 +15,8 @@ anchored = 0 //unbolt floorbolts update_canmove() - if(src.eyeobj) - src.eyeobj.setLoc(get_turf(src)) + if(eyeobj) + eyeobj.setLoc(get_turf(src)) shuttle_caller_list -= src SSshuttle.autoEvac() @@ -42,7 +42,7 @@ for(var/obj/machinery/ai_status_display/O in world) //change status if(src.key) O.mode = 2 - if (istype(loc, /obj/item/device/aicard)) + if(istype(loc, /obj/item/device/aicard)) loc.icon_state = "aicard-404" return ..() diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index b43ef3552f4..bc050cfaa3b 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -109,7 +109,7 @@ var/const/VOX_DELAY = 600 src << "Wireless interface disabled, unable to interact with announcement PA." return - var/list/words = text2list(trim(message), " ") + var/list/words = splittext(trim(message), " ") var/list/incorrect_words = list() if(words.len > 30) diff --git a/code/modules/mob/living/silicon/robot/login.dm b/code/modules/mob/living/silicon/robot/login.dm index e04f992744b..b1218a210fc 100644 --- a/code/modules/mob/living/silicon/robot/login.dm +++ b/code/modules/mob/living/silicon/robot/login.dm @@ -8,6 +8,4 @@ ticker.mode.remove_gangster(mind,1,remove_bosses=1) ticker.mode.remove_thrall(mind,0) ticker.mode.remove_shadowling(mind) - ticker.mode.remove_hog_follower(mind, 0) - - winset(src, null, "mainwindow.macro=robot-default") \ No newline at end of file + ticker.mode.remove_hog_follower(mind, 0) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 08aa811cffd..f7922b9d411 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -5,6 +5,8 @@ icon_state = "robot" maxHealth = 100 health = 100 + macro_default = "robot-default" + macro_hotkeys = "robot-hotkeys" bubble_icon = "robot" var/sight_mode = 0 var/custom_name = "" @@ -676,7 +678,7 @@ /mob/living/silicon/robot/attack_slime(mob/living/simple_animal/slime/M) if(..()) //successful slime shock - flick("noise", flash) + flash_eyes() var/stunprob = M.powerlevel * 7 + 10 if(prob(stunprob) && M.powerlevel >= 8) adjustBruteLoss(M.powerlevel * rand(6,10)) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index d7b0945faa5..72a48a63fe2 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -99,11 +99,13 @@ var/obj/item/weapon/melee/baton/B = I if(B.bcell) B.bcell.charge = B.bcell.maxcharge + if(istype(I, /obj/item/weapon/tank/jetpack)) + var/obj/item/weapon/tank/jetpack/J = I + J.air_contents.assert_gas("co2") + J.air_contents.gases["co2"][MOLES] = (6 * ONE_ATMOSPHERE) * J.volume / (R_IDEAL_GAS_EQUATION * T20C) R.toner = R.tonermax - return - /obj/item/weapon/robot_module/proc/rebuild()//Rebuilds the list so it's possible to add/remove items from the module var/list/temp_list = modules modules = list() diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 37605204ab1..5058bc292d8 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -136,9 +136,9 @@ src.take_organ_damage(20) if(2) src.take_organ_damage(10) - flick("noise", src:flash) src << "*BZZZT*" src << "Warning: Electromagnetic pulse detected." + flash_eyes(affect_silicon = 1) ..() /mob/living/silicon/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0) @@ -394,7 +394,7 @@ visible_message("[M] has slashed at [src]!", \ "[M] has slashed at [src]!") if(prob(8)) - flick("noise", flash) + flash_eyes(affect_silicon = 1) add_logs(M, src, "attacked") adjustBruteLoss(damage) updatehealth() @@ -467,7 +467,7 @@ /mob/living/silicon/grabbedby(mob/living/user) return -/mob/living/silicon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0) +/mob/living/silicon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash/noise) if(affect_silicon) return ..() diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 92339d872e9..aaa61f49a39 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -18,6 +18,8 @@ speak_emote = list("states") bubble_icon = "machine" + faction = list("neutral, silicon") + var/obj/machinery/bot_core/bot_core = null var/bot_core_type = /obj/machinery/bot_core var/list/users = list() //for dialog updates @@ -252,6 +254,7 @@ src << "You sense your form change as you are uploaded into [src]." bot_name = name name = paicard.pai.name + faction = user.faction add_logs(user, paicard.pai, "uploaded to [src.bot_name],") else user << "[W] is inactive." @@ -857,6 +860,7 @@ Pass a positive integer as an argument to override a bot's default speed. paicard.pai << "You feel your control fade as [paicard] ejects from [bot_name]." paicard = null name = bot_name + faction = initial(faction) /mob/living/simple_animal/bot/proc/ejectpairemote(mob/user) if(bot_core.allowed(user) && paicard) @@ -881,3 +885,6 @@ Pass a positive integer as an argument to override a bot's default speed. ..() if(paicard && (!client || stat == DEAD)) ejectpai(0) + +/mob/living/simple_animal/bot/sentience_act() + faction -= "silicon" \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 7ddd1dc2a74..836a0d63579 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -171,7 +171,7 @@ var/global/mulebot_count = 0 ui = new(user, src, ui_key, "mulebot", name, 600, 375, master_ui, state) ui.open() -/mob/living/simple_animal/bot/mulebot/get_ui_data(mob/user) +/mob/living/simple_animal/bot/mulebot/ui_data(mob/user) var/list/data = list() data["on"] = on data["locked"] = locked diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 59f9a7303f3..7ce2de34087 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -274,13 +274,13 @@ /mob/living/simple_animal/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) - attack_threshold_check(damage,M.melee_damage_type) + apply_damage(damage, M.melee_damage_type, threshold_check = 1, threshold_message = 1) return 1 /mob/living/simple_animal/bullet_act(obj/item/projectile/Proj) if(!Proj) return - apply_damage(Proj.damage, Proj.damage_type) + apply_damage(Proj.damage, Proj.damage_type, threshold_message = 1) Proj.on_hit(src) return 0 @@ -330,7 +330,7 @@ M.do_attack_animation(src) visible_message("[M] [response_harm] [src]!") playsound(loc, "punch", 25, 1, -1) - attack_threshold_check(harm_intent_damage) + apply_damage(harm_intent_damage, threshold_check = 1, threshold_message = 1) add_logs(M, src, "attacked") updatehealth() return 1 @@ -339,7 +339,7 @@ if(..()) //successful monkey bite. if(stat != DEAD) var/damage = rand(1, 3) - attack_threshold_check(damage) + apply_damage(damage, threshold_check = 1, threshold_message = 1) return 1 if (M.a_intent == "help") if (health > 0) @@ -360,7 +360,7 @@ visible_message("[M] has slashed at [src]!", \ "[M] has slashed at [src]!") playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1) - attack_threshold_check(damage) + apply_damage(damage, threshold_check = 1, threshold_message = 1) add_logs(M, src, "attacked") return 1 @@ -369,7 +369,7 @@ var/damage = rand(5, 10) if(stat != DEAD) L.amount_grown = min(L.amount_grown + damage, L.max_grown) - attack_threshold_check(damage) + apply_damage(damage, threshold_check = 1, threshold_message = 1) return 1 /mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M) @@ -377,15 +377,16 @@ var/damage = rand(15, 25) if(M.is_adult) damage = rand(20, 35) - attack_threshold_check(damage) + apply_damage(damage, threshold_check = 1, threshold_message = 1) return 1 -/mob/living/simple_animal/proc/attack_threshold_check(damage, damagetype = BRUTE) - if(damage <= force_threshold || !damage_coeff[damagetype]) - visible_message("[src] looks unharmed.") +/mob/living/simple_animal/apply_damage(damage = 0, damagetype = BRUTE, threshold_check = 0, threshold_message = 0) + if(!damage_coeff[damagetype] || threshold_check && damage <= force_threshold) + if(threshold_message) + visible_message("[src] looks unharmed.") + return 0 else - adjustBruteLoss(damage) - updatehealth() + return ..() /mob/living/simple_animal/attackby(obj/item/O, mob/living/user, params) //Marker -Agouri diff --git a/code/modules/mob/living/simple_animal/slime/death.dm b/code/modules/mob/living/simple_animal/slime/death.dm index 2f28d8b1359..0a20862a574 100644 --- a/code/modules/mob/living/simple_animal/slime/death.dm +++ b/code/modules/mob/living/simple_animal/slime/death.dm @@ -18,7 +18,7 @@ return if(buckled) - Feedstop(silent=1) //releases ourselves from the mob we fed on. + Feedstop(silent = 1) //releases ourselves from the mob we fed on. stat = DEAD overlays.len = 0 diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 7f6c9fee544..e4bb256f899 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -57,4 +57,7 @@ sync_mind() - winset(src, null, "mainwindow.macro=default") \ No newline at end of file + if(client.prefs.hotkeys) + winset(src, null, "mainwindow.macro=[macro_hotkeys] mapwindow.map.focus=true input.background-color=#e0e0e0") + else + winset(src, null, "mainwindow.macro=[macro_default] input.focus=true input.background-color=#d3b5b5") diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 99a5e26cb68..5a2ea7b281b 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -10,9 +10,8 @@ var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak - var/obj/screen/flash = null + var/obj/screen/hands = null - var/obj/screen/damageoverlay = null /*A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob. A variable should only be globally attached to turfs/objects/whatever, when it is in fact needed as such. The current method unnecessarily clusters up the variable list, especially for humans (although rearranging won't really clean it up a lot but the difference will be noticable for other mobs). @@ -21,6 +20,9 @@ */ var/zone_selected = null + var/macro_default = "default" + var/macro_hotkeys = "hotkeys" + var/damageoverlaytemp = 0 var/computer_id = null var/lastattacker = null diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index 308f94245b7..87e9255e41d 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -21,7 +21,7 @@ Contents: /obj/item/clothing/mask/gas/voice/space_ninja/speechModification(message) if(voice == "Unknown") if(copytext(message, 1, 2) != "*") - var/list/temp_message = text2list(message, " ") + var/list/temp_message = splittext(message, " ") var/list/pick_list = list() for(var/i = 1, i <= temp_message.len, i++) pick_list += i @@ -30,7 +30,7 @@ Contents: if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue temp_message[H] = ninjaspeak(temp_message[H]) pick_list -= H - message = list2text(temp_message, " ") + message = jointext(temp_message, " ") //The Alternate speech mod is now the main one. message = replacetext(message, "l", "r") diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 7efef3d01bf..98faa83bf9b 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -617,7 +617,7 @@ ui = new(user, src, ui_key, "apc", name, 535, 515, master_ui, state) ui.open() -/obj/machinery/power/apc/get_ui_data(mob/user) +/obj/machinery/power/apc/ui_data(mob/user) var/list/data = list( "locked" = locked, "isOperating" = operating, @@ -625,7 +625,7 @@ "powerCellStatus" = cell ? cell.percent() : null, "chargeMode" = chargemode, "chargingStatus" = charging, - "totalLoad" = lastused_equip + lastused_light + lastused_environ, + "totalLoad" = lastused_total, "coverLocked" = coverlocked, "siliconUser" = user.has_unlimited_silicon_privilege, "malfStatus" = get_malf_status(user), diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index cc5416f52e8..5ca4eabf1df 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -114,11 +114,6 @@ By design, d1 is the smallest direction and d2 is the highest else icon_state = "[d1]-[d2]" - -// returns the powernet this cable belongs to -/obj/structure/cable/proc/get_powernet() //TODO: remove this as it is obsolete - return powernet - //Telekinesis has no effect on a cable /obj/structure/cable/attack_tk(mob/user) return diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm new file mode 100644 index 00000000000..b0f11026686 --- /dev/null +++ b/code/modules/power/monitor.dm @@ -0,0 +1,81 @@ +/obj/machinery/computer/monitor + name = "power monitoring console" + desc = "It monitors power levels across the station." + icon_screen = "power" + icon_keyboard = "power_key" + use_power = 2 + idle_power_usage = 20 + active_power_usage = 100 + circuit = /obj/item/weapon/circuitboard/powermonitor + + var/obj/structure/cable/attached + + var/list/history = list() + var/record_size = 60 + var/record_interval = 50 + var/next_record = 0 + +/obj/machinery/computer/monitor/New() + ..() + search() + history["supply"] = list() + history["demand"] = list() + +/obj/machinery/computer/monitor/process() + if(!attached) + use_power = 1 + search() + else + use_power = 2 + record() + +/obj/machinery/computer/monitor/proc/search() + var/turf/T = get_turf(src) + attached = locate() in T + +/obj/machinery/computer/monitor/proc/record() + if(world.time >= next_record) + next_record = world.time + record_interval + + var/list/supply = history["supply"] + supply += attached.powernet.viewavail + if(supply.len > record_size) + supply.Cut(1, 2) + + var/list/demand = history["demand"] + demand += attached.powernet.viewload + if(demand.len > record_size) + demand.Cut(1, 2) + +/obj/machinery/computer/monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \ + datum/tgui/master_ui = null, datum/ui_state/state = default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "power_monitor", name, 1200, 1000, master_ui, state) + ui.open() + +/obj/machinery/computer/monitor/ui_data() + var/list/data = list() + data["stored"] = record_size + data["interval"] = record_interval / 10 + data["attached"] = attached ? TRUE : FALSE + if(attached) + data["supply"] = attached.powernet.viewavail + data["demand"] = attached.powernet.viewload + data["history"] = history + + data["areas"] = list() + for(var/obj/machinery/power/terminal/term in attached.powernet.nodes) + var/obj/machinery/power/apc/A = term.master + if(istype(A)) + data["areas"] += list(list( + "name" = A.area.name, + "charge" = A.cell.percent(), + "load" = A.lastused_total, + "charging" = A.charging, + "eqp" = A.equipment, + "lgt" = A.lighting, + "env" = A.environ + )) + + return data diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index d1b4c5a01ec..6853d2dac26 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -34,7 +34,7 @@ /obj/machinery/power/proc/surplus() if(powernet) - return powernet.avail-powernet.load + return powernet.avail - powernet.load else return 0 @@ -50,10 +50,8 @@ // returns true if the area has power on given channel (or doesn't require power). // defaults to power_channel /obj/machinery/proc/powered(var/chan = -1) // defaults to power_channel - - if(!src.loc) + if(!loc) return 0 - if(!use_power) return 1 diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index f8e8826294d..28ef1488d02 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -3,14 +3,15 @@ // each contiguous network of cables & nodes ///////////////////////////////////// /datum/powernet + var/number // unique id var/list/cables = list() // all cables & junctions var/list/nodes = list() // all connected machines var/load = 0 // the current load on the powernet, increased by each machine at processing var/newavail = 0 // what available power was gathered last tick, then becomes... var/avail = 0 //...the current available power in the powernet + var/viewavail = 0 // the available power as it appears on the power console (gradually updated) var/viewload = 0 // the load as it appears on the power console (gradually updated) - var/number = 0 // Unused //TODEL var/netexcess = 0 // excess power on the powernet (typically avail-load)/////// /datum/powernet/New() @@ -75,7 +76,6 @@ //handles the power changes in the powernet //called every ticks by the powernet controller /datum/powernet/proc/reset() - //see if there's a surplus of power remaining in the powernet and stores unused power in the SMES netexcess = avail - load @@ -83,11 +83,11 @@ for(var/obj/machinery/power/smes/S in nodes) // find the SMESes in the network S.restore() // and restore some of the power that was used - //updates the viewed load (as seen on power computers) - viewload = 0.8*viewload + 0.2*load - viewload = round(viewload) + // update power consoles + viewavail = round(0.8 * viewavail + 0.2 * avail) + viewload = round(0.8 * viewload + 0.2 * load) - //reset the powernet + // reset the powernet load = 0 avail = newavail newavail = 0 diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index d1585e5b40f..6d27247e9a4 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -46,7 +46,7 @@ component_parts = list() component_parts += new /obj/item/weapon/circuitboard/smes(null) for(var/i in 1 to 5) - component_parts += new /obj/item/weapon/stock_parts/cell/high(null) + component_parts += new /obj/item/weapon/stock_parts/cell/high/empty(null) component_parts += new /obj/item/stack/cable_coil(null, 5) component_parts += new /obj/item/weapon/stock_parts/capacitor(null) RefreshParts() @@ -78,7 +78,7 @@ MC += PC.maxcharge C += PC.charge capacity = MC / (15000) * 1e6 - if(!initial(charge)) + if(!initial(charge) && !charge) charge = C / 15000 * 1e6 /obj/machinery/power/smes/attackby(obj/item/I, mob/user, params) @@ -333,7 +333,7 @@ ui = new(user, src, ui_key, "smes", name, 340, 440, master_ui, state) ui.open() -/obj/machinery/power/smes/get_ui_data() +/obj/machinery/power/smes/ui_data() var/list/data = list( "capacityPercent" = round(100*charge/capacity, 0.1), "capacity" = capacity, diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 97e91f6748d..d7562287e11 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -363,7 +363,7 @@ ui = new(user, src, ui_key, "solar_control", name, 500, 400, master_ui, state) ui.open() -/obj/machinery/power/solar_control/get_ui_data() +/obj/machinery/power/solar_control/ui_data() var/data = list() data["generated"] = round(lastgen) diff --git a/code/modules/procedural mapping/mapGenerator.dm b/code/modules/procedural mapping/mapGenerator.dm index ce6b5a18c89..c4bff6d8657 100644 --- a/code/modules/procedural mapping/mapGenerator.dm +++ b/code/modules/procedural mapping/mapGenerator.dm @@ -155,8 +155,8 @@ src << "Missing Input" return - var/list/startCoords = text2list(startInput, ";") - var/list/endCoords = text2list(endInput, ";") + var/list/startCoords = splittext(startInput, ";") + var/list/endCoords = splittext(endInput, ";") if(!startCoords || !endCoords) src << "Invalid Coords" src << "Start Input: [startInput]" diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 524dfa341cb..3631f1cc5ce 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -3,6 +3,12 @@ caliber = "357" projectile_type = /obj/item/projectile/bullet +/obj/item/ammo_casing/a762 + desc = "A 7.62 bullet casing." + icon_state = "762-casing" + caliber = "a762" + projectile_type = /obj/item/projectile/bullet + /obj/item/ammo_casing/a50 desc = "A .50AE bullet casing." caliber = ".50" @@ -142,6 +148,12 @@ icon_state = "mshell" projectile_type = /obj/item/projectile/bullet/meteorshot +/obj/item/ammo_casing/shotgun/breaching + name = "breaching shell" + desc = "An economic version of the meteorshot, utilizing similar technologies. Great for busting down doors." + icon_state = "mshell" + projectile_type = /obj/item/projectile/bullet/meteorshot/weak + /obj/item/ammo_casing/shotgun/pulseslug name = "pulse slug" desc = "A delicate device which can be loaded into a shotgun. The primer acts as a button which triggers the gain medium and fires a powerful \ diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index bc8bdb6f428..443eb48ff26 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -166,3 +166,14 @@ obj/item/ammo_casing/energy/net /obj/item/ammo_casing/energy/trap projectile_type = /obj/item/projectile/energy/trap select_name = "snare" + +/obj/item/ammo_casing/energy/instakill + projectile_type = /obj/item/projectile/beam/instakill + e_cost = 0 + select_name = "DESTROY" + +/obj/item/ammo_casing/energy/instakill/blue + projectile_type = /obj/item/projectile/beam/instakill/blue + +/obj/item/ammo_casing/energy/instakill/red + projectile_type = /obj/item/projectile/beam/instakill/red diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index a5ff5364b5e..390339609e5 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -304,6 +304,11 @@ obj/item/ammo_box/magazine/tommygunm45 icon_state = "m12gt" ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror +/obj/item/ammo_box/magazine/m12g/breach + name = "shotgun magazine (12g breacher slugs)" + icon_state = "m12gbc" + ammo_type = /obj/item/projectile/bullet/meteorshot/weak + /obj/item/ammo_box/magazine/toy name = "foam force META magazine" ammo_type = /obj/item/ammo_casing/caseless/foam_dart diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 0b7aaf73c5f..636fc7074ba 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -284,3 +284,27 @@ ammo_type = list(/obj/item/ammo_casing/energy/temp, /obj/item/ammo_casing/energy/temp/hot) cell_type = "/obj/item/weapon/stock_parts/cell/high" pin = null + +/obj/item/weapon/gun/energy/laser/instakill + name = "instakill rifle" + icon_state = "instagib" + item_state = "instagib" + desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit." + ammo_type = list(/obj/item/ammo_casing/energy/instakill) + force = 60 + origin_tech = null + +/obj/item/weapon/gun/energy/laser/instakill/red + desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a red design." + icon_state = "instagibred" + item_state = "instagibred" + ammo_type = list(/obj/item/ammo_casing/energy/instakill/red) + +/obj/item/weapon/gun/energy/laser/instakill/blue + desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a blue design." + icon_state = "instagibblue" + item_state = "instagibblue" + ammo_type = list(/obj/item/ammo_casing/energy/instakill/blue) + +/obj/item/weapon/gun/energy/laser/instagib/emp_act() //implying you could stop the instagib + return \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm index 7d54685f070..a924bd5b328 100644 --- a/code/modules/projectiles/guns/projectile/saw.dm +++ b/code/modules/projectiles/guns/projectile/saw.dm @@ -1,12 +1,12 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw name = "\improper L6 SAW" - desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation." + desc = "A heavily modified 5.56x45mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation." icon_state = "l6closed100" item_state = "l6closedmag" w_class = 5 slot_flags = 0 origin_tech = "combat=5;materials=1;syndicate=2" - mag_type = /obj/item/ammo_box/magazine/m762 + mag_type = /obj/item/ammo_box/magazine/mm556x45 heavy_weapon = 1 fire_sound = 'sound/weapons/Gunshot_smg.ogg' var/cover_open = 0 @@ -27,6 +27,7 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon() icon_state = "l6[cover_open ? "open" : "closed"][magazine ? Ceiling(get_ammo(0)/12.5)*25 : "-empty"]" + item_state = "l6[cover_open ? "openmag" : "closedmag"]" /obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays @@ -64,70 +65,77 @@ /obj/item/projectile/bullet/saw - damage = 35 + damage = 45 armour_penetration = 5 /obj/item/projectile/bullet/saw/bleeding - damage = 15 + damage = 20 armour_penetration = 0 /obj/item/projectile/bullet/saw/bleeding/on_hit(atom/target, blocked = 0, hit_zone) if((blocked != 100) && istype(target, /mob/living/carbon/human)) var/mob/living/carbon/human/H = target - H.drip(25) + H.drip(35) /obj/item/projectile/bullet/saw/hollow - damage = 45 - armour_penetration = 0 + damage = 60 + armour_penetration = -10 /obj/item/projectile/bullet/saw/ap - damage = 30 - armour_penetration = 35 + damage = 40 + armour_penetration = 75 /obj/item/projectile/bullet/saw/incen - damage = 5 + damage = 7 armour_penetration = 0 +obj/item/projectile/bullet/saw/incen/Move() + ..() + var/turf/location = get_turf(src) + if(location) + PoolOrNew(/obj/effect/hotspot, location) + location.hotspot_expose(700, 50, 1) + /obj/item/projectile/bullet/saw/incen/on_hit(atom/target, blocked = 0) . = ..() if(iscarbon(target)) var/mob/living/carbon/M = target - M.adjust_fire_stacks(1) + M.adjust_fire_stacks(3) M.IgniteMob() //magazines// -/obj/item/ammo_box/magazine/m762 - name = "box magazine (7.62mm)" +/obj/item/ammo_box/magazine/mm556x45 + name = "box magazine (5.56x45mm)" icon_state = "a762-50" origin_tech = "combat=2" - ammo_type = /obj/item/ammo_casing/a762 - caliber = "a762" + ammo_type = /obj/item/ammo_casing/mm556x45 + caliber = "mm55645" max_ammo = 50 -/obj/item/ammo_box/magazine/m762/bleeding - name = "box magazine (Bleeding 7.62mm)" +/obj/item/ammo_box/magazine/mm556x45/bleeding + name = "box magazine (Bleeding 5.56x45mm)" origin_tech = "combat=3" - ammo_type = /obj/item/ammo_casing/a762/bleeding + ammo_type = /obj/item/ammo_casing/mm556x45/bleeding -/obj/item/ammo_box/magazine/m762/hollow - name = "box magazine (Hollow-Point 7.62mm)" +/obj/item/ammo_box/magazine/mm556x45/hollow + name = "box magazine (Hollow-Point 5.56x45mm)" origin_tech = "combat=3" - ammo_type = /obj/item/ammo_casing/a762/hollow + ammo_type = /obj/item/ammo_casing/mm556x45/hollow -/obj/item/ammo_box/magazine/m762/ap - name = "box magazine (Armor Penetrating 7.62mm)" +/obj/item/ammo_box/magazine/mm556x45/ap + name = "box magazine (Armor Penetrating 5.56x45mm)" origin_tech = "combat=4" - ammo_type = /obj/item/ammo_casing/a762/ap + ammo_type = /obj/item/ammo_casing/mm556x45/ap -/obj/item/ammo_box/magazine/m762/incen - name = "box magazine (Incendiary 7.62mm)" +/obj/item/ammo_box/magazine/mm556x45/incen + name = "box magazine (Incendiary 5.56x45mm)" origin_tech = "combat=4" - ammo_type = /obj/item/ammo_casing/a762/incen + ammo_type = /obj/item/ammo_casing/mm556x45/incen -/obj/item/ammo_box/magazine/m762/update_icon() +/obj/item/ammo_box/magazine/mm556x45/update_icon() ..() icon_state = "a762-[round(ammo_count(),10)]" @@ -135,28 +143,27 @@ //casings// -/obj/item/ammo_casing/a762 - desc = "A 7.62mm bullet casing." +/obj/item/ammo_casing/mm556x45 + desc = "A 556x45mm bullet casing." icon_state = "762-casing" - caliber = "a762" + caliber = "mm55645" projectile_type = /obj/item/projectile/bullet/saw -/obj/item/ammo_casing/a762/bleeding - desc = "A 7.62mm bullet casing with specialized inner-casing, that when it makes contact with a target, release tiny shrapnel to induce internal bleeding." +/obj/item/ammo_casing/mm556x45/bleeding + desc = "A 556x45mm bullet casing with specialized inner-casing, that when it makes contact with a target, release tiny shrapnel to induce internal bleeding." icon_state = "762-casing" - caliber = "a762" projectile_type = /obj/item/projectile/bullet/saw/bleeding -/obj/item/ammo_casing/a762/hollow - desc = "A 7.62mm bullet casing designed to cause more damage to unarmored targets." +/obj/item/ammo_casing/mm556x45/hollow + desc = "A 556x45mm bullet casing designed to cause more damage to unarmored targets." projectile_type = /obj/item/projectile/bullet/saw/hollow -/obj/item/ammo_casing/a762/ap - desc = "A 7.62mm bullet casing designed with a hardened-tipped core to help penetrate armored targets." +/obj/item/ammo_casing/mm556x45/ap + desc = "A 556x45mm bullet casing designed with a hardened-tipped core to help penetrate armored targets." projectile_type = /obj/item/projectile/bullet/saw/ap -/obj/item/ammo_casing/a762/incen - desc = "A 7.62mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames. " +/obj/item/ammo_casing/mm556x45/incen + desc = "A 556x45mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames. " projectile_type = /obj/item/projectile/bullet/saw/incen diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index adc787c0679..083746274de 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -298,7 +298,7 @@ item_state = "bulldog" w_class = 3 origin_tech = "combat=5;materials=4;syndicate=6" - mag_type = /obj/item/ammo_box/magazine/m12g + mag_type = /obj/item/ammo_box/magazine/m12g/stun fire_sound = 'sound/weapons/Gunshot.ogg' can_suppress = 0 burst_size = 1 diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 043ba75060f..11b0f9b456d 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -11,7 +11,6 @@ /obj/item/projectile/beam/practice name = "practice laser" damage = 0 - hitsound = null nodamage = 1 /obj/item/projectile/beam/scatter @@ -92,3 +91,22 @@ /obj/item/projectile/beam/lasertag/bluetag icon_state = "bluelaser" suit_types = list(/obj/item/clothing/suit/redtag) + +/obj/item/projectile/beam/instakill + name = "instagib laser" + icon_state = "purple_laser" + damage = 200 + damage_type = BURN + +/obj/item/projectile/beam/instakill/blue + icon_state = "blue_laser" + +/obj/item/projectile/beam/instakill/red + icon_state = "red_laser" + +/obj/item/projectile/beam/instakill/on_hit(atom/target) + . = ..() + if(iscarbon(target)) + var/mob/living/carbon/M = target + M.visible_message("[M] explodes into a shower of gibs!") + M.gib() \ No newline at end of file diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 060fd1e7377..84c553c72ba 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -72,7 +72,7 @@ . = ..() if(iscarbon(target)) var/mob/living/carbon/M = target - M.adjust_fire_stacks(1) + M.adjust_fire_stacks(4) M.IgniteMob() @@ -101,6 +101,11 @@ stun = 8 hitsound = 'sound/effects/meteorimpact.ogg' +/obj/item/projectile/bullet/meteorshot/weak + damage = 10 + weaken = 4 + stun = 4 + /obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = 0) . = ..() if(istype(target, /atom/movable)) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 270e810c19c..07c91896be4 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -80,7 +80,7 @@ ui = new(user, src, ui_key, "chem_dispenser", name, 550, 550, master_ui, state) ui.open() -/obj/machinery/chem_dispenser/get_ui_data() +/obj/machinery/chem_dispenser/ui_data() var/data = list() data["amount"] = amount data["energy"] = energy diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index e925fde9de5..092953d1243 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -73,7 +73,7 @@ ui = new(user, src, ui_key, "chem_heater", name, 275, 400, master_ui, state) ui.open() -/obj/machinery/chem_heater/get_ui_data() +/obj/machinery/chem_heater/ui_data() var/data = list() data["targetTemp"] = target_temperature data["isActive"] = on diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm index 95f5beff14c..e8d918142f7 100644 --- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm @@ -2,6 +2,7 @@ /datum/reagent/blob name = "Unknown" description = "shouldn't exist and you should adminhelp immediately." + color = "#FFFFFF" var/shortdesc = null //just damage and on_mob effects, doesn't include special, blob-tile only effects var/blobbernaut_message = "slams" //blobbernaut attack verb var/message = "The blob strikes you" //message sent to any mob hit by the blob @@ -16,7 +17,7 @@ /datum/reagent/blob/proc/death_reaction(obj/effect/blob/B, cause) //when a blob dies, do this return -/datum/reagent/blob/proc/expand_reaction(obj/effect/blob/B, turf/T) //when the blob expands, do this +/datum/reagent/blob/proc/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T) //when the blob expands, do this return //does brute and a little stamina damage @@ -24,7 +25,7 @@ name = "Ripping Tendrils" id = "ripping_tendrils" description = "will do medium brute and stamina damage." - color = "#890000" + color = "#991010" blobbernaut_message = "rips" message_living = ", and you feel your skin ripping and tearing off" @@ -60,12 +61,12 @@ B.overmind.blob_mobs.Add(BS) return ..() -/datum/reagent/blob/sporing_pods/expand_reaction(obj/effect/blob/B, turf/T) +/datum/reagent/blob/sporing_pods/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T) if(prob(10)) var/mob/living/simple_animal/hostile/blob/blobspore/weak/BS = new/mob/living/simple_animal/hostile/blob/blobspore/weak(T) BS.overmind = B.overmind BS.update_icons() - B.overmind.blob_mobs.Add(BS) + newB.overmind.blob_mobs.Add(BS) //does brute damage but can replicate when damaged and has a chance of expanding again /datum/reagent/blob/replicating_foam @@ -82,15 +83,15 @@ /datum/reagent/blob/replicating_foam/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause) if(damage > 0 && original_health - damage > 0) - var/obj/effect/blob/newB = B.expand() + var/obj/effect/blob/newB = B.expand(null, 0) if(newB) newB.health = original_health - damage newB.check_health(cause) newB.update_icon() return ..() -/datum/reagent/blob/replicating_foam/expand_reaction(obj/effect/blob/B, turf/T) - B.expand() //do it again! +/datum/reagent/blob/replicating_foam/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T) + newB.expand() //do it again! //does low burn and a lot of stamina damage, reacts to stamina damage /datum/reagent/blob/energized_fibers @@ -98,7 +99,7 @@ id = "energized_fibers" description = "will do low burn and high stamina damage, and react to stamina damage." shortdesc = "will do low burn and high stamina damage." - color = "#FFDC73" + color = "#EFD65A" blobbernaut_message = "shocks" message_living = ", and you feel a strong tingling sensation" @@ -229,6 +230,29 @@ if(M) M.adjustStaminaLoss(0.4*reac_volume) +//does burn damage and EMPs, slightly fragile +/datum/reagent/blob/electromagnetic_web + name = "Electromagnetic Web" + id = "electromagnetic_web" + description = "will do low burn damage and EMP targets, but is somewhat fragile." + color = "#83ECEC" + blobbernaut_message = "lashes" + message = "The blob lashes you" + message_living = ", and you hear a faint buzzing" + +/datum/reagent/blob/electromagnetic_web/reaction_mob(mob/living/M, method=TOUCH, reac_volume) + reac_volume = ..() + M.emp_act(2) + if(M) + M.apply_damage(0.6*reac_volume, BURN) + +/datum/reagent/blob/electromagnetic_web/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause) + return damage * 1.2 //a laser will do 24 damage, which will kill any recently-made normal blob + +/datum/reagent/blob/electromagnetic_web/death_reaction(obj/effect/blob/B, cause) + if(!isnull(cause)) + empulse(B.loc, 2, 3) //less than screen range, so you can stand out of range to avoid it + //does brute damage, bonus damage for each nearby blob, and spreads damage out /datum/reagent/blob/synchronous_mesh name = "Synchronous Mesh" @@ -261,9 +285,9 @@ for(var/obj/effect/blob/C in orange(1, B)) if(C.overmind && C.overmind.blob_reagent_datum == B.overmind.blob_reagent_datum && !istype(C, /obj/effect/blob/core)) //only hurt blobs that have the same overmind chemical and aren't cores C.take_damage(damage/damagesplit, CLONE, B, 0) - return damage/damagesplit + return damage / damagesplit else - return damage*1.25 + return damage * 1.25 //does low brute damage, oxygen damage, and stamina damage and wets tiles when damaged /datum/reagent/blob/pressurized_slime diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index fd3755148d1..9eeaebdd865 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -241,24 +241,24 @@ build_path = /obj/item/weapon/circuitboard/rdconsole category = list("Computer Boards") -/datum/design/ordercomp - name = "Computer Design (Supply ordering console)" - desc = "Allows for the construction of circuit boards used to build a Supply ordering console." - id = "ordercomp" - req_tech = list("programming" = 2) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/ordercomp - category = list("Computer Boards") - -/datum/design/supplycomp - name = "Computer Design (Supply shuttle console)" - desc = "Allows for the construction of circuit boards used to build a Supply shuttle console." - id = "supplycomp" +/datum/design/cargo + name = "Computer Design (Supply Console)" + desc = "Allows for the construction of circuit boards used to build a Supply Console." + id = "cargo" req_tech = list("programming" = 3) build_type = IMPRINTER materials = list(MAT_GLASS = 1000, "sacid" = 20) - build_path = /obj/item/weapon/circuitboard/supplycomp + build_path = /obj/item/weapon/circuitboard/cargo + category = list("Computer Boards") + +/datum/design/cargorequest + name = "Computer Design (Supply Request Console)" + desc = "Allows for the construction of circuit boards used to build a Supply Request Console." + id = "cargorequest" + req_tech = list("programming" = 2) + build_type = IMPRINTER + materials = list(MAT_GLASS = 1000, "sacid" = 20) + build_path = /obj/item/weapon/circuitboard/cargo/request category = list("Computer Boards") /datum/design/mining diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 742091057c5..719dbb5d8eb 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -39,12 +39,12 @@ var/list/temp_list if(!id_with_upload.len) temp_list = list() - temp_list = text2list(id_with_upload_string, ";") + temp_list = splittext(id_with_upload_string, ";") for(var/N in temp_list) id_with_upload += text2num(N) if(!id_with_download.len) temp_list = list() - temp_list = text2list(id_with_download_string, ";") + temp_list = splittext(id_with_download_string, ";") for(var/N in temp_list) id_with_download += text2num(N) diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index b81553e3de8..d4018d364ee 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -36,7 +36,7 @@ var/datum/events/keycard_events = new() ui = new(user, src, ui_key, "keycard_auth", name, 375, 125, master_ui, state) ui.open() -/obj/machinery/keycard_auth/get_ui_data() +/obj/machinery/keycard_auth/ui_data() var/list/data = list() data["waiting"] = waiting data["auth_required"] = event_source ? event_source.event : 0 diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm new file mode 100644 index 00000000000..2b5968cc068 --- /dev/null +++ b/code/modules/shuttle/computer.dm @@ -0,0 +1,78 @@ +/obj/machinery/computer/shuttle + name = "Shuttle Console" + icon_screen = "shuttle" + icon_keyboard = "tech_key" + req_access = list( ) + circuit = /obj/item/weapon/circuitboard/shuttle + var/shuttleId + var/possible_destinations = "" + var/admin_controlled + var/no_destination_swap = 0 + +/obj/machinery/computer/shuttle/New(location, obj/item/weapon/circuitboard/shuttle/C) + ..() + if(istype(C)) + possible_destinations = C.possible_destinations + shuttleId = C.shuttleId + +/obj/machinery/computer/shuttle/attack_hand(mob/user) + if(..(user)) + return + src.add_fingerprint(usr) + + var/list/options = params2list(possible_destinations) + var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId) + var/dat = "Status: [M ? M.getStatusText() : "*Missing*"] " + if(M) + var/destination_found + for(var/obj/docking_port/stationary/S in SSshuttle.stationary) + if(!options.Find(S.id)) + continue + if(M.canDock(S)) + continue + destination_found = 1 + dat += "Send to [S.name] " + if(!destination_found) + dat += "Shuttle Locked " + if(admin_controlled) + dat += "Authorized personnel only " + dat += "Request Authorization " + dat += "Close" + + var/datum/browser/popup = new(user, "computer", M ? M.name : "shuttle", 300, 200) + popup.set_content(" " - if(M) - var/destination_found - for(var/obj/docking_port/stationary/S in SSshuttle.stationary) - if(!options.Find(S.id)) - continue - if(M.canDock(S)) - continue - destination_found = 1 - dat += "Send to [S.name] " - if(!destination_found) - dat += "Shuttle Locked " - if(admin_controlled) - dat += "Authorized personnel only " - dat += "Request Authorization " - dat += "Close" - - var/datum/browser/popup = new(user, "computer", M ? M.name : "shuttle", 300, 200) - popup.set_content("
+ 06 February 2016+LordPidey updated:+
Lzimann updated:+
neersighted updated:+
05 February 2016+Joan updated:+
Kor updated:+
MMMiracles updated:+
PKPenguin321 updated:+
bgobandit updated:+
octareenroon91 updated:+
01 February 2016Erwgd updated:
+ - #{{id}}
+ {{object}}
+ {{cost}} Points
+
+
+ #{{id}}
+ {{object}}
+ {{cost}} Points
+ By {{orderedby}}
+ Comment: {{comment}}
+ {{#if !data.requestonly}}
+
+
+ {{/if}}
+ Area
+ Charge
+ Load
+ Status
+ Equipment
+ Lighting
+ Environment
+ {{Math.round(adata.areas[@index].charge)}} %
+ {{Math.round(adata.areas[@index].load)}} W
+ {{chargingMode(charging)}}
+ {{channelPower(eqp)}} [{{channelMode(eqp)}}]
+ {{channelPower(lgt)}} [{{channelMode(lgt)}}]
+ {{channelPower(env)}} [{{channelMode(env)}}]
+ + {{else}} + Pure + {{/each}} + + {{/each}} + |