cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 14:08:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
This commit is contained in:
Erthilo
2013-08-31 17:45:31 +01:00
parent 3dd21206f0 2454d72233
commit b75d97a488
52 changed files with 173 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+1 -1
View File
@@ -1574,7 +1574,7 @@
return
if(href_list["dna_lock"])
if(usr != src.occupant) return
if(istype(src, /obj/item/device/mmi))
if(istype(occupant, /mob/living/carbon/brain))
occupant_message("You are a brain. No.")
return
if(src.occupant)