Merge branch 'master' of github.com:Baystation12/Baystation12 into dev

This commit is contained in:
Mloc-Argent
2013-07-22 14:42:50 +01:00
10 changed files with 20 additions and 17 deletions
@@ -186,6 +186,7 @@
changeling.geneticdamage = 30
src.dna = chosen_dna
src.real_name = chosen_dna.real_name
src.flavor_text = ""
updateappearance(src, src.dna.uni_identity)
domutcheck(src, null)
+2
View File
@@ -125,6 +125,8 @@
pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
update_icon()
if(ticker && ticker.current_state == 3)//if the game is running
src.initialize()
return
first_run()
+2
View File
@@ -20,6 +20,8 @@
action(atom/target)
if(!action_checks(target)) return
if(!cargo_holder) return
if(istype(target, /obj/structure/stool)) return
if(istype(target,/obj))
var/obj/O = target
if(!O.anchored)