@@ -65,7 +65,7 @@
|
||||
src.max_complexity = round(max_complexity)
|
||||
|
||||
/obj/item/electronic_assembly/GenerateTag()
|
||||
tag = "assembly_[next_assembly_id++]"
|
||||
tag = "assembly_[next_assembly_id++]"
|
||||
|
||||
/obj/item/electronic_assembly/examine(mob/user)
|
||||
. = ..()
|
||||
@@ -616,7 +616,7 @@
|
||||
..()
|
||||
|
||||
/obj/item/electronic_assembly/default //The /default electronic_assemblys are to allow the introduction of the new naming scheme without breaking old saves.
|
||||
name = "type-a electronic assembly"
|
||||
name = "type-a electronic assembly"
|
||||
|
||||
/obj/item/electronic_assembly/calc
|
||||
name = "type-b electronic assembly"
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
interact(user)
|
||||
|
||||
/datum/integrated_io/lists/proc/interact(mob/user)
|
||||
. = ..()
|
||||
var/list/my_list = data
|
||||
var/t = "<h2>[src]</h2><br>"
|
||||
t += "List length: [my_list.len]<br>"
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
desc = "A seemingly enigmatic device which connects to nearby APCs wirelessly and draws power from them, now in industrial size!"
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
extended_desc = "The siphon drains 2 kW of power from an APC in the same room as it as long as it has charge remaining. It will always drain \
|
||||
from the 'equipment' power channel."
|
||||
from the 'equipment' power channel."
|
||||
icon_state = "power_relay"
|
||||
complexity = 15
|
||||
spawn_flags = IC_SPAWN_RESEARCH
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
#define TARGET_TO_SOURCE 1
|
||||
#define PUMP_EFFICIENCY 0.6
|
||||
#define TANK_FAILURE_PRESSURE (ONE_ATMOSPHERE*25)
|
||||
#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE*24)
|
||||
#define PUMP_MAX_VOLUME 100
|
||||
|
||||
|
||||
|
||||
@@ -893,7 +893,7 @@
|
||||
return FALSE
|
||||
var/ignore_bags = get_pin_data(IC_INPUT, 1)
|
||||
if(ignore_bags)
|
||||
GET_COMPONENT_FROM(STR, /datum/component/storage, A)
|
||||
var/datum/component/storage/STR = A.GetComponent(/datum/component/storage)
|
||||
if(STR)
|
||||
return FALSE
|
||||
set_pin_data(IC_OUTPUT, 1, WEAKREF(A))
|
||||
@@ -1104,7 +1104,7 @@
|
||||
/obj/item/integrated_circuit/input/matscan/do_work()
|
||||
var/atom/movable/H = get_pin_data_as_type(IC_INPUT, 1, /atom/movable)
|
||||
var/turf/T = get_turf(src)
|
||||
GET_COMPONENT_FROM(mt, /datum/component/material_container, H)
|
||||
var/datum/component/material_container/mt = H.GetComponent(/datum/component/material_container)
|
||||
if(!mt) //Invalid input
|
||||
return
|
||||
if(H in view(T)) // This is a camera. It can't examine thngs,that it can't see.
|
||||
|
||||
@@ -339,7 +339,7 @@
|
||||
assembly.visible_message("<span class='danger'>[assembly] has thrown [A]!</span>")
|
||||
log_attack("[assembly] [REF(assembly)] has thrown [A] with non-lethal force.")
|
||||
A.forceMove(drop_location())
|
||||
A.throw_at(locate(x_abs, y_abs, T.z), range, 3, , , , CALLBACK(src, .proc/post_throw, A))
|
||||
A.throw_at(locate(x_abs, y_abs, T.z), range, 3, null, null, null, CALLBACK(src, .proc/post_throw, A))
|
||||
|
||||
// If the item came from a grabber now we can update the outputs since we've thrown it.
|
||||
if(istype(G))
|
||||
@@ -411,7 +411,7 @@
|
||||
.=..()
|
||||
|
||||
/obj/item/integrated_circuit/manipulation/matman/proc/AfterMaterialInsert(type_inserted, id_inserted, amount_inserted)
|
||||
GET_COMPONENT(materials, /datum/component/material_container)
|
||||
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
|
||||
set_pin_data(IC_OUTPUT, 2, materials.total_amount)
|
||||
for(var/I in 1 to mtypes.len)
|
||||
var/datum/material/M = materials.materials[mtypes[I]]
|
||||
@@ -423,7 +423,7 @@
|
||||
return TRUE
|
||||
|
||||
/obj/item/integrated_circuit/manipulation/matman/do_work(ord)
|
||||
GET_COMPONENT(materials, /datum/component/material_container)
|
||||
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
|
||||
var/atom/movable/H = get_pin_data_as_type(IC_INPUT, 1, /atom/movable)
|
||||
if(!check_target(H))
|
||||
activate_pin(4)
|
||||
@@ -441,7 +441,7 @@
|
||||
else
|
||||
activate_pin(4)
|
||||
if(2)
|
||||
GET_COMPONENT_FROM(mt, /datum/component/material_container, H)
|
||||
var/datum/component/material_container/mt = H.GetComponent(/datum/component/material_container)
|
||||
var/suc
|
||||
for(var/I in 1 to mtypes.len)
|
||||
var/datum/material/M = materials.materials[mtypes[I]]
|
||||
@@ -467,7 +467,7 @@
|
||||
activate_pin(6)
|
||||
|
||||
/obj/item/integrated_circuit/manipulation/matman/Destroy()
|
||||
GET_COMPONENT(materials, /datum/component/material_container)
|
||||
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
|
||||
materials.retrieve_all()
|
||||
.=..()
|
||||
|
||||
@@ -509,14 +509,14 @@
|
||||
if(!container || !istype(container,/obj/item/storage) || !Adjacent(container))
|
||||
return
|
||||
|
||||
GET_COMPONENT_FROM(STR, /datum/component/storage, container)
|
||||
var/datum/component/storage/STR = container.GetComponent(/datum/component/storage)
|
||||
if(!STR)
|
||||
return
|
||||
|
||||
STR.attackby(src, target_obj)
|
||||
|
||||
else
|
||||
GET_COMPONENT_FROM(STR, /datum/component/storage, target_obj.loc)
|
||||
var/datum/component/storage/STR = target_obj.loc.GetComponent(/datum/component/storage)
|
||||
if(!STR)
|
||||
return
|
||||
|
||||
|
||||
@@ -199,7 +199,6 @@
|
||||
set_pin_data(IC_OUTPUT, 1, WEAKREF(null))
|
||||
if(installed_brain.brainmob)
|
||||
installed_brain.brainmob.remote_control = null
|
||||
..()
|
||||
|
||||
|
||||
//Brain changes
|
||||
@@ -238,7 +237,7 @@
|
||||
|
||||
brainholder.do_work(6)
|
||||
|
||||
/mob/living/brain/canUseTopic()
|
||||
/mob/living/brain/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE)
|
||||
return check_bot_self
|
||||
|
||||
/obj/item/integrated_circuit/smart/advanced_pathfinder/proc/hippie_xor_decrypt()
|
||||
@@ -329,7 +328,6 @@
|
||||
installed_pai.forceMove(drop_location())
|
||||
set_pin_data(IC_OUTPUT, 1, WEAKREF(null))
|
||||
installed_pai.pai.remote_control = null
|
||||
..()
|
||||
|
||||
|
||||
//pAI changes
|
||||
@@ -371,5 +369,5 @@
|
||||
|
||||
paiholder.do_work(6)
|
||||
|
||||
/mob/living/silicon/pai/canUseTopic()
|
||||
return check_bot_self
|
||||
/mob/living/silicon/pai/canUseTopic(atom/movable/M, be_close=FALSE, no_dextery=FALSE, no_tk=FALSE)
|
||||
return check_bot_self
|
||||
|
||||
Reference in New Issue
Block a user