Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops

Conflicts:
	code/game/gamemodes/objective.dm
This commit is contained in:
Spamcat
2013-07-01 19:49:29 +04:00
161 changed files with 4191 additions and 2367 deletions
-1
View File
@@ -14,7 +14,6 @@ obj/item/changestone/attack_hand(var/mob/user as mob)
H.gender = FEMALE
H.dna.ready_dna(H)
H.update_body()
H.update_face()
..()
+1 -1
View File
@@ -1,6 +1,6 @@
/obj/item/weapon/circuitboard/atmoscontrol
name = "\improper Central Atmospherics Computer Circuitboard"
build_path = "/obj/machinery/computer/security/atmoscontrol"
build_path = /obj/machinery/computer/atmoscontrol
/obj/machinery/computer/atmoscontrol
name = "\improper Central Atmospherics Computer"
+1 -1
View File
@@ -78,7 +78,7 @@
/obj/item/weapon/autopsy_scanner/verb/print_data()
set src in view(usr, 1)
set name = "Print Data"
if(usr.stat)
if(usr.stat || !(istype(usr,/mob/living/carbon/human)))
usr << "No."
return