diff --git a/baystation12.dme b/baystation12.dme index 0235a3dabad..4c31adaf3c5 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1335,7 +1335,6 @@ #include "code\WorkInProgress\Cael_Aislinn\Supermatter\SuperMatter.dm" #include "code\WorkInProgress\Cael_Aislinn\Supermatter\ZeroPointLaser.dm" #include "code\WorkInProgress\Chinsky\ashtray.dm" -#include "code\WorkInProgress\Cib\MedicalSideEffects.dm" #include "code\WorkInProgress\kilakk\fax.dm" #include "code\WorkInProgress\Mini\ATM.dm" #include "code\WorkInProgress\Mini\atmos_control.dm" diff --git a/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm b/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm index 7fcd57eefd3..724168c8c1a 100644 --- a/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm +++ b/code/WorkInProgress/Cael_Aislinn/Economy/Accounts.dm @@ -14,7 +14,7 @@ var/global/list/all_money_accounts = list() station_account = new() station_account.owner_name = "[station_name()] Station Account" station_account.account_number = rand(111111, 999999) - station_account.remote_access_pin = rand(1111, 111111) + station_account.remote_access_pin = rand(1000, 9999) station_account.money = 75000 //create an entry in the account transaction log for when it was created @@ -36,7 +36,7 @@ var/global/list/all_money_accounts = list() var/datum/money_account/department_account = new() department_account.owner_name = "[department] Account" department_account.account_number = rand(111111, 999999) - department_account.remote_access_pin = rand(1111, 111111) + department_account.remote_access_pin = rand(1000, 9999) department_account.money = 5000 //create an entry in the account transaction log for when it was created @@ -62,7 +62,7 @@ var/global/list/all_money_accounts = list() //create a new account var/datum/money_account/M = new() M.owner_name = new_owner_name - M.remote_access_pin = rand(1111, 111111) + M.remote_access_pin = rand(1000, 9999) M.money = starting_funds //create an entry in the account transaction log for when it was created @@ -161,7 +161,7 @@ var/global/list/all_money_accounts = list() vendor_account = department_accounts["Vendor"] if(!current_date_string) - current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 2557" + current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [game_year]" machine_id = "[station_name()] Acc. DB #[num_financial_terminals++]" diff --git a/code/ZAS/FEA_gas_mixture.dm b/code/ZAS/FEA_gas_mixture.dm index 8b7ab992c93..273d7669f1d 100644 --- a/code/ZAS/FEA_gas_mixture.dm +++ b/code/ZAS/FEA_gas_mixture.dm @@ -367,7 +367,7 @@ What are the archived variables for? //del(giver) return 1 -/datum/gas_mixture/proc/remove(amount) +/datum/gas_mixture/proc/remove(amount, var/filtered = 0) //Purpose: Removes a certain number of moles from the air. //Called by: ? //Inputs: How many moles to remove. @@ -384,7 +384,7 @@ What are the archived variables for? removed.oxygen = QUANTIZE((oxygen/sum)*amount) removed.nitrogen = QUANTIZE((nitrogen/sum)*amount) removed.carbon_dioxide = QUANTIZE((carbon_dioxide/sum)*amount) - removed.toxins = QUANTIZE((toxins/sum)*amount) + removed.toxins = QUANTIZE(((toxins/sum)*amount)*(1-filtered)) oxygen -= removed.oxygen/group_multiplier nitrogen -= removed.nitrogen/group_multiplier @@ -396,8 +396,8 @@ What are the archived variables for? var/datum/gas/corresponding = new trace_gas.type() removed.trace_gases += corresponding - corresponding.moles = (trace_gas.moles/sum)*amount - trace_gas.moles -= corresponding.moles/group_multiplier + corresponding.moles = ((trace_gas.moles/sum)*amount)*(1-filtered) + trace_gas.moles -= (corresponding.moles/group_multiplier)*(1-filtered) removed.temperature = temperature update_values() diff --git a/code/ZAS/ZAS_Turfs.dm b/code/ZAS/ZAS_Turfs.dm index 0070a19c5d2..4cdc8217e8f 100644 --- a/code/ZAS/ZAS_Turfs.dm +++ b/code/ZAS/ZAS_Turfs.dm @@ -20,21 +20,22 @@ return GM -/turf/remove_air(amount as num) +/turf/remove_air(amount as num, var/filtered = 0) var/datum/gas_mixture/GM = new - var/sum = oxygen + carbon_dioxide + nitrogen + toxins + var/sum = oxygen + carbon_dioxide + nitrogen + (toxins*(1-filtered)) if(sum>0) GM.oxygen = (oxygen/sum)*amount GM.carbon_dioxide = (carbon_dioxide/sum)*amount GM.nitrogen = (nitrogen/sum)*amount - GM.toxins = (toxins/sum)*amount + GM.toxins = ((toxins/sum)*amount)*(1-filtered) GM.temperature = temperature GM.update_values() return GM + /turf/simulated/var/current_graphic = null /turf/simulated/var/tmp/datum/gas_mixture/air @@ -109,21 +110,21 @@ else return ..() -/turf/simulated/remove_air(amount as num) +/turf/simulated/remove_air(amount as num, var/filtered = 0) if(zone) var/datum/gas_mixture/removed = null - removed = zone.air.remove(amount) + removed = zone.air.remove(amount, filtered) return removed else if(air) var/datum/gas_mixture/removed = null - removed = air.remove(amount) + removed = air.remove(amount, filtered) if(air.check_tile_graphic()) update_visuals(air) return removed else - return ..() + return ..(amount, filtered) /turf/simulated/proc/update_air_properties() var/air_directions_archived = air_check_directions diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 0db84249c6c..79a31b23e85 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -65,8 +65,8 @@ var/server var/banappeals - var/wikiurl = "http://baystation12.net/wiki/index.php?title=Main_Page" - var/forumurl = "http://baystation12.net/forums/" + var/wikiurl + var/forumurl //Alert level description var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index b3b03e6ac26..4f8a04a192b 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -68,7 +68,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/farwa name = "Farwa crate" - contains = list (/obj/item/weapon/storage/box/farwacubes) + contains = list (/obj/item/weapon/storage/box/monkeycubes/farwacubes) cost = 30 containertype = /obj/structure/closet/crate/freezer containername = "Farwa crate" @@ -76,7 +76,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/skrell name = "Neaera crate" - contains = list (/obj/item/weapon/storage/box/neaeracubes) + contains = list (/obj/item/weapon/storage/box/monkeycubes/neaeracubes) cost = 30 containertype = /obj/structure/closet/crate/freezer containername = "Neaera crate" @@ -84,7 +84,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/stok name = "Stok crate" - contains = list (/obj/item/weapon/storage/box/stokcubes) + contains = list (/obj/item/weapon/storage/box/monkeycubes/stokcubes) cost = 30 containertype = /obj/structure/closet/crate/freezer containername = "Stok crate" diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index a4158218a1e..c1be061f537 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -133,7 +133,7 @@ var/orient = "LEFT" // "RIGHT" changes the dir suffix to "-r" var/mob/living/occupant = null var/available_chemicals = list("inaprovaline" = "Inaprovaline", "stoxin" = "Soporific", "dermaline" = "Dermaline", "bicaridine" = "Bicaridine", "dexalin" = "Dexalin") - var/amounts = list(10, 20) + var/amounts = list(5, 10) New() @@ -269,11 +269,11 @@ proc/inject_chemical(mob/living/user as mob, chemical, amount) if(src.occupant && src.occupant.reagents) - if(src.occupant.reagents.get_reagent_amount(chemical) + amount <= 40) + if(src.occupant.reagents.get_reagent_amount(chemical) + amount <= 20) src.occupant.reagents.add_reagent(chemical, amount) user << "Occupant now has [src.occupant.reagents.get_reagent_amount(chemical)] units of [available_chemicals[chemical]] in his/her bloodstream." return - user << "There's no occupant in the sleeper or the subject rejects the chemicals!" + user << "There's no occupant in the sleeper or the subject has too many chemicals!" return diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index ea2456cf977..300d62745c0 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -181,7 +181,8 @@ if(target_temperature < T0C + MIN_TEMPERATURE) target_temperature = T0C + MIN_TEMPERATURE - var/datum/gas_mixture/gas = location.remove_air(0.25*environment.total_moles) + var/datum/gas_mixture/gas + gas = location.remove_air(0.25*environment.total_moles) var/heat_capacity = gas.heat_capacity() var/energy_used = max( abs( heat_capacity*(gas.temperature - target_temperature) ), MAX_ENERGY_CHANGE) diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index fd66d0c2c32..e643fb5e244 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -334,7 +334,7 @@ src.icon_state = "pod_0" src.eject_wait = 0 //If it's still set somehow. domutcheck(src.occupant) //Waiting until they're out before possible monkeyizing. - src.occupant.add_side_effect("Bad Stomach") // Give them an extra side-effect for free. +// src.occupant.add_side_effect("Bad Stomach") // Give them an extra side-effect for free. src.occupant = null src.biomass -= CLONE_BIOMASS diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 7c3b44a4e03..c73adc11620 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -432,7 +432,7 @@ var/counter = 1 while(src.active2.fields[text("com_[]", counter)]) counter++ - src.active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557
[t1]") + src.active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") if (href_list["del_c"]) if ((istype(src.active2, /datum/data/record) && src.active2.fields[text("com_[]", href_list["del_c"])])) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 262dcf4ab82..e56ba78f201 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -369,7 +369,7 @@ What a mess.*/ var/counter = 1 while(active2.fields[text("com_[]", counter)]) counter++ - active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], 2557
[t1]") + active2.fields[text("com_[counter]")] = text("Made by [authenticated] ([rank]) on [time2text(world.realtime, "DDD MMM DD hh:mm:ss")], [game_year]
[t1]") if ("Delete Record (ALL)") if (active1) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index a7936f15643..fd34b65baa0 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -1064,7 +1064,7 @@ /obj/item/weapon/paintkit //Please don't use this for anything, it's a base type for custom mech paintjobs. name = "mecha customisation kit" desc = "A generic kit containing all the needed tools and parts to turn a mech into another mech." - icon = 'custom_items.dmi' + icon = 'icons/obj/custom_items.dmi' icon_state = "royce_kit" var/new_name = "mech" //What is the variant called? diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 96789249fdf..ef855399460 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1371,7 +1371,7 @@ /obj/mecha/proc/get_log_html() var/output = "[src.name] Log" for(var/list/entry in log) - output += {"
[time2text(entry["time"],"DDD MMM DD hh:mm:ss")] 2555
+ output += {"
[time2text(entry["time"],"DDD MMM DD hh:mm:ss")] [game_year]
[entry["message"]]
"} output += "" diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 5638c175c60..22476ad0056 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -19,6 +19,8 @@ if(!ishuman(user)) user << "\red You don't know how to use this!" return + if(user.silent) + return if(spamcheck) user << "\red \The [src] needs to recharge!" return diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 0f65736b507..ee6f96161a8 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -12,7 +12,8 @@ icon_state ="bookEngineering" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Station Repairs and Construction" - /*dat = {" + + dat = {" @@ -23,16 +24,16 @@ - "}*/ + "} + /obj/item/weapon/book/manual/engineering_particle_accelerator name = "Particle Accelerator User's Guide" icon_state ="bookParticleAccelerator" author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Particle Accelerator User's Guide" -//big pile of shit below. - /*dat = {" + dat = {" -

Growing Humans

+

Growing Diona

- Why would you want to grow humans? Well I'm expecting most readers to be in the slave trade, but a few might actually - want to revive fallen comrades. Growing pod people is easy, but prone to disaster. + Growing Diona is easy!

    -
  1. Find a dead person who is in need of cloning.
    2. -
  2. Take a blood sample with a syringe.
    3. -
  3. Inject a seed pack with the blood sample.
  4. Plant the seeds.
    5. -
  5. Tend to the plants water and nutrition levels until it is time to harvest the cloned human.
    6. +
  6. Tend to the plants water and nutrition levels until it is time to harvest the Diona.

It really is that easy! Good luck! - "}*/ + "} + /obj/item/weapon/book/manual/medical_cloning name = "Cloning techniques of the 26th century" icon_state ="bookCloning" author = "Medical Journal, volume 3" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned title = "Cloning techniques of the 26th century" -//big pile of shit below. - /*dat = {" + dat = {"