Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
DexterDude committed Jul 28, 2024
1 parent 8e9f123 commit 1e7009c
Show file tree
Hide file tree
Showing 35 changed files with 952 additions and 696 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,4 @@
#define SCAPE_PL_ENG list('sound/soundscape/engamb1.ogg', 'sound/soundscape/engamb2.ogg', 'sound/soundscape/engamb3.ogg', 'sound/soundscape/engamb4.ogg', 'sound/soundscape/engamb5.ogg', 'sound/soundscape/engamb6.ogg', 'sound/soundscape/engamb7.ogg', )
#define SCAPE_PL_HANGAR list('sound/soundscape/hangaramb1.ogg', 'sound/soundscape/hangaramb2.ogg', 'sound/soundscape/hangaramb3.ogg', 'sound/soundscape/hangaramb4.ogg', 'sound/soundscape/hangaramb5.ogg', 'sound/soundscape/hangaramb6.ogg', 'sound/soundscape/hangaramb7.ogg', 'sound/soundscape/hangaramb8.ogg', 'sound/soundscape/hangaramb9.ogg', 'sound/soundscape/hangaramb10.ogg', )
#define SCAPE_PL_ARES list('sound/soundscape/mother.ogg')
#define SCAPE_PL_AICORE list('sound/soundscape/aicore/aicore_beep.ogg', 'sound/soundscape/aicore/aicore_ident.ogg', 'sound/soundscape/aicore/aicore_rumble1.ogg', 'sound/soundscape/aicore/aicore_rumble2.ogg', 'sound/soundscape/aicore/aicore_rumble3.ogg', 'sound/soundscape/aicore/aicore_rumble4.ogg', 'sound/soundscape/aicore/aicore_rumble5.ogg', 'sound/soundscape/aicore/aicore_tone1.ogg', 'sound/soundscape/aicore/aicore_tone2.ogg', 'sound/soundscape/aicore/aicore_tone3.ogg', 'sound/soundscape/aicore/aicore_tone4.ogg', 'sound/soundscape/aicore/aicore_tone5.ogg', 'sound/soundscape/aicore/aicore_tone6.ogg', 'sound/soundscape/aicore/aicore_tone7.ogg', 'sound/soundscape/aicore/aicore_tone8.ogg', 'sound/soundscape/aicore/aicore_tone9.ogg', 'sound/soundscape/aicore/aicore_tone10.ogg', 'sound/soundscape/aicore/aicore_tone11.ogg', 'sound/soundscape/aicore/aicore_tone12.ogg', 'sound/soundscape/aicore/aicore_tone13.ogg', 'sound/soundscape/aicore/aicore_tone14.ogg', 'sound/soundscape/aicore/aicore_tone15.ogg', 'sound/soundscape/aicore/aicore_tone16.ogg', 'sound/soundscape/aicore/aicore_tone17.ogg', 'sound/soundscape/aicore/aicore_tone18.ogg', )
20 changes: 19 additions & 1 deletion code/game/area/golden_arrow.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
icon_state = "upperengineering"

/area/golden_arrow/briefing
name = "\improper Briefing Area"
name = "\improper Assembly Room"
icon_state = "briefing"

/area/golden_arrow/dorms
Expand Down Expand Up @@ -81,3 +81,21 @@
/area/golden_arrow/platoonarmory
name = "\improper Platoon Armory"
icon_state = "alpha"

/area/golden_arrow/ai_interface
name = "\improper Human AI Interface"
icon_state = "airoom"
soundscape_playlist = SCAPE_PL_AICORE
soundscape_interval = 7

/area/golden_arrow/motor_pool
name = "\improper Motor Pool"
icon_state = "workshop"

/area/golden_arrow/lower_cargo
name = "\improper Lower Cargo Bays"
icon_state = "req"

/area/golden_arrow/supplydrop
name = "\improper Supply Drop Bay"
icon_state = "astronavigation"
27 changes: 26 additions & 1 deletion code/game/objects/structures/signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,32 @@
/obj/structure/sign/banners/united_americas_flag
name = "\improper United Americas flag"
desc = "A flag of the United Americas. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
icon_state = "ua_flag"
icon_state = "uaflag"

/obj/structure/sign/banners/colonial_marines_flag
name = "\improper United States Colonial Marine Corps flag"
desc = "A flag of the United States Colonial Marine Corps. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
icon_state = "cmflag"
/obj/structure/sign/banners/colonial_marines_flag_worn
name = "\improper Worn United States Colonial Marine Corps flag"
desc = "A very worn flag of the United States Colonial Marine Corps. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
icon_state = "cmflag_worn"
/obj/structure/sign/banners/twe_flag
name = "\improper Three World Empire flag"
desc = "A flag of the Three World Empire. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
icon_state = "tweflag"
/obj/structure/sign/banners/twe_worn
name = "\improper Worn Three World Empire flag"
desc = "A very worn flag of the Three World Empire. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
icon_state = "tweflag_worn"
/obj/structure/sign/banners/upp_flag
name = "\improper Union of Progressive Peoples flag"
desc = "A flag of the Union of Progressive Peoples. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
icon_state = "uppflag"
/obj/structure/sign/banners/upp_worn
name = "\improper Worn Union of Progressive Peoples flag"
desc = "A very worn flag of the Union of Progressive Peoples. Inspires patriotism, fear, or revulsion depending on the viewer's political leanings."
icon_state = "uppflag_worn"

//=====================//
// SEMIOTIC STANDARD //
Expand Down
8 changes: 8 additions & 0 deletions code/game/objects/structures/tables_racks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,14 @@
icon_state = "clothtable"
table_prefix = "cloth"

/obj/structure/surface/table/reinforced/aicore
name = "AI interface table"
desc = "A rather fancy looking table for the ship's AI core."
icon_state = "aicoretable"

/obj/structure/surface/table/reinforced/aicore/update_icon()
return

/obj/structure/surface/table/reinforced/toc
name = "operations table"
desc = "A square metal surface resting on its fat metal bottom. You can't flip something that doesn't have legs."
Expand Down
11 changes: 11 additions & 0 deletions code/modules/shuttle/shuttles/shipmap_elevator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,14 @@
dir = NORTH
height = 5
width = 7

/obj/docking_port/stationary/shipmap_elevator/one
name = "Vehicle Elevator One"

/obj/docking_port/stationary/shipmap_elevator/two
name = "Vehicle Elevator Two"

/obj/docking_port/stationary/shipmap_elevator/cargo
name = "Cargo Elevator"
height = 6
width = 8
Binary file modified icons/obj/structures/props/banners.dmi
Binary file not shown.
Binary file modified icons/obj/structures/tables.dmi
Binary file not shown.
Loading

0 comments on commit 1e7009c

Please sign in to comment.