cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source
This commit is contained in:
PsiOmega
2015-02-26 08:22:25 +01:00
parent 586ab164f8 f14922f1f8
commit e7653e1ed5
97 changed files with 1252 additions and 1109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/research/rdconsole.dm
View File

@@ -162,7 +162,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/Topic(href, href_list)
if(..())
return
return 1
add_fingerprint(usr)

2
code/modules/research/server.dm
View File

@@ -205,7 +205,7 @@
/obj/machinery/computer/rdservercontrol/Topic(href, href_list)
if(..())
return
return 1
add_fingerprint(usr)
usr.set_machine(src)

2
code/modules/research/xenoarchaeology/finds/finds.dm
View File

@@ -345,7 +345,7 @@
/obj/item/weapon/gun/energy/laser/practice/xenoarch,\
/obj/item/weapon/gun/energy/laser/xenoarch,\
/obj/item/weapon/gun/energy/xray/xenoarch,\
/obj/item/weapon/gun/energy/laser/captain/xenoarch)
/obj/item/weapon/gun/energy/captain/xenoarch)
if(spawn_type)
var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc)
new_item = new_gun

4
code/modules/research/xenoarchaeology/finds/finds_eguns.dm
View File

@@ -19,7 +19,7 @@
update_icon()
return
/obj/item/weapon/gun/energy/laser/captain/xenoarch
/obj/item/weapon/gun/energy/captain/xenoarch
icon = 'icons/obj/xenoarchaeology.dmi'
update_icon()
return
return

7
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
View File

@@ -181,6 +181,7 @@ datum/genesequence
onclose(user, "reconstitutor")
/obj/machinery/computer/reconstitutor/animal/Topic(href, href_list)
if(..()) return 1
if(href_list["clone"])
var/sequence_num = text2num(href_list["sequence_num"])
var/datum/genesequence/cloned_genesequence = completed_genesequences[sequence_num]
@@ -201,10 +202,9 @@ datum/genesequence
pod1.biomass -= CLONE_BIOMASS
else
usr << "\red \icon[src] Unable to locate cloning pod!"
else
..()
/obj/machinery/computer/reconstitutor/Topic(href, href_list)
if(..()) return 1
if(href_list["insertpos"])
//world << "inserting gene for genesequence [href_list["insertgenome"]] at pos [text2num(href_list["insertpos"])]"
var/sequence_num = text2num(href_list["sequence_num"])
@@ -252,9 +252,6 @@ datum/genesequence
usr.unset_machine(src)
usr << browse(null, "window=reconstitutor")
else
..()
/obj/machinery/computer/reconstitutor/proc/scan_fossil(var/obj/item/weapon/fossil/scan_fossil)
//see whether we accept these kind of fossils
if(accepted_fossil_types.len && !accepted_fossil_types.Find(scan_fossil.type))