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 new [SOMEWHAT NEAT] Nanotrasen Outpost! #2490

Merged
merged 42 commits into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
07fcaa4
the outpost !!
goober3 Nov 17, 2023
b8852b4
tweaks the brig, enables outposts
goober3 Nov 17, 2023
2d68d33
fixes bathroom area to appease the linters
goober3 Nov 17, 2023
43f5e36
tweaks
goober3 Nov 17, 2023
0fe7fc8
further tweaks & attempts to appease CI
goober3 Nov 17, 2023
ed2c525
hangars!!! and fire alarms.
goober3 Nov 18, 2023
e3bda7b
re-enables outposts
goober3 Nov 18, 2023
fe846fc
straightens up the pillars on the 56x20 hangar
goober3 Nov 18, 2023
e88c2c3
Merge branch 'master' into icepost
goober3 Nov 18, 2023
2157ae4
tweaks to the hangars & outpost
goober3 Nov 18, 2023
4b6ab2f
Merge branch 'icepost' of https://github.com/goober3/hi-github-portsi…
goober3 Nov 18, 2023
64b4b95
intercoms, maintenance greeble
goober3 Nov 18, 2023
b0c3730
posters, adds tiny fans to ERT bay
goober3 Nov 18, 2023
e793ffd
indestructible schist, comments out nt_asteroid for TMing purposes --…
goober3 Nov 25, 2023
a68655e
Merge branch 'master' into icepost
goober3 Nov 25, 2023
69e3c63
new elevator, remaps hangars a little, major additions / tweaks to ou…
goober3 Dec 3, 2023
5d9d033
Merge branch 'icepost' of https://github.com/goober3/hi-github-portsi…
goober3 Dec 3, 2023
88d843d
Merge branch 'master' into icepost
goober3 Dec 3, 2023
998bcf2
fixes baseturf-less snow tiles
goober3 Dec 3, 2023
933fe0b
Merge branch 'icepost' of https://github.com/goober3/hi-github-portsi…
goober3 Dec 3, 2023
8b6aaae
fixes bar area
goober3 Dec 3, 2023
8f923a0
populates trashcans
goober3 Dec 3, 2023
1759356
tweaks the outpost and hangars, hopefully fixes checks.
goober3 Dec 5, 2023
a4de6e4
APC in fore maintenance
goober3 Dec 5, 2023
a455fca
greebles tables in underground hangars
goober3 Dec 6, 2023
3546510
adds door shutters & unlocked safes to shops
goober3 Dec 6, 2023
e569082
repositions the stethoscopes to maintenance tunnels for esteeming bur…
goober3 Dec 6, 2023
6611134
adds cryo room & lounge
goober3 Dec 7, 2023
9fccda2
tweaks, removes newspapers from underground hangars to prevent spacew…
goober3 Dec 7, 2023
97ab8e5
tweaks, fixes checks probably
goober3 Dec 7, 2023
d96b24c
yikes!
goober3 Dec 7, 2023
520a921
dd
goober3 Dec 7, 2023
3ae4665
Merge branch 'master' into icepost
goober3 Dec 7, 2023
399662e
tweaks outpost level, converts all hangars to outdoor versions.
goober3 Dec 13, 2023
0ed8c16
Merge branch 'icepost' of https://github.com/goober3/hi-github-portsi…
goober3 Dec 13, 2023
340b5a6
Merge branch 'master' into icepost
goober3 Dec 13, 2023
80dfec6
fixing lighting in small hangars
goober3 Dec 16, 2023
f16099d
Merge remote-tracking branch 'upstream/master' into icepost
goober3 Jan 5, 2024
9feeb9e
tweaks bar
goober3 Jan 5, 2024
31e21cb
Merge branch 'master' into icepost
goober3 Jan 5, 2024
4520cb7
Merge branch 'icepost' of https://github.com/goober3/hi-github-portsi…
goober3 Jan 5, 2024
0ed7419
very important commit !!
goober3 Jan 5, 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
1,826 changes: 1,826 additions & 0 deletions _maps/outpost/hangar/nt_ice_20x20.dmm

Large diffs are not rendered by default.

2,557 changes: 2,557 additions & 0 deletions _maps/outpost/hangar/nt_ice_40x20.dmm

Large diffs are not rendered by default.

6,103 changes: 6,103 additions & 0 deletions _maps/outpost/hangar/nt_ice_40x40.dmm

Large diffs are not rendered by default.

3,189 changes: 3,189 additions & 0 deletions _maps/outpost/hangar/nt_ice_56x20.dmm

Large diffs are not rendered by default.

7,095 changes: 7,095 additions & 0 deletions _maps/outpost/hangar/nt_ice_56x40.dmm

Large diffs are not rendered by default.

13,671 changes: 13,671 additions & 0 deletions _maps/outpost/nanotrasen_ice.dmm

Large diffs are not rendered by default.

24 changes: 23 additions & 1 deletion code/game/area/areas/outpost.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
icon_state = "quartoffice"
sound_environment = SOUND_AREA_SMALL_SOFTFLOOR

