shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304

Browse Source 
[MIRROR] Made some object lists less terrible to read
This commit is contained in:
LetterJay
2017-07-31 03:43:03 -05:00
committed by GitHub
parent c4cf30c4eb 79bf3edab9
commit 35fba1933e
240 changed files with 1010 additions and 906 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/procedural_mapping/mapGenerators/cellular.dm
+2 -2
View File
@@ -12,7 +12,7 @@
var/list/current_state
var/width = 10
var/height = 10
var/list/type_map = list(/turf/open/floor/plating,/turf/closed/wall)
var/list/type_map = list(/turf/open/floor/plating, /turf/closed/wall)
var/turf/start = null
/datum/mapGenerator/ca/defineRegion(turf/Start, turf/End, replace = 0)
@@ -88,7 +88,7 @@
/datum/mapGenerator/ca/caves
b_rule = list(5,6,7,8)
s_rule = list(4)
type_map = list(/turf/open/floor/plating/asteroid/basalt,/turf/closed/mineral/volcanic)
type_map = list(/turf/open/floor/plating/asteroid/basalt, /turf/closed/mineral/volcanic)
iterations = 5
/datum/mapGenerator/ca/maze
code/modules/procedural_mapping/mapGenerators/syndicate.dm
+2 -2
View File
@@ -14,8 +14,8 @@
/datum/mapGeneratorModule/syndieFurniture
clusterCheckFlags = CLUSTER_CHECK_ALL
spawnableTurfs = list()
spawnableAtoms = list(/obj/structure/table = 20,/obj/structure/chair = 15,/obj/structure/chair/stool = 10, \
/obj/structure/frame/computer = 15, /obj/item/weapon/storage/toolbox/syndicate = 15 ,\
spawnableAtoms = list(/obj/structure/table = 20, /obj/structure/chair = 15, /obj/structure/chair/stool = 10,
/obj/structure/frame/computer = 15, /obj/item/weapon/storage/toolbox/syndicate = 15,
/obj/structure/closet/syndicate = 25, /obj/machinery/suit_storage_unit/syndicate = 15)
/datum/mapGeneratorModule/splatterLayer/syndieMobs