Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences

Conflicts:
	code/modules/mob/transform_procs.dm
This commit is contained in:
phil235
2015-04-27 00:11:49 +02:00
774 changed files with 22474 additions and 9523 deletions
+13
View File
@@ -78,6 +78,8 @@
if (tr_flags & TR_DEFAULTMSG)
O << "<B>You are now a monkey.</B>"
O.update_pipe_vision()
for(var/A in loc.vars)
if(loc.vars[A] == src)
loc.vars[A] = O
@@ -191,6 +193,8 @@
if (tr_flags & TR_DEFAULTMSG)
O << "<B>You are now a human.</B>"
O.update_pipe_vision()
updateappearance(O)
. = O
@@ -238,6 +242,8 @@
else
O.key = key
O.update_pipe_vision()
var/obj/loc_landmark
for(var/obj/effect/landmark/start/sloc in landmarks_list)
if (sloc.name != "AI")
@@ -319,6 +325,8 @@
else
O.key = key
O.update_pipe_vision()
if (config.rename_cyborg)
O.rename_self("cyborg", 1)
@@ -357,6 +365,7 @@
new_xeno.key = key
new_xeno << "<B>You are now an alien.</B>"
new_xeno.update_pipe_vision()
. = new_xeno
qdel(src)
@@ -389,6 +398,7 @@
new_slime.key = key
new_slime << "<B>You are now a slime. Skreee!</B>"
new_slime.update_pipe_vision()
. = new_slime
qdel(src)
@@ -425,6 +435,7 @@
new_corgi.key = key
new_corgi << "<B>You are now a Corgi. Yap Yap!</B>"
new_corgi.update_pipe_vision()
. = new_corgi
qdel(src)
@@ -458,6 +469,7 @@
new_mob << "You suddenly feel more... animalistic."
new_mob.update_pipe_vision()
. = new_mob
qdel(src)
@@ -475,6 +487,7 @@
new_mob.key = key
new_mob.a_intent = "harm"
new_mob << "You feel more... animalistic"
new_mob.update_pipe_vision()
. = new_mob
qdel(src)