cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #3210 and #3209

Browse Source
This commit is contained in:
d3athrow
2013-06-29 19:10:35 -05:00
parent dd39c73e32
commit ddba0448e9
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/mecha/mecha.dm
View File

@@ -1546,7 +1546,7 @@
return return
if(href_list["dna_lock"]) if(href_list["dna_lock"])
if(usr != src.occupant) return if(usr != src.occupant) return
if(src.occupant) if(src.occupant && (!istype(src, /obj/item/device/mmi/posibrain) || !istype(src, /obj/item/device/mmi)))
src.dna = src.occupant.dna.unique_enzymes src.dna = src.occupant.dna.unique_enzymes
src.occupant_message("You feel a prick as the needle takes your DNA sample.") src.occupant_message("You feel a prick as the needle takes your DNA sample.")
return return

2
code/modules/mob/living/silicon/pai/recruit.dm
View File

@@ -93,6 +93,8 @@ var/datum/paiController/paiController // Global handler for pAI candidates
proc/recruitWindow(var/mob/M as mob) proc/recruitWindow(var/mob/M as mob)
var/datum/paiCandidate/candidate var/datum/paiCandidate/candidate
for(var/datum/paiCandidate/c in pai_candidates) for(var/datum/paiCandidate/c in pai_candidates)
if(!istype(c) || !istype(M))
break
if(c.key == M.key) if(c.key == M.key)
candidate = c candidate = c
if(!candidate) if(!candidate)