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

Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync

Browse Source
This commit is contained in:
deathride58
2018-07-05 00:17:44 -04:00
parent cc628a905e e92379e360
commit ac6fddcfb3
18 changed files with 99 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/admin/verbs/SDQL2/SDQL_2.dm
View File

@@ -54,6 +54,7 @@
return
var/list/refs = list()
var/where_used = FALSE
for(var/list/query_tree in querys)
var/list/from_objs = list()
var/list/select_types = list()
@@ -82,6 +83,7 @@
objs_all = objs.len
if("where" in query_tree)
where_used = TRUE
var/objs_temp = objs
objs = list()
for(var/datum/d in objs_temp)
@@ -119,7 +121,7 @@
var/end_time = REALTIMEOFDAY
end_time -= start_time
return list("<span class='admin'>SDQL query results: [query_text]</span>",\
"<span class='admin'>SDQL query completed: [objs_all] objects selected by path, and [objs_eligible] objects executed on after WHERE filtering if applicable.</span>",\
"<span class='admin'>SDQL query completed: [objs_all] objects selected by path, and [where_used ? objs_eligible : objs_all] objects executed on after WHERE filtering if applicable.</span>",\
"<span class='admin'>SDQL query took [DisplayTimeText(end_time)] to complete.</span>") + refs
/proc/SDQL_qdel_datum(datum/d)

6
code/modules/projectiles/ammunition/energy/gravity.dm
View File

@@ -7,8 +7,8 @@
var/obj/item/gun/energy/gravity_gun/gun
/obj/item/ammo_casing/energy/gravityrepulse/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
. = ..()
gun = G
. = ..()
/obj/item/ammo_casing/energy/gravityattract
projectile_type = /obj/item/projectile/gravityattract
@@ -20,8 +20,8 @@
/obj/item/ammo_casing/energy/gravityattract/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
. = ..()
gun = G
. = ..()
/obj/item/ammo_casing/energy/gravitychaos
projectile_type = /obj/item/projectile/gravitychaos
@@ -32,5 +32,5 @@
var/obj/item/gun/energy/gravity_gun/gun
/obj/item/ammo_casing/energy/gravitychaos/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
. = ..()
gun = G
. = ..()

4
code/modules/research/designs/machine_designs.dm
View File

@@ -14,7 +14,7 @@
name = "Machine Design (Circulator Board)"
desc = "The circuit board for a circulator."
id = "circulator"
build_path = /obj/machinery/atmospherics/components/binary/circulator
build_path = /obj/item/circuitboard/machine/circulator
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -22,7 +22,7 @@
name = "Machine Design (TEG Board)"
desc = "The circuit board for a TEG."
id = "teg"
build_path = /obj/machinery/power/generator
build_path = /obj/item/circuitboard/machine/generator
category = list ("Engineering Machinery")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING