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:
@@ -391,11 +391,15 @@
|
||||
/datum/map_template/shuttle/arrival/omega
|
||||
suffix = "omega"
|
||||
name = "arrival shuttle (Omega)"
|
||||
|
||||
|
||||
/datum/map_template/shuttle/aux_base/default
|
||||
suffix = "default"
|
||||
name = "auxilliary base (Default)"
|
||||
|
||||
/datum/map_template/shuttle/aux_base/small
|
||||
suffix = "small"
|
||||
name = "auxilliary base (Small)"
|
||||
|
||||
/datum/map_template/shuttle/escape_pod/default
|
||||
suffix = "default"
|
||||
name = "escape pod (Default)"
|
||||
@@ -426,4 +430,4 @@
|
||||
|
||||
/datum/map_template/shuttle/ruin/syndicate_fighter
|
||||
suffix = "syndicate_fighter"
|
||||
name = "Syndicate Fighter"
|
||||
name = "Syndicate Fighter"
|
||||
|
||||
Reference in New Issue
Block a user