From 61f931e7c64de14b57bc96ceb79cbcfbcbe815b1 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Sun, 28 Oct 2018 13:13:16 +0100 Subject: [PATCH 01/51] Gives cargo IPC blood --- code/datums/supplypacks.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 2db64b30bdb..4d8bd9432f4 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -923,6 +923,14 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine containername = "machine prototype crate" access = access_research +/datum/supply_packs/science/oil + name = "Oil Tank Crate" + contains = list(/obj/structure/reagent_dispensers/oil, + /obj/item/reagent_containers/food/drinks/oilcan) + cost = 10 + containertype = /obj/structure/largecrate + containername = "oil tank crate" + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Organic ///////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// From b5b3fca2afcd2efb9980ca524ddd3cb77cdb49e4 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 29 Oct 2018 20:01:22 +0100 Subject: [PATCH 02/51] Mechs can now only be repaired once every 1.5 seconds --- code/game/mecha/mecha.dm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 64874762050..157fee6e523 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -43,6 +43,8 @@ var/lights_power = 6 var/emagged = FALSE + var/list/repairers = new + //inner atmos var/use_internal_tank = 0 var/internal_tank_valve = ONE_ATMOSPHERE @@ -778,15 +780,22 @@ var/obj/item/weldingtool/WT = W if(healthYou repair the damaged gas tank.") + if(!(user in repairers)) // Can only repair it once at a time + repairers += user + user.visible_message("[user] starts repairing some damage to [name].", "You start repairing some damage to [name]") + playsound(user, WT.usesound, 50, 1) + if(do_after(user, 15 * WT.toolspeed, target = src)) // Takes 1.5 seconds to repair + if (internal_damage & MECHA_INT_TANK_BREACH) + clearInternalDamage(MECHA_INT_TANK_BREACH) + user.visible_message("[user] repairs the damaged gas tank.", "You repair the damaged gas tank.") + else + user.visible_message("[user] repairs some damage to [name].", "You repair some damage to [name]") + health += min(10, initial(health)-health) + repairers -= user else - user.visible_message("[user] repairs some damage to [name].") - health += min(10, initial(health)-health) + to_chat(user, "You are already repairing [name]!") else to_chat(user, "The welder must be on for this task!") - return 1 else to_chat(user, "The [name] is at full integrity!") return 1 From 07e419a8a45a36ec0282ea7f454cdba305827f64 Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Mon, 29 Oct 2018 20:31:11 +0100 Subject: [PATCH 03/51] Items dropped in a pod will now stay in the pod. --- code/modules/spacepods/spacepod.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm index ed2e9154a10..bb9c2d41fa1 100644 --- a/code/modules/spacepods/spacepod.dm +++ b/code/modules/spacepods/spacepod.dm @@ -199,6 +199,9 @@ deal_damage(P.damage) P.on_hit(src) +/obj/spacepod/AllowDrop() + return TRUE + /obj/spacepod/blob_act() deal_damage(30) return From 2e2af221faead5ea333029c492df120d8ae16d17 Mon Sep 17 00:00:00 2001 From: Jountax <29084482+Jountax@users.noreply.github.com> Date: Mon, 29 Oct 2018 15:31:23 -0400 Subject: [PATCH 04/51] Update chili.dm --- code/modules/hydroponics/grown/chili.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 01e05762eba..333cfa6f7b6 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -28,11 +28,11 @@ // Ice Chili /obj/item/seeds/chili/ice - name = "pack of ice pepper seeds" - desc = "These seeds grow into ice pepper plants." + name = "pack of chilly pepper seeds" + desc = "These seeds grow into chilly pepper plants." icon_state = "seed-icepepper" species = "chiliice" - plantname = "Ice Pepper Plants" + plantname = "Chilly Pepper Plants" product = /obj/item/reagent_containers/food/snacks/grown/icepepper lifespan = 25 maturation = 4 @@ -73,4 +73,4 @@ icon_state = "ghostchilipepper" filling_color = "#F8F8FF" bitesize_mod = 4 - origin_tech = "biotech=4;magnets=5" \ No newline at end of file + origin_tech = "biotech=4;magnets=5" From eb182aa1fbe91e2b8f09b7e065734ef247e1008a Mon Sep 17 00:00:00 2001 From: Jountax <29084482+Jountax@users.noreply.github.com> Date: Mon, 29 Oct 2018 16:12:28 -0400 Subject: [PATCH 05/51] Update chili.dm --- code/modules/hydroponics/grown/chili.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 333cfa6f7b6..f8bf515ce6b 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -43,7 +43,7 @@ /obj/item/reagent_containers/food/snacks/grown/icepepper seed = /obj/item/seeds/chili/ice - name = "ice pepper" + name = "chilly pepper" desc = "It's a mutant strain of chili" icon_state = "icepepper" filling_color = "#0000CD" From ed4b31c6d1a5f767e2ad668a38747e7eb09d2f92 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Mon, 29 Oct 2018 13:20:45 -0700 Subject: [PATCH 06/51] Fixes Surgery1 holosign --- _maps/map_files/cyberiad/cyberiad.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 4fbb941c9a2..bd18d50835d 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -5896,7 +5896,7 @@ "cjt" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/asmaint) "cju" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/effect/landmark/start{name = "Medical Doctor"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "darkblue"},/area/medical/surgery1) "cjv" = (/obj/structure/closet/wardrobe/medic_white,/obj/item/clothing/head/surgery/blue,/obj/item/clothing/head/surgery/blue,/obj/item/clothing/head/surgery/green,/obj/item/clothing/head/surgery/green,/obj/item/clothing/head/surgery/purple,/obj/item/clothing/head/surgery/purple,/obj/item/clothing/suit/storage/fr_jacket,/obj/item/clothing/suit/storage/fr_jacket,/obj/item/clothing/suit/storage/fr_jacket,/obj/item/clothing/under/rank/medical/blue,/obj/item/clothing/under/rank/medical/green,/obj/item/clothing/under/rank/medical/purple,/turf/simulated/floor/plasteel{dir = 2; icon_state = "cafeteria"; tag = "icon-cafeteria (NORTHEAST)"},/area/medical/medbreak) -"cjw" = (/obj/machinery/light_switch{pixel_x = -23; pixel_y = -5},/obj/machinery/holosign_switch{pixel_x = -23; pixel_y = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "darkblue"},/area/medical/surgery1) +"cjw" = (/obj/machinery/light_switch{pixel_x = -23; pixel_y = -5},/obj/machinery/holosign_switch{id = "surgery1"; pixel_x = -23; pixel_y = 4},/turf/simulated/floor/plasteel{dir = 10; icon_state = "darkblue"},/area/medical/surgery1) "cjx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5; level = 1},/turf/simulated/floor/plasteel{tag = "icon-whiteblue (WEST)"; icon_state = "whiteblue"; dir = 8},/area/medical/surgery1) "cjy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/turf/simulated/floor/plasteel{dir = 6; icon_state = "darkblue"},/area/medical/surgery1) "cjz" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/medical/ward) From 8a0767a88aba877eb1bc3f9225aba37434118927 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Mon, 29 Oct 2018 14:33:35 -0700 Subject: [PATCH 07/51] Adds speach impediment handling to megaphones --- code/game/objects/items/devices/megaphone.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 8b53e3d8ed7..43515ed5241 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -47,6 +47,7 @@ message = sanitize(copytext(message, 1, MAX_MESSAGE_LEN)) if(!message) return + message = user.handle_speech_problems(message)[1] message = capitalize(message) if((loc == user && !user.incapacitated())) if(emagged) From 8860b285ff612519a7f6bb086a443325c167c997 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Mon, 29 Oct 2018 14:55:14 -0700 Subject: [PATCH 08/51] Makes drone gib on shutdown --- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 0a24b6414ca..afbca436c06 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -243,7 +243,7 @@ return to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") - death() + gib() /mob/living/silicon/robot/drone/proc/full_law_reset() clear_supplied_laws() From 7e3566dc550e9426f27f95f5c8c437cfc3312b82 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 29 Oct 2018 19:54:50 -0400 Subject: [PATCH 09/51] Automatic changelog generation for PR #10053 [ci skip] --- html/changelogs/AutoChangeLog-pr-10053.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10053.yml diff --git a/html/changelogs/AutoChangeLog-pr-10053.yml b/html/changelogs/AutoChangeLog-pr-10053.yml new file mode 100644 index 00000000000..8d54634460e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10053.yml @@ -0,0 +1,4 @@ +author: "Farie82" +delete-after: True +changes: + - bugfix: "Items dropped in a space pod are now under the seat. No more magical dropping out of the pod" From 028b53b0553c57f34405a459e125ff3b2b63d69d Mon Sep 17 00:00:00 2001 From: warior4356 Date: Mon, 29 Oct 2018 16:56:09 -0700 Subject: [PATCH 10/51] Fixes ID based runtime on shutting down drones --- code/modules/mob/living/silicon/robot/drone/drone.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 0a24b6414ca..1b18b6b3cbe 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -132,7 +132,7 @@ to_chat(user, "The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.") return - if(!allowed(usr)) + if(!allowed(W)) to_chat(user, "Access denied.") return @@ -158,7 +158,7 @@ if(emagged) return - if(allowed(usr)) + if(allowed(W)) shut_down() else to_chat(user, "Access denied.") From 68f27d7fb13fd0c54f524a47528df8bfc0bce3d0 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 29 Oct 2018 19:57:47 -0400 Subject: [PATCH 11/51] Automatic changelog generation for PR #10054 [ci skip] --- html/changelogs/AutoChangeLog-pr-10054.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10054.yml diff --git a/html/changelogs/AutoChangeLog-pr-10054.yml b/html/changelogs/AutoChangeLog-pr-10054.yml new file mode 100644 index 00000000000..2d53e6f19e8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10054.yml @@ -0,0 +1,4 @@ +author: "warior4356" +delete-after: True +changes: + - bugfix: "fixed the holosign in surgery1" From 3fc5e3e45415491aa7e71f3e15688bd324a73662 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 29 Oct 2018 19:59:12 -0400 Subject: [PATCH 12/51] Automatic changelog generation for PR #10056 [ci skip] --- html/changelogs/AutoChangeLog-pr-10056.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10056.yml diff --git a/html/changelogs/AutoChangeLog-pr-10056.yml b/html/changelogs/AutoChangeLog-pr-10056.yml new file mode 100644 index 00000000000..5c7426be636 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10056.yml @@ -0,0 +1,4 @@ +author: "Warior4356" +delete-after: True +changes: + - bugfix: "Megaphone now handle speech impediments properly" From 3aeb8d43249151ca1eb0b94d716c46745ce6ca23 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 29 Oct 2018 20:09:13 -0400 Subject: [PATCH 13/51] Automatic changelog generation for PR #10058 [ci skip] --- html/changelogs/AutoChangeLog-pr-10058.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10058.yml diff --git a/html/changelogs/AutoChangeLog-pr-10058.yml b/html/changelogs/AutoChangeLog-pr-10058.yml new file mode 100644 index 00000000000..55894317a4a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10058.yml @@ -0,0 +1,4 @@ +author: "Warior4356" +delete-after: True +changes: + - bugfix: "Swiping an ID through a drone no longer causes a runtime and correctly shuts it down" From 6bbfd381483491d707f8bee885fd58c973086862 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Mon, 29 Oct 2018 17:56:38 -0700 Subject: [PATCH 14/51] Fixes silicons pressing door buttons and doors not opening. --- code/game/machinery/door_control.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 556cba8e330..279a3e197dc 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -82,7 +82,7 @@ add_fingerprint(user) if(normaldoorcontrol) - for(var/obj/machinery/door/airlock/D in range(range)) + for(var/obj/machinery/door/airlock/D in range(range, src)) if(D.id_tag == id) if(specialfunctions & OPEN) if(D.density) @@ -113,7 +113,7 @@ D.safe = 1 else - for(var/obj/machinery/door/poddoor/M in range(range)) + for(var/obj/machinery/door/poddoor/M in range(range, src)) if(M.id_tag == id) if(M.density) spawn( 0 ) From f4d5f73261b2d32d58666a5d8b6bb71f30870f9c Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 29 Oct 2018 21:31:49 -0400 Subject: [PATCH 15/51] Fixes Paper Bundles Bug --- code/modules/paperwork/paper_bundle.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 73c9f9459dc..900d3d4bdb8 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -71,7 +71,8 @@ update_icon() - attack_self(usr) //Update the browsed page. + if(winget(usr, "[name]", "is-visible") == "true") // NOT MY FAULT IT IS A BUILT IN PROC PLEASE DO NOT HIT ME + attack_self(usr) //Update the browsed page. add_fingerprint(usr) return From 514596a0b1a950a2dd8a28b242004d1449072548 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 29 Oct 2018 22:17:46 -0400 Subject: [PATCH 16/51] Automatic changelog generation for PR #10061 [ci skip] --- html/changelogs/AutoChangeLog-pr-10061.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10061.yml diff --git a/html/changelogs/AutoChangeLog-pr-10061.yml b/html/changelogs/AutoChangeLog-pr-10061.yml new file mode 100644 index 00000000000..7f136b69dc6 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10061.yml @@ -0,0 +1,4 @@ +author: "Warior4356" +delete-after: True +changes: + - bugfix: "Silicons are now able to open a door linked to a button regardless of proximity" From 03ebb789e8cac5b72bf1aec576c7d55883ca1068 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 30 Oct 2018 02:33:12 +0000 Subject: [PATCH 17/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 16 ++++++++++++++++ html/changelogs/.all_changelog.yml | 12 ++++++++++++ html/changelogs/AutoChangeLog-pr-10053.yml | 4 ---- html/changelogs/AutoChangeLog-pr-10054.yml | 4 ---- html/changelogs/AutoChangeLog-pr-10056.yml | 4 ---- html/changelogs/AutoChangeLog-pr-10058.yml | 4 ---- html/changelogs/AutoChangeLog-pr-10061.yml | 4 ---- 7 files changed, 28 insertions(+), 20 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10053.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-10054.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-10056.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-10058.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-10061.yml diff --git a/html/changelog.html b/html/changelog.html index 5b33bff5da7..6560f3a08fa 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,22 @@ -->
+

