Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
8a4d601
InitalCommit
Oct 1, 2025
a5d13e1
Layering
Oct 2, 2025
9529e64
MaorChanges
Oct 2, 2025
217c945
SaveDesperate
Oct 2, 2025
146ae24
MorningProgress
Oct 3, 2025
64a123d
FinishedRoomDesign
Oct 3, 2025
62bbb8c
ComAm81AbyssalNameChange
Oct 3, 2025
7e0bc2d
Areas
Oct 3, 2025
622e7e3
UndoWhoops
Oct 3, 2025
4f7db11
GonzoAddit
Oct 3, 2025
e434928
MinorAreaChange
Oct 3, 2025
5b3af97
AdditWesternMapCodeAndSprites
Oct 4, 2025
881466c
WorkOnGoing
Oct 5, 2025
d648dd5
CLBriefAndMoreChanges
Oct 5, 2025
4fe98df
Misc
Oct 6, 2025
cf4d8af
Merge branch 'WorkMaster' into SpaceStationMap
Oct 6, 2025
7d5f91e
Addit
Oct 7, 2025
f33f987
FloorsAndMoreMapping
Oct 7, 2025
d73e2f9
ConAm
Oct 8, 2025
05bf113
ConAmAdditSign
Oct 8, 2025
e408b37
Fixes
Oct 8, 2025
d04ac74
Fixes2
Oct 8, 2025
f1cfb95
Fixe3
Oct 8, 2025
d9b725d
MoarFix
Oct 8, 2025
a5c9494
InitalHoldstate
Oct 8, 2025
c635403
Fixup maps in TGM format
Oct 8, 2025
9390a08
Maor
Oct 8, 2025
39e3f90
Tunnels
Oct 8, 2025
3c5391a
MoreAndMore
Oct 9, 2025
2c76afe
Addit
Oct 9, 2025
3d2a751
AddConsole
Oct 9, 2025
4f24674
AdditStuff
Oct 9, 2025
7fc526f
ReProp
Oct 9, 2025
9d5a010
SpritesGalore
Oct 9, 2025
c99fafb
blank
Oct 9, 2025
ae605fa
ChangesGalore
Oct 10, 2025
fdedd48
Anchor
Oct 10, 2025
6294df3
DiceAndRoles
Oct 10, 2025
993b581
NightmareAddit
Oct 10, 2025
545d6af
AdditChanges
Oct 10, 2025
2fe608d
MissedThing
Oct 10, 2025
f4ccd8c
MinorThing
Oct 11, 2025
51d4887
MinorMapChangeAndSprite
Oct 17, 2025
9307820
Ian
Oct 18, 2025
811033e
Merge branch 'WorkMaster' into SpaceStationMap
Nov 30, 2025
74b159a
FixUpTanks
Nov 30, 2025
d5eb873
Merge branch 'WorkMaster' into SpaceStationMap
Jan 19, 2026
6232e57
AnimalFix
Jan 19, 2026
001f3c6
SurvChange
Jan 20, 2026
b4f6af9
NewSolar
Jan 20, 2026
61e63e8
APC
Jan 20, 2026
846d059
Walls
Jan 20, 2026
a092610
SurvsMandatoryRoleplay
Jan 21, 2026
0d9377e
Merge branch 'WorkMaster' into SpaceStationMap
Feb 17, 2026
f7517e7
Merge branch 'WorkMaster' into SpaceStationMap
Feb 17, 2026
0344062
FixPower
Feb 17, 2026
6602665
Merge branch 'master' into SpaceStationMap
Steelpoint Feb 18, 2026
177fe6f
Merge branch 'WorkMaster' into SpaceStationMap
Feb 22, 2026
d934e61
Merge branch 'WorkMaster' into SpaceStationMap
Feb 23, 2026
1115808
Merge branch 'master' into SpaceStationMap
Detective-Google Mar 3, 2026
ce52a4e
Merge branch 'WorkMaster' into SpaceStationMap
Mar 4, 2026
2b4a251
Merge branch 'master' into SpaceStationMap
Steelpoint Mar 4, 2026
c4d5095
Merge branch 'WorkMaster' into SpaceStationMap
Mar 7, 2026
1d6cfaf
Fixer
Mar 7, 2026
5e5d0e9
PopChange
Mar 10, 2026
4353b58
Suggested
Mar 10, 2026
3392a85
Merge branch 'WorkMaster' into SpaceStationMap
Mar 15, 2026
47a147f
Merge branch 'WorkMaster' into SpaceStationMap
May 3, 2026
56b17e9
LandingLight
May 3, 2026
d2fa0f6
Merge branch 'WorkMaster' into SpaceStationMap
Jun 1, 2026
279457b
Merge branch 'master' into SpaceStationMap
Jun 6, 2026
580a7c7
Merge branch 'master' into SpaceStationMap
Jun 24, 2026
168abc2
Merge branch 'master' into SpaceStationMap
Jun 24, 2026
1c0c4e7
Merge branch 'master' into SpaceStationMap
Jun 29, 2026
b3670c7
Conam
Jun 29, 2026
97b3aff
db
Jun 29, 2026
af7a998
addit
Jun 29, 2026
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 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
#define MAP_TYRARGO_RIFT "Tyrargo Rift"
#define MAP_WHITE_ANTRE_RESEARCH_FACILITY "White Antre Research Facility"
#define MAP_CONAM_81_ABYSSAL "Con-Am 81 'Abyssal'"
#define MAP_CHINOOK "Chinook 91 GSO" //admin level
#define MAP_ROSTOCK "SSV Rostock" //UPP Warship
#define MAP_HUNTERSHIP "Hunter Ship"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/dcs/signals/signals_global.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,3 +99,6 @@
/// From /datum/controller/subsystem/hijack/proc/call_shuttle()
#define COMSIG_GLOB_HIJACK_INBOUND "!hijack_inbound"


