shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-30297

Browse Source
This commit is contained in:
LetterJay
2017-09-12 23:36:35 -05:00
committed by GitHub
parent 9e73d297cc 23e40446ae
commit cd0997aa1e
297 changed files with 11347 additions and 8518 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/station_goals/dna_vault.dm
+6 -6
View File
@@ -90,10 +90,10 @@
to_chat(user, "<span class='warning'>Plant needs to be ready to harvest to perform full data scan.</span>") //Because space dna is actually magic
return
if(plants[H.myseed.type])
to_chat(user, "<span class='notice'>Plant data already present in local storage.<span>")
to_chat(user, "<span class='notice'>Plant data already present in local storage.</span>")
return
plants[H.myseed.type] = 1
to_chat(user, "<span class='notice'>Plant data added to local storage.<span>")
to_chat(user, "<span class='notice'>Plant data added to local storage.</span>")
//animals
var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey, /mob/living/carbon/alien))
@@ -104,19 +104,19 @@
to_chat(user, "<span class='warning'>No compatible DNA detected</span>")
return
if(animals[target.type])
to_chat(user, "<span class='notice'>Animal data already present in local storage.<span>")
to_chat(user, "<span class='notice'>Animal data already present in local storage.</span>")
return
animals[target.type] = 1
to_chat(user, "<span class='notice'>Animal data added to local storage.<span>")
to_chat(user, "<span class='notice'>Animal data added to local storage.</span>")
//humans
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(dna[H.dna.uni_identity])
to_chat(user, "<span class='notice'>Humanoid data already present in local storage.<span>")
to_chat(user, "<span class='notice'>Humanoid data already present in local storage.</span>")
return
dna[H.dna.uni_identity] = 1
to_chat(user, "<span class='notice'>Humanoid data added to local storage.<span>")
to_chat(user, "<span class='notice'>Humanoid data added to local storage.</span>")
/obj/machinery/dna_vault
name = "DNA Vault"
code/modules/station_goals/station_goal.dm
+1 -1
View File
@@ -39,7 +39,7 @@
/datum/station_goal/Topic(href, href_list)
..()
if(!check_rights(R_ADMIN))
if(!check_rights(R_ADMIN) || !usr.client.holder.CheckAdminHref(href, href_list))
return
if(href_list["announce"])