From 5a0c98757229ef0a3ea27c6bd7c1c2f2a458c665 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Sat, 30 May 2020 00:19:00 +0000 Subject: [PATCH 1/2] Automatic changelog compile [ci skip] --- html/changelog.html | 448 -------------------------------------------- 1 file changed, 448 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 3d05d75736..cc419e13fb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -385,454 +385,6 @@
  • You can now choose your name and color as a holoparasite/guardian/holocarp!
  • fixes lings being able to get mechanical holoparasites
    • - -

    28 March 2020

    -

    Arreksuru and Detective Google updated:

    - -

    Arturlang updated:

    - -

    Bhijn updated:

    - -

    Bhijn (original PR by Azarak, sprites by Discord user Smug Asshole Muhreen#5522) updated:

    - -

    BlackMajor updated:

    - -

    Bumtickley00 updated:

    - -

    Crystal9156 updated:

    - -

    Dennok, ported by Hatterhat updated:

    - -

    Detective-Google updated:

    - -

    EmeraldSundisk updated:

    - -

    Ghommie updated:

    - -

    Ghommie (plus a fix originally done by Skogol) updated:

    - -

    Hatterhat updated:

    - -

    InnocentFire made the sprites all thanks to them! updated:

    - -

    KathrinBailey updated:

    - -

    Kraseo updated:

    - -

    Linzolle updated:

    - -

    Moonlit Protector updated:

    - -

    MrJWhit updated:

    - -

    MrPerson updated:

    - -

    Naksu updated:

    - -

    NecromancerAnne and goldnharl updated:

    - -

    NecromancerAnne and zawo and zeroisthebiggay and carlarctg updated:

    - -

    Owai-Seek updated:

    - -

    Putnam updated:

    - -

    Putnam3145 updated:

    - -

    Qustinnus/floyd, Ghommie updated:

    - -

    Ragolution updated:

    - -

    Seris02 updated:

    - -

    Skoglol updated:

    - -

    Timberpoes updated:

    - -

    Trilbyspaceclone updated:

    - -

    Useroth updated:

    - -

    Xantholne updated:

    - -

    YakumoChen updated:

    - -

    Yenwodyah updated:

    - -

    actioninja, ninjanomnom updated:

    - -

    bunny232 updated:

    - -

    dapnee updated:

    - -

    floyd updated:

    - -

    kappa-sama updated:

    - -

    keronshb updated:

    - -

    kevinz000 updated:

    - -

    monster860 updated:

    - -

    necromanceranne updated:

    - -

    raspyosu updated:

    - -

    spookydonut updated:

    - -

    wesoda25 updated:

    - -

    zeroisthebiggay updated:

    - GoonStation 13 Development Team From 17d4c99b25a2f548e95a9af87bbaa1cd164668e7 Mon Sep 17 00:00:00 2001 From: coldud13 Date: Tue, 2 Jun 2020 19:10:41 +1000 Subject: [PATCH 2/2] alt click to remove containers from reagent grinder and biogenerator --- code/modules/hydroponics/biogenerator.dm | 11 ++++++++--- .../reagents/chemistry/machinery/reagentgrinder.dm | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 28f3387097..06d2b3efda 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -205,6 +205,11 @@ popup.set_content(dat) popup.open() +/obj/machinery/biogenerator/AltClick(mob/living/user) + . = ..() + if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + detach(user) + /obj/machinery/biogenerator/proc/activate() if (usr.stat != CONSCIOUS) return @@ -293,9 +298,9 @@ update_icon() return . -/obj/machinery/biogenerator/proc/detach() +/obj/machinery/biogenerator/proc/detach(mob/living/user) if(beaker) - beaker.forceMove(drop_location()) + user.put_in_hands(beaker) beaker = null update_icon() @@ -310,7 +315,7 @@ updateUsrDialog() else if(href_list["detach"]) - detach() + detach(usr) updateUsrDialog() else if(href_list["create"]) diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 75848f89b9..a53c57a3e7 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -213,6 +213,11 @@ for(var/datum/reagent/R in beaker.reagents.reagent_list) . += "- [R.volume] units of [R.name]." +/obj/machinery/reagentgrinder/AltClick(mob/user) + . = ..() + if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + replace_beaker(user) + /obj/machinery/reagentgrinder/proc/eject(mob/user) for(var/i in holdingitems) var/obj/item/O = i