/// From /obj/structure/machinery/door_control/abyssal_lockdown/use_button(mob/living/user,force)
#define COMSIG_GLOB_ABYSSAL_LOCKDOWN "!abyssal_lockdown"
3 changes: 3 additions & 0 deletions code/__DEFINES/minimap.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
#define MINIMAP_AREA_OOB "#3a3a3a"
#define MINIMAP_AREA_COMMS "#00b3ffe7"

// Abyssal
#define MINIMAP_AREA_SPACE "#1a1a1a"

// Ceiling colors
#define MINIMAP_CEILING_TIER_GLASS "#b2e6f19a"
#define MINIMAP_CEILING_TIER_1 "#606060a2"
Expand Down
5 changes: 5 additions & 0 deletions code/__DEFINES/sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,8 @@
// White Antre Soundscapes
#define AMBIENCE_ANTRE 'sound/ambience/venir_hallway.ogg'
#define AMBIENCE_ANTRE_ADJACENT 'sound/ambience/venir_hallway_adjacent.ogg'

// Abyssal Soundscapes

#define SCAPE_ABYSSAL_INTERIOR list('sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg')
#define SCAPE_ABYSSAL_EXTERIOR list('sound/ambience/ambispace.ogg')
237 changes: 237 additions & 0 deletions code/game/area/ConAm_81_Abyssal.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,237 @@
//Abyssal Areas--------------------------------------//

/area/abyssal
name = "Con-Am 81 'Abyssal'"
icon = 'icons/turf/area_prison_v3_fiorina.dmi'
icon_state = "fiorina"
can_build_special = TRUE
temperature = T20C
powernet_name = "ground"
ceiling = CEILING_GLASS
minimap_color = MINIMAP_AREA_COLONY
ceiling_muffle = FALSE
unoviable_timer = FALSE

//parent types

/area/abyssal/interior
name = "Abyssal - Interior"
icon_state = "base_icon"
soundscape_playlist = SCAPE_ABYSSAL_INTERIOR
ambience_exterior = AMBIENCE_ALMAYER
soundscape_interval = 45

