From af04daa17b09f7757587bea2f6bf984c22923b9f Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Sun, 5 Aug 2018 17:11:48 -0700 Subject: [PATCH 01/25] Added --- .../reagents/reagent_containers/food/condiment.dm | 14 -------------- maps/aurora/aurora-3_sublevel.dmm | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index adbdfda9f1a..fd6b4f92b5d 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -15,20 +15,6 @@ center_of_mass = list("x"=16, "y"=6) volume = 50 -/obj/item/weapon/reagent_containers/food/condiment/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) - return - -/obj/item/weapon/reagent_containers/food/condiment/attack_self(var/mob/user as mob) - return - -/obj/item/weapon/reagent_containers/food/condiment/attack(var/mob/M as mob, var/mob/user as mob, var/def_zone) - if(standard_feed_mob(user, M)) - return - -/obj/item/weapon/reagent_containers/food/condiment/afterattack(var/obj/target, var/mob/user, var/proximity) - if(!proximity) - return - /obj/item/weapon/reagent_containers/food/condiment/self_feed_message(var/mob/user) user << "You swallow some of contents of \the [src]." diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index f73c99f58d1..7aa71704139 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -28255,6 +28255,7 @@ name = "Containment Cell Echo" }, /obj/structure/cable/green, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/rnd/xenobiology/cells/echo) "XE" = ( From 6de5ccca15c417231f323fe90c2b3ec1bf6cdfdc Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Sun, 5 Aug 2018 17:14:16 -0700 Subject: [PATCH 02/25] Changelog. --- html/changelogs/burgerbb-fixes.yml | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 html/changelogs/burgerbb-fixes.yml diff --git a/html/changelogs/burgerbb-fixes.yml b/html/changelogs/burgerbb-fixes.yml new file mode 100644 index 00000000000..531fdbd455e --- /dev/null +++ b/html/changelogs/burgerbb-fixes.yml @@ -0,0 +1,38 @@ +################################ +# 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 condiments, including salt and pepper, not being able to be poured." + - bugfix: "Fixes objects getting stuck in xenobiology disposals." From afb9755a03151b0d6fa9580511eb006e0c00a31c Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Sun, 5 Aug 2018 19:23:08 -0700 Subject: [PATCH 03/25] One more --- code/modules/reagents/reagent_containers/hypospray.dm | 3 ++- code/modules/reagents/reagent_containers/inhaler.dm | 3 ++- html/changelogs/burgerbb-fixes.yml | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index dcf97311313..468b4bc0423 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -44,6 +44,8 @@ var/trans = reagents.trans_to_mob(M, amount_per_transfer_from_this, CHEM_BLOOD) admin_inject_log(user, M, src, contained, trans) to_chat(user,"[trans] units injected. [reagents.total_volume] units remaining in \the [src].") + + update_icon() return @@ -65,7 +67,6 @@ ..() if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled. flags &= ~OPENCONTAINER - update_icon() return /obj/item/weapon/reagent_containers/hypospray/autoinjector/update_icon() diff --git a/code/modules/reagents/reagent_containers/inhaler.dm b/code/modules/reagents/reagent_containers/inhaler.dm index 4024a0727af..9ed09ba24b1 100644 --- a/code/modules/reagents/reagent_containers/inhaler.dm +++ b/code/modules/reagents/reagent_containers/inhaler.dm @@ -66,13 +66,14 @@ playsound(src.loc, 'sound/items/stimpack.ogg', 50, 1) to_chat(user,"[trans] units injected. [reagents.total_volume] units remaining in \the [src].") + update_icon() + return /obj/item/weapon/reagent_containers/inhaler/attack(mob/M as mob, mob/user as mob) ..() if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled. flags &= ~OPENCONTAINER - update_icon() return /obj/item/weapon/reagent_containers/inhaler/update_icon() diff --git a/html/changelogs/burgerbb-fixes.yml b/html/changelogs/burgerbb-fixes.yml index 531fdbd455e..cf9e44d21fc 100644 --- a/html/changelogs/burgerbb-fixes.yml +++ b/html/changelogs/burgerbb-fixes.yml @@ -36,3 +36,4 @@ delete-after: True changes: - bugfix: "Fixes condiments, including salt and pepper, not being able to be poured." - bugfix: "Fixes objects getting stuck in xenobiology disposals." + - bugfix: "Fixes autoinhalers and autoinjectors refusing to change their icons after use." From fe50df5f04946a82939bb90bcc98c239c300c6f4 Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Sun, 5 Aug 2018 19:29:51 -0700 Subject: [PATCH 04/25] Fixes #5089 --- code/game/objects/items/weapons/stunbaton.dm | 4 ++++ html/changelogs/burgerbb-fixes.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index feaa6708307..f7356af2e0c 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -282,6 +282,10 @@ force = 3 agonyforce = 60 +/obj/item/weapon/melee/baton/slime/Initialize() + bcell = new/obj/item/weapon/cell/high(src) + . = ..() + /obj/item/weapon/melee/baton/slime/update_icon() icon_state = initial(icon_state) item_state = initial(item_state) diff --git a/html/changelogs/burgerbb-fixes.yml b/html/changelogs/burgerbb-fixes.yml index cf9e44d21fc..25855e48394 100644 --- a/html/changelogs/burgerbb-fixes.yml +++ b/html/changelogs/burgerbb-fixes.yml @@ -37,3 +37,4 @@ changes: - bugfix: "Fixes condiments, including salt and pepper, not being able to be poured." - bugfix: "Fixes objects getting stuck in xenobiology disposals." - bugfix: "Fixes autoinhalers and autoinjectors refusing to change their icons after use." + - bugfix: "Fixes Slime Batons not spawning without a power source." From 589d86b0c4626cdb6b4e487acb8edf71bec1236b Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Sun, 5 Aug 2018 21:10:50 -0700 Subject: [PATCH 05/25] yeet --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm | 2 +- html/changelogs/burgerbb-fixes.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index 43643604bea..fb4734e93e7 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -277,7 +277,7 @@ var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) var/datum/gas_mixture/lowertemp = T.return_air() - lowertemp.temperature = max(min(lowertemp.temperature-2000, lowertemp.temperature / 2), 0) + lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, 0) lowertemp.react() qdel(hotspot) diff --git a/html/changelogs/burgerbb-fixes.yml b/html/changelogs/burgerbb-fixes.yml index 25855e48394..e469e03e5aa 100644 --- a/html/changelogs/burgerbb-fixes.yml +++ b/html/changelogs/burgerbb-fixes.yml @@ -38,3 +38,4 @@ changes: - bugfix: "Fixes objects getting stuck in xenobiology disposals." - bugfix: "Fixes autoinhalers and autoinjectors refusing to change their icons after use." - bugfix: "Fixes Slime Batons not spawning without a power source." + - bugfix: "Fixes miscalculation in heat reduction for fire extinguishers." From b60792eb2feb0703b2ecd8fa1da376dbd4339c37 Mon Sep 17 00:00:00 2001 From: BurgerLua Date: Mon, 6 Aug 2018 01:52:14 -0700 Subject: [PATCH 06/25] JUST IN CASE --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm | 2 +- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm index 114f289523d..d3d0fbf42e5 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm @@ -182,7 +182,7 @@ var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) var/datum/gas_mixture/lowertemp = T.remove_air(T:air:total_moles) - lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, 0) + lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, T0C) lowertemp.react() T.assume_air(lowertemp) qdel(hotspot) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index fb4734e93e7..7722f34cf0d 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -277,7 +277,7 @@ var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) var/datum/gas_mixture/lowertemp = T.return_air() - lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, 0) + lowertemp.temperature = max(lowertemp.temperature-2000, lowertemp.temperature / 2, T0C) lowertemp.react() qdel(hotspot) From cdaff13ec29c69a0e42a513effec161414c6b896 Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 6 Aug 2018 22:01:30 +0300 Subject: [PATCH 07/25] Changelogs, 06AUG2018 --- html/changelog.html | 28 +++++++++++++------- html/changelogs/.all_changelog.yml | 8 ++++++ html/changelogs/burgerbb-fixes.yml | 41 ------------------------------ 3 files changed, 27 insertions(+), 50 deletions(-) delete mode 100644 html/changelogs/burgerbb-fixes.yml diff --git a/html/changelog.html b/html/changelog.html index 16c5621f1be..59cb79f9431 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -5,7 +5,7 @@ + + @@ -24,7 +24,7 @@
Space Station 13
- +

Code licensed under AGPLv3. Content licensed under CC BY-SA 3.0.

@@ -48,14 +48,24 @@
+

06 August 2018

+

BurgerBB updated:

+
    +
  • Fixes condiments, including salt and pepper, not being able to be poured.
    • +
  • Fixes objects getting stuck in xenobiology disposals.
    • +
  • Fixes autoinhalers and autoinjectors refusing to change their icons after use.
    • +
  • Fixes Slime Batons not spawning without a power source.
    • +
  • Fixes miscalculation in heat reduction for fire extinguishers.
    • +
+

05 August 2018

Alberyk updated:

    @@ -5730,7 +5740,7 @@

    09 March 2013

    Cael Aislinn updated:

      -
    • Beekeeping is now possible. Construct an apiary of out wood and embed it into a hydroponics tray, then get a queen bee and bottle of BeezEez from cargo bay. +
    • Beekeeping is now possible. Construct an apiary of out wood and embed it into a hydroponics tray, then get a queen bee and bottle of BeezEez from cargo bay. Hives produce honey and honeycomb, but be wary if the bees start swarming.
    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index dc8ffab6fea..4b50efc905f 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5892,3 +5892,11 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 'Command Dock Monitoring'. ben10083: - rscadd: Added a Medical Hud to the Medical Module +2018-08-06: + BurgerBB: + - bugfix: Fixes condiments, including salt and pepper, not being able to be poured. + - bugfix: Fixes objects getting stuck in xenobiology disposals. + - bugfix: Fixes autoinhalers and autoinjectors refusing to change their icons after + use. + - bugfix: Fixes Slime Batons not spawning without a power source. + - bugfix: Fixes miscalculation in heat reduction for fire extinguishers. diff --git a/html/changelogs/burgerbb-fixes.yml b/html/changelogs/burgerbb-fixes.yml deleted file mode 100644 index e469e03e5aa..00000000000 --- a/html/changelogs/burgerbb-fixes.yml +++ /dev/null @@ -1,41 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# 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 condiments, including salt and pepper, not being able to be poured." - - bugfix: "Fixes objects getting stuck in xenobiology disposals." - - bugfix: "Fixes autoinhalers and autoinjectors refusing to change their icons after use." - - bugfix: "Fixes Slime Batons not spawning without a power source." - - bugfix: "Fixes miscalculation in heat reduction for fire extinguishers." From eeda41a31f4f563cebe4429136461187e8d800b3 Mon Sep 17 00:00:00 2001 From: Karolis Date: Mon, 6 Aug 2018 22:51:43 +0300 Subject: [PATCH 08/25] Fixed vueui resources not working (#5095) * Fixed vueui resources not working * Changelog * Mistake --- code/modules/vueui/ui.dm | 7 ++++++- html/changelogs/Karolis2011 - vueui fixes.yml | 5 +++++ vueui/src/assets/global.scss | 4 ++++ vueui/src/main.js | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Karolis2011 - vueui fixes.yml diff --git a/code/modules/vueui/ui.dm b/code/modules/vueui/ui.dm index ea9e8b6b1fd..b971c7ae610 100644 --- a/code/modules/vueui/ui.dm +++ b/code/modules/vueui/ui.dm @@ -126,7 +126,7 @@ main ui datum.
- + Javascript file has failed to load. Click here to force load resources
[debugtxt]