From 5a1ba486c3ffa3987f82e0c5b998ce0dc219e5ba Mon Sep 17 00:00:00 2001 From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com> Date: Sat, 1 Feb 2020 18:49:05 +0000 Subject: [PATCH 1/4] Fixes problem with spawning diona turfs. (#8162) --- .../living/carbon/alien/diona/diona_powers.dm | 6 ++- html/changelogs/diona_turf_Fix.yml | 41 +++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/diona_turf_Fix.yml diff --git a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm index 09eedaac9a7..d30b4c8a5d4 100644 --- a/code/modules/mob/living/carbon/alien/diona/diona_powers.dm +++ b/code/modules/mob/living/carbon/alien/diona/diona_powers.dm @@ -415,4 +415,8 @@ O.droplimb(TRUE, DROPLIMB_EDGE) qdel(O) var/structure_path = diona_structures[chosen_structure] - new structure_path(get_turf(src)) + var/turf/T = get_turf(src) + if(isturf(structure_path)) + T.ChangeTurf(structure_path) + else + new structure_path(T) diff --git a/html/changelogs/diona_turf_Fix.yml b/html/changelogs/diona_turf_Fix.yml new file mode 100644 index 00000000000..4f54a6ba1a1 --- /dev/null +++ b/html/changelogs/diona_turf_Fix.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: mikomyazaki + +# 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: "Fixes issue where diona-created turfs wouldn't get the right lighting." From 09519ce2222502c83358cc8d833774784d3769e4 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Sat, 1 Feb 2020 18:49:39 +0000 Subject: [PATCH 2/4] "[ci skip] Automatic Build - 2020.02.01.18.49.39" --- html/changelog.html | 1 + html/changelogs/.all_changelog.yml | 1 + html/changelogs/diona_turf_Fix.yml | 41 ------------------------------ 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 html/changelogs/diona_turf_Fix.yml diff --git a/html/changelog.html b/html/changelog.html index 51df4cf45a6..576baa33901 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -59,6 +59,7 @@

mikomyazaki updated:

31 January 2020

diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 240bed4694f..368009a052c 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -11599,3 +11599,4 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. mikomyazaki: - bugfix: Hardsuit mounted weaponry no longer have safeties, that weren't possible to disable. + - bugfix: Fixes issue where diona-created turfs wouldn't get the right lighting. diff --git a/html/changelogs/diona_turf_Fix.yml b/html/changelogs/diona_turf_Fix.yml deleted file mode 100644 index 4f54a6ba1a1..00000000000 --- a/html/changelogs/diona_turf_Fix.yml +++ /dev/null @@ -1,41 +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 -# admin -# backend -# security -# refactor -################################# - -# Your name. -author: mikomyazaki - -# 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: "Fixes issue where diona-created turfs wouldn't get the right lighting." From 2108e42ec758ace535191774a522d181d09b6713 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sat, 1 Feb 2020 22:28:28 +0200 Subject: [PATCH 3/4] Corrects the Hegemony Pistol's fluff description (#8164) --- code/modules/projectiles/guns/energy/nuclear.dm | 1 + html/changelogs/geeves-pistol_fix.yml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 html/changelogs/geeves-pistol_fix.yml diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 6f309a056c6..adde53701a2 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -146,6 +146,7 @@ /obj/item/gun/energy/pistol/hegemony name = "hegemony energy pistol" desc = "An upgraded variant of the standard energy pistol with two settings: Incapacitate and Smite." + description_fluff = "This is the Zkrehk-Guild Beamgun, an energy-based sidearm designed and manufactured on Moghes. A special crystal used in its design allows it to penetrate armor with pinpoint accuracy." icon = 'icons/obj/guns/hegemony_pistol.dmi' icon_state = "hegemony_pistol" item_state = "hegemony_pistol" diff --git a/html/changelogs/geeves-pistol_fix.yml b/html/changelogs/geeves-pistol_fix.yml new file mode 100644 index 00000000000..a7f2b5b26ef --- /dev/null +++ b/html/changelogs/geeves-pistol_fix.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - bugfix: "Fixed Hegemony Energy Pistols having the Nanotrasen Energy Pistol description fluff." \ No newline at end of file From 2d01f92e8fb29dc5d98e9c8fc52de2175c0d294e Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Sat, 1 Feb 2020 20:29:00 +0000 Subject: [PATCH 4/4] "[ci skip] Automatic Build - 2020.02.01.20.29.00" --- html/changelog.html | 1 + html/changelogs/.all_changelog.yml | 2 ++ html/changelogs/geeves-pistol_fix.yml | 6 ------ 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/geeves-pistol_fix.yml diff --git a/html/changelog.html b/html/changelog.html index 576baa33901..54254296b5b 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -47,6 +47,7 @@
  • Diona gestalts can now use their biomass / arms to create biomass structures.
  • Removed nymphs' ability to open biomass walls. It was buggy.
  • Nymphs can now be holstered and worn on the ear slots.
    • +
  • Fixed Hegemony Energy Pistols having the Nanotrasen Energy Pistol description fluff.

    • Goret updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 368009a052c..888da3b748b 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -11592,6 +11592,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: Diona gestalts can now use their biomass / arms to create biomass structures. - rscdel: Removed nymphs' ability to open biomass walls. It was buggy. - tweak: Nymphs can now be holstered and worn on the ear slots. + - bugfix: Fixed Hegemony Energy Pistols having the Nanotrasen Energy Pistol description + fluff. Goret: - bugfix: Upon breaking, borosilicate glass will now make borosilicate shards. YourDaddy117: diff --git a/html/changelogs/geeves-pistol_fix.yml b/html/changelogs/geeves-pistol_fix.yml deleted file mode 100644 index a7f2b5b26ef..00000000000 --- a/html/changelogs/geeves-pistol_fix.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Geeves - -delete-after: True - -changes: - - bugfix: "Fixed Hegemony Energy Pistols having the Nanotrasen Energy Pistol description fluff." \ No newline at end of file