Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
This commit is contained in:
Poojawa
2018-03-14 16:49:40 -05:00
committed by GitHub
parent be23070f67
commit 6c7da493d9
122 changed files with 12848 additions and 12563 deletions
@@ -316,7 +316,7 @@
to_chat(user, "<span class='warning'>You feel yourself radically changing your slime type...</span>")
if(do_after(user, 120, target = user))
to_chat(user, "<span class='warning'>You feel different!</span>")
user.set_species(/datum/species/jelly/slime)
user.set_species(pick(/datum/species/jelly/slime, /datum/species/jelly/stargazer))
return
to_chat(user, "<span class='notice'>You stop the transformation.</span>")
@@ -870,8 +870,9 @@
force = 6
materials = list(MAT_METAL=500)
throwforce = 10
throw_speed = 3
throw_range = 7
throw_speed = 0.1
throw_range = 28
glide_size = 2
flags_1 = CONDUCT_1
max_amount = 60
turf_type = /turf/open/floor/sepia