diff --git a/code/datums/api.dm b/code/datums/api.dm index 702b000bd7e..2a88185a3b9 100644 --- a/code/datums/api.dm +++ b/code/datums/api.dm @@ -648,7 +648,7 @@ proc/api_update_command_database() s["host"] = host ? host : null s["players"] = 0 s["stationtime"] = worldtime2text() - s["roundduration"] = get_round_duration() + s["roundduration"] = get_round_duration_formatted() s["gameid"] = game_id if(queryparams["status"] == "2") diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm index 2946583fe1f..d0db0e56a34 100644 --- a/code/modules/cargo/random_stock/t2_uncommon.dm +++ b/code/modules/cargo/random_stock/t2_uncommon.dm @@ -73,7 +73,7 @@ STOCK_ITEM_UNCOMMON(mediumcell, 3) STOCK_ITEM_UNCOMMON(chempack, 5) var/list/chems = SSchemistry.chemical_reagents.Copy() - var/list/exclusion = list("drink", "reagent", "adminordrazine", "beer2", "azoth", "elixir_life", "liquid_fire", "philosopher_stone", "undead_ichor", "love", "shapesand", "usolve", "sglue", "black_matter", "lightning", "trioxin") + var/list/exclusion = list("drink", "reagent", "adminordrazine", "beer2", "azoth", "elixir_life", "liquid_fire", "philosopher_stone", "undead_ichor", "love", "shapesand", "usolve", "sglue", "black_matter", "lightning", "trioxin", "phoron_salt") chems -= exclusion for (var/i in 1 to rand(2, 6)) var/obj/item/weapon/reagent_containers/chem_disp_cartridge/C = new /obj/item/weapon/reagent_containers/chem_disp_cartridge(L) diff --git a/code/modules/cargo/randomstock.dm b/code/modules/cargo/randomstock.dm index 6dc9318b029..0dd2dc515a4 100644 --- a/code/modules/cargo/randomstock.dm +++ b/code/modules/cargo/randomstock.dm @@ -1,3 +1,4 @@ + //See Setup.dm for the configuration vars: //TOTAL_STOCK //STOCK_UNCOMMON_PROB diff --git a/html/changelogs/burgerbb-phoron salt more.yml b/html/changelogs/burgerbb-phoron salt more.yml new file mode 100644 index 00000000000..6919de284bc --- /dev/null +++ b/html/changelogs/burgerbb-phoron salt more.yml @@ -0,0 +1,39 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: BurgerBB + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes phoron salt from spawning in the cargo warehouse." + - bugfix: "Fixes lack of shutters in the library." + - bugfix: "Fixes round information API displaying incorrect time."