/area/outpost/cargo/smeltery
name = "Smeltery"
icon_state = "mining_production"

/area/outpost/crew
name = "Crew Quarters"
Expand Down Expand Up @@ -68,6 +71,11 @@
icon_state = "library"
sound_environment = SOUND_AREA_LARGE_SOFTFLOOR

/area/outpost/crew/bathroom
name = "Bathroom"
icon_state = "restrooms"
sound_environment = SOUND_ENVIRONMENT_BATHROOM

/area/outpost/crew/lounge
name = "Lounge"
icon_state = "lounge"
Expand Down Expand Up @@ -174,14 +182,16 @@
name = "Armory"
icon_state = "armory"

/area/outpost/security/checkpoint
name = "Security Checkpoint"
icon_state = "checkpoint1"

/area/outpost/storage
name = "Storage"
icon_state = "storage"
lighting_colour_tube = "#ffce93"
lighting_colour_bulb = "#ffbc6f"


/area/outpost/vacant_rooms
name = "Vacant Rooms"
icon_state = "vacant_commissary"
Expand All @@ -190,6 +200,18 @@
name = "Vacant Office"
icon_state = "vacant_office"

/area/outpost/vacant_rooms/shop
name = "Shop"
icon_state = "vacant_room"

//for powered outdoors non-space areas -- uses ice planet ambience

/area/outpost/exterior
name = "Exterior"
icon_state = "green"
sound_environment = SOUND_ENVIRONMENT_CAVE
ambientsounds = SPOOKY

// this might be redundant with /area/space/nearstation. unsure; use with caution?
/area/outpost/external
name = "External"
Expand Down
7 changes: 7 additions & 0 deletions code/game/turfs/closed/_closed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,13 @@
bullet_sizzle = TRUE
bullet_bounce_sound = null

/turf/closed/indestructible/rock/schist
name = "schist"
desc = "Extremely densely-packed layers of schist. Say it ten times fast."
icon = 'icons/turf/walls/rockwall_icemoon.dmi'
icon_state = "rockwall_icemoon-0"
base_icon_state = "rockwall_icemoon"

/turf/closed/indestructible/paper
name = "thick paper wall"
desc = "A wall layered with impenetrable sheets of paper."
Expand Down
3 changes: 3 additions & 0 deletions code/game/turfs/open/floor/plating/icemoon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@
icon_state = "icemoon_ground_smooth"
base_icon_state = "icemoon_ground_smooth"

/turf/open/floor/plating/asteroid/icerock/temperate
initial_gas_mix = "o2=22;n2=82;TEMP=255.37"

/turf/open/floor/plating/asteroid/iceberg
gender = PLURAL
name = "cracked ice floor"
Expand Down
45 changes: 44 additions & 1 deletion code/modules/overmap/objects/outpost/outpost_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,37 @@
dock_width = 56
dock_height = 40

/*
Nanotrasen Ice Planet
*/
/datum/map_template/outpost/nanotrasen_ice
name = "nanotrasen_ice"

/datum/map_template/outpost/hangar/nt_ice_20x20
name = "hangar/nt_ice_20x20"
dock_width = 20
dock_height = 20

/datum/map_template/outpost/hangar/nt_ice_40x20
name = "hangar/nt_ice_40x20"
dock_width = 40
dock_height = 20

/datum/map_template/outpost/hangar/nt_ice_40x40
name = "hangar/nt_ice_40x40"
dock_width = 40
dock_height = 40

/datum/map_template/outpost/hangar/nt_ice_56x20
name = "hangar/nt_ice_56x20"
dock_width = 56
dock_height = 20

/datum/map_template/outpost/hangar/nt_ice_56x40
name = "hangar/nt_ice_56x40"
dock_width = 56
dock_height = 40

/*
/datum/overmap/outpost subtypes
*/
Expand All @@ -87,7 +118,7 @@
main_template = /datum/map_template/outpost/indie_space
elevator_template = /datum/map_template/outpost/elevator_indie
// Uses "default" hangars (indie_space).

/*
/datum/overmap/outpost/nanotrasen_asteroid
token_icon_state = "station_asteroid_0"
main_template = /datum/map_template/outpost/nt_asteroid
Expand All @@ -100,6 +131,18 @@
/datum/map_template/outpost/hangar/nt_asteroid_56x20,
/datum/map_template/outpost/hangar/nt_asteroid_56x40
)
*/
/datum/overmap/outpost/nanotrasen_ice
token_icon_state = "station_asteroid_0"
main_template = /datum/map_template/outpost/nanotrasen_ice
elevator_template = /datum/map_template/outpost/elevator_indie
hangar_templates = list(
/datum/map_template/outpost/hangar/nt_ice_20x20,
/datum/map_template/outpost/hangar/nt_ice_40x20,
/datum/map_template/outpost/hangar/nt_ice_40x40,
/datum/map_template/outpost/hangar/nt_ice_56x20,
/datum/map_template/outpost/hangar/nt_ice_56x40
)

/datum/overmap/outpost/no_main_level // For example and adminspawn.
main_template = null
Expand Down