/area/abyssal/exterior
name = "Abyssal - Exterior"
icon_state = "base_icon"
ceiling = CEILING_NONE
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL|AREA_CONTAINMENT|AREA_UNWEEDABLE|AREA_NOBURROW
requires_power = FALSE
ambience_exterior = SCAPE_ABYSSAL_EXTERIOR
minimap_color = MINIMAP_AREA_GLASS
temperature = TCMB
pressure = 0
always_unpowered = 1
base_lighting_alpha = 255

/area/abyssal/oob
name = "Out Of Bounds"
icon_state = "oob"
ceiling = CEILING_MAX
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL|AREA_NOBURROW
ambience_exterior = SCAPE_ABYSSAL_EXTERIOR
minimap_color = MINIMAP_AREA_SPACE
requires_power = FALSE
temperature = TCMB
pressure = 0
always_unpowered = 1
base_lighting_alpha = 255

//// Landing Zone \\\\

/area/abyssal/interior/landing_zone
name = "Con-Am 81 'Abyssal' - Hanger - Landing Zone"
icon_state = "lz1"
ceiling = CEILING_NONE
is_resin_allowed = FALSE
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ
linked_lz = DROPSHIP_LZ1

//// Interior Station \\\\

// Survivor Bunker
/area/abyssal/interior/bunker
name = "Abyssal - Emergency Radiation Bunker"
icon_state = "police_line"
flags_area = AREA_NOTUNNEL|AREA_NOBURROW
minimap_color = MINIMAP_AREA_JUNGLE

//Corridor
/area/abyssal/interior/corridor_west
name = "Abyssal - Port - Main Corridor"
icon_state = "station0"
minimap_color = MINIMAP_DIRT

/area/abyssal/interior/corridor_central
name = "Abyssal - Central - Main Corridor"
icon_state = "station0"
minimap_color = MINIMAP_DIRT

/area/abyssal/interior/corridor_east
name = "Abyssal - Starboard - Main Corridor"
icon_state = "station0"
minimap_color = MINIMAP_DIRT

//Telecommunications
/area/abyssal/interior/telecomms_1
name = "Abyssal - Secondary Telecommunications Hub"
icon_state = "power0"
minimap_color = MINIMAP_AREA_ENGI

/area/abyssal/interior/telecomms_2
name = "Abyssal - Primary Telecommunications Hub"
icon_state = "power0"
minimap_color = MINIMAP_AREA_ENGI

//Maintenance
/area/abyssal/interior/maintenance
name = "Abyssal - Maintenance"
icon_state = "maints"
minimap_color = MINIMAP_LAVA

/area/abyssal/interior/maintenance/west
name = "Abyssal - Port - Maintenance"
linked_lz = DROPSHIP_LZ1

/area/abyssal/interior/maintenance/south
name = "Abyssal - Aft - Maintenance"

/area/abyssal/interior/maintenance/north
name = "Abyssal - Fore - Maintenance"

/area/abyssal/interior/maintenance/east
name = "Abyssal - Starboard - Maintenance"

/area/abyssal/interior/maintenance/central
name = "Abyssal - Central - Maintenance"

//Solar Control
/area/abyssal/interior/solar_control_south
name = "Abyssal - Aft - Solar Interior Controlroom"
icon_state = "disco"
minimap_color = MINIMAP_AREA_GLASS

/area/abyssal/interior/solar_control_north
name = "Abyssal - Fore - Solar Interior Controlroom"
icon_state = "disco"
minimap_color = MINIMAP_AREA_GLASS

/area/abyssal/interior/solar_control_north_west
name = "Abyssal - Fore-Port - Solar Interior Controlroom"
icon_state = "disco"
minimap_color = MINIMAP_AREA_GLASS

//Departments
/area/abyssal/interior/arrivals
name = "Abyssal - Arrivals Wing"
icon_state = "station1"
linked_lz = DROPSHIP_LZ1
minimap_color = MINIMAP_AREA_CELL_MED

/area/abyssal/interior/cargo
name = "Abyssal - Cargo Wing"
icon_state = "station1"
linked_lz = DROPSHIP_LZ1
minimap_color = MINIMAP_AREA_SHIP

/area/abyssal/interior/atmo
name = "Abyssal - Atmospherics"
icon_state = "station1"
minimap_color = MINIMAP_AREA_CELL_VIP

