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

Jump to bottom

New surface lab building / research facility #28722

Merged
merged 25 commits into from
Mar 19, 2019
Merged

New surface lab building / research facility #28722

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ef20bf6
Add lab
I-am-Erk Mar 15, 2019
0e6c8b4
Merge remote-tracking branch 'upstream/master' into lab-surface
I-am-Erk Mar 15, 2019
3ad29a2
Update specials.json
I-am-Erk Mar 15, 2019
6ee8dc1
playtest updates. Add looks_likes that got lost somewhere.
I-am-Erk Mar 16, 2019
19eb37c
Add items to all the nested maps
I-am-Erk Mar 16, 2019
fc0b973
Finish item spawns, add some more playtest details
I-am-Erk Mar 16, 2019
d273324
goofy typo
I-am-Erk Mar 16, 2019
5f2832e
Add a (temporary) basement, and connect to lab. Run through item spaw…
I-am-Erk Mar 17, 2019
691ee44
unlint overmap\specials
I-am-Erk Mar 17, 2019
2d85106
Monsters!
I-am-Erk Mar 17, 2019
db5b9c0
touch up monster groups
I-am-Erk Mar 17, 2019
1a4294c
Move files to appropriate spots
I-am-Erk Mar 17, 2019
38feb20
Parking lot vehicles
I-am-Erk Mar 17, 2019
e9e8cbe
Update lab_surface_big_z1.json
I-am-Erk Mar 17, 2019
4c4e138
lint furniture
I-am-Erk Mar 17, 2019
9802f41
Update specials.json
I-am-Erk Mar 17, 2019
c8c496f
add a road
I-am-Erk Mar 17, 2019
52a2f6d
fix errors caught in review
I-am-Erk Mar 18, 2019
84e7054
tweak item spawns
I-am-Erk Mar 18, 2019
2c8143a
Add lab garden and fix a few missed details
I-am-Erk Mar 18, 2019
f3a06a5
prepare basement for security checkpoint
I-am-Erk Mar 18, 2019
8255897
ah what the heck, did a security checkpoint (1)
I-am-Erk Mar 18, 2019
b99184e
basement security area monsters and items
I-am-Erk Mar 18, 2019
40b6b6c
finish lab security room
I-am-Erk Mar 18, 2019
0cc7001
fix error caught on playtest
I-am-Erk Mar 18, 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
31 changes: 29 additions & 2 deletions data/json/furniture.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@
"move_cost_mod": -1,
"required_str": -1,
"flags": [ "FLAMMABLE", "NOITEM", "ORGANIC" ],
"examine_action": "bulletin_board",
"deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 4, 8 ] } ] },
"bash": {
"str_min": 3,
Expand Down Expand Up @@ -4293,13 +4294,13 @@
{
"type": "furniture",
"id": "f_glass_cabinet",
"name": "glass-fronted cabinet",
"symbol": "[",
"looks_like": "f_locker",
"description": "A tall storage cabinet with a clear glass window.",
"color": "light_gray",
"move_cost_mod": -1,
"required_str": 8,
"looks_like": "f_display_rack",
I-am-Erk marked this conversation as resolved.
Show resolved Hide resolved
"flags": [ "PLACE_ITEM", "TRANSPARENT", "BLOCKSDOOR" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4368,6 +4369,7 @@
"bgcolor": "white",
"move_cost_mod": 2,
"required_str": -1,
"looks_like": "f_counter",
"flags": [ "TRANSPARENT", "PLACE_ITEM", "MOUNTABLE" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4405,6 +4407,7 @@
"color": "black_yellow",
"move_cost_mod": -1,
"required_str": -1,
"looks_like": "f_lab_bench",
"flags": [ "CONTAINER", "PLACE_ITEM", "FIRE_CONTAINER", "SUPPRESS_SMOKE" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4451,6 +4454,7 @@
"move_cost_mod": 3,
"required_str": 10,
"max_volume": 4000,
"looks_like": "f_glass_fridge",
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4490,6 +4494,7 @@
"required_str": 16,
"max_volume": 4000,
"insulation": 2,
"looks_like": "f_washer",
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4532,6 +4537,7 @@
"required_str": 18,
"max_volume": 7000,
"insulation": 6,
"looks_like": "f_fridge",
"flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4572,7 +4578,8 @@
"symbol": "u",
"color": "green",
"move_cost_mod": 1,
"required_str": -1,
"required_str": -1,
"looks_like": "f_sink",
"flags": [ "PLACE_ITEM", "TRANSPARENT" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4604,6 +4611,7 @@
"bgcolor": "white",
"move_cost_mod": 0,
"required_str": 1,
"looks_like": "f_rack_coat",
"flags": [ "PLACE_ITEM", "TRANSPARENT" ],
"deconstruct": {
"items": [ { "item": "steel_lump", "count": 1 }, { "item": "wheel_caster", "count": 1 }, { "item": "pipe", "count": 1 } ]
Expand All @@ -4629,6 +4637,7 @@
"color": "red_white",
"move_cost_mod": -1,
"required_str": 12,
"looks_like": "t_machinery_light",
"flags": [ "TRANSPARENT" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4672,6 +4681,7 @@
"color": "blue_white",
"move_cost_mod": -1,
"required_str": 18,
"looks_like": "t_machinery_old",
"flags": [ "BLOCKSDOOR" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4716,6 +4726,7 @@
"move_cost_mod": -1,
"required_str": -1,
"max_volume": 4000,
"looks_like": "t_machinery_heavy",
"flags": [ "TRANSPARENT" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -4756,6 +4767,7 @@
"move_cost_mod": -1,
"required_str": -1,
"max_volume": 4000,
"looks_like": "t_machinery_heavy",
"deconstruct": {
"items": [
{ "item": "scrap", "count": [ 2, 6 ] },
Expand Down Expand Up @@ -4794,6 +4806,7 @@
"bgcolor": "white",
"move_cost_mod": -1,
"required_str": -1,
"looks_like": "t_machinery_electronic",
"deconstruct": {
"items": [
{ "item": "scrap", "count": [ 2, 6 ] },
Expand Down Expand Up @@ -4833,6 +4846,7 @@
"move_cost_mod": 7,
"required_str": -1,
"flags": [ "PLACE_ITEM", "CONTAINER" ],
"looks_like": "t_machinery_electronic",
"deconstruct": {
"items": [
{ "item": "scrap", "count": [ 2, 6 ] },
Expand Down Expand Up @@ -4872,6 +4886,7 @@
"move_cost_mod": 8,
"required_str": -1,
"flags": [ "PLACE_ITEM", "CONTAINER" ],
"looks_like": "t_machinery_electronic",
"deconstruct": {
"items": [
{ "item": "scrap", "count": [ 2, 6 ] },
Expand Down Expand Up @@ -4911,6 +4926,7 @@
"move_cost_mod": 4,
"required_str": 6,
"flags": [ "PLACE_ITEM", "TRANSPARENT" ],
"looks_like": "f_bed",
"deconstruct": {
"items": [
{ "item": "scrap", "count": [ 2, 6 ] },
Expand Down Expand Up @@ -4944,6 +4960,7 @@
"move_cost_mod": -1,
"required_str": 6,
"flags": [ "BLOCKS_DOOR" ],
"looks_like": "f_standing_tank",
"deconstruct": {
"items": [
{ "item": "glass_tube_small", "count": [ 6, 12 ] },
Expand Down Expand Up @@ -4988,6 +5005,7 @@
"move_cost_mod": -1,
"required_str": 5,
"flags": [ "BLOCKS_DOOR" ],
"looks_like": "f_standing_tank",
"deconstruct": {
"items": [
{ "item": "scrap", "count": [ 2, 6 ] },
Expand Down Expand Up @@ -5030,6 +5048,7 @@
"move_cost_mod": -1,
"required_str": 4,
"flags": [ "BLOCKS_DOOR" ],
"looks_like": "f_standing_tank",
"deconstruct": {
"items": [
{ "item": "scrap", "count": [ 2, 6 ] },
Expand Down Expand Up @@ -5073,6 +5092,7 @@
"required_str": -1,
"open": "f_curtain_open",
"flags": [ "PLACE_ITEM" ],
"looks_like": "t_curtain",
"deconstruct": {
"items": [
{ "item": "pipe", "count": [ 1, 2 ] },
Expand All @@ -5095,6 +5115,7 @@
{
"type": "furniture",
"id": "f_curtain_open",
"looks_like": "t_curtain_o",
"name": "open privacy curtain",
"description": "Stop peeking!",
"symbol": "N",
Expand Down Expand Up @@ -5131,6 +5152,7 @@
"bgcolor": "white",
"move_cost_mod": 5,
"required_str": 6,
"looks_like": "f_filing_cabinet",
"flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR" ],
"deconstruct": {
"items": [
Expand Down Expand Up @@ -5172,6 +5194,7 @@
"bgcolor": "white",
"move_cost_mod": -1,
"required_str": -1,
"looks_like": "f_air_conditioner",
"deconstruct": {
"items": [
{ "item": "scrap", "count": [ 2, 6 ] },
Expand Down Expand Up @@ -5204,6 +5227,7 @@
{
"type": "furniture",
"id": "f_water_purifier",
"looks_like": "f_water_heater",
"name": "water purifier",
"description": "This removes ions dissolved in the water, making it pretty clean, if you care about that kind of thing.",
"symbol": "W",
Expand Down Expand Up @@ -5244,6 +5268,7 @@
{
"type": "furniture",
"id": "f_server",
"looks_like": "f_utility_shelf",
"name": "server stack",
"description": "This is a big pile of computers. They're all turned off.",
"symbol": ":",
Expand Down Expand Up @@ -5279,6 +5304,7 @@
"type": "furniture",
"id": "f_air_compressor",
"name": "air compressor",
"looks_like": "f_standing_tank",
"description": "This durable tank is topped with a motor that will cram as much air into the tank as possible.",
"symbol": "8",
"color": "black_yellow",
Expand Down Expand Up @@ -5360,6 +5386,7 @@
"type": "furniture",
"id": "f_dishwasher",
"name": "dishwasher",
"looks_like": "f_oven",
"description": "This metal box used to spray hot water and soap at dirty dishes to make them clean and to save people an unpleasant chore. Now, with the power off and it sitting for a while, it is starting to smell a bit off.",
"symbol": "{",
"bgcolor": "white",
Expand Down
Loading