Hard upstream sync (#6951)

* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
This commit is contained in:
deathride58
2018-05-31 23:03:18 +00:00
committed by kevinz000
parent b6e608cb4c
commit 2f9e3e403d
395 changed files with 134016 additions and 26287 deletions
@@ -13,7 +13,7 @@
var/list/assembly_components = list()
var/max_components = IC_MAX_SIZE_BASE
var/max_complexity = IC_COMPLEXITY_BASE
var/opened = FALSE
var/opened = TRUE
var/obj/item/stock_parts/cell/battery // Internal cell which most circuits need to work.
var/cell_type = /obj/item/stock_parts/cell
var/can_charge = TRUE //Can it be charged in a recharger?
@@ -450,7 +450,8 @@
else
for(var/obj/item/integrated_circuit/input/S in assembly_components)
S.attackby_react(I,user,user.a_intent)
return ..()
if(user.a_intent != INTENT_HELP)
return ..()
/obj/item/electronic_assembly/attack_self(mob/user)
@@ -489,9 +490,11 @@
choice.ask_for_input(user)
/obj/item/electronic_assembly/emp_act(severity)
..()
for(var/i in 1 to contents.len)
var/atom/movable/AM = contents[i]
. = ..()
if(. & EMP_PROTECT_CONTENTS)
return
for(var/I in src)
var/atom/movable/AM = I
AM.emp_act(severity)
// Returns true if power was successfully drawn.
@@ -742,4 +745,4 @@
if(EAST)
pixel_x = -31
if(WEST)
pixel_x = 31
pixel_x = 31
@@ -259,8 +259,10 @@
if(program["requires_upgrades"] && !upgraded && !debug)
to_chat(usr, "<span class='warning'>This program uses unknown component designs. Printer upgrade is required to proceed.</span>")
return
if(program["unsupported_circuit"] && !debug)
to_chat(usr, "<span class='warning'>This program uses components not supported by the specified assembly. Please change the assembly type in the save file to a supported one.</span>")
return
else if(fast_clone || debug)
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
if(debug || materials.use_amount_type(program["metal_cost"], MAT_METAL))
@@ -129,10 +129,6 @@
if(initial(desc) != desc)
assembly_params["desc"] = desc
// Save panel status
if(opened)
assembly_params["opened"] = TRUE
// Save modified color
if(initial(detail_color) != detail_color)
assembly_params["detail_color"] = detail_color
@@ -162,10 +158,6 @@
if(assembly_params["desc"])
desc = assembly_params["desc"]
// Load panel status
if(assembly_params["opened"])
opened = TRUE
if(assembly_params["detail_color"])
detail_color = assembly_params["detail_color"]
@@ -883,6 +883,7 @@
return FALSE
set_pin_data(IC_OUTPUT, 1, WEAKREF(A))
push_data()
to_chat(user, "<span class='notice'>You scan [A] with [assembly].</span>")
activate_pin(1)
return TRUE
@@ -915,6 +916,7 @@
return FALSE
set_pin_data(IC_OUTPUT, 1, WEAKREF(A))
push_data()
to_chat(user, "<span class='notice'>You scan [A] with [assembly].</span>")
activate_pin(1)
return TRUE
@@ -941,6 +943,7 @@
user.transferItemToLoc(A,drop_location())
set_pin_data(IC_OUTPUT, 1, WEAKREF(A))
push_data()
to_chat(user, "<span class='notice'>You let [assembly] scan [A].</span>")
activate_pin(1)
return TRUE