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.

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

The Wrecked Factory Ruin #2943

Merged
merged 71 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
8fb2e95
Create RationPlant.dmm
Gristlebee Mar 25, 2024
df8600f
Update RationPlant.dmm
Gristlebee Mar 26, 2024
79de3fe
Update RationPlant.dmm
Gristlebee Mar 26, 2024
a8c517d
Update RationPlant.dmm
Gristlebee Mar 27, 2024
6695ab7
Update RationPlant.dmm
Gristlebee Mar 29, 2024
3cd661c
Create RationPlant - Copy.dmm
Gristlebee Apr 3, 2024
e5adaae
moves into ruins folder
Gristlebee Apr 6, 2024
086ea2b
areas
Gristlebee Apr 8, 2024
1e3999e
Update lavaland_surface_wrecked_factory.dmm
Gristlebee Apr 9, 2024
aad2a25
Update lavaland_surface_wrecked_factory.dmm
Gristlebee Apr 9, 2024
e8d6892
enemies and stuff
Gristlebee Apr 12, 2024
c473b88
Update lavaland_surface_wrecked_factory.dmm
Gristlebee Apr 12, 2024
fedd9db
areas+loot
Gristlebee Apr 15, 2024
da39bd1
naturalization
Gristlebee Apr 15, 2024
cd10b10
powernets
Gristlebee Apr 16, 2024
c7ac90d
file organization plus final touches
Gristlebee Apr 16, 2024
bf58454
Decaling
Gristlebee Apr 16, 2024
2dfc277
Update lavaland_surface_wrecked_factory.dmm
Gristlebee Apr 16, 2024
41cfbb7
Adds indestructible titanium walls, more cleanups
Gristlebee Apr 16, 2024
6b9bba2
catalogue, few touches. gets rid of map copies
Gristlebee Apr 28, 2024
d7e7a68
death to more old versions, update lavaland.dm
Gristlebee Apr 28, 2024
ca14456
Merge branch 'master' into Factoly
Gristlebee Apr 28, 2024
3f3f179
Fixes the chairs
Gristlebee Apr 28, 2024
b9026f4
krills some bad shutter IDs
Gristlebee Apr 28, 2024
1870863
Revert "krills some bad shutter IDs"
Gristlebee Apr 29, 2024
bc938de
Reapply "krills some bad shutter IDs"
Gristlebee Apr 29, 2024
b759ab6
lavaland atmos tile subtypes
Gristlebee May 2, 2024
01cdde3
Revert "lavaland atmos tile subtypes"
Gristlebee May 2, 2024
74bd315
Reapply "lavaland atmos tile subtypes"
Gristlebee May 2, 2024
a7fa3c2
Merge branch 'master' into Factoly
Gristlebee May 2, 2024
63dac42
the NT outfit gupdate
Gristlebee May 2, 2024
a115b04
tones down enemies, makes stuff not one tile, medkit, locker helpers
Gristlebee May 9, 2024
49eccae
Merge branch 'master' into Factoly
Gristlebee May 9, 2024
5c144b4
enemies
Gristlebee May 9, 2024
378581c
cabinents
Gristlebee May 9, 2024
f656eb0
the linter told me this was bad
Gristlebee May 9, 2024
662f540
sidings
Gristlebee May 9, 2024
ee8f999
siding
Gristlebee May 9, 2024
5f3ffd7
ups max body temp on syndi ops so they STOP DYING
Gristlebee May 9, 2024
ad9c45e
Revert "ups max body temp on syndi ops so they STOP DYING"
Gristlebee May 9, 2024
dbb9535
Reapply "ups max body temp on syndi ops so they STOP DYING"
Gristlebee May 9, 2024
c065643
Revert "Reapply "ups max body temp on syndi ops so they STOP DYING""
Gristlebee May 9, 2024
647730d
Reapply "Reapply "ups max body temp on syndi ops so they STOP DYING""
Gristlebee May 9, 2024
66553a5
itty bitty decal
Gristlebee May 9, 2024
10997ff
Revert "itty bitty decal"
Gristlebee May 9, 2024
865b710
Reapply "itty bitty decal"
Gristlebee May 9, 2024
85f097e
Revert "itty bitty decal"
Gristlebee May 9, 2024
c0e2572
Reapply "itty bitty decal"
Gristlebee May 9, 2024
e721994
changes
Gristlebee May 12, 2024
6a6273a
Requested Changes + Extra Mountainside
Gristlebee May 12, 2024
9008faf
mountain touch ups
Gristlebee May 12, 2024
1fa6cfd
the cover up
Gristlebee May 18, 2024
451d64e
factoly expansion
Gristlebee May 24, 2024
3b4cc9b
Update lavaland_surface_wrecked_factory.dmm
Gristlebee May 24, 2024
9fb560d
Merge branch 'master' into Factoly
Gristlebee May 24, 2024
c98225e
Update lavaland_surface_wrecked_factory.dmm
Gristlebee May 24, 2024
8d24bd8
Merge branch 'Factoly' of https://github.com/Gristlebee/Shiptest-Fork…
Gristlebee May 24, 2024
30c04cb
blood, guts, suffering and more enemies
Gristlebee May 24, 2024
53b722f
descs, more enemies, mini egun
Gristlebee May 24, 2024
41767a8
trash
Gristlebee May 24, 2024
53ad898
no mag commander
Gristlebee May 24, 2024
6f42c4d
Update lavaland_surface_wrecked_factory.dmm
Gristlebee May 24, 2024
6706961
waahhh, oops
Gristlebee May 24, 2024
1b6d004
Update lavaland_surface_wrecked_factory.dmm
Gristlebee May 24, 2024
37b6c65
buttons
Gristlebee May 24, 2024
487c7eb
removes wall lurker
Gristlebee May 27, 2024
2309b45
Merge branch 'master' into Factoly
Gristlebee May 28, 2024
da83e05
ramzi mob stuff, kills locker population
Gristlebee May 28, 2024
7871a59
Merge branch 'master' into Factoly
Gristlebee Jun 6, 2024
cb513b9
fixes enemy typepaths
Gristlebee Jun 7, 2024
524b1b6
Merge branch 'master' into Factoly
Gristlebee Jun 9, 2024
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
6,530 changes: 6,530 additions & 0 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_wrecked_factory.dmm

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions _maps/map_catalogue.txt
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ Find the key for using this catalogue in "map_catalogue_key.txt"
Size = (x = 90)(y = 63)(z = 1)
Tags = "Medium Combat Challenge", "Medium Loot", "Megafauna", "Necropolis Loot", "Inhospitable", "Lava"

