From 9d93bea9920d2eaa0e9a8e219465e5e1d88d1bf7 Mon Sep 17 00:00:00 2001
From: Andrew <h.andrew1002@yahoo.com>
Date: Thu, 8 Aug 2019 15:26:39 -0500
Subject: [PATCH] Allows Construction of Serenity in Robotics

---
 code/modules/research/designs/circuits.dm     |  4 +++
 code/modules/research/mechfab_designs.dm      |  8 +++++
 .../mistyLuminescence - Serenity Unlocked.yml | 36 +++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 html/changelogs/mistyLuminescence - Serenity Unlocked.yml

diff --git a/code/modules/research/designs/circuits.dm b/code/modules/research/designs/circuits.dm
index 0caf5104fa5..062e204b97d 100644
--- a/code/modules/research/designs/circuits.dm
+++ b/code/modules/research/designs/circuits.dm
@@ -474,7 +474,11 @@ CIRCUITS BELOW
 	req_tech = list(TECH_DATA = 4, TECH_COMBAT = 2)
 	build_path = /obj/item/weapon/circuitboard/mecha/gygax/targeting
 	sort_string = "NAACC"
+<<<<<<< HEAD
 //VOREStation Edit to make Serenity Constructable
+=======
+
+>>>>>>> fcc8242... Allows Construction of Serenity in Robotics (#6380)
 /datum/design/circuit/mecha/gygax_medical
 	name = "'Serenity' medical control"
 	id = "gygax_medical"
diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm
index e65cea97cb8..ac095f12e6e 100644
--- a/code/modules/research/mechfab_designs.dm
+++ b/code/modules/research/mechfab_designs.dm
@@ -107,13 +107,21 @@
 
 /datum/design/item/mechfab/gygax
 	category = "Gygax"
+<<<<<<< HEAD
 //VOREStation Edit to make Serenity Constructable						
+=======
+
+>>>>>>> fcc8242... Allows Construction of Serenity in Robotics (#6380)
 /datum/design/item/mechfab/gygax/chassis/serenity
 	name = "Serenity Chassis"
 	id = "serenity_chassis"
 	build_path = /obj/item/mecha_parts/chassis/serenity
 	materials = list(DEFAULT_WALL_MATERIAL = 18750, "phoron" = 4000)
+<<<<<<< HEAD
 	
+=======
+
+>>>>>>> fcc8242... Allows Construction of Serenity in Robotics (#6380)
 /datum/design/item/mechfab/gygax/chassis
 	name = "Gygax Chassis"
 	id = "gygax_chassis"
diff --git a/html/changelogs/mistyLuminescence - Serenity Unlocked.yml b/html/changelogs/mistyLuminescence - Serenity Unlocked.yml
new file mode 100644
index 00000000000..1bdc1068ce1
--- /dev/null
+++ b/html/changelogs/mistyLuminescence - Serenity Unlocked.yml	
@@ -0,0 +1,36 @@
+################################
+# 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
+#################################
+
+# Your name.  
+author: mistyLuminescence
+
+# 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: 
+  - tweak: "Allows construction of serenity in robotics."
\ No newline at end of file