Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds microlabs #33727

Merged
merged 7 commits into from
Sep 4, 2019
Merged

Adds microlabs #33727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
990cacb
Adds microlabs
John-Candlebury Sep 1, 2019
2659978
Allow opening depot doors
John-Candlebury Sep 1, 2019
81f1db2
Update data/json/mapgen/microlab/microlab_generic.json
John-Candlebury Sep 1, 2019
db2b306
Update data/json/mapgen/microlab/microlab_special_tiles.json
John-Candlebury Sep 1, 2019
281d4f9
Adds surface connected microlab
John-Candlebury Sep 1, 2019
354d2ff
Merge branch 'microlab' of https://github.com/John-Candlebury/Catacly…
John-Candlebury Sep 1, 2019
6669e21
Slight mapgen adjustments, new monster spawn lists.
John-Candlebury Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions data/json/itemgroups/item_groups.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5160,6 +5160,47 @@
[ "chem_nitric_acid", 5 ]
]
},
{
"type": "item_group",
"id": "mutagens",
"items": [
[ "mutagen", 8 ],
[ "mutagen_plant", 2 ],
[ "mutagen_insect", 2 ],
[ "mutagen_spider", 2 ],
[ "mutagen_fish", 2 ],
[ "mutagen_slime", 2 ],
[ "mutagen_rat", 2 ],
[ "mutagen_beast", 2 ],
[ "mutagen_cattle", 2 ],
[ "mutagen_cephalopod", 2 ],
[ "mutagen_bird", 2 ],
[ "mutagen_lizard", 2 ],
[ "mutagen_troglobite", 2 ],
[ "mutagen_ursine", 2 ],
[ "mutagen_feline", 2 ],
[ "mutagen_lupine", 2 ],
[ "iv_mutagen", 6 ],
[ "iv_mutagen_plant", 2 ],
[ "iv_mutagen_insect", 2 ],
[ "iv_mutagen_spider", 2 ],
[ "iv_mutagen_fish", 2 ],
[ "iv_mutagen_slime", 2 ],
[ "iv_mutagen_rat", 2 ],
[ "iv_mutagen_beast", 2 ],
[ "iv_mutagen_cattle", 2 ],
[ "iv_mutagen_cephalopod", 2 ],
[ "iv_mutagen_bird", 2 ],
[ "iv_mutagen_lizard", 2 ],
[ "iv_mutagen_troglobite", 2 ],
[ "iv_mutagen_ursine", 2 ],
[ "iv_mutagen_feline", 2 ],
[ "iv_mutagen_lupine", 2 ],
[ "purifier", 10 ],
[ "iv_purifier", 8 ],
[ "syringe", 8 ]
]
},
{
"type": "item_group",
"id": "mut_iv",
Expand Down
39 changes: 39 additions & 0 deletions data/json/itemgroups/tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,45 @@
[ "acetylene_machine", 1 ]
]
},
{
"type": "item_group",
"id": "tools_robotics",
"//": "tools and equipment you might find on robotics laboratories.",
"items": [
[ "recipe_lab_elec", 4 ],
[ "UPS_off", 6 ],
[ "file", 10 ],
[ "atomic_lamp", 1 ],
[ "control_laptop", 1 ],
[ "bot_manhack", 2 ],
[ "teleporter", 1 ],
[ "laptop", 4 ],
[ "plut_cell", 4 ],
[ "superglue", 30 ],
[ "pliers", 10 ],
[ "matches", 10 ],
[ "glasses_safety", 20 ],
[ "duct_tape", 8 ],
[ "misc_repairkit", 15 ],
[ "welder", 10 ],
[ "soldering_iron", 8 ],
[ "extinguisher", 10 ],
[ "magnifying_glass", 10 ],
[ "multitool", 20 ],
[ "screwdriver_set", 20 ],
[ "flashlight", 20 ],
[ "mobile_memory_card_science", 40 ],
[ "camera_pro", 2 ],
[ "element", 5 ],
[ "battery", 10 ],
[ "goggles_welding", 20 ],
[ "sm_extinguisher", 10 ],
[ "toolbox", 5 ],
[ "tool_belt", 10 ],
[ "hand_vice", 10 ],
[ "wrench", 10 ]
]
},
{
"id": "hand_tools",
"type": "item_group",
Expand Down
274 changes: 274 additions & 0 deletions data/json/mapgen/microlab/microlab_connector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,274 @@
[
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "microlab_sub_connector" ],
"weight": 1000,
"object": {
"fill_ter": "t_concrete",
"rows": [
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "microlab" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "microlab_rock_border" ],
"weight": 1000,
"object": {
"fill_ter": "t_concrete",
"rows": [
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "microlab" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "microlab_sub_station" ],
"weight": 1000,
"object": {
"fill_ter": "t_concrete",
"rows": [
"##| |##",
"##|^ |##",
"##|^ hhhh YY hhhh |##",
"##|^ |##",
"##|^ hhhh hhhh |##",
"##|^ |##",
"##|^ |^^^^^^|##",
"##||(((((| ||||||||##",
"###|l h ( YY |#########",
"###|l ( YY |#########",
"###|l ( |#########",
"###||2|||| |#########",
"###| | |#########",
"###| hd|G55||#########",
"###| ddd| ^|#########",
"###||5(((| ^|||||||###",
"###|B VV ^^|###",
"###|B YY ?|###",
"###|B dddd YY t ?|###",
"###|B d hd ?|###",
"###|B t? ^^|###",
"###|||||||| ||||||||###",
"##########|22|##########",
"##########| |##########"
],
"palettes": [ "microlab" ],
"terrain": { "G": "t_card_science" },
"items": {
"l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ],
"t": { "item": "magazines", "chance": 90 }
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "microlab_generic_sub_entry" ],
"weight": 1000,
"object": {
"fill_ter": "t_concrete",
"rows": [
"||||||||||| |||||||||||",
" cc c | |^BBB| ",
" cc c c| | h|r i ",
" c| | dd|r c ",
" FFFFccccc| | h|r c ",
"|||||||||||YY|[===|| ",
" FF c|^???^ v| c ",
" c|? V| c ",
" c|? tt | i ",
" c| | ",
"|5|||| dddd |==2|",
" Y2 d hd 2Y ",
" Y2 ^^^^ 2Y ",
"|2|||| |||| ^|((2|",
" r| ^| ",
"cc r|n^^^ ^|^ ",
"cc hc||||||YY|[====| h ",
" c|FFFF| | h ^B|6tt ",
"|||||||22||22|dd B|||||",
" | |h nB|FFF ",
" c6 6c | ||||||| ",
" cc cc | |6h ",
" cc cc 2 |c ccccc ",
" | | "
],
"palettes": [ "microlab" ],
"terrain": { "G": "t_card_science" },
"items": {
"l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ],
"t": { "item": "magazines", "chance": 90 }
}
}
},
{
"type": "mapgen",
"om_terrain": [ [ "microlab_generic_surface_connector" ] ],
"method": "json",
"object": {
"fill_ter": "t_concrete",
"rows": [
" | | |cccc| ",
" |=[==| |||||| ",
" ((2| | 2 2 i ",
" ( | cci| 2 2 c ",
" (@@| | |||||| c ",
"|||||| cci| |rrrr| ",
" F|F ( | | 2 c ",
" F|F ( cci| |||||| c ",
" F|F 2 | |rrrr| i ",
" |F |rrrr| | 2 ",
"|5|||||||||22|||||||||||",
" 2 YY 5TYY ",
" 2 YY 5 YY ",
"|2||||^??? yyyyy|(((|",
" r|t y 5 dd|",
"cc r|V tt yyyyy| hl|",
"cc hc|t y |||||",
" c|^??? yyyyy|###|",
"||||||||||| ^|((22|||#|",
" rrcc| hd^= ^|eeeeee|#|",
" c| dd = ^|eeeeee|#|",
" c6 6|B = ^|EeeeeE|#|",
" cc r|B [ ^|eeeeee|#|",
" | |22|||||||||||"
],
"palettes": [ "microlab" ],
"terrain": { "e": "t_elevator", "E": "t_elevator_control" },
"items": {
"l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ],
"t": { "item": "magazines", "chance": 90 }
}
}
},
{
"type": "mapgen",
"om_terrain": [ [ "microlab_generic_surface" ] ],
"method": "json",
"object": {
"fill_ter": "t_concrete",
"rows": [
" yyyyyyyyyyyyyyyyyyyyyy ",
" yyyyyyyyyyyyyyyyyyyyyy ",
" y____________________y ",
" y____________________y ",
" y____________________y ",
" ||||||||||22|yyyyyyyyy ",
" | SS|________y ",
" | SS|________y ",
" | SS|________y ",
" | SS|________y ",
" | |((((|22||555555|y ",
" | |........|yyyyyy|. ",
" | |..dddd..|......|. ",
" | |^.d.hd..5yyyyyy| ",
" | |||||||..5......| ",
" | (V.??....Gyyyyyy| ",
" | (t.......|......| ",
" | (^???....|yyyyyy| ",
" | ||||||..^|yyyyyy| ",
" | |.hd^=..^|eeeeee| ",
" | |.dd.=..^|eeeeee| ",
" | |B...=..^|EeeeeE| ",
" | |B...[..^|eeeeee| ",
" ||||||||||||||||||||| "
],
"palettes": [ "microlab" ],
"terrain": {
"e": "t_elevator",
"E": "t_elevator_control",
" ": "t_grass",
"_": "t_pavement",
".": "t_thconc_floor",
"G": "t_card_science"
}
}
},
{
"type": "mapgen",
"om_terrain": [ [ "microlab_generic_surface_roof" ] ],
"method": "json",
"object": {
"fill_ter": "t_concrete",
"rows": [
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. ",
" ................. "
],
"terrain": { " ": "t_open_air", ".": "t_concrete" }
}
}
]
Loading