Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts:
#	icons/mob/feet.dmi
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-05-23 19:04:09 +02:00
49 changed files with 232 additions and 176 deletions
@@ -181,4 +181,5 @@
id = "Rotatium"
result = "rotatium"
required_reagents = list("lsd" = 1, "teslium" = 1, "methamphetamine" = 1)
result_amount = 3
mix_message = "<span class='danger'>After sparks, fire, and the smell of LSD, the mix is constantly spinning with no stop in sight.</span>"