From aa28d1dd5d556bae66e26c4ee456906b5587d3d0 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Wed, 17 Jun 2020 00:17:03 +0000 Subject: [PATCH 1/6] Automatic changelog compile [ci skip] --- html/changelog.html | 253 -------------------------------------------- 1 file changed, 253 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index cc419e13fb..2caa7e290a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -132,259 +132,6 @@ - -

15 April 2020

-

Arturlang updated:

- -

Auris456852 updated:

- -

Bhijn updated:

- -

BuffEngineering updated:

- -

DeltaFire15 updated:

- -

Detective-Google updated:

- -

Ghommie updated:

- -

KathrinBailey updated:

- -

Kraseo updated:

- -

Owai-Seek updated:

- -

PersianXerxes updated:

- -

Putnam3145 updated:

- -

Seris02 updated:

- -

Trilbyspaceclone updated:

- -

Xantholne updated:

- -

actioninja updated:

- -

actioninja (ported by Ghommie) updated:

- -

bunny232 updated:

- -

dapnee updated:

- -

kappa-sama updated:

- -

keronshb updated:

- -

kevinz000 updated:

- -

kiwedespars updated:

- -

necromanceranne updated:

- -

timothyteakettle updated:

- -

zeroisthebiggay updated:

- GoonStation 13 Development Team From 4d0421f9cd68c6ba8f838acf2b022b9f807279a8 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Thu, 18 Jun 2020 00:17:23 +0000 Subject: [PATCH 2/6] Automatic changelog compile [ci skip] --- html/changelog.html | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/html/changelog.html b/html/changelog.html index 2caa7e290a..d6584a9430 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -122,16 +122,6 @@
  • Stun thresholding stops disarm spams at extremely high stamina loss.
  • Ashen Arrows are actually called Ashen Arrows in the crafting menu.
    • - -

    16 April 2020

    -

    ForrestWick updated:

    - -

    Linzolle updated:

    - GoonStation 13 Development Team From b490f02c78584f09965b00d42b8347f56dd673a4 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Thu, 18 Jun 2020 02:30:58 -0700 Subject: [PATCH 3/6] Ports IV bags from TG Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg. --- code/game/machinery/iv_drip.dm | 3 +- code/game/objects/items/storage/bags.dm | 2 +- .../kitchen_machinery/smartfridge.dm | 2 +- .../reagents/reagent_containers/chem_pack.dm | 51 ++++++++++++++++++ .../research/designs/medical_designs.dm | 10 ++++ .../research/techweb/nodes/biotech_nodes.dm | 2 +- icons/obj/bloodpack.dmi | Bin 1248 -> 1340 bytes icons/obj/reagentfillings.dmi | Bin 4198 -> 4626 bytes tgstation.dme | 1 + 9 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 code/modules/reagents/reagent_containers/chem_pack.dm diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index ad5df7cea0..cd9e9dc83f 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -13,7 +13,8 @@ var/obj/item/reagent_containers/beaker var/static/list/drip_containers = typecacheof(list(/obj/item/reagent_containers/blood, /obj/item/reagent_containers/food, - /obj/item/reagent_containers/glass)) + /obj/item/reagent_containers/glass, + /obj/item/reagent_containers/chem_pack)) /obj/machinery/iv_drip/Initialize(mapload) . = ..() diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index d687702af5..69ff1bb7f7 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -391,7 +391,7 @@ STR.storage_flags = STORAGE_FLAGS_VOLUME_DEFAULT STR.max_volume = STORAGE_VOLUME_CHEMISTRY_BAG STR.insert_preposition = "in" - STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/syringe/dart)) + STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/syringe/dart, /obj/item/reagent_containers/chem_pack)) /* * Biowaste bag (mostly for xenobiologists) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 67a636eb9c..891a6abec2 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -463,7 +463,7 @@ return TRUE if(!O.reagents || !O.reagents.reagent_list.len) // other empty containers not accepted return FALSE - if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) || istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray)) + if(istype(O, /obj/item/reagent_containers/syringe) || istype(O, /obj/item/reagent_containers/glass/bottle) || istype(O, /obj/item/reagent_containers/glass/beaker) || istype(O, /obj/item/reagent_containers/spray) || istype(O, /obj/item/reagent_containers/medspray) || istype(O, /obj/item/reagent_containers/chem_pack)) return TRUE return FALSE diff --git a/code/modules/reagents/reagent_containers/chem_pack.dm b/code/modules/reagents/reagent_containers/chem_pack.dm new file mode 100644 index 0000000000..35ec588ec5 --- /dev/null +++ b/code/modules/reagents/reagent_containers/chem_pack.dm @@ -0,0 +1,51 @@ +/obj/item/reagent_containers/chem_pack + name = "intravenous medicine bag" + desc = "A plastic pressure bag, or 'chem pack', for IV administration of drugs. It is fitted with a thermosealing strip." + icon = 'icons/obj/bloodpack.dmi' + icon_state = "chempack" + volume = 100 + reagent_flags = OPENCONTAINER + spillable = TRUE + obj_flags = UNIQUE_RENAME + resistance_flags = ACID_PROOF + var/sealed = FALSE + +/obj/item/reagent_containers/chem_pack/on_reagent_change(changetype) + update_icon() + +/obj/item/reagent_containers/chem_pack/update_icon() + cut_overlays() + + var/v = min(round(reagents.total_volume / volume * 10), 10) + if(v > 0) + var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "chempack1") + filling.icon_state = "chempack[v]" + filling.color = mix_color_from_reagents(reagents.reagent_list) + add_overlay(filling) + +/obj/item/reagent_containers/chem_pack/AltClick(mob/living/user) + if(user.canUseTopic(src, BE_CLOSE, NO_DEXTERY) && !sealed) + if(iscarbon(user) && (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))) + to_chat(user, "Uh... whoops! You accidentally spill the content of the bag onto yourself.") + SplashReagents(user) + return + else + DISABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER) + ENABLE_BITFIELD(reagents.reagents_holder_flags, DRAWABLE |INJECTABLE ) + spillable = FALSE + sealed = TRUE + to_chat(user, "You seal the bag.") + + +/obj/item/reagent_containers/chem_pack/examine() + . = ..() + if(sealed) + . += "The bag is sealed shut." + else + . += "Alt-click to seal it." + + +obj/item/reagent_containers/chem_pack/attack_self(mob/user) + if(sealed) + return + ..() \ No newline at end of file diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 69bf039428..22e444e443 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -212,6 +212,16 @@ category = list("Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL +/datum/design/chem_pack + name = "Intravenous Medicine Bag" + desc = "A plastic pressure bag for IV administration of drugs." + id = "chem_pack" + build_type = PROTOLATHE + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + materials = list(/datum/material/plastic = 2000) + build_path = /obj/item/reagent_containers/chem_pack + category = list("Medical Designs") + /datum/design/cloning_disk name = "Cloning Data Disk" desc = "Produce additional disks for storing genetic data." diff --git a/code/modules/research/techweb/nodes/biotech_nodes.dm b/code/modules/research/techweb/nodes/biotech_nodes.dm index 8f7d978a99..977f8685d6 100644 --- a/code/modules/research/techweb/nodes/biotech_nodes.dm +++ b/code/modules/research/techweb/nodes/biotech_nodes.dm @@ -5,7 +5,7 @@ display_name = "Biological Technology" description = "What makes us tick." //the MC, silly! prereq_ids = list("base") - design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner") + design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner","chem_pack") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) /datum/techweb_node/adv_biotech diff --git a/icons/obj/bloodpack.dmi b/icons/obj/bloodpack.dmi index 82b4c2e543d8d896b1483ba17c06809357e8c164..2355a81f8f06bda4b7c051ce2d66c1c1d456e861 100644 GIT binary patch delta 1206 zcmV;n1WEhg3A_rBBms$$C3b(WHaR0T7oS391y?^81s7jWE&#=dL*vaHqIv)T1a3)0 zK~#90?OIQ0+g2R@JWAI=5An8UqakF6A&=N=Of|?YdxxFciwlilb7AZf9|OsC2OoOq zVSxp5v94(-C>M>fQ!u=a9a@G=5MuHmD$aBeZiAVWfdvJViA*J`zh&$ev< z*%EO)f3;e@{utH3_xyiP55P+z3UI(Ve{WPw=@H=jz9kxWT{q$vKHIjfEJz6FKRi6d zKllp(P=u1kU+r+x~KKf`}J_zLs5der` z?E^GTTV{;GFbpup004$z1a=rXY2ed``v~Xnb_ay`-S6FU}D7{XLN8SmB@4P_xcUB1JZ@1g{9y-41{)z{vVE-8{ z9+?1f2f}xJ+#?{IuefkMQ9SY^z!<~y^fWBXLbKTf=Nw17uE_Ar0^$7qejk^gJ%R80 zD3{CRN8pv`fN>+7e{OCrxB;eV;@)D36fe;nFs|o)9Ql7qBfxdtUCw#1)HR#Uh(DdO zqTmMr7E3T6?nBeGNPgFKac{8%egG^G;z|+Vd4oS1^Yil~n{*rpp68)hEE39)%g+x0 zUK%~bDfy)z0nhW`I1U`g0f1O5n$H3^x3&V}*;Kp@Unc`80xFe?QK?i6(cIqNUaa*z zFSwRcglvC)(cIg&VI8xyAwNE@UP&@eGnA25!6K-!QZK!*;~>|kX@AK9d7 zcA!HCa6gp-fs^`#QK0G*q#pr6f@u!+x^ebp^XVfieFEw0@cR14RtJM7PqP~v_cNOy zdcB@CGcyCv^KhD_Y7@wlplCAAjst1y6LKnjfa(HNBPT$00jiM`pt=CnIP(Pj2a=X; U27{N#p#T5?07*qoM6N<$f-$u$hyVZp delta 1113 zcmV-f1g87E3g8KlBmskwC3b&QtE}Ma=c3@^>&XQGo>VvqTu4Pb000CSNkly z&WlRvWCWMep`l!eN;vS5rHCtq{y9@ha1u&8$nTPz&enUfr01*jU4DPM`yIdE@B6*? zPw!sNbzP!EG#TOqzJ&d?k~Sde-8h;5CRnuaysh(NxWLE_W4?^7BF5Rp3h&Y zRIc2o68oO~83NCQ$l-tEy6!uJVk)abB{kb zB;;xCcUbu7B3)le1m#)aB=W;NHw=E9`zikYDR1%>OI$u8e~*8;9(mwh_5p6G#MB-H z3x&ekalRl3c6HmXGduk&{_u+3WYTx1hrZX zAp`)mS}nFGi8Bg(a(AC({!XVSNYwe3S1*4CK)qgnpc+%V1tez;$8lb;<3=+7#>NJ# z?KUjG#iK_LD87H97f*X7n0)gR$?I_;nZMm`^BopncYfsu%IrVZi>EDsd;`fhKIs;a z%$HxjGE_Y6E+B+petsUuacDFexUS35s;jSgjswa3-ENn+A3r3DB1)x_b{9DH7%*uh z^Dizg#xKCOZEmj=wc-sm2285IPa?lo3kZT>*LB@^s%w8V8h!rJl+_RS09Ywv-`%HB zDD>qIf`HpAMce~e)`+VlKp6J^Xe=!)4J7INK4BP=&*wGDP|NQgfLk2g#C7s3cY!br z@qHiP_W@F^BtH&Z+un|a7jx-0`J4)r1SprwwQ{*!ljQdH_EK#ahVipHMX2VNY+4Oc!7pQ!l_!)1cVA(61)z{%hqk#}2wpm2x&IgPd znL8gaYG}29y3L8_1G2adP!hnx!nQru*R6phZQH}b0`82Yz;Q#l3rG=cySLU&v(Lz9 z2TDyXU~B764PbNgL&w9zvwQcG*20RP%?h*!K}j;rW)a5E2bf+zO#PnVOaRjbn8r*1 f(*>Bu)C=$*+biP_+g{IL00000NkvXXu0mjft~?HI diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index f07928741d30b3536f891fd7b50927d203f71cf5..05337721c7bb58179c3d734b36450efec7239087 100644 GIT binary patch literal 4626 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 Date: Thu, 18 Jun 2020 02:45:44 -0700 Subject: [PATCH 4/6] Revert "Automatic changelog compile [ci skip]" This reverts commit aa28d1dd5d556bae66e26c4ee456906b5587d3d0. --- html/changelog.html | 263 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 263 insertions(+) diff --git a/html/changelog.html b/html/changelog.html index d6584a9430..cc419e13fb 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -122,6 +122,269 @@
  • Stun thresholding stops disarm spams at extremely high stamina loss.
  • Ashen Arrows are actually called Ashen Arrows in the crafting menu.
    • + +

    16 April 2020

    +

    ForrestWick updated:

    +
      +
    • changed a certain item to be called meatball, ended racism, thank you obama
      • +
    +

    Linzolle updated:

    +
      +
    • remove any slurs, etc. to comply with GitHub's ToS
      • +
    + +

    15 April 2020

    +

    Arturlang updated:

    +
      +
    • Adds garlic, a mutation of onions
      • +
    • You can now make garlic necklaces.
      • +
    • Tweaked hunger to be more the same as blood level for bloodsuckers
      • +
    • Bloodsuckers no longer get zero healing from regenerative cores, the core now heals their wounds but not their blood.
      • +
    • Bloodsucker heal is now based a lot more on blood level.
      • +
    • You can no longer be effectively immortal when fully auged as a bloodsucker.
      • +
    • Regenerative cores will regain their old names when they are renewed, no more working decayed cores.
      • +
    • Removes a lot of unnecesiry clutter of comments and tries to make the vars more consistent for bloodsucker code.
      • +
    • Made the regenerative core use one proc instead of copypasta
      • +
    +

    Auris456852 updated:

    +
      +
    • Added printer sound for admins that plays when someone messages Centcomm or the Syndicate. Just like RP!
      • +
    +

    Bhijn updated:

    +
      +
    • The traitor panel now actually shows a list of contractor targets.
      • +
    • Fail2Topic now supports Linux. Do beware that this requires some sysop experience to properly set up!
      • +
    • Fail2Topic is now disabled by default, and the out-of-the-box config files have been updated to be a little more detailed.
      • +
    • Added a lfwb-inspired orbiting pixel + flashing outline animation to the sprint and combat mode buttons. This can be toggled via the preferences menu, and is completely independent from all HUD themes.
      • +
    +

    BuffEngineering updated:

    +
      +
    • You may no longer summon plasteel from the door dimension.
      • +
    • High security airlocks are now 33% more materially efficient!
      • +
    +

    DeltaFire15 updated:

    +
      +
    • clockie vanguard now quickly regenerates stam while active (as its description always told you,)
      • +
    +

    Detective-Google updated:

    +
      +
    • Shotguns are now slower and require two hands to fire.
      • +
    +

    Ghommie updated:

    +
      +
    • mobs with antag statuses such as wizard, ert and nuke ops get their flavor text removed now.
      • +
    • Fixed megafauna mobs, goliaths and "anchored" AIs being stuffable into closets.
      • +
    • After years of visual agony, the Curse of The Floating Disembodied Phallus has come to an end.
      • +
    • Underwear now fulfills its purpose.
      • +
    • Privates visibility preferences.
      • +
    • refactored polychromic clothing into an element.
      • +
    • Blacklists unsynthetizable reagents from botany bees honey production.
      • +
    • Fixed toilet cistern loot spawning on the floor.
      • +
    • The megafauna's hitbox doesn't include 0 alpha sections anymore.
      • +
    • Wizard robes & co work again now.
      • +
    • Fixed some spell casting message spam.
      • +
    • Added M/F body preferences.
      • +
    • fixed yet another few airless issues with the space hermit ruin.
      • +
    • Intellectual property infringment is not cool.
      • +
    • Near-station nuclear explosions now display the on-station nuke explosion cinematic, consistently with its clearance of the station level and its nuclear victory / total annihilation ending status.
      • +
    • Nuclear bombs can't be anchored in space areas (not just turfs) anymore, as a quick effortless way to discourage players from anchoring the device on the edge of the map.
      • +
    • Fixed a whacky miniature cell duping issue.
      • +
    • Liver failure is back!
      • +
    • standarized a few (prefs off) side effects from enlargment chems on livers to do organ damage instead without the blood volume whackiness.
      • +
    • High liver damage now slows mobs down.
      • +
    • Fixing an issue with the split personality removing the original owner from the round if the body died while the stranger was in control.
      • +
    • fixed a few floaty sprite accessories.
      • +
    • Fixed a few mutations not working correctly.
      • +
    • Fixed the phantom thief component, again.
      • +
    • Made votes obfuscation settings more robust.
      • +
    • Also included them in custom votes.
      • +
    • The map rotation vote will only hide ongoing votes now, not the results.
      • +
    • The crusher's vortex talisman trophy now has a cooldown between each spawned wall.
      • +
    • Backend body size preferences.
      • +
    • Infiltrator's boots don't stop slips and "space wind" through the power of runtime errors anymore, and properly silence the user's footsteps now.
      • +
    • Chaplains are now inelegible for bloodsuckers.
      • +
    • Fixed crafting hud icon overlapping the second pocket on 1:1 screen mode.
      • +
    • Removed some dead flightsuit code leftovers.
      • +
    • Reenabled the swarmers event. Also blacklisted another dozen other machineries and structures that may be critical to the shift or station integrity from swarmers' HUNGER for materials.
      • +
    • Fixed find_safe_turfs() searching for turfs with concentration of oxygen lower than 16 rather higher.
      • +
    +

    KathrinBailey updated:

    +
      +
    • Radiation shuttesr to all supermatters.
      • +
    • Windowed shutters to armouries where relevant.
      • +
    • New posters are now on the map in relevant locations.
      • +
    • Windowed shutter now has glass, the door closing proc sees this and no longer changes opacity.
      • +
    • Accidental HoochMaster removal in the bar.
      • +
    • Spawning looking at the supermatter with no mesons on Meta.
      • +
    • Missing disposal pipe outside HoP office.
      • +
    • Sofas were never adjusted when the pool was added.
      • +
    • New shutter sprites
      • +
    • Reinforced Shutter
      • +
    • Radiation Shutter
      • +
    • Window Shutter
      • +
    • Shutters not being blast doors functionally.
      • +
    • Shutter armour block and health.
      • +
    +

    Kraseo updated:

    +
      +
    • Sneaksuit now costs 5 TC rather than 3.
      • +
    • You can break out of neckgrabs once more.
      • +
    +

    Owai-Seek updated:

    +
      +
    • Port Pina Colada, Painkiller, Moscow Mule, Hivemind Eraser, Moana Lou Drinks
      • +
    • Gunfire, Hellfire, Sins Delight, Strawberry Daiquiri, Miami Vice, Malibu Sunset, Lizz Fizz, Hotline Miami
      • +
    • Strawberry and Pineapple Juice
      • +
    • Salami Slices
      • +
    • Soda Dispenser Juices
      • +
    • Reorganize Vendor Objects (Bowls, Glasses, Shot Glasses)
      • +
    • Strawberry Milk and Tea actually use strawberry Juice.
      • +
    • Lizards can eat egg wraps. Moved Egg Wraps to Misc
      • +
    +

    PersianXerxes updated:

    +
      +
    • TGUI Next UIs for: chem heaters, chem masters, chem dispensers, and sleepers
      • +
    • Reworked Chem Master code
      • +
    +

    Putnam3145 updated:

    +
      +
    • No more station integrity goal
      • +
    • Upload-hacked-law goal only picksif there's an AI to upload to
      • +
    • A new, much more barebones holding facility for contractors.
      • +
    • Energy nets are gone.
      • +
    • Various ghost roles are now easier to ghost as.
      • +
    • The candles in the dojo no longer make the place hotter and hotter over time.
      • +
    • Nymphomania removed
      • +
    • Exhibitionism ignored by preferences now, since it was also removed
      • +
    • Quirk migration now does an admin log instead of a stack trace
      • +
    • Roundstart rulesets now roll properly.
      • +
    • Added configs for various antag threat levels.
      • +
    • Fixed a runtime in threat calculation.
      • +
    • Fixed up some misleading texts.
      • +
    • Dynamic reworked to be more "storyteller-like": threat is now how threatened the station is right now and threat level is how much the mode wants the station to be threatened.
      • +
    • Random storyteller is now truly random.
      • +
    • Story storyteller now gives a nice rising-action-climax-falling action curve for threat level.
      • +
    • "Chaotic" storyteller now simply ramps up threat level as round goes on.
      • +
    • "Classic" storyteller, basically doing what "random" did before.
      • +
    • Latejoin changelings for dynamic
      • +
    • Average threat calculation works now
      • +
    • Contamination is back.
      • +
    +

    Seris02 updated:

    +
      +
    • stops hijackers from being able to remotely blow up borgs
      • +
    • wall walking boots
      • +
    • made color picking for character appearance show the colors when you pick them
      • +
    • the sergal markings
      • +
    +

    Trilbyspaceclone updated:

    +
      +
    • Cooks aided by Clowns have came out with and new healthy Salad - Caesar Salad. Just dont eat the knife...
      • +
    • Ports over TG's Mortars and Pestles.
      • +
    • Water, Holywater and Unholywater will now now quickly purge itself if you have 151u in your system
      • +
    • Most crate types can now be made, some costing more do to function over fashion
      • +
    • Medical Mechs syringe gun now knows many more life saving chems, like Insulin, Dexalin, Prussian Blue, Kelotane and Bicaridine
      • +
    • torches take less staminda to use.
      • +
    • Glowsticks dont last as long
      • +
    • Penlights are better at being lights
      • +
    • Torches are brighter then before - Indian Johns want to be on lava land rejoy!
      • +
    • Eye lights have 30% less light coming out of them.
      • +
    • Spec Ops crate no longer talks about a "Null Crate" what ever that is
      • +
    • Changlogs are updateded once again as of the 28th of March on year 2020
      • +
    • White Ships, Telerelays and a defunk mining post are now always going to spawn.
      • +
    • Corrects a few desc on station side ruins
      • +
    +

    Xantholne updated:

    +
      +
    • bumbles will stop sleeping so much
      • +
    +

    actioninja updated:

    +
      +
    • Washing machines now support arbitrary dye color
      • +
    • Washing machines now dye nearly every item.
      • +
    • lots of backend changes to clothing overlays, report any issues
      • +
    • Better glowing lights
      • +
    +

    actioninja (ported by Ghommie) updated:

    +
      +
    • repathed all under clothing, keep an eye out for errors.
      • +
    +

    bunny232 updated:

    +
      +
    • Box secmos now is now longer connected to the scrubber loop
      • +
    +

    dapnee updated:

    +
      +
    • plant disk sorter in botany, bounty console for the rest of cargo, a missing air alarm in the incinerator
      • +
    • fixed a decal in front of security, moved an AIR alarm so it doesn't look awful to ghosts/AI, asteroids don't delete air anymore, fixed more active turfs, the buttons in the bridge "should" work now, HoP and cargo desks should be secure now
      • +
    • quarters that found their way out of the quartermaster's back room
      • +
    +

    kappa-sama updated:

    +
      +
    • normies can no longer steal circuit codes
      • +
    • doubles the Stam damage of nonlethal krav stompers
      • +
    • no longer Krav Maga stomp people that are standing
      • +
    • no more 20pop requirement for noslips
      • +
    +

    keronshb updated:

    +
      +
    • Reverts Mining Base RNG Placement
      • +
    +

    kevinz000 updated:

    +
      +
    • Melee attacks now stagger people, preventing them from sprinting until the (relatively short lived) effect runs out. Duration equation is [(1.5 + (w_class/7.5)) * force].
      • +
    • Fireman carrying now makes the person being carried unable to use items. Piggybacking now slows down the person being ridden. In both cases, the person riding will be dazed when forcefully dismounted, and dazed for a second if dismounting from piggybacking
      • +
    • turfs properly initialize atom colors if they're colored.
      • +
    • cloners now stabilize mutations while someone's cloning, meaning active genes will not life tick.
      • +
    • datum/pipeline return_air stack trace now gives a reference so it's actually marginally useful if caught in round.
      • +
    • Volumetric storage is here.
      • +
    • Traitor chaplains can now become neutered versions of cults.
      • +
    • beams should no longer go across the map and mess everything up if their source or target isn't on a turf.
      • +
    +

    kiwedespars updated:

    +
      +
    • Added paper masks.
      • +
    +

    necromanceranne updated:

    +
      +
    • Fixed limb damage calc
      • +
    • Stunslugs are now a mixed damage taser-like slug that will allow you to apply a variety of damage while still being countered by tasers usual counters.
      • +
    • Mech scattershot guns are no longer oneshotting people into stamina crit.
      • +
    • Removed an number of cargo crate packs: Riot shotguns/standard shotguns, double barreled shotguns, techshell crate, swat tasers, WT550 types (not rubber or standard), traitor theft objective kits.
      • +
    • HEALTH AND STAMINA DON'T STACK FOR PUTTING YOU INTO STAMINA CRIT.
      • +
    • YOUR FISTS ARE HELLA GODDAMN STRONG.
      • +
    • ACCEPT THE FELINIDS WARES, FOR SKOOMA HAS INCREDIBLE LETHAL PROPERTIES: YOUR HANDS BECOME LIKE SWORDS.
      • +
    • BOXERS CAN ONLY KNOCK OUT OTHER BOXERS BECAUSE THEY HAVE HONOR OR SOME SHIT
      • +
    • INCREASED STAMINA DAMAGE TO LIMBS FROM 50% TO 75%.
      • +
    • Double-barreled shotguns and any child of such now can be used with off-hand equipment.
      • +
    • Readds bioterror darts to the nuclear operative uplink for the legacy price of 6tc! Has all new horrid reagents!
      • +
    • Scatterlaser is now in-line with buckshot. Nukies can't purchase scatterlaser shot.
      • +
    • Null crates are no longer available in cargo!
      • +
    • Sleeping Carp and Rising Bass now dodge. Again.
      • +
    • Russian Revolver can no longer be exploited for a free 357.
      • +
    • Several guns now shoot exactly where you click regardless of movement or turning.
      • +
    +

    timothyteakettle updated:

    +
      +
    • added beacon for cooks to choose an ingredient box, which replaces the random box they used to receive
      • +
    • added a new sushi ingredients box
      • +
    • added more items to the wildcard box's possible contents
      • +
    • add new holodeck wrestling belt which lets you use moves only on those also wearing it
      • +
    • add new holodeck map featuring the holodeck wrestling belt
      • +
    • new reagent 'Condensed Cooking Oil'
      • +
    • list of chems that can go into fried non-food items was changed
      • +
    +

    zeroisthebiggay updated:

    +
      +
    • sneaksuit to contractor items
      • +
    • sneaksuit is a bundle
      • +
    • intel potion and radio implant from contractor items
      • +
    • ghosts can now DNR
      • +
    • sneaksuit is not fireproof
      • +
    • insidious balaclava muzzlepsprite works
      • +
    • You can now choose your name and color as a holoparasite/guardian/holocarp!
      • +
    • fixes lings being able to get mechanical holoparasites
      • +
    GoonStation 13 Development Team From 9197cb48131ad44394c5fc13a879ef5f1b8421e8 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Thu, 18 Jun 2020 21:06:22 -0700 Subject: [PATCH 5/6] allows storage in medbelts and organ boxes. --- code/game/objects/items/storage/belt.dm | 3 ++- code/game/objects/items/storage/firstaid.dm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 82ae274012..b0ac47ca11 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -180,7 +180,8 @@ /obj/item/implantcase, /obj/item/implant, /obj/item/implanter, - /obj/item/pinpointer/crew + /obj/item/pinpointer/crew, + /obj/item/reagent_containers/chem_pack )) /obj/item/storage/belt/medical/surgery_belt_adv diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index c7c0a711c8..c4ef04b001 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -418,7 +418,8 @@ /obj/item/circuitboard/computer/crew, /obj/item/stack/sheet/glass, /obj/item/stack/sheet/mineral/silver, - /obj/item/organ_storage + /obj/item/organ_storage, + /obj/item/reagent_containers/chem_pack )) //hijacking the minature first aids for hypospray boxes. <3 From 06f0d42ee9e96a794135ccff8fe1bbc6287109f8 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Sat, 20 Jun 2020 16:53:39 -0700 Subject: [PATCH 6/6] makes chem packs slightly cheaper --- code/modules/research/designs/medical_designs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 22e444e443..e1e55f3476 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -218,7 +218,7 @@ id = "chem_pack" build_type = PROTOLATHE departmental_flags = DEPARTMENTAL_FLAG_MEDICAL - materials = list(/datum/material/plastic = 2000) + materials = list(/datum/material/plastic = 1500) build_path = /obj/item/reagent_containers/chem_pack category = list("Medical Designs")