From ab7fb176f67e455d594aeedb4c279bfb1370ea77 Mon Sep 17 00:00:00 2001
From: Mark van Alphen <markvanalphen2@gmail.com>
Date: Mon, 22 Apr 2019 22:04:31 +0200
Subject: [PATCH] Opacity fix, re-add rotatium

---
 code/game/turfs/space/space.dm                    | 3 +++
 code/game/turfs/turf.dm                           | 3 +++
 code/modules/events/vent_clog.dm                  | 2 +-
 code/modules/reagents/chemistry/reagents/drugs.dm | 4 ++--
 code/modules/reagents/chemistry/recipes/toxins.dm | 9 ++++++++-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 66a2db0f970..342c7f23ff1 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -27,6 +27,9 @@
 	if (light_power && light_range)
 		update_light()
 
+	if (opacity)
+		has_opaque_atom = TRUE
+
 	return INITIALIZE_HINT_NORMAL
 
 /turf/space/Destroy(force)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index f9f19d4d4c4..dc7de45f695 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -51,6 +51,9 @@
 	if(light_power && light_range)
 		update_light()
 
+	if (opacity)
+		has_opaque_atom = TRUE
+
 /hook/startup/proc/smooth_world()
 	var/watch = start_watch()
 	log_startup_progress("Smoothing atoms...")
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 9b1588e1161..29b0b44e721 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -23,7 +23,7 @@
 							"atrazine","banana","charcoal","space_drugs","methamphetamine","holywater","ethanol","hot_coco","facid",
 							"blood","morphine","ether","fluorine","mutadone","mutagen","hydrocodone","fuel",
 							"haloperidol","lsd","syndicate_nanites","lipolicide","frostoil","salglu_solution","beepskysmash",
-							"omnizine", "amanitin", "neurotoxin", "synaptizine")
+							"omnizine", "amanitin", "neurotoxin", "synaptizine", "rotatium")
 		var/datum/reagents/R = new/datum/reagents(50)
 		R.my_atom = vent
 		R.add_reagent(pick(gunk), 50)
diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index 8a4d9b338ed..9e96ed5b56b 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -616,7 +616,7 @@
 /datum/reagent/rotatium/on_mob_life(mob/living/carbon/M)
 	if(M.hud_used)
 		if(current_cycle >= 20 && current_cycle % 20 == 0)
-			var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"])
+			var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
 			var/rotation = min(round(current_cycle / 20), 89) // By this point the player is probably puking and quitting anyway
 			for(var/whole_screen in screens)
 				animate(whole_screen, transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING, loop = -1)
@@ -625,7 +625,7 @@
 
 /datum/reagent/rotatium/on_mob_delete(mob/living/M)
 	if(M && M.hud_used)
-		var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"])
+		var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
 		for(var/whole_screen in screens)
 			animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
 	..()
diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm
index cdc10bcbcc5..6d7fa9028a8 100644
--- a/code/modules/reagents/chemistry/recipes/toxins.dm
+++ b/code/modules/reagents/chemistry/recipes/toxins.dm
@@ -174,4 +174,11 @@
 	required_reagents = list("formaldehyde" = 1, "sodium" = 1, "chlorine" = 1, "lithium" = 1)
 	result_amount = 4
 	mix_message = "The mixture thins and loses all color."
-	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
\ No newline at end of file
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/rotatium
+	name = "Rotatium"
+	id = "Rotatium"
+	results = "rotatium"
+	required_reagents = list("lsd" = 1, "teslium" = 1, "fentanyl" = 1)
+	mix_message = "<span class='danger'>After sparks, fire, and the smell of LSD, the mix is constantly spinning with no stop in sight.</span>"
\ No newline at end of file