From e5429ee259769b8478fc4f38e3a1540645591873 Mon Sep 17 00:00:00 2001 From: imsxz Date: Sun, 1 Oct 2017 01:51:40 -0400 Subject: [PATCH 01/10] Fixes holy vampire thralls --- code/game/gamemodes/vampire/vampire_powers.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 13f05048393..739cd898d0b 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -313,6 +313,7 @@ return 0 if(!affects(C)) C.visible_message("[C] seems to resist the takeover!", "Your faith of [ticker.Bible_deity_name] has kept your mind clear of all evil.") + return 0 if(!ishuman(C)) to_chat(user, "You can only enthrall humans!") return 0 From 8c289a4cf74750d1cd5b0bc541069ca2e219b32c Mon Sep 17 00:00:00 2001 From: imsxz Date: Sun, 1 Oct 2017 14:08:18 -0400 Subject: [PATCH 02/10] Fixes shadowling rapid rehatch --- code/game/gamemodes/shadowling/shadowling_abilities.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 55d1a2f8db7..2965456c99b 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -363,7 +363,7 @@ var/mob/living/carbon/human/H = target H.visible_message("[H]'s skin suddenly bubbles and shifts around their body!", \ "You regenerate your protective armor and cleanse your form of defects.") - H.adjustCloneLoss(target.getCloneLoss()) + H.adjustCloneLoss(-target.getCloneLoss()) H.equip_to_slot_or_del(new /obj/item/clothing/under/shadowling(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/shadowling(H), slot_shoes) H.equip_to_slot_or_del(new /obj/item/clothing/suit/space/shadowling(H), slot_wear_suit) From 6820302398445811bf2b2df63d909d83ced5bf2b Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 2 Oct 2017 03:09:36 -0400 Subject: [PATCH 03/10] Automatic changelog generation for PR #8176 [ci skip] --- html/changelogs/AutoChangeLog-pr-8176.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8176.yml diff --git a/html/changelogs/AutoChangeLog-pr-8176.yml b/html/changelogs/AutoChangeLog-pr-8176.yml new file mode 100644 index 00000000000..25c6ec2158a --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8176.yml @@ -0,0 +1,4 @@ +author: "Imsxz" +delete-after: True +changes: + - bugfix: "Rapid re-hatch no longer kills shadowlings." From bc15746e88e265ddee5920f8c7d7b2d6306ccffa Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 2 Oct 2017 03:16:04 -0400 Subject: [PATCH 04/10] Automatic changelog generation for PR #8173 [ci skip] --- html/changelogs/AutoChangeLog-pr-8173.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8173.yml diff --git a/html/changelogs/AutoChangeLog-pr-8173.yml b/html/changelogs/AutoChangeLog-pr-8173.yml new file mode 100644 index 00000000000..6ff9c007b5e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8173.yml @@ -0,0 +1,4 @@ +author: "Imsxz" +delete-after: True +changes: + - bugfix: "Vampires can no longer enthrall chaplains" From 1139d1db9368f87deda8c261c361ab9b9b34c547 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 2 Oct 2017 03:19:13 -0400 Subject: [PATCH 05/10] Automatic changelog compile, [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/AutoChangeLog-pr-8173.yml | 4 ---- html/changelogs/AutoChangeLog-pr-8176.yml | 4 ---- 4 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-8173.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-8176.yml diff --git a/html/changelog.html b/html/changelog.html index 79b40b53de8..64c78323a6b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
+

02 October 2017

+

Imsxz updated:

+
    +
  • Rapid re-hatch no longer kills shadowlings.
    • +
  • Vampires can no longer enthrall chaplains
    • +
+

30 September 2017

Jovaniph updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 646ae8d3ddd..b569dc8ec86 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5501,3 +5501,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: Coroner now has their own locker in the morgue. Landerlow: - rscadd: Adds hydrocodone to the Cyborg Hypospray +2017-10-02: + Imsxz: + - bugfix: Rapid re-hatch no longer kills shadowlings. + - bugfix: Vampires can no longer enthrall chaplains diff --git a/html/changelogs/AutoChangeLog-pr-8173.yml b/html/changelogs/AutoChangeLog-pr-8173.yml deleted file mode 100644 index 6ff9c007b5e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-8173.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Imsxz" -delete-after: True -changes: - - bugfix: "Vampires can no longer enthrall chaplains" diff --git a/html/changelogs/AutoChangeLog-pr-8176.yml b/html/changelogs/AutoChangeLog-pr-8176.yml deleted file mode 100644 index 25c6ec2158a..00000000000 --- a/html/changelogs/AutoChangeLog-pr-8176.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Imsxz" -delete-after: True -changes: - - bugfix: "Rapid re-hatch no longer kills shadowlings." From 5edbda20254cefc774e79b6c6b2ba1b41445dd91 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Mon, 2 Oct 2017 09:44:24 +0100 Subject: [PATCH 06/10] re-adds light switch to robotics --- _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 507b5bc7b71..b249a7f0787 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -4479,7 +4479,7 @@ "bIg" = (/obj/machinery/door_control{dir = 2; id = "mechbay"; name = "Mech Bay Door Control"; pixel_x = 6; pixel_y = 24; req_access_txt = "29"},/turf/simulated/floor/plasteel{tag = "icon-warningcorner (WEST)"; icon_state = "warningcorner"; dir = 8},/area/assembly/chargebay) "bIh" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/assembly/chargebay) "bIi" = (/turf/simulated/wall,/area/medical/research{name = "Research Division"}) -"bIj" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24; shock_proof = 0},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics) +"bIj" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24; shock_proof = 0},/obj/machinery/light_switch{pixel_x = -22; pixel_y = -10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics) "bIk" = (/obj/structure/sign/securearea,/turf/simulated/wall,/area/medical/research{name = "Research Division"}) "bIl" = (/obj/structure/stool/bed/chair/office/light{dir = 1},/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitered"},/area/assembly/robotics) "bIm" = (/obj/machinery/camera{c_tag = "Research Robotics Lab"; dir = 2; network = list("Research","SS13")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteredcorner"},/area/assembly/robotics) From d9a7540007bf572ed011ae4107607a109f0f7fa9 Mon Sep 17 00:00:00 2001 From: Ansari Date: Mon, 2 Oct 2017 19:18:28 +0800 Subject: [PATCH 07/10] Change slot machine's paying chance --- code/game/machinery/slotmachine.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 7775744ba45..543ea80f490 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -47,14 +47,14 @@ if(operation == 1) // Play if(working == 1) return - if(!account || account.money < 10) + if(!account || account.money < 100) return - if(!account.charge(10, transaction_purpose = "Bet", dest_name = name)) + if(!account.charge(100, transaction_purpose = "Bet", dest_name = name)) return plays += 1 working = 1 icon_state = "slots-on" - var/roll = rand(1,1350) + var/roll = rand(1,20000) playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) spawn(25) if(roll == 1) From 6935deca76ef9cd99474db740b157a5aa7f76550 Mon Sep 17 00:00:00 2001 From: Birdtalon Date: Thu, 5 Oct 2017 11:40:40 +0100 Subject: [PATCH 08/10] travis --- _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 b249a7f0787..f9804d7fb12 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -4479,7 +4479,7 @@ "bIg" = (/obj/machinery/door_control{dir = 2; id = "mechbay"; name = "Mech Bay Door Control"; pixel_x = 6; pixel_y = 24; req_access_txt = "29"},/turf/simulated/floor/plasteel{tag = "icon-warningcorner (WEST)"; icon_state = "warningcorner"; dir = 8},/area/assembly/chargebay) "bIh" = (/turf/simulated/floor/plasteel{dir = 1; icon_state = "warning"},/area/assembly/chargebay) "bIi" = (/turf/simulated/wall,/area/medical/research{name = "Research Division"}) -"bIj" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24; shock_proof = 0},/obj/machinery/light_switch{pixel_x = -22; pixel_y = -10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics) +"bIj" = (/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/obj/machinery/power/apc{dir = 8; name = "west bump"; pixel_x = -24; shock_proof = 0},/obj/machinery/light_switch{pixel_x = -23; pixel_y = -10},/turf/simulated/floor/plasteel{icon_state = "white"},/area/assembly/robotics) "bIk" = (/obj/structure/sign/securearea,/turf/simulated/wall,/area/medical/research{name = "Research Division"}) "bIl" = (/obj/structure/stool/bed/chair/office/light{dir = 1},/obj/effect/landmark/start{name = "Roboticist"},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitered"},/area/assembly/robotics) "bIm" = (/obj/machinery/camera{c_tag = "Research Robotics Lab"; dir = 2; network = list("Research","SS13")},/turf/simulated/floor/plasteel{dir = 4; icon_state = "whiteredcorner"},/area/assembly/robotics) From cd7d659e1d3ddc324b038392af52b6a214fda142 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 5 Oct 2017 08:44:25 -0400 Subject: [PATCH 09/10] Automatic changelog generation for PR #8180 [ci skip] --- html/changelogs/AutoChangeLog-pr-8180.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-8180.yml diff --git a/html/changelogs/AutoChangeLog-pr-8180.yml b/html/changelogs/AutoChangeLog-pr-8180.yml new file mode 100644 index 00000000000..20ee979ba56 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-8180.yml @@ -0,0 +1,4 @@ +author: "Birdtalon" +delete-after: True +changes: + - bugfix: "Re-adds missing light switch to robotics." From 2318853eda834f97c9dc102afc8914d1b48837a1 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 5 Oct 2017 10:40:41 -0400 Subject: [PATCH 10/10] Automatic changelog compile, [ci skip] --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/AutoChangeLog-pr-8180.yml | 4 ---- 3 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-8180.yml diff --git a/html/changelog.html b/html/changelog.html index 64c78323a6b..b02c209c85a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
    +

    05 October 2017

    +

    Birdtalon updated:

    +
      +
    • Re-adds missing light switch to robotics.
      • +
    +

    02 October 2017

    Imsxz updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index b569dc8ec86..3d360f6cc41 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5505,3 +5505,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Imsxz: - bugfix: Rapid re-hatch no longer kills shadowlings. - bugfix: Vampires can no longer enthrall chaplains +2017-10-05: + Birdtalon: + - bugfix: Re-adds missing light switch to robotics. diff --git a/html/changelogs/AutoChangeLog-pr-8180.yml b/html/changelogs/AutoChangeLog-pr-8180.yml deleted file mode 100644 index 20ee979ba56..00000000000 --- a/html/changelogs/AutoChangeLog-pr-8180.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Birdtalon" -delete-after: True -changes: - - bugfix: "Re-adds missing light switch to robotics."