30 October 2018

+

Farie82 updated:

+
    +
  • Items dropped in a space pod are now under the seat. No more magical dropping out of the pod
    • +
+

Warior4356 updated:

+
    +
  • Megaphone now handle speech impediments properly
    • +
  • Swiping an ID through a drone no longer causes a runtime and correctly shuts it down
    • +
  • Silicons are now able to open a door linked to a button regardless of proximity
    • +
+

warior4356 updated:

+
    +
  • fixed the holosign in surgery1
    • +
+

29 October 2018

Farie82 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index c30a1d16165..a71b73f31ac 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7776,3 +7776,15 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: Mech speech bubbles should now follow the mech. gatchapod: - bugfix: Fixed airlocks electrocuting people remotely through open UI +2018-10-30: + Farie82: + - bugfix: Items dropped in a space pod are now under the seat. No more magical dropping + out of the pod + Warior4356: + - bugfix: Megaphone now handle speech impediments properly + - bugfix: Swiping an ID through a drone no longer causes a runtime and correctly + shuts it down + - bugfix: Silicons are now able to open a door linked to a button regardless of + proximity + warior4356: + - bugfix: fixed the holosign in surgery1 diff --git a/html/changelogs/AutoChangeLog-pr-10053.yml b/html/changelogs/AutoChangeLog-pr-10053.yml deleted file mode 100644 index 8d54634460e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10053.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Farie82" -delete-after: True -changes: - - bugfix: "Items dropped in a space pod are now under the seat. No more magical dropping out of the pod" diff --git a/html/changelogs/AutoChangeLog-pr-10054.yml b/html/changelogs/AutoChangeLog-pr-10054.yml deleted file mode 100644 index 2d53e6f19e8..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10054.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "warior4356" -delete-after: True -changes: - - bugfix: "fixed the holosign in surgery1" diff --git a/html/changelogs/AutoChangeLog-pr-10056.yml b/html/changelogs/AutoChangeLog-pr-10056.yml deleted file mode 100644 index 5c7426be636..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10056.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Warior4356" -delete-after: True -changes: - - bugfix: "Megaphone now handle speech impediments properly" diff --git a/html/changelogs/AutoChangeLog-pr-10058.yml b/html/changelogs/AutoChangeLog-pr-10058.yml deleted file mode 100644 index 55894317a4a..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10058.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Warior4356" -delete-after: True -changes: - - bugfix: "Swiping an ID through a drone no longer causes a runtime and correctly shuts it down" diff --git a/html/changelogs/AutoChangeLog-pr-10061.yml b/html/changelogs/AutoChangeLog-pr-10061.yml deleted file mode 100644 index 7f136b69dc6..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10061.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Warior4356" -delete-after: True -changes: - - bugfix: "Silicons are now able to open a door linked to a button regardless of proximity" From 6c43e5381aaf83c001d123d4c523081b097fbba4 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 29 Oct 2018 22:54:00 -0400 Subject: [PATCH 18/51] Automatic changelog generation for PR #10062 [ci skip] --- html/changelogs/AutoChangeLog-pr-10062.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10062.yml diff --git a/html/changelogs/AutoChangeLog-pr-10062.yml b/html/changelogs/AutoChangeLog-pr-10062.yml new file mode 100644 index 00000000000..ab22048e767 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10062.yml @@ -0,0 +1,4 @@ +author: "Dave-TH" +delete-after: True +changes: + - bugfix: "Adding a paper to a paper bundle no longer automatically opens the bundle." From 7cb02e80f415eedba6342374993d58d342bdd45b Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 30 Oct 2018 04:49:54 +0000 Subject: [PATCH 19/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/AutoChangeLog-pr-10062.yml | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10062.yml diff --git a/html/changelog.html b/html/changelog.html index 6560f3a08fa..cb182442730 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,10 @@

    30 October 2018

    +

    Dave-TH updated:

    +
      +
    • Adding a paper to a paper bundle no longer automatically opens the bundle.
      • +

    Farie82 updated:

    • Items dropped in a space pod are now under the seat. No more magical dropping out of the pod
      • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index a71b73f31ac..3b6c34a25b1 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7777,6 +7777,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. gatchapod: - bugfix: Fixed airlocks electrocuting people remotely through open UI 2018-10-30: + Dave-TH: + - bugfix: Adding a paper to a paper bundle no longer automatically opens the bundle. Farie82: - bugfix: Items dropped in a space pod are now under the seat. No more magical dropping out of the pod diff --git a/html/changelogs/AutoChangeLog-pr-10062.yml b/html/changelogs/AutoChangeLog-pr-10062.yml deleted file mode 100644 index ab22048e767..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10062.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Dave-TH" -delete-after: True -changes: - - bugfix: "Adding a paper to a paper bundle no longer automatically opens the bundle." From f03aea80f5c2ebe745d07ae9ceb6ff2c2cedb9af Mon Sep 17 00:00:00 2001 From: farie82 Date: Tue, 30 Oct 2018 08:51:29 +0100 Subject: [PATCH 20/51] Set the repairing to 20 --- code/game/mecha/mecha.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 157fee6e523..1704fecd7a1 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -790,7 +790,7 @@ user.visible_message("[user] repairs the damaged gas tank.", "You repair the damaged gas tank.") else user.visible_message("[user] repairs some damage to [name].", "You repair some damage to [name]") - health += min(10, initial(health)-health) + health += min(20, initial(health)-health) repairers -= user else to_chat(user, "You are already repairing [name]!") @@ -1501,4 +1501,4 @@ visual_effect_icon = ATTACK_EFFECT_MECHFIRE else if(damtype == TOX) visual_effect_icon = ATTACK_EFFECT_MECHTOXIN - ..() \ No newline at end of file + ..() From 9b6f1248c6939b4d265e77c23d5c23f810cee217 Mon Sep 17 00:00:00 2001 From: alex-gh Date: Sat, 27 Oct 2018 13:11:42 +0200 Subject: [PATCH 21/51] Fixed tabling through solid objects. --- code/game/objects/structures.dm | 29 ++++++++------------ code/game/objects/structures/tables_racks.dm | 12 +++++--- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index e38350a0136..faf86394dba 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -64,26 +64,26 @@ if(C == user) do_climb(user) +/obj/structure/proc/density_check() + for(var/obj/O in orange(0, src)) + if(O.density && !istype(O, /obj/machinery/door/window)) //Ignores windoors, as those already block climbing, otherwise a windoor on the opposite side of a table would prevent climbing. + return O + var/turf/T = get_turf(src) + if(T.density) + return T + return null /obj/structure/proc/do_climb(var/mob/living/user) - if(!can_touch(user) || !climbable) return + var/blocking_object = density_check() + if(blocking_object) + to_chat(user, "You cannot climb [src], as it is blocked by \a [blocking_object]!") + return - for(var/obj/O in range(0, src)) - if(O.density == 1 && O != src && !istype(O, /obj/machinery/door/window)) //Ignores windoors, as those already block climbing, otherwise a windoor on the opposite side of a table would prevent climbing. - to_chat(user, "You cannot climb [src], as it is blocked by \a [O]!") - return - for(var/turf/T in range(0, src)) - if(T.density == 1) - to_chat(user, "You cannot climb [src], as it is blocked by \a [T]!") - return var/turf/T = src.loc if(!T || !istype(T)) return - var/obj/machinery/door/poddoor/shutters/S = locate() in T.contents - if(S && S.density) return - usr.visible_message("[user] starts climbing onto \the [src]!") climber = user if(!do_after(user, 50, target = src)) @@ -94,11 +94,6 @@ climber = null return - S = locate() in T.contents - if(S && S.density) - climber = null - return - usr.loc = get_turf(src) if(get_turf(user) == get_turf(src)) usr.visible_message("[user] climbs onto \the [src]!") diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 3ec50187bfb..999e90cd89f 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -180,12 +180,16 @@ var/obj/item/grab/G = I if(G.affecting.buckled) to_chat(user, "[G.affecting] is buckled to [G.affecting.buckled]!") - return 0 + return FALSE if(G.state < GRAB_AGGRESSIVE) to_chat(user, "You need a better grip to do that!") - return 0 + return FALSE if(!G.confirm()) - return 0 + return FALSE + var/blocking_object = density_check() + if(blocking_object) + to_chat(user, "You cannot do this there is \a [blocking_object] in the way!") + return FALSE G.affecting.forceMove(get_turf(src)) G.affecting.Weaken(2) item_placed(G.affecting) @@ -193,7 +197,7 @@ "[G.assailant] pushes [G.affecting] onto [src].") add_attack_logs(G.assailant, G.affecting, "Pushed onto a table") qdel(I) - return 1 + return TRUE qdel(I) /obj/structure/table/attackby(obj/item/I, mob/user, params) From 873a66009752bc8f8a02aede5c037d0968c88bc7 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 30 Oct 2018 08:55:15 -0400 Subject: [PATCH 22/51] Automatic changelog generation for PR #10029 [ci skip] --- html/changelogs/AutoChangeLog-pr-10029.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10029.yml diff --git a/html/changelogs/AutoChangeLog-pr-10029.yml b/html/changelogs/AutoChangeLog-pr-10029.yml new file mode 100644 index 00000000000..919fc43067e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10029.yml @@ -0,0 +1,4 @@ +author: "Farie82" +delete-after: True +changes: + - rscadd: "Cargo can now buy oil tanks." From d579a64a922cee2e9a4763bba42bf3e0bfed58af Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 30 Oct 2018 13:14:10 +0000 Subject: [PATCH 23/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 1 + html/changelogs/.all_changelog.yml | 1 + html/changelogs/AutoChangeLog-pr-10029.yml | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10029.yml diff --git a/html/changelog.html b/html/changelog.html index cb182442730..4d7d28ebc48 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -64,6 +64,7 @@

      Farie82 updated:

      • Items dropped in a space pod are now under the seat. No more magical dropping out of the pod
        • +
      • Cargo can now buy oil tanks.

      Warior4356 updated:

        diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 3b6c34a25b1..56bf1d73752 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7782,6 +7782,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Farie82: - bugfix: Items dropped in a space pod are now under the seat. No more magical dropping out of the pod + - rscadd: Cargo can now buy oil tanks. Warior4356: - bugfix: Megaphone now handle speech impediments properly - bugfix: Swiping an ID through a drone no longer causes a runtime and correctly diff --git a/html/changelogs/AutoChangeLog-pr-10029.yml b/html/changelogs/AutoChangeLog-pr-10029.yml deleted file mode 100644 index 919fc43067e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10029.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Farie82" -delete-after: True -changes: - - rscadd: "Cargo can now buy oil tanks." From a430b826e5ec2c4c804a9f49dd2d22f06bab890f Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 30 Oct 2018 09:34:19 -0400 Subject: [PATCH 24/51] Automatic changelog generation for PR #10009 [ci skip] --- html/changelogs/AutoChangeLog-pr-10009.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10009.yml diff --git a/html/changelogs/AutoChangeLog-pr-10009.yml b/html/changelogs/AutoChangeLog-pr-10009.yml new file mode 100644 index 00000000000..c262a7ddc3a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10009.yml @@ -0,0 +1,4 @@ +author: "uc_guy" +delete-after: True +changes: + - bugfix: "You can no longer table people through walls/doors/shutters." From 6620009f909a2ec17e38f2ac0d082371593a7ecd Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 30 Oct 2018 15:34:19 +0000 Subject: [PATCH 25/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/AutoChangeLog-pr-10009.yml | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10009.yml diff --git a/html/changelog.html b/html/changelog.html index 4d7d28ebc48..49a9502b389 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -72,6 +72,10 @@
      • Swiping an ID through a drone no longer causes a runtime and correctly shuts it down
      • Silicons are now able to open a door linked to a button regardless of proximity
      +

      uc_guy updated:

      +
        +
      • You can no longer table people through walls/doors/shutters.
        • +

      warior4356 updated:

      • fixed the holosign in surgery1
        • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 56bf1d73752..d60bc05921c 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7789,5 +7789,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. shuts it down - bugfix: Silicons are now able to open a door linked to a button regardless of proximity + uc_guy: + - bugfix: You can no longer table people through walls/doors/shutters. warior4356: - bugfix: fixed the holosign in surgery1 diff --git a/html/changelogs/AutoChangeLog-pr-10009.yml b/html/changelogs/AutoChangeLog-pr-10009.yml deleted file mode 100644 index c262a7ddc3a..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10009.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "uc_guy" -delete-after: True -changes: - - bugfix: "You can no longer table people through walls/doors/shutters." From 6f07fd668a2dd7a6891024282313a76a564a7d4f Mon Sep 17 00:00:00 2001 From: TatsumakiMagi Date: Tue, 30 Oct 2018 23:21:57 +0000 Subject: [PATCH 26/51] Fixes adjacency issues with merch shop, arcade shop and give command --- code/game/machinery/computer/store.dm | 3 +++ code/modules/arcade/prize_datums.dm | 3 +++ code/modules/mob/living/carbon/give.dm | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index bfa2820d9b3..f49d91c53b3 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -145,6 +145,9 @@ th.cost.toomuch {background:maroon;} var/itemID = text2num(href_list["buy"]) var/datum/storeitem/item = centcomm_store.items[itemID] var/sure = alert(usr,"Are you sure you wish to purchase [item.name] for $[item.cost]?","You sure?","Yes","No") in list("Yes","No") + if(!Adjacent(usr)) + to_chat(usr, "You are not close enough to do that.") + return if(sure=="No") updateUsrDialog() return diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm index a2209a172ff..ef1512858d4 100644 --- a/code/modules/arcade/prize_datums.dm +++ b/code/modules/arcade/prize_datums.dm @@ -9,6 +9,9 @@ var/global/datum/prizes/global_prizes = new prizes += new itempath() /datum/prizes/proc/PlaceOrder(var/obj/machinery/prize_counter/prize_counter, var/itemID) + if(!prize_counter.Adjacent(usr)) + to_chat(usr, "You need to be closer!") + return if(!prize_counter) return 0 var/datum/prize_item/item = global_prizes.prizes[itemID] diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index 55c4db791ac..473715367b4 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -29,7 +29,7 @@ if("Yes") if(!I) return - if(!Adjacent(usr)) + if(!Adjacent(target)) to_chat(usr, " You need to stay in reaching distance while giving an object.") to_chat(target, " [usr.name] moved too far away.") return From e764982ca0d29278a2a871f609ee763b65c6890e Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 30 Oct 2018 19:48:06 -0400 Subject: [PATCH 27/51] Automatic changelog generation for PR #10070 [ci skip] --- html/changelogs/AutoChangeLog-pr-10070.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10070.yml diff --git a/html/changelogs/AutoChangeLog-pr-10070.yml b/html/changelogs/AutoChangeLog-pr-10070.yml new file mode 100644 index 00000000000..b5fb0c7b887 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10070.yml @@ -0,0 +1,4 @@ +author: "TatsumakiMagi" +delete-after: True +changes: + - bugfix: "fixed merch shop, arcade shop and the give command working from a distance" From eec839f15f32881134d326020d88a19922f7c571 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 30 Oct 2018 19:49:49 -0400 Subject: [PATCH 28/51] Automatic changelog generation for PR #10055 [ci skip] --- html/changelogs/AutoChangeLog-pr-10055.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10055.yml diff --git a/html/changelogs/AutoChangeLog-pr-10055.yml b/html/changelogs/AutoChangeLog-pr-10055.yml new file mode 100644 index 00000000000..5c5ddd59454 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10055.yml @@ -0,0 +1,4 @@ +author: "Jountax" +delete-after: True +changes: + - tweak: "Renamed Ice Peppers to Chilly Peppers." From 352f132c581c3e889d5c5cd495a589a6dbf36fd1 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 31 Oct 2018 01:39:51 +0000 Subject: [PATCH 29/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 10 ++++++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-10055.yml | 4 ---- html/changelogs/AutoChangeLog-pr-10070.yml | 4 ---- 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10055.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-10070.yml diff --git a/html/changelog.html b/html/changelog.html index 49a9502b389..88340d98314 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,16 @@ -->
        +

        31 October 2018

        +

        Jountax updated:

        +
          +
        • Renamed Ice Peppers to Chilly Peppers.
          • +
        +

        TatsumakiMagi updated:

        +
          +
        • fixed merch shop, arcade shop and the give command working from a distance
          • +
        +

        30 October 2018

        Dave-TH updated:

          diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index d60bc05921c..a5cc4cf367d 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7793,3 +7793,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - bugfix: You can no longer table people through walls/doors/shutters. warior4356: - bugfix: fixed the holosign in surgery1 +2018-10-31: + Jountax: + - tweak: Renamed Ice Peppers to Chilly Peppers. + TatsumakiMagi: + - bugfix: fixed merch shop, arcade shop and the give command working from a distance diff --git a/html/changelogs/AutoChangeLog-pr-10055.yml b/html/changelogs/AutoChangeLog-pr-10055.yml deleted file mode 100644 index 5c5ddd59454..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10055.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Jountax" -delete-after: True -changes: - - tweak: "Renamed Ice Peppers to Chilly Peppers." diff --git a/html/changelogs/AutoChangeLog-pr-10070.yml b/html/changelogs/AutoChangeLog-pr-10070.yml deleted file mode 100644 index b5fb0c7b887..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10070.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "TatsumakiMagi" -delete-after: True -changes: - - bugfix: "fixed merch shop, arcade shop and the give command working from a distance" From c3236e84acb19989c701016dce64e4e7d45c79e8 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Tue, 30 Oct 2018 18:50:32 -0700 Subject: [PATCH 30/51] Revert "Makes drone gib on shutdown" This reverts commit 8860b285ff612519a7f6bb086a443325c167c997. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index afbca436c06..0a24b6414ca 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -243,7 +243,7 @@ return to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") - gib() + death() /mob/living/silicon/robot/drone/proc/full_law_reset() clear_supplied_laws() From c6249d89f5a2b4d4ee0cefd6a542a5fbd176d761 Mon Sep 17 00:00:00 2001 From: warior4356 Date: Tue, 30 Oct 2018 19:06:23 -0700 Subject: [PATCH 31/51] Fixed by not allowing ghost to reenter corpse. --- code/modules/mob/living/silicon/robot/drone/drone.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 0a24b6414ca..fd3d8818ce7 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -223,6 +223,10 @@ health = 35 - (getBruteLoss() + getFireLoss()) update_stat("updatehealth([reason])") +/mob/living/silicon/robot/drone/death(gibbed) + . = ..(gibbed) + ghostize(can_reenter_corpse = 0) + //CONSOLE PROCS /mob/living/silicon/robot/drone/proc/law_resync() From ff961c609f37bd8e8f8f6ae76794c3ca0c0ba087 Mon Sep 17 00:00:00 2001 From: shazbot194 Date: Tue, 30 Oct 2018 19:44:32 -0800 Subject: [PATCH 32/51] Updated --- code/game/objects/items/robot/robot_upgrades.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 4bef1cbb324..27d7e6817f3 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -207,7 +207,7 @@ /obj/item/borg/upgrade/syndicate name = "illegal equipment module" - desc = "Unlocks the hidden, deadlier functions of a cyborg" + desc = "Unlocks the hidden, deadlier functions of a cyborg. As well as prevent any emag tampering." icon_state = "cyborg_upgrade3" origin_tech = "combat=4;syndicate=1" require_module = 1 From 5d43617825d40a277ca34cb230a1fcaf4fe887a5 Mon Sep 17 00:00:00 2001 From: shazbot194 Date: Tue, 30 Oct 2018 20:24:12 -0800 Subject: [PATCH 33/51] Shadey's nitpick --- code/game/objects/items/robot/robot_upgrades.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 27d7e6817f3..064b66b78f4 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -207,7 +207,7 @@ /obj/item/borg/upgrade/syndicate name = "illegal equipment module" - desc = "Unlocks the hidden, deadlier functions of a cyborg. As well as prevent any emag tampering." + desc = "Unlocks the hidden, deadlier functions of a cyborg. Also prevents emag subversion." icon_state = "cyborg_upgrade3" origin_tech = "combat=4;syndicate=1" require_module = 1 From 9aed1d66975bec77b5fc1c6a4fd9b40cc9cdb993 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Wed, 31 Oct 2018 14:18:33 +0100 Subject: [PATCH 34/51] Fixes Rewriter drink description typo --- code/modules/reagents/chemistry/reagents/drink_cold.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index 1a7be3748b8..35b67fa2a8b 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -163,12 +163,12 @@ /datum/reagent/consumable/drink/cold/rewriter name = "Rewriter" - description = "The secert of the sanctuary of the Libarian..." + description = "The secret of the sanctuary of the Librarian..." id = "rewriter" color = "#485000" // rgb:72, 080, 0 drink_icon = "rewriter" drink_name = "Rewriter" - drink_desc = "The secert of the sanctuary of the Libarian..." + drink_desc = "The secret of the sanctuary of the Librarian..." taste_message = "coffee...soda?" /datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M) From 61b03f67ac48e91d0a457a3cf2397356cef6bdd4 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 31 Oct 2018 10:00:03 -0400 Subject: [PATCH 35/51] Automatic changelog generation for PR #10077 [ci skip] --- html/changelogs/AutoChangeLog-pr-10077.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10077.yml diff --git a/html/changelogs/AutoChangeLog-pr-10077.yml b/html/changelogs/AutoChangeLog-pr-10077.yml new file mode 100644 index 00000000000..4c90e032c84 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10077.yml @@ -0,0 +1,4 @@ +author: "Arkatos" +delete-after: True +changes: + - spellcheck: "Fixes Rewriter drink description typo." From b877b40ee486517ae135be3df9a1c3dece17c5fd Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 31 Oct 2018 15:07:52 +0000 Subject: [PATCH 36/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/AutoChangeLog-pr-10077.yml | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10077.yml diff --git a/html/changelog.html b/html/changelog.html index 88340d98314..ebfe0b3d7ec 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,10 @@

          31 October 2018

          +

          Arkatos updated:

          +
            +
          • Fixes Rewriter drink description typo.
            • +

          Jountax updated:

          • Renamed Ice Peppers to Chilly Peppers.
            • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index a5cc4cf367d..ad4343bf9eb 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7794,6 +7794,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. warior4356: - bugfix: fixed the holosign in surgery1 2018-10-31: + Arkatos: + - spellcheck: Fixes Rewriter drink description typo. Jountax: - tweak: Renamed Ice Peppers to Chilly Peppers. TatsumakiMagi: diff --git a/html/changelogs/AutoChangeLog-pr-10077.yml b/html/changelogs/AutoChangeLog-pr-10077.yml deleted file mode 100644 index 4c90e032c84..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10077.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Arkatos" -delete-after: True -changes: - - spellcheck: "Fixes Rewriter drink description typo." From f9a9b09616afe0b59f522a54b61bf9f52d80320b Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 31 Oct 2018 19:20:48 +0100 Subject: [PATCH 37/51] Put in tigers code --- code/__HELPERS/mobs.dm | 21 +++++++++++++++++++++ code/game/mecha/mecha.dm | 28 ++++++++++------------------ 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 1ca1fe01036..13ee3c9e5ef 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -372,6 +372,27 @@ This is always put in the attack log. if(progress) qdel(progbar) +#define DOAFTERONCE_MAGIC "Magic~~" +GLOBAL_LIST_INIT(do_after_once_tracker, list()) +/proc/do_after_once(mob/user, delay, needhand = 1, atom/target = null, progress = 1, attempt_cancel_message = "Attempt cancelled.") + if(!user || !target) + return + + var/cache_key = "[user.UID()][target.UID()]" + if(GLOB.do_after_once_tracker[cache_key]) + GLOB.do_after_once_tracker[cache_key] = DOAFTERONCE_MAGIC + to_chat(user, "[attempt_cancel_message]") + return FALSE + GLOB.do_after_once_tracker[cache_key] = TRUE + . = do_after(user, delay, needhand, target, progress, extra_checks = CALLBACK(GLOBAL_PROC, .proc/do_after_once_checks, cache_key)) + GLOB.do_after_once_tracker[cache_key] = FALSE + +/proc/do_after_once_checks(cache_key) + if(GLOB.do_after_once_tracker[cache_key] && GLOB.do_after_once_tracker[cache_key] == DOAFTERONCE_MAGIC) + GLOB.do_after_once_tracker[cache_key] = FALSE + return FALSE + return TRUE + /proc/is_species(A, species_datum) . = FALSE if(ishuman(A)) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 1704fecd7a1..aa0c9495cbe 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -43,8 +43,6 @@ var/lights_power = 6 var/emagged = FALSE - var/list/repairers = new - //inner atmos var/use_internal_tank = 0 var/internal_tank_valve = ONE_ATMOSPHERE @@ -778,22 +776,16 @@ else if(iswelder(W) && user.a_intent != INTENT_HARM) var/obj/item/weldingtool/WT = W - if(health[user] starts repairing some damage to [name].", "You start repairing some damage to [name]") - playsound(user, WT.usesound, 50, 1) - if(do_after(user, 15 * WT.toolspeed, target = src)) // Takes 1.5 seconds to repair - if (internal_damage & MECHA_INT_TANK_BREACH) - clearInternalDamage(MECHA_INT_TANK_BREACH) - user.visible_message("[user] repairs the damaged gas tank.", "You repair the damaged gas tank.") - else - user.visible_message("[user] repairs some damage to [name].", "You repair some damage to [name]") - health += min(20, initial(health)-health) - repairers -= user - else - to_chat(user, "You are already repairing [name]!") + if(health < initial(health)) + if(WT.remove_fuel(0,user)) + user.visible_message("[user] starts repairing some damage to [name].", "You start repairing some damage to [name]") + if(do_after_once(user, 15 * WT.toolspeed, target = src, attempt_cancel_message = "You stop repairing [name].")) + if(internal_damage & MECHA_INT_TANK_BREACH) + clearInternalDamage(MECHA_INT_TANK_BREACH) + user.visible_message("[user] repairs the damaged gas tank.", "You repair the damaged gas tank.") + else + user.visible_message("[user] repairs some damage to [name].", "You repair some damage to [name].") + health += min(20, initial(health) - health) else to_chat(user, "The welder must be on for this task!") else From 65675b6c8b1e4f4c829d2ebe824a730636df43ce Mon Sep 17 00:00:00 2001 From: joep van der velden Date: Wed, 31 Oct 2018 19:23:16 +0100 Subject: [PATCH 38/51] spacing! --- code/game/mecha/mecha.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index aa0c9495cbe..3cf0e3513e7 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -777,7 +777,7 @@ else if(iswelder(W) && user.a_intent != INTENT_HARM) var/obj/item/weldingtool/WT = W if(health < initial(health)) - if(WT.remove_fuel(0,user)) + if(WT.remove_fuel(0, user)) user.visible_message("[user] starts repairing some damage to [name].", "You start repairing some damage to [name]") if(do_after_once(user, 15 * WT.toolspeed, target = src, attempt_cancel_message = "You stop repairing [name].")) if(internal_damage & MECHA_INT_TANK_BREACH) From 1af2c7cb143079bcd80b9c346c81d0761d3879da Mon Sep 17 00:00:00 2001 From: Citinited Date: Wed, 31 Oct 2018 22:08:54 +0000 Subject: [PATCH 39/51] kills another nullspace bug --- code/modules/recycling/disposal.dm | 73 ++++++++++++++++-------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index daf799f31d2..f6474c4a16b 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -46,7 +46,7 @@ T.nicely_link_to_other_stuff(src) //When the disposalsoutlet is forcefully moved. Due to meteorshot (not the recall spell) -/obj/machinery/disposal/Moved(atom/OldLoc, Dir) +/obj/machinery/disposal/Moved(atom/OldLoc, Dir) . = ..() eject() var/ptype = istype(src, /obj/machinery/disposal/deliveryChute) ? PIPE_DISPOSALS_CHUTE : PIPE_DISPOSALS_BIN //Check what disposaltype it is @@ -1220,24 +1220,27 @@ // if not entering from disposal bin, // transfer to linked object (outlet or bin) -/obj/structure/disposalpipe/trunk/transfer(var/obj/structure/disposalholder/H) - +/obj/structure/disposalpipe/trunk/transfer(obj/structure/disposalholder/H) + if(!H) + return if(H.dir == DOWN) // we just entered from a disposer return ..() // so do base transfer proc // otherwise, go to the linked object - if(linked) - var/obj/structure/disposaloutlet/O = linked - if(istype(O) && (H)) - O.expel(H) // expel at outlet - else - var/obj/machinery/disposal/D = linked - if(H) - D.expel(H) // expel at disposal - else - if(H) - src.expel(H, src.loc, 0) // expel at turf - return null - + if(!linked) + expel(H, loc, FALSE) // expel at turf + else if(istype(linked, /obj/structure/disposaloutlet)) + var/obj/structure/disposaloutlet/DO = linked + for(var/atom/movable/AM in H) + AM.forceMove(DO) + qdel(H) + H.vent_gas(loc) + DO.expel() + else if(istype(linked, /obj/machinery/disposal)) + var/obj/machinery/disposal/D = linked + H.forceMove(D) + D.expel(H) // expel at disposal + else //just in case + expel(H, loc, FALSE) // nextdir /obj/structure/disposalpipe/trunk/nextdir(var/fromdir) @@ -1283,24 +1286,29 @@ if(T) T.nicely_link_to_other_stuff(src) - // expel the contents of the holder object, then delete it - // called when the holder exits the outlet -/obj/structure/disposaloutlet/proc/expel(var/obj/structure/disposalholder/H, animation = 1) +/obj/structure/disposaloutlet/Destroy() + if(linkedtrunk) + linkedtrunk.remove_trunk_links() + expel(FALSE) + return ..() + + +// expel the contents of the outlet +/obj/structure/disposaloutlet/proc/expel(animation = TRUE) if(animation) flick("outlet-open", src) playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0) sleep(20) //wait until correct animation frame playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0) - if(H) - for(var/atom/movable/AM in H) - AM.forceMove(loc) - AM.pipe_eject(dir) - if(!istype(AM,/mob/living/silicon/robot/drone)) //Drones keep smashing windows from being fired out of chutes. Bad for the station. ~Z - spawn(5) - if(AM) - AM.throw_at(target, 3, 1) - H.vent_gas(src.loc) - qdel(H) + for(var/atom/movable/AM in contents) + AM.forceMove(loc) + AM.pipe_eject(dir) + if(istype(AM,/mob/living/silicon/robot/drone)) //Drones keep smashing windows from being fired out of chutes. Bad for the station. ~Z + return + spawn(5) + if(QDELETED(AM)) + return + AM.throw_at(target, 3, 1) /obj/structure/disposaloutlet/attackby(var/obj/item/I, var/mob/user, params) @@ -1339,7 +1347,7 @@ return //When the disposalsoutlet is forcefully moved. Due to meteorshot or the recall item spell for instance -/obj/structure/disposaloutlet/Moved(atom/OldLoc, Dir) +/obj/structure/disposaloutlet/Moved(atom/OldLoc, Dir) . = ..() var/turf/T = OldLoc if(T.intact) @@ -1356,11 +1364,6 @@ C.density = 1 qdel(src) -/obj/structure/disposaloutlet/Destroy() - if(linkedtrunk) - linkedtrunk.remove_trunk_links() - return ..() - // called when movable is expelled from a disposal pipe or outlet // by default does nothing, override for special behaviour From 7dc3e8b4ffc40d3cbd3e65ee46759dd64e10eba2 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 31 Oct 2018 19:15:36 -0400 Subject: [PATCH 40/51] Automatic changelog generation for PR #10079 [ci skip] --- html/changelogs/AutoChangeLog-pr-10079.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10079.yml diff --git a/html/changelogs/AutoChangeLog-pr-10079.yml b/html/changelogs/AutoChangeLog-pr-10079.yml new file mode 100644 index 00000000000..f052526caaa --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10079.yml @@ -0,0 +1,4 @@ +author: "Citinited" +delete-after: True +changes: + - bugfix: "A disposal nullspace bug." From 0a136c0aa4a5f4d177c3c6801c02c62ff5dbb0dc Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 1 Nov 2018 00:47:51 +0000 Subject: [PATCH 41/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-10079.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10079.yml diff --git a/html/changelog.html b/html/changelog.html index ebfe0b3d7ec..24ac470cbd0 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
            +

            01 November 2018

            +

            Citinited updated:

            +
              +
            • A disposal nullspace bug.
              • +
            +

            31 October 2018

            Arkatos updated:

              diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index ad4343bf9eb..77658738b53 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7800,3 +7800,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: Renamed Ice Peppers to Chilly Peppers. TatsumakiMagi: - bugfix: fixed merch shop, arcade shop and the give command working from a distance +2018-11-01: + Citinited: + - bugfix: A disposal nullspace bug. diff --git a/html/changelogs/AutoChangeLog-pr-10079.yml b/html/changelogs/AutoChangeLog-pr-10079.yml deleted file mode 100644 index f052526caaa..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10079.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Citinited" -delete-after: True -changes: - - bugfix: "A disposal nullspace bug." From c97380725197bfb4b33d6ee05cdf463a0ea1d9b2 Mon Sep 17 00:00:00 2001 From: Mitchell Date: Wed, 31 Oct 2018 21:00:42 -0500 Subject: [PATCH 42/51] Reduces Pool Temp Spam --- code/game/machinery/poolcontroller.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index 4fff66a43e7..17fae9df6f6 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -62,7 +62,7 @@ continue handleTemp(M) //handles pool temp effects on the swimmers if(ishuman(M)) //Only human types will drown, to keep things simple for non-human mobs that live in the water - handleDrowning(M) + handleDrowning(M) /obj/machinery/poolcontroller/proc/cleanPool() for(var/obj/effect/decal/cleanable/decal in decalinpool) //Cleans up cleanable decals like blood and such @@ -79,11 +79,11 @@ to_chat(M, "The water is searing hot!") if(WARM) //Warm the mob. - if(prob(50)) //inform the mob of warm water half the time + if(prob(5)) //inform the mob of warm water occasionally to_chat(M, "The water is quite warm.")//Inform the mob it's warm water. if(COOL) //Cool the mob. - if(prob(50)) //inform the mob of cold water half the time + if(prob(5)) //inform the mob of cold water occasionally to_chat(M, "The water is chilly.")//Inform the mob it's chilly water. if(FRIGID) //YOU'RE AS COLD AS ICE From 4929df42afb0d797f668cc5420c8f5913c416308 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 31 Oct 2018 22:15:03 -0400 Subject: [PATCH 43/51] Automatic changelog generation for PR #10084 [ci skip] --- html/changelogs/AutoChangeLog-pr-10084.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10084.yml diff --git a/html/changelogs/AutoChangeLog-pr-10084.yml b/html/changelogs/AutoChangeLog-pr-10084.yml new file mode 100644 index 00000000000..19ec54759b8 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10084.yml @@ -0,0 +1,4 @@ +author: "Mitchs98" +delete-after: True +changes: + - tweak: "Lowers the spam you receive from entering a warm or cold pool. You will no longer receive 'The water is quite warm.' nearly every few seconds." From 17203ecf3238fe445be30d843077e85c6700b45d Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 1 Nov 2018 04:01:47 +0000 Subject: [PATCH 44/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-10084.yml | 4 ---- 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10084.yml diff --git a/html/changelog.html b/html/changelog.html index 24ac470cbd0..956c5e1ca04 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -61,6 +61,10 @@
              • A disposal nullspace bug.
              +

              Mitchs98 updated:

              +
                +
              • Lowers the spam you receive from entering a warm or cold pool. You will no longer receive 'The water is quite warm.' nearly every few seconds.
                • +

              31 October 2018

              Arkatos updated:

              diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 77658738b53..40c06e240ea 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7803,3 +7803,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2018-11-01: Citinited: - bugfix: A disposal nullspace bug. + Mitchs98: + - tweak: Lowers the spam you receive from entering a warm or cold pool. You will + no longer receive 'The water is quite warm.' nearly every few seconds. diff --git a/html/changelogs/AutoChangeLog-pr-10084.yml b/html/changelogs/AutoChangeLog-pr-10084.yml deleted file mode 100644 index 19ec54759b8..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10084.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Mitchs98" -delete-after: True -changes: - - tweak: "Lowers the spam you receive from entering a warm or cold pool. You will no longer receive 'The water is quite warm.' nearly every few seconds." From 5a9a966f038d76e20dcaac70c585bcac231d137e Mon Sep 17 00:00:00 2001 From: Mitchell Date: Thu, 1 Nov 2018 00:04:01 -0500 Subject: [PATCH 45/51] Fixes #10083 --- code/game/gamemodes/changeling/powers/headcrab.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm index 96d4a784f45..18f31517028 100644 --- a/code/game/gamemodes/changeling/powers/headcrab.dm +++ b/code/game/gamemodes/changeling/powers/headcrab.dm @@ -30,9 +30,9 @@ for(var/mob/living/silicon/S in range(2,user)) to_chat(S, "Your sensors are disabled by a shower of blood!") S.Weaken(3) - var/turf = get_turf(user) + var/new_location = user.loc spawn(5) // So it's not killed in explosion - var/mob/living/simple_animal/hostile/headcrab/crab = new(turf) + var/mob/living/simple_animal/hostile/headcrab/crab = new(new_location) for(var/obj/item/organ/internal/I in organs) I.loc = crab crab.origin = M From 91fb53351f0bed678c46bed43b4e557ace0dc422 Mon Sep 17 00:00:00 2001 From: Mitchell Date: Thu, 1 Nov 2018 01:25:17 -0500 Subject: [PATCH 46/51] Removes user.loc --- code/game/gamemodes/changeling/powers/headcrab.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm index 18f31517028..a950ec7a9c9 100644 --- a/code/game/gamemodes/changeling/powers/headcrab.dm +++ b/code/game/gamemodes/changeling/powers/headcrab.dm @@ -30,7 +30,7 @@ for(var/mob/living/silicon/S in range(2,user)) to_chat(S, "Your sensors are disabled by a shower of blood!") S.Weaken(3) - var/new_location = user.loc + var/new_location = user.drop_location() spawn(5) // So it's not killed in explosion var/mob/living/simple_animal/hostile/headcrab/crab = new(new_location) for(var/obj/item/organ/internal/I in organs) From 11422a25a446f6636bd5b76123c60553cce003e6 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 1 Nov 2018 02:38:46 -0400 Subject: [PATCH 47/51] Automatic changelog generation for PR #10085 [ci skip] --- html/changelogs/AutoChangeLog-pr-10085.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10085.yml diff --git a/html/changelogs/AutoChangeLog-pr-10085.yml b/html/changelogs/AutoChangeLog-pr-10085.yml new file mode 100644 index 00000000000..b10e1c5c8dd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10085.yml @@ -0,0 +1,4 @@ +author: "Mitchs98" +delete-after: True +changes: + - bugfix: "Headslugs no longer teleport out of closed lockers upon bursting." From 676142ce4f1b4793a914ccc514aea1bead6c9aac Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 1 Nov 2018 04:16:49 -0400 Subject: [PATCH 48/51] Automatic changelog generation for PR #10057 [ci skip] --- html/changelogs/AutoChangeLog-pr-10057.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10057.yml diff --git a/html/changelogs/AutoChangeLog-pr-10057.yml b/html/changelogs/AutoChangeLog-pr-10057.yml new file mode 100644 index 00000000000..c7811f103cd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10057.yml @@ -0,0 +1,4 @@ +author: "Warior4356" +delete-after: True +changes: + - bugfix: "Ghosts can no longer re-enter a drone that has been shut down." From cb4af9bfb9b25e1fe7aa8af5b17570c8e6e1192c Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 1 Nov 2018 08:25:50 +0000 Subject: [PATCH 49/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 5 +++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-10057.yml | 4 ---- html/changelogs/AutoChangeLog-pr-10085.yml | 4 ---- 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10057.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-10085.yml diff --git a/html/changelog.html b/html/changelog.html index 956c5e1ca04..2665eebe93a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -64,6 +64,11 @@

              Mitchs98 updated:

              • Lowers the spam you receive from entering a warm or cold pool. You will no longer receive 'The water is quite warm.' nearly every few seconds.
                • +
              • Headslugs no longer teleport out of closed lockers upon bursting.
                • +
              +

              Warior4356 updated:

              +
                +
              • Ghosts can no longer re-enter a drone that has been shut down.

              31 October 2018

              diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 40c06e240ea..140391b5c45 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7806,3 +7806,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Mitchs98: - tweak: Lowers the spam you receive from entering a warm or cold pool. You will no longer receive 'The water is quite warm.' nearly every few seconds. + - bugfix: Headslugs no longer teleport out of closed lockers upon bursting. + Warior4356: + - bugfix: Ghosts can no longer re-enter a drone that has been shut down. diff --git a/html/changelogs/AutoChangeLog-pr-10057.yml b/html/changelogs/AutoChangeLog-pr-10057.yml deleted file mode 100644 index c7811f103cd..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10057.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Warior4356" -delete-after: True -changes: - - bugfix: "Ghosts can no longer re-enter a drone that has been shut down." diff --git a/html/changelogs/AutoChangeLog-pr-10085.yml b/html/changelogs/AutoChangeLog-pr-10085.yml deleted file mode 100644 index b10e1c5c8dd..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10085.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Mitchs98" -delete-after: True -changes: - - bugfix: "Headslugs no longer teleport out of closed lockers upon bursting." From 45c3300848439be2490134e70fee7efb36c86aac Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 1 Nov 2018 10:55:41 -0400 Subject: [PATCH 50/51] Automatic changelog generation for PR #10051 [ci skip] --- html/changelogs/AutoChangeLog-pr-10051.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10051.yml diff --git a/html/changelogs/AutoChangeLog-pr-10051.yml b/html/changelogs/AutoChangeLog-pr-10051.yml new file mode 100644 index 00000000000..dcea3ef5eec --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10051.yml @@ -0,0 +1,5 @@ +author: "Farie82" +delete-after: True +changes: + - tweak: "Repairing a mech now says you're doing it to the others +balance: Mechs now take time to repair. No more spam repairing" From 11f9b819e4702e694ad36ad9ae604e5349562acf Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 1 Nov 2018 15:21:18 +0000 Subject: [PATCH 51/51] Automatic changelog compile, [ci skip] --- html/changelog.html | 4 ++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-10051.yml | 5 ----- 3 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10051.yml diff --git a/html/changelog.html b/html/changelog.html index 2665eebe93a..d4f91352c4f 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -61,6 +61,10 @@
              • A disposal nullspace bug.
              +

              Farie82 updated:

              +
                +
              • Repairing a mech now says you're doing it to the others balance: Mechs now take time to repair. No more spam repairing
                • +

              Mitchs98 updated:

              • Lowers the spam you receive from entering a warm or cold pool. You will no longer receive 'The water is quite warm.' nearly every few seconds.
                • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 140391b5c45..4df1eaa1708 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -7803,6 +7803,9 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2018-11-01: Citinited: - bugfix: A disposal nullspace bug. + Farie82: + - tweak: 'Repairing a mech now says you''re doing it to the others balance: Mechs + now take time to repair. No more spam repairing' Mitchs98: - tweak: Lowers the spam you receive from entering a warm or cold pool. You will no longer receive 'The water is quite warm.' nearly every few seconds. diff --git a/html/changelogs/AutoChangeLog-pr-10051.yml b/html/changelogs/AutoChangeLog-pr-10051.yml deleted file mode 100644 index dcea3ef5eec..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10051.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Farie82" -delete-after: True -changes: - - tweak: "Repairing a mech now says you're doing it to the others -balance: Mechs now take time to repair. No more spam repairing"