/area/abyssal/interior/hydro
name = "Abyssal - Hydroponics"
icon_state = "botany"
minimap_color = MINIMAP_AREA_CELL_LOW

/area/abyssal/interior/dormitory
name = "Abyssal - Dormitory"
icon_state = "station2"
minimap_color = MINIMAP_AREA_CELL_VIP

/area/abyssal/interior/galley
name = "Abyssal - Galley Kitchen"
icon_state = "station2"
minimap_color = MINIMAP_AREA_CELL_VIP

/area/abyssal/interior/security
name = "Abyssal - Security Wing"
icon_state = "security_hub"
minimap_color = MINIMAP_AREA_COLONY_MARSHALLS

/area/abyssal/interior/engineering
name = "Abyssal - Engineering Wing"
icon_state = "power0"
minimap_color = MINIMAP_AREA_COLONY_ENGINEERING

/area/abyssal/interior/medical
name = "Abyssal - Medical Wing"
icon_state = "station3"
minimap_color = MINIMAP_AREA_COLONY_HOSPITAL

/area/abyssal/interior/science
name = "Abyssal - Science Wing"
icon_state = "station4"
minimap_color = MINIMAP_AREA_RESEARCH
ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS

/area/abyssal/interior/command
name = "Abyssal - Command Wing"
icon_state = "fiorina"
minimap_color = MINIMAP_AREA_COMMAND
ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS

/area/abyssal/interior/liaison
name = "Abyssal - Executive Coordinators Office"
icon_state = "station4"
minimap_color = MINIMAP_AREA_COMMAND
ceiling = CEILING_UNDERGROUND_METAL_BLOCK_CAS

//// Exterior Station \\\\

/area/abyssal/exterior/fore
name = "Abyssal - Exterior Fore"
icon_state = "maints"

/area/abyssal/exterior/aft
name = "Abyssal - Exterior Aft"
icon_state = "maints"

//// Derelict Shuttle \\\\

/area/abyssal/interior/derelict_shuttle
name = "Unidentified Space Craft (UFO-1)"
icon_state = "tumor0-deep"
ceiling = CEILING_REINFORCED_METAL
flags_area = AREA_NOTUNNEL
ambience_exterior = AMBIENCE_DERELICT
soundscape_playlist = SCAPE_PL_LV759_DERELICTSHIP
minimap_color = MINIMAP_AREA_HYBRISACAVES
requires_power = FALSE

//// Gonzo \\\\

/area/abyssal/gonzo
name = "Abyssal - Exterior Starboard"
icon_state = "maints"
ceiling = CEILING_MAX
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL|AREA_NOBURROW
minimap_color = MINIMAP_AREA_GLASS
ambience_exterior = SCAPE_ABYSSAL_EXTERIOR
requires_power = FALSE
base_lighting_alpha = 255
always_unpowered = 1
17 changes: 17 additions & 0 deletions code/game/machinery/door_control.dm
Original file line number Diff line number Diff line change
Expand Up @@ -424,3 +424,20 @@
handle_dropship(id)

desiredstate = !desiredstate

/obj/structure/machinery/door_control/abyssal_lockdown
var/used = FALSE
var/colony_lockdown_time = 5 MINUTES

/obj/structure/machinery/door_control/abyssal_lockdown/use_button(mob/living/user,force)
if(world.time < SSticker.mode.round_time_lobby + colony_lockdown_time)
to_chat(user, SPAN_WARNING("The station-wide emergency lockdown cannot be lifted yet. Please wait another [floor((SSticker.mode.round_time_lobby + colony_lockdown_time-world.time)/600)] minutes before trying again."))
return
if(used)
to_chat(user, SPAN_WARNING("The station-wide emergency lockdown has already been lifted."))
return
. = ..()
SEND_GLOBAL_SIGNAL(COMSIG_GLOB_ABYSSAL_LOCKDOWN)
marine_announcement("The station-wide emergency lockdown has been lifted.")
xeno_announcement("We sense the encroachment of new hosts upon our metal hive.")
used = TRUE
38 changes: 38 additions & 0 deletions code/game/objects/effects/decals/floor_symbol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,44 @@
/obj/effect/decal/floor_symbol/wy_3x1/right
icon_state = "wy_right"

