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
@@ -51,6 +51,9 @@
return
/obj/item/lazarus_injector/emp_act()
. = ..()
if(. & EMP_PROTECT_SELF)
return
if(!malfunctioning)
malfunctioning = 1
@@ -2,6 +2,7 @@
/obj/item/mining_scanner
desc = "A scanner that checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations."
name = "manual mining scanner"
icon = 'icons/obj/device.dmi'
icon_state = "mining1"
item_state = "analyzer"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
@@ -51,6 +51,9 @@
qdel(src)
/obj/item/wormhole_jaunter/emp_act(power)
. = ..()
if(. & EMP_PROTECT_SELF)
return
var/triggered = FALSE
if(usr.get_item_by_slot(SLOT_BELT) == src)