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/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/changelog.html b/html/changelog.html
index 51df4cf45a6..54254296b5b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -47,6 +47,7 @@
 				<li class="rscadd">Diona gestalts can now use their biomass / arms to create biomass structures.</li>
 				<li class="rscdel">Removed nymphs' ability to open biomass walls. It was buggy.</li>
 				<li class="tweak">Nymphs can now be holstered and worn on the ear slots.</li>
+				<li class="bugfix">Fixed Hegemony Energy Pistols having the Nanotrasen Energy Pistol description fluff.</li>
 			</ul>
 			<h3 class="author">Goret updated:</h3>
 			<ul class="changes bgimages16">
@@ -59,6 +60,7 @@
 			<h3 class="author">mikomyazaki updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="bugfix">Hardsuit mounted weaponry no longer have safeties, that weren't possible to disable.</li>
+				<li class="bugfix">Fixes issue where diona-created turfs wouldn't get the right lighting.</li>
 			</ul>
 
 			<h2 class="date">31 January 2020</h2>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 240bed4694f..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:
@@ -11599,3 +11601,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.