mapmerge update + mats properly work

code/datums/materials/_material.dm

@@ -81,8 +81,8 @@ Simple datum which is instanced once per type and is used for every object of sa
 	if(material_flags & MATERIAL_ADD_PREFIX)
 		source.name = "[name] [source.name]"
 
-	if(beauty_modifier)
-		addtimer(CALLBACK(source, /datum.proc/_AddElement, list(/datum/element/beauty, beauty_modifier * amount)), 0)
+	// if(beauty_modifier) returnign in hardsync2 if i ever port ebeauty cmp
+	// 	addtimer(CALLBACK(source, /datum.proc/_AddElement, list(/datum/element/beauty, beauty_modifier * amount)), 0)
 
 	if(istype(source, /obj)) //objs
 		on_applied_obj(source, amount, material_flags)
@@ -151,8 +151,8 @@ Simple datum which is instanced once per type and is used for every object of sa
 	if(material_flags & MATERIAL_ADD_PREFIX)
 		source.name = initial(source.name)
 
-	if(beauty_modifier) //component/beauty/InheritComponent() will handle the removal.
-		addtimer(CALLBACK(source, /datum.proc/_AddElement, list(/datum/element/beauty, -beauty_modifier * amount)), 0)
+	// if(beauty_modifier) //component/beauty/InheritComponent() will handle the removal.
+	// 	addtimer(CALLBACK(source, /datum.proc/_AddElement, list(/datum/element/beauty, -beauty_modifier * amount)), 0)
 
 	if(istype(source, /obj)) //objs
 		on_removed_obj(source, amount, material_flags)

html/admin/unbanpanel.css

@@ -0,0 +1,61 @@
+body {
+    margin: 0;
+}
+
+.searchbar {
+    overflow: hidden;
+    background-color: #272727;
+    position: fixed;
+    top: 0;
+    width: 100%;
+    font-weight: bold;
+    text-align: center;
+    line-height: 30px;
+    z-index: 1;
+}
+
+.main {
+    padding: 16px;
+    margin-top: 20px;
+    text-align: center;
+}
+
+.banbox {
+    position: relative;
+    width: 90%;
+    display: table;
+    flex-direction: column;
+    border: 1px solid #161616;
+    margin-right: auto;
+    margin-left: auto;
+    margin-bottom: 10px;
+    border-radius: 3px;
+}
+
+.header {
+    width: 100%;
+    background-color:rgba(0,0,0,0.3);
+}
+
+.container {
+    display: table;
+    width: 100%;
+}
+
+.reason {
+    display: table-cell;
+    width: 90%;
+}
+
+.edit {
+    display: table-cell;
+    width: 10%;
+}
+
+.banned {
+    background-color:#ff5555;
+}
+
+.unbanned {
+    background-color:#00b75c;
+}

html/admin/view_variables.css

@@ -3,7 +3,7 @@ body {
 	font-size: 9pt;
 }
 .value {
-	font-family: "consolas", monospace; /* consolas is better!! (was "Courier New") */
+	font-family: "Courier New", monospace;
 	font-size: 8pt;
 	display: inline-block;
 }
@@ -12,24 +12,26 @@ table.matrix {
 	border-collapse: collapse; border-spacing: 0;
 	font-size: 7pt;
 }
-table.matrix td{
+.matrix td{
 	text-align: center;
 	padding: 0 1ex 0ex 1ex;
 }
 table.matrixbrak {
 	border-collapse: collapse; border-spacing: 0;
 }
-table.matrixbrak td.lbrak, table.matrixbrak td.rbrak{
+table.matrixbrak td.lbrak {
 	width: 0.8ex;
 	font-size: 50%;
 	border-top: solid 0.25ex black;
 	border-bottom: solid 0.25ex black;
-}
-table.matrixbrak td.lbrak {
 	border-left: solid 0.5ex black;
 	border-right: none;
 }
 table.matrixbrak td.rbrak {
-	border-right: solid 0.5ex black;
-	border-left: none;
+		width: 0.8ex;
+		font-size: 50%;
+		border-top: solid 0.25ex black;
+		border-bottom: solid 0.25ex black;
+		border-right: solid 0.5ex black;
+		border-left: none;
 }

html/browser/common.css

@@ -76,7 +76,6 @@ a.icon img, .linkOn.icon img
 	width: 18px;
 	height: 18px;
 }
-
 ul
 {
 	padding: 4px 0 0 10px;
@@ -396,3 +395,17 @@ ul.sparse {
 .slider.round:before {
   border-radius: 50%;
 }
+
+.severity {
+	margin:0px;
+	padding: 1px 8px 1px 8px;
+	border-radius: 25px;
+	border: 1px solid #161616;
+	background: #40628a;
+	color: #ffffff;
+}
+
+.severity img {
+    display: inline-block;
+    vertical-align: middle;
+}

html/browser/roundend.css

@@ -10,13 +10,15 @@
 	color: #ef2f3c;
 	font-weight: bold;
 }
+
 .bluetext {
 	color: #517fff;
 	font-weight: bold;
 }
+
 .neutraltext {
 	font-weight: bold; /* If you feel these should have some color feel free to change */
-} 
+}
 
 .marooned {
 	color: rgb(109, 109, 255); font-weight: bold;
@@ -93,4 +95,4 @@ body {
 
 .tooltip_container:hover .tooltip_hover {
 	visibility: visible;
-}
+}

html/browser/scannernew.css

@@ -9,13 +9,20 @@
 	margin: 2px 2px 0 10px;
 	text-align: center;
 }
-
 .dnaBlock
 {
 	font-family: Fixed, monospace;
 	float: left;
 }
-
+a.incompleteBlock
+{
+	background: #8a4040;
+}
+a.incompleteBlock:hover
+{
+	color: #40628a;
+	background: #ffffff;
+}
 img.selected
 {
 	border: 1px solid blue;
@@ -36,4 +43,4 @@ a.clean
 	background: none;
 	border: none;
 	marging: none;
-} 
+}