From 796cbf30f3ab8be1528e1e88f0bbf266f8f1a5b8 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Sat, 6 Oct 2018 22:55:19 +0000 Subject: [PATCH 01/19] "[ci skip] Automatic Build - 2018.10.06.22.55.19" --- html/changelog.html | 83 + html/changelogs/.all_changelog.yml | 12378 ++++++++-------- html/changelogs/Sindorman-cameras.yml | 12 - html/changelogs/Sindorman-carp-update.yml | 38 - html/changelogs/Sindorman-centra-remap.yml | 13 - html/changelogs/Sindorman-table.yml | 13 - html/changelogs/albery-runes.yml | 7 - html/changelogs/alberyk-blood.yml | 6 - html/changelogs/alberyk-brains.yml | 6 - html/changelogs/alberyk-clothing.yml | 7 - html/changelogs/alberyk-golem.yml | 6 - html/changelogs/alberyk-hair.yml | 6 - html/changelogs/alberyk-holodeck.yml | 6 - html/changelogs/alberyk-tajara.yml | 7 - html/changelogs/alberyk-toys.yml | 6 - html/changelogs/alberyk-vaurca.yml | 6 - html/changelogs/alberyk-wizard.yml | 6 - html/changelogs/arrow768-door-welding.yml | 37 - html/changelogs/arrow768-leyon.yml | 37 - html/changelogs/arrow768-medical-intern.yml | 37 - html/changelogs/arrow768-staff-of-changes.yml | 37 - .../arrow769-cortical-stacks-tech.yml | 37 - html/changelogs/arrow769-icelance.yml | 37 - html/changelogs/arrow769-vkrexi.yml | 37 - .../burgerbb - additional dungeons.yml | 37 - .../burgerbb - lunchbox removal.yml | 37 - html/changelogs/burgerbb - spawn produce.yml | 37 - html/changelogs/burgerbb-chocolate.yml | 37 - .../burgerbb-disposals_improvements.yml | 37 - .../burgerbb-drink_and_hunger_overhaul.yml | 45 - .../burgerbb-infestation_overhaul.yml | 39 - html/changelogs/burgerbb-skinhead.yml | 37 - html/changelogs/dapocalypse-development.yml | 37 - html/changelogs/dragodress.yml | 38 - html/changelogs/fowl-gudgot.yml | 7 - .../furrycactus-medical-overhaul.yml | 37 - html/changelogs/furrycactus-solars.yml | 37 - vueui/package-lock.json | 28 +- 38 files changed, 6343 insertions(+), 7012 deletions(-) delete mode 100644 html/changelogs/Sindorman-cameras.yml delete mode 100644 html/changelogs/Sindorman-carp-update.yml delete mode 100644 html/changelogs/Sindorman-centra-remap.yml delete mode 100644 html/changelogs/Sindorman-table.yml delete mode 100644 html/changelogs/albery-runes.yml delete mode 100644 html/changelogs/alberyk-blood.yml delete mode 100644 html/changelogs/alberyk-brains.yml delete mode 100644 html/changelogs/alberyk-clothing.yml delete mode 100644 html/changelogs/alberyk-golem.yml delete mode 100644 html/changelogs/alberyk-hair.yml delete mode 100644 html/changelogs/alberyk-holodeck.yml delete mode 100644 html/changelogs/alberyk-tajara.yml delete mode 100644 html/changelogs/alberyk-toys.yml delete mode 100644 html/changelogs/alberyk-vaurca.yml delete mode 100644 html/changelogs/alberyk-wizard.yml delete mode 100644 html/changelogs/arrow768-door-welding.yml delete mode 100644 html/changelogs/arrow768-leyon.yml delete mode 100644 html/changelogs/arrow768-medical-intern.yml delete mode 100644 html/changelogs/arrow768-staff-of-changes.yml delete mode 100644 html/changelogs/arrow769-cortical-stacks-tech.yml delete mode 100644 html/changelogs/arrow769-icelance.yml delete mode 100644 html/changelogs/arrow769-vkrexi.yml delete mode 100644 html/changelogs/burgerbb - additional dungeons.yml delete mode 100644 html/changelogs/burgerbb - lunchbox removal.yml delete mode 100644 html/changelogs/burgerbb - spawn produce.yml delete mode 100644 html/changelogs/burgerbb-chocolate.yml delete mode 100644 html/changelogs/burgerbb-disposals_improvements.yml delete mode 100644 html/changelogs/burgerbb-drink_and_hunger_overhaul.yml delete mode 100644 html/changelogs/burgerbb-infestation_overhaul.yml delete mode 100644 html/changelogs/burgerbb-skinhead.yml delete mode 100644 html/changelogs/dapocalypse-development.yml delete mode 100644 html/changelogs/dragodress.yml delete mode 100644 html/changelogs/fowl-gudgot.yml delete mode 100644 html/changelogs/furrycactus-medical-overhaul.yml delete mode 100644 html/changelogs/furrycactus-solars.yml diff --git a/html/changelog.html b/html/changelog.html index c5e2ca67af7..fbce9cdd33a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,89 @@ -->
+

