Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633

[MIRROR] Refactor weather to use Z traits, assorted related cleanup
2018-01-21 22:42:53 +00:00
parent 5bc5df68db 5d880be1e2
commit 28751ba370
26 changed files with 114 additions and 122 deletions
@@ -422,7 +422,7 @@
 				L.fix()

 		if("floorlava")
-			SSweather.run_weather("the floor is lava")
+			SSweather.run_weather(/datum/weather/floor_is_lava)

 		if("virus")
 			if(!check_rights(R_FUN))