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