File Name = "_maps\RandomRuins\LavaRuins\lavaland_surface_wrecked_factory.dmm"
Size = (x = 47)(y = 47)(z = 1)
Tags = "Boss Combat Challenge", "Major Loot", "Shelter", "Lava"

ReebeRuins:
File Name = "_maps\RandomRuins\Ruins\reebe_swarmers.dmm"
Size = (x = 20)(y = 20)(z = 1)
Expand Down
5 changes: 2 additions & 3 deletions _maps/shuttles/syndicate/syndicate_aegis.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5236,9 +5236,8 @@
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"Zq" = (
/obj/structure/closet/wall/orange{
name = "Engineering locker";
pixel_y = 30
/obj/structure/closet/wall/orange/directional/north{
name = "Engineering locker"
},
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 8
Expand Down
6 changes: 6 additions & 0 deletions code/datums/ruins/lavaland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,9 @@
id = "lava_canyon"
description = "Tectonic activity has gouged a large fissure into the surface of the planet here. Tucked in the crevasse, the remains of an ashwalker village lay in ashes."
suffix = "lavaland_surface_lava_canyon.dmm"

/datum/map_template/ruin/lavaland/wrecked_factory
name = "Wrecked Factory"
id = "wreck_factory"
description = "A Nanotrasen processing facility, assaulted by a pirate raid that has killed most of the staff. The offices however, remain unbreached for now."
suffix = "lavaland_surface_wrecked_factory.dmm"
34 changes: 34 additions & 0 deletions code/game/area/areas/ruins/lavaland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,37 @@
/area/ruin/unpowered/scorched_hut
name = "Scorched Hut"
icon_state = "red"

// Wrecked Factory

/area/ruin/lavaland/factory/warehouse
name = "Factory Warehouse"
icon_state = "cargo_warehouse"
requires_power = FALSE

/area/ruin/lavaland/factory/foreman_office
name = "Foreman's Office"
icon_state = "purple"
requires_power = FALSE

/area/ruin/lavaland/factory/adminstrative
name = "Adminstrative Wing"
icon_state = "bridge_hallway"
requires_power = FALSE

/area/ruin/lavaland/factory/manager_office
name ="Manager's Office"
icon_state = "bridge"
requires_power = FALSE

/area/ruin/lavaland/factory/lobby
name ="Lobby"
icon_state = "hallC"
requires_power = FALSE

/area/ruin/lavaland/factory/dorms
name ="Dormitory"
icon_state = "crew_quarters"
requires_power = FALSE


10 changes: 10 additions & 0 deletions code/game/turfs/closed/_closed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,16 @@
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_AIRLOCK)
canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK)

/turf/closed/indestructible/titanium
name = "wall"
desc = "A light-weight titanium wall used in shuttles. Effectively impervious to conventional methods of destruction."
icon = 'icons/turf/walls/shuttle_wall.dmi'
icon_state = "shuttle_wall-0"
base_icon_state = "shuttle_wall"
flags_ricochet = RICOCHET_SHINY | RICOCHET_HARD
smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE)

/turf/closed/indestructible/riveted
icon = 'icons/turf/walls/riveted.dmi'
Expand Down
36 changes: 36 additions & 0 deletions code/game/turfs/open/floor/plating/lavaland.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,39 @@
light_range = 2
light_power = 0.6
light_color = LIGHT_COLOR_FIRE

/turf/open/floor/concrete/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
light_color = LIGHT_COLOR_FIRE

/turf/open/floor/concrete/slab_1/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
light_color = LIGHT_COLOR_FIRE

/turf/open/floor/plating/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
light_color = LIGHT_COLOR_FIRE

/turf/open/floor/plating/rust/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
light_color = LIGHT_COLOR_FIRE

/turf/open/floor/plasteel/white/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
light_color = LIGHT_COLOR_FIRE

/turf/open/floor/plasteel/dark/lava
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
light_range = 2
light_power = 0.6
light_color = LIGHT_COLOR_FIRE
6 changes: 6 additions & 0 deletions code/modules/mob/living/simple_animal/hostile/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 400
speed = 1

/mob/living/simple_animal/hostile/syndicate/space/Initialize()
Expand Down Expand Up @@ -92,6 +93,7 @@
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 400
speed = 1
projectile_deflect_chance = 50

Expand Down Expand Up @@ -144,6 +146,7 @@
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 400
speed = 1
projectile_deflect_chance = 50

Expand Down Expand Up @@ -191,6 +194,7 @@
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 400
speed = 1

/mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize()
Expand Down Expand Up @@ -224,6 +228,7 @@
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 400
speed = 1

/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/Initialize()
Expand Down Expand Up @@ -254,6 +259,7 @@
health = 170
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 400
speed = 1

/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/Initialize()
Expand Down
Loading