From 8848a51fe89956526f4a6e01a8820bbfa55f9a5d Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Sat, 11 Jul 2015 03:26:41 +1200 Subject: [PATCH 1/4] Fixed dropping modules on conveyor belts --- code/modules/recycling/conveyor2.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 2244e98bf1..32d6652e9d 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -95,8 +95,9 @@ // attack with item, place item on conveyor /obj/machinery/conveyor/attackby(var/obj/item/I, mob/user) if(isrobot(user)) return //Carn: fix for borgs dropping their modules on conveyor belts - user.drop_item() - if(I && I.loc) I.loc = src.loc + if(I.loc != user) return // This should stop mounted modules ending up outside the module. + + user.drop_item(src) return // attack with hand, move pulled object onto conveyor From 09f502f8d733591aee64993348c4ccb19a73944d Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Sat, 11 Jul 2015 03:01:03 +1200 Subject: [PATCH 2/4] Fixed spriteless item in xenoarch loot drop --- code/modules/mining/mine_turfs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index c56bcde642..dc4e469458 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -336,8 +336,8 @@ R.amount = rand(5,25) if(2) - var/obj/item/stack/tile/R = new(src) - R.amount = rand(1,5) + var/obj/item/stack/tile/plasteel/R = new(src) + R.amount = rand(5,25) if(3) var/obj/item/stack/sheet/metal/R = new(src) From 47ced1df13cf7b2a587f65955c83450a9a5bfba0 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Sat, 11 Jul 2015 09:51:58 +0200 Subject: [PATCH 3/4] Changelog update. --- html/changelog.html | 12 ++++++++++++ html/changelogs/.all_changelog.yml | 7 +++++++ html/changelogs/HarpyEagle-dev-freeze.yml | 3 +-- html/changelogs/Loganbacca-fixes.yml | 5 ----- html/changelogs/Loganbacca-projectilefixes.yml | 4 ---- 5 files changed, 20 insertions(+), 11 deletions(-) delete mode 100644 html/changelogs/Loganbacca-fixes.yml delete mode 100644 html/changelogs/Loganbacca-projectilefixes.yml diff --git a/html/changelog.html b/html/changelog.html index baade72db7..8e35f57b96 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,18 @@ -->
+

11 July 2015

+

HarpyEagle updated:

+
    +
  • Added inhand sprites for flashes, flashbangs, emp and other grenades.
    • +
+

Loganbacca updated:

+
    +
  • Turrets no longer burn holes through the AI.
    • +
  • Projectiles now have a chance of hitting mobs riding cargo trains.
    • +
  • Fixed visual bugs with projectile effects.
    • +
+

10 July 2015

Zuhayr updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 389e1f2265..269e5ecf87 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -1961,3 +1961,10 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2015-07-10: Zuhayr: - rscadd: Ninja now spawns on a little pod on Z2 and can teleport to the main level. +2015-07-11: + HarpyEagle: + - imageadd: Added inhand sprites for flashes, flashbangs, emp and other grenades. + Loganbacca: + - bugfix: Turrets no longer burn holes through the AI. + - tweak: Projectiles now have a chance of hitting mobs riding cargo trains. + - bugfix: Fixed visual bugs with projectile effects. diff --git a/html/changelogs/HarpyEagle-dev-freeze.yml b/html/changelogs/HarpyEagle-dev-freeze.yml index c5e49e70d8..a999f1236d 100644 --- a/html/changelogs/HarpyEagle-dev-freeze.yml +++ b/html/changelogs/HarpyEagle-dev-freeze.yml @@ -1,4 +1,3 @@ author: HarpyEagle -changes: - - imageadd: "Added inhand sprites for flashes, flashbangs, emp and other grenades." +changes: [] delete-after: false diff --git a/html/changelogs/Loganbacca-fixes.yml b/html/changelogs/Loganbacca-fixes.yml deleted file mode 100644 index fd4c2f8b00..0000000000 --- a/html/changelogs/Loganbacca-fixes.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: Loganbacca -delete-after: True -changes: - - bugfix: "Turrets no longer burn holes through the AI." - - tweak: "Projectiles now have a chance of hitting mobs riding cargo trains." diff --git a/html/changelogs/Loganbacca-projectilefixes.yml b/html/changelogs/Loganbacca-projectilefixes.yml deleted file mode 100644 index ec05a99f6e..0000000000 --- a/html/changelogs/Loganbacca-projectilefixes.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: Loganbacca -delete-after: True -changes: - - bugfix: "Fixed visual bugs with projectile effects." From 339d08b20e8a923b2ac2c4f429788936666f3efc Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Sat, 11 Jul 2015 10:51:03 +0200 Subject: [PATCH 4/4] Compilation fix. --- code/modules/mining/mine_turfs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index da1d8c6ad2..79da2fdf99 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -342,7 +342,7 @@ R.amount = rand(5,25) if(2) - var/obj/item/stack/tile/plasteel/R = new(src) + var/obj/item/stack/material/plasteel/R = new(src) R.amount = rand(5,25) if(3)