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 16:03:18 -07:00
committed by kevinz000
parent b6e608cb4c
commit 2f9e3e403d
395 changed files with 134016 additions and 26287 deletions
@@ -606,6 +606,15 @@
id = /obj/item/card/id/syndicate
implants = list(/obj/item/implant/exile)
/datum/outfit/vr/snowtide
name = "Snowdin Outfit"
shoes = /obj/item/clothing/shoes/winterboots
suit = /obj/item/clothing/suit/hooded/wintercoat
back = /obj/item/storage/backpack
mask = /obj/item/clothing/mask/breath
r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
internals_slot = SLOT_R_STORE
/obj/effect/mob_spawn/human/syndicatesoldier/coldres/alive/female
mob_gender = FEMALE
@@ -666,4 +675,5 @@
/obj/effect/turf_decal/snowdin_station_sign/up/seven
icon_state = "AOPU7"
/obj/effect/landmark/vr_spawn/snowdin
vr_outfit = /datum/outfit/vr/snowtide