06 October 2018

+

Alberyk updated:

+ +

Alberyk, AndurilFlame, Bauser, DronzTheWolf updated:

+ +

Arrow768 updated:

+ +

BurgerBB updated:

+ +

Drago updated:

+ +

Furrycactus updated:

+ +

Lord Fowl updated:

+ +

PoZe updated:

+ +

PoZe, ben10083 updated:

+ +

dapocalypse updated:

+ +

01 October 2018

PoZe updated:

06 October 2018

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index ab895d8d65d..bb31208bd78 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -6248,3 +6248,5 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. of ethanol/butanol. - balance: Damage to slimes is now based on a percentage of the volume of that reagent on the slime, meaning more water kills slimes faster. + - bugfix: Hunger/thirst icons now scale to their hunger/thirst levels appropriately. + - bugfix: Fixed hunger/thirst penalty scaling. diff --git a/html/changelogs/burgerbb - hunger tweaks.yml b/html/changelogs/burgerbb - hunger tweaks.yml deleted file mode 100644 index b408f1927f1..00000000000 --- a/html/changelogs/burgerbb - hunger tweaks.yml +++ /dev/null @@ -1,38 +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: "Hunger/thirst icons now scale to their hunger/thirst levels appropriately." - - bugfix: "Fixed hunger/thirst penalty scaling." From 1c332bf57101adde21200dbe33829b9e44cee14f Mon Sep 17 00:00:00 2001 From: Erki Date: Mon, 8 Oct 2018 21:20:13 +0300 Subject: [PATCH 16/19] Admins are no longer kicked for using proxies (#5383) --- code/modules/client/client procs.dm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 69c839ede6b..39c95d7057e 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -95,7 +95,7 @@ if(href_list["warnacknowledge"]) var/queryid = text2num(href_list["warnacknowledge"]) warnings_acknowledge(queryid) - + if(href_list["notifacknowledge"]) var/queryid = text2num(href_list["notifacknowledge"]) notifications_acknowledge(queryid) @@ -660,10 +660,13 @@ if (config.ipintel_email) var/datum/ipintel/res = get_ip_intel(address) if (config.ipintel_rating_kick && res.intel >= config.ipintel_rating_kick) - message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a proxy/VPN. They are being kicked because of this.") - log_admin("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a proxy/VPN. They are being kicked because of this.") - to_chat(src, "Usage of proxies is not permitted by the rules. You are being kicked because of this.") - del(src) + if (!holder) + message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a proxy/VPN. They are being kicked because of this.") + log_admin("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a proxy/VPN. They are being kicked because of this.") + to_chat(src, "Usage of proxies is not permitted by the rules. You are being kicked because of this.") + del(src) + else + message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN.") else if (res.intel >= config.ipintel_rating_bad) message_admins("Proxy Detection: [key_name_admin(src)] IP intel rated [res.intel*100]% likely to be a Proxy/VPN.") ip_intel = res.intel From e411334910865fc523b2a5573cfa1f2c9f27d5ae Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 8 Oct 2018 15:22:00 -0300 Subject: [PATCH 17/19] Fixes zombie juice turning people into zombies right away (#5386) I deleted this line by accident, this should make the transformation not instant anymore. Also, it adds an armor check to being infected by the zombie attacks. --- .../mob/living/carbon/human/species/species_attack.dm | 6 +++++- .../Chemistry-Reagents/Chemistry-Reagents-Toxins.dm | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/species_attack.dm b/code/modules/mob/living/carbon/human/species/species_attack.dm index 0eba344e878..a1583f5e09d 100644 --- a/code/modules/mob/living/carbon/human/species/species_attack.dm +++ b/code/modules/mob/living/carbon/human/species/species_attack.dm @@ -158,7 +158,11 @@ return if(target.internal_organs_by_name["zombie"]) to_chat(user, "You feel that \the [target] has been already infected!") - if(prob(25)) + + var/infection_chance = 80 + var/armor = target.run_armor_check(zone,"melee") + infection_chance -= armor + if(prob(infection_chance)) if(target.reagents) target.reagents.add_reagent("trioxin", 10) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm index d302daa7420..25a49c9a328 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm @@ -812,6 +812,9 @@ if(!H.internal_organs_by_name["brain"]) //destroying the brain stops trioxin from bringing the dead back to life return + if(H && H.stat != DEAD) + return + for(var/datum/language/L in H.languages) H.remove_language(L.name) From 60840043aa0ce0896fce8207bf55ac60333bc946 Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Mon, 8 Oct 2018 11:22:14 -0700 Subject: [PATCH 18/19] Map fixes (#5391) ERT troopers no longer have access to Heavy Asset Protection shuttle blast door. Chemistry windoors access is fixed. Fixes #5388 Deleted rogue pipe next to medical break room. Fixes #5372 Chemistry has a sink, EMT room has a disposal unit now. Added a single cryostatis bag to medical storage. Now medbay has 6 bags in total on main level. --- html/changelogs/Sindorman-fixes.yml | 15 ++++++++++ maps/aurora/aurora-1_centcomm.dmm | 2 +- maps/aurora/aurora-4_mainlevel.dmm | 46 ++++++++++++++++++++--------- 3 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 html/changelogs/Sindorman-fixes.yml diff --git a/html/changelogs/Sindorman-fixes.yml b/html/changelogs/Sindorman-fixes.yml new file mode 100644 index 00000000000..9fe29f22a0b --- /dev/null +++ b/html/changelogs/Sindorman-fixes.yml @@ -0,0 +1,15 @@ +author: PoZe + +# 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: "Deleted wrong pipe below medical break room, it shouldn't shoot trash anymore." + - maptweak: "Added one cryostatis bag into medica storage. And added a sink to the chemistry. Added disposal unit to EMT room." + - bugfix: "Chemistry windoors access is fixed." + - bugfix: "Regular ERT members no longer has access to Admin Shuttle(HAP) blast door remote button. ERT commander and CCIA are the only people whose ID has access to it." diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 6c4cf25f2a5..bb06f9dd602 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -22653,7 +22653,7 @@ name = "Administration Shuttle"; pixel_x = 0; pixel_y = 26; - req_access = list(101) + req_access = list(108) }, /turf/unsimulated/floor{ icon_state = "dark" diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index b44ba0de5f2..e186d44f797 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -30973,7 +30973,8 @@ }, /obj/machinery/door/window/brigdoor/northright{ dir = 8; - name = "Chemistry Desk" + name = "Chemistry Desk"; + req_access = list(33) }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -39216,7 +39217,8 @@ pixel_y = 23 }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 2; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/dark, /area/medical/emt) @@ -39224,9 +39226,6 @@ /turf/simulated/floor/tiled/dark, /area/medical/emt) "bvX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -39234,6 +39233,10 @@ pixel_x = 7; pixel_y = 28 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/medical/emt) "bvY" = ( @@ -40092,6 +40095,9 @@ /area/hallway/primary/central_one) "bxq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/medical/emt) "bxr" = ( @@ -58284,6 +58290,10 @@ /area/quartermaster/lobby) "dvg" = ( /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/dark, /area/medical/emt) "dzP" = ( @@ -60891,7 +60901,8 @@ }, /obj/machinery/door/firedoor, /obj/machinery/door/window/brigdoor/northright{ - name = "Chemistry Desk" + name = "Chemistry Desk"; + req_access = list(33) }, /obj/machinery/ringer_button{ id = "chemistry_ringer"; @@ -61339,15 +61350,14 @@ /turf/simulated/floor/plating, /area/maintenance/library) "nEE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/structure/sign/nosmoking_1{ pixel_y = 32 }, +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, /turf/simulated/floor/tiled/dark, /area/medical/emt) "nGb" = ( @@ -61743,6 +61753,7 @@ pixel_x = 24; req_one_access = list(24,11,55) }, +/obj/item/bodybag/cryobag, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "oSF" = ( @@ -63053,6 +63064,13 @@ /obj/effect/large_stock_marker, /turf/simulated/floor/tiled, /area/quartermaster/lobby) +"wJR" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark, +/area/medical/emt) "wKI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -63420,13 +63438,14 @@ icon_state = "corner_white"; dir = 5 }, -/obj/structure/sign/nosmoking_1{ - pixel_y = 32 - }, /obj/machinery/light{ icon_state = "tube1"; dir = 1 }, +/obj/structure/sink/kitchen{ + name = "chemistry sink"; + pixel_y = 28 + }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) "ygM" = ( @@ -64564,7 +64583,6 @@ /obj/effect/floor_decal/corner/lime/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -96630,7 +96648,7 @@ bsx bbr bxs bvV -bvW +wJR bxs bzE bAG From 61b3d6cf3dc32dc9cd1def645aded04c77fd355d Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Mon, 8 Oct 2018 18:23:08 +0000 Subject: [PATCH 19/19] "[ci skip] Automatic Build - 2018.10.08.18.23.08" --- html/changelog.html | 9 +++++++++ html/changelogs/.all_changelog.yml | 10 ++++++++++ html/changelogs/Sindorman-fixes.yml | 15 --------------- 3 files changed, 19 insertions(+), 15 deletions(-) delete mode 100644 html/changelogs/Sindorman-fixes.yml diff --git a/html/changelog.html b/html/changelog.html index 437ca983a51..6c0bedcc5c1 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,15 @@ -->
+

08 October 2018

+

PoZe updated:

+
    +
  • Deleted wrong pipe below medical break room, it shouldn't shoot trash anymore.
    • +
  • Added one cryostatis bag into medica storage. And added a sink to the chemistry. Added disposal unit to EMT room.
    • +
  • Chemistry windoors access is fixed.
    • +
  • Regular ERT members no longer has access to Admin Shuttle(HAP) blast door remote button. ERT commander and CCIA are the only people whose ID has access to it.
    • +
+

07 October 2018

BurgerBB updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index bb31208bd78..f9f348db7ce 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -6250,3 +6250,13 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. on the slime, meaning more water kills slimes faster. - bugfix: Hunger/thirst icons now scale to their hunger/thirst levels appropriately. - bugfix: Fixed hunger/thirst penalty scaling. +2018-10-08: + PoZe: + - bugfix: Deleted wrong pipe below medical break room, it shouldn't shoot trash + anymore. + - maptweak: Added one cryostatis bag into medica storage. And added a sink to the + chemistry. Added disposal unit to EMT room. + - bugfix: Chemistry windoors access is fixed. + - bugfix: Regular ERT members no longer has access to Admin Shuttle(HAP) blast door + remote button. ERT commander and CCIA are the only people whose ID has access + to it. diff --git a/html/changelogs/Sindorman-fixes.yml b/html/changelogs/Sindorman-fixes.yml deleted file mode 100644 index 9fe29f22a0b..00000000000 --- a/html/changelogs/Sindorman-fixes.yml +++ /dev/null @@ -1,15 +0,0 @@ -author: PoZe - -# 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: "Deleted wrong pipe below medical break room, it shouldn't shoot trash anymore." - - maptweak: "Added one cryostatis bag into medica storage. And added a sink to the chemistry. Added disposal unit to EMT room." - - bugfix: "Chemistry windoors access is fixed." - - bugfix: "Regular ERT members no longer has access to Admin Shuttle(HAP) blast door remote button. ERT commander and CCIA are the only people whose ID has access to it."