//// Con-Am \\\\

/obj/effect/decal/floor_symbol/con_am
name = "\improper Con-Am Logo"
icon_state = "conam_directional"

/obj/effect/decal/floor_symbol/con_am/left
icon_state = "conam_directional1"

/obj/effect/decal/floor_symbol/con_am/right
icon_state = "conam_directional2"

// Bigger Alt

/obj/effect/decal/floor_symbol/con_am/alt
icon_state = "conam_big_dir"

/obj/effect/decal/floor_symbol/con_am/alt/bottom_2
icon_state = "conam_big_dir1"

/obj/effect/decal/floor_symbol/con_am/alt/bottom_3
icon_state = "conam_big_dir2"

/obj/effect/decal/floor_symbol/con_am/alt/bottom_4
icon_state = "conam_big_dir3"

/obj/effect/decal/floor_symbol/con_am/alt/top_1
icon_state = "conam_big_dir4"

/obj/effect/decal/floor_symbol/con_am/alt/top_2
icon_state = "conam_big_dir5"

/obj/effect/decal/floor_symbol/con_am/alt/top_3
icon_state = "conam_big_dir6"

/obj/effect/decal/floor_symbol/con_am/alt/top_4
icon_state = "conam_big_dir7"

/obj/effect/decal/floor_symbol/uscm_3x3
name = "\improper USCM Logo"
icon_state = "uscm_center"
Expand Down
11 changes: 11 additions & 0 deletions code/game/objects/effects/decals/posters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -257,3 +257,14 @@
/obj/structure/sign/poster/upp/Initialize()
serial_number = pick(88,89,90,91,92,93,94,95,96,97,98,99,100)
.=..()

////////////////
//Abyssal Poster//
////////////////

/obj/structure/sign/poster/conam
icon_state = "poster101"

/obj/structure/sign/poster/conam/Initialize()
serial_number = 101
.=..()
5 changes: 5 additions & 0 deletions code/game/objects/effects/decals/posters/poster_list.dm
Original file line number Diff line number Diff line change
Expand Up @@ -516,3 +516,8 @@ Template
icon_state="poster101"
name = "Light of science"
desc = "Funded by Weyland-Yutani to try on improving the USCM's view of their research staff. This one, specifically, dates way back to when research laboratories were first estabilished onboard USCM patrol vessels, after a good amount of government lobbying. The art is geometric, but yet expressive with its vibrant warm colors, of an artistic style made by an unknown artist. The art itself is supposed to represent the burning light of 'Science', glowing and piercing the dark as a star, opening paths through the expansive obscure."

/datum/poster/poster_102
icon_state="poster101"
name = "Con-Amalagated poster"
desc = "A poster for the con-am corporation. It looks far more colorful than the drab looking station it is found on."
13 changes: 13 additions & 0 deletions code/game/objects/structures/props.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1604,3 +1604,16 @@
layer = TURF_LAYER
plane = FLOOR_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT

/obj/structure/prop/misc/lit_cable
name = "power cable surface connector"
desc = "Manual connection point to the station's powernet, emits a low level of light."
icon = 'icons/obj/pipes/power_cond_heavy.dmi'
icon_state = "node"
layer = ABOVE_WEED_LAYER
plane = FLOOR_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
light_on = TRUE
light_color = "#BB3F3F"
light_range = 2
light_power = 1
9 changes: 9 additions & 0 deletions code/game/objects/structures/signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -801,3 +801,12 @@
icon_state = "calendar_ua"
desc = "Classic office decoration and a place to stare at maniacally, has a vertically placed UA flag and some army symbolics."
calendar_faction = FACTION_MARINE

//===================//
// Con-Am Faction Symbol //
//=================//

/obj/structure/sign/conam
name = "\improper Con-Am Poster"
desc = "A symbol of the Con-Am corporation. Oozes a proud confidence of Con-Am, despite its mounting real world troubles."
icon_state = "conam_symbol"
Loading