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

Issacs Lament (WIP) #5881

Closed
wants to merge 32 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
240d789
LZ & Mansion & Hedges
Warfan1815 Feb 10, 2024
231a39d
Welcome Centre
Warfan1815 Feb 10, 2024
5cd56d4
Hospital & Research
Warfan1815 Feb 10, 2024
f1650da
miscellany changes
Warfan1815 Feb 11, 2024
7e44877
USCM Garrison
Warfan1815 Feb 12, 2024
3f8c8a7
Flood Area
Warfan1815 Feb 12, 2024
ace485d
Merge branch 'cmss13-devs:master' into IssacsLament
Warfan1815 Feb 12, 2024
8d05c73
Liq-R-Mart
Warfan1815 Feb 12, 2024
05b0957
GasN'Gear
Warfan1815 Feb 12, 2024
6f6f3ec
Miscellany Houses
Warfan1815 Feb 14, 2024
6c79b5a
WeyYu Hostel
Warfan1815 Feb 14, 2024
f1587a1
misc changes
Warfan1815 Feb 25, 2024
4cc6e96
Adds welded door as icon_state and additonal map changes - operations
Warfan1815 Mar 4, 2024
8385458
Operations changes
Warfan1815 Mar 4, 2024
d1a5ce2
LZ & Mansion & Hedges
Warfan1815 Feb 10, 2024
6c39429
Welcome Centre
Warfan1815 Feb 10, 2024
35bec02
Hospital & Research
Warfan1815 Feb 10, 2024
13738e0
miscellany changes
Warfan1815 Feb 11, 2024
4761a21
USCM Garrison
Warfan1815 Feb 12, 2024
82ee115
Flood Area
Warfan1815 Feb 12, 2024
e3e40e4
Liq-R-Mart
Warfan1815 Feb 12, 2024
84553d8
GasN'Gear
Warfan1815 Feb 12, 2024
7ad00c7
Miscellany Houses
Warfan1815 Feb 14, 2024
272f42d
WeyYu Hostel
Warfan1815 Feb 14, 2024
d256fad
misc changes
Warfan1815 Feb 25, 2024
84c72ff
Adds welded door as icon_state and additonal map changes - operations
Warfan1815 Mar 4, 2024
09d12e4
Operations changes
Warfan1815 Mar 4, 2024
d53e6e3
Merge branch 'IssacsLament' of https://github.com/Warfan1815/cmss13 i…
Warfan1815 Mar 4, 2024
995ffe9
Operations Completed
Warfan1815 Mar 5, 2024
eebd4cc
Operations Areas
Warfan1815 Mar 5, 2024
c2336b4
Wood object changes
Warfan1815 Mar 6, 2024
b0cd9c4
Merge branch 'master' of https://github.com/Warfan1815/cmss13 into Is…
Warfan1815 Mar 6, 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 change: 1 addition & 0 deletions code/__DEFINES/__game.dm
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@
#define WALL_BONE_RESIN "bone_resin"
#define WALL_CAVE "cavewall"
#define WALL_WOOD "wood"
#define WALL_WOOD_PLAIN "wood_plain"
#define WALL_GOLD "gold"
#define WALL_CULT "cult"
#define WALL_STONE "stone"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/sounds.dm
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@
#define SCAPE_PL_WIND list('sound/soundscape/wind1.ogg','sound/soundscape/wind2.ogg')
#define SCAPE_PL_LV522_OUTDOORS list('sound/soundscape/lv522/outdoors/wind1.ogg','sound/soundscape/lv522/outdoors/wind2.ogg','sound/soundscape/lv522/outdoors/wind3.ogg',)
#define SCAPE_PL_LV522_INDOORS list('sound/soundscape/lv522/indoors/indoor_wind.ogg','sound/soundscape/lv522/indoors/indoor_wind2.ogg')
#define SCAPE_PL_LV553_OUTDOORS list('sound/soundscape/thunderclap1.ogg', 'sound/soundscape/thunderclap2.ogg', 'sound/soundscape/lv522/outdoors/wind1.ogg','sound/soundscape/lv522/outdoors/wind2.ogg','sound/soundscape/lv522/outdoors/wind3.ogg')
#define SCAPE_PL_LV553_INDOORS list('sound/soundscape/lv522/indoors/indoor_wind.ogg','sound/soundscape/lv522/indoors/indoor_wind2.ogg')
#define SCAPE_PL_CAVE list('sound/soundscape/rocksfalling1.ogg', 'sound/soundscape/rocksfalling2.ogg')
#define SCAPE_PL_ELEVATOR_MUSIC list('sound/soundscape/medbay1.ogg','sound/soundscape/medbay2.ogg', 'sound/soundscape/medbay3.ogg')
#define SCAPE_PL_THUNDER list('sound/soundscape/thunderclap1.ogg', 'sound/soundscape/thunderclap2.ogg')
Expand Down
343 changes: 343 additions & 0 deletions code/game/area/Isaacs_Lament.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,343 @@
//lv553 AREAS--------------------------------------//

/area/lv553
icon = 'icons/turf/area_strata.dmi'
icon_state = "base_ico"
can_build_special = TRUE
powernet_name = "ground"
minimap_color = MINIMAP_AREA_COLONY

//parent types

/area/lv553/indoors
name = "Isaac's Lament - Indoors"
icon_state = "shed_x_ag"
ceiling = CEILING_METAL //because this is a PARENT TYPE and you should not be using it and should also be changing the icon!!!
soundscape_playlist = SCAPE_PL_LV553_INDOORS


/area/lv553/outdoors
name = "Isaac's Lament - Outdoors"
icon_state = "path"
ceiling = CEILING_NONE //because this is a PARENT TYPE and you should not be using it and should also be changing the icon!!!
soundscape_playlist = SCAPE_PL_LV553_OUTDOORS

/area/lv553/oob
name = "lv553 - Out Of Bounds"
icon_state = "ag_e"
ceiling = CEILING_MAX
is_resin_allowed = FALSE
flags_area = AREA_NOTUNNEL

/area/lv553/oob/w_y_vault
name = "lv553 - Weyland Secure Vault"
icon_state = "shed_x_ag"

//LZ1

/area/lv553/landing_zone_1
name = "Isaac's Lament - Landing Zone One"
icon_state = "landingzone_1"
is_resin_allowed = FALSE
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ

//LZ2

/area/lv553/landing_zone_2
name = "Isaac's Lament - Landing Zone Two"
icon_state = "landingzone_2"
is_resin_allowed = FALSE
is_landing_zone = TRUE
minimap_color = MINIMAP_AREA_LZ

//Outdoors

/area/lv553/outdoors/landing_zones_disembark
name = "Isaac's Lament - Landing Zones Disembarkation Road"

/area/lv553/outdoors/bungalow_manager_exterior
name = "Isaac's Lament - WeyYu Colonial Manager's Bungalow Exterior"

/area/lv553/outdoors/welcome_center_exterior/west
name = "WeyYu Welcome Center - West Exterior"

/area/lv553/outdoors/welcome_center_exterior/east
name = "WeyYu Welcome Center - East Exterior"

/area/lv553/outdoors/gated_community_exterior
name = "Isaac's Lament - WeyYu Gated Community Exterior"

/area/lv553/outdoors/hospital/break_garden
name = "Jeppson's Memorial Hospital - Break Garden"

/area/lv553/outdoors/hospital/road_north_west
name = "Jeppson's Memorial Hospital - North West Road Entrance"

/area/lv553/outdoors/hospital/road_north_east
name = "Jeppson's Memorial Hospital - North East Road Entrance"

/area/lv553/outdoors/uscm_garrison_exterior/fenced
name = "USCM Garrison - Fenced Exterior"

/area/lv553/outdoors/uscm_garrison_exterior/entrance
name = "USCM Garrison - Entrance Exterior"

/area/lv553/outdoors/flooded_streets/west
name = "Flooded Streets - West"

/area/lv553/outdoors/flooded_streets/east
name = "Flooded Streets - East"

/area/lv553/outdoors/flooded_streets/waste_treatment
name = "Isaac's Lament - Flooded Waste Treatment Facility Exterior"

/area/lv553/outdoors/colony_streets/west
name = "Isaac's Lament - Colony Streets West"

/area/lv553/outdoors/colony_streets/southwest
name = "Isaac's Lament - Colony Streets South-West"

/area/lv553/outdoors/colony_streets/south
name = "Isaac's Lament - Colony Streets South"

/area/lv553/outdoors/colony_streets/southeast
name = "Isaac's Lament - Colony Streets South-East"

/area/lv553/outdoors/colony_streets/east
name = "Isaac's Lament - Colony Streets East"

/area/lv553/outdoors/colony_streets/northeast
name = "Isaac's Lament - Colony Streets North-East"

/area/lv553/outdoors/lone_buildings/gas_n_gear
name = "Issac's Lament - Gas N' Gear Exterior"

/area/lv553/outdoors/lone_buildings/weyyu_hostel
name = "Issac's Lament - Weyland-Yutani Hostel Exterior"

//Indoors

/area/lv553/indoors/bungalow_manager
name = "Isaac's Lament - WeyYu Colonial Manager's Bungalow"
icon_state = "shed_1_ag"

/area/lv553/indoors/aerospace_control
name = "Isaac's Lament - Landing Zones' Aerospace Control"
icon_state = "outpost_gen_1"
requires_power = FALSE

/area/lv553/indoors/lz_sec_checkpoint
name = "Isaac's Lament - Landing Zones' Security Checkpoint"
icon_state = "outpost_sec_4"

/area/lv553/indoors/welcome_center/offices
name = "WeyYu Welcome Center - Offices"
icon_state = "offices"

/area/lv553/indoors/welcome_center/lobby
name = "WeyYu Welcome Center - Lobby"
icon_state = "dorms_lobby"

/area/lv553/indoors/welcome_center/canteen
name = "WeyYu Welcome Center - Canteen"
icon_state = "dorms_canteen"

/area/lv553/indoors/hospital/lobby
name = "Jeppson's Memorial Hospital - Hallway"
icon_state = "outpost_med_hall"

/area/lv553/indoors/hospital/reception
name = "Jeppson's Memorial Hospital - Reception"
icon_state = "outpost_med_recp"

/area/lv553/indoors/hospital/outpatients_and_icu
name = "Jeppson's Memorial Hospital - Intensive Care Unit and Outpatients"
icon_state = "outpost_med_recovery"

/area/lv553/indoors/hospital/storage_laundyroom_and_breakroom
name = "Jeppson's Memorial Hospital - Storage, Laundryoom and Breakroom"
icon_state = "outpost_med_stock"

/area/lv553/indoors/hospital/operating_rooms
name = "Jeppson's Memorial Hospital - Operating Rooms"
icon_state = "outpost_med_or"

/area/lv553/indoors/hospital/garage
name = "Jeppson's Memorial Hospital - Paramedics Garage"
icon_state = "garage"

/area/lv553/indoors/hospital/research/floor
name = "Jeppson's Memorial Hospital - Research Floor"
icon_state = "outpost_med_chem"

/area/lv553/indoors/hospital/research/toilets
name = "Jeppson's Memorial Hospital - Research Toilets"
icon_state = "outpost_med_chem"

/area/lv553/indoors/hospital/research/offices
name = "Jeppson's Memorial Hospital - Research Managers Offices"
icon_state = "outpost_med_chem"

/area/lv553/indoors/hospital/research/reception
name = "Jeppson's Memorial Hospital - Research Reception"
icon_state = "outpost_med_chem"

/area/lv553/indoors/gated_community/residence_bunkhouse
name = "Jeppson's Memorial Hospital - Staff Residence Bunkhouse"
icon_state = "shed_2_ag"

/area/lv553/indoors/gated_community/head_of_corporate_engineering
name = "Weyland Yutani Gated Community - Head of Engineering House"
icon_state = "shed_3_ag"

/area/lv553/indoors/gated_community/head_of_corporate_security
name = "Weyland Yutani Gated Community - Head of Security House"
icon_state = "shed_4_ag"

/area/lv553/indoors/gated_community/director_of_corporate_research
name = "Weyland Yutani Gated Community - Director of Research House"
icon_state = "shed_5_ag"

/area/lv553/indoors/gated_community/director_of_coporate_relations
name = "Weyland Yutani Gated Community - Director of Corporate Relations House"
icon_state = "shed_6_ag"

/area/lv553/indoors/uscm_garrison/recruitment_office
name = "USCM Garrison - Recruitment Office"
icon_state = "shed_1_ug"

/area/lv553/indoors/uscm_garrison/garrison_bunks
name = "USCM Garrison - Garrison Bunks"
icon_state = "shed_2_ug"

/area/lv553/indoors/uscm_garrison/armory
name = "USCM Garrison - Armory"
icon_state = "shed_3_ug"

/area/lv553/indoors/uscm_garrison/io_office
name = "USCM Garrison - Third Fleet Intelligence Office"
icon_state = "tcomms1"

/area/lv553/indoors/flooded/weymart
name = "Flooded Area - Weymart"
icon_state = "shed_4_ug"

/area/lv553/indoors/flooded/waste_station
name = "Flooded Area - Waste Water Station"
icon_state = "outpost_engi_4"

/area/lv553/indoors/flooded/waste_silos
name = "Flooded Area - Waste Water Silos"
icon_state = "disposal"

/area/lv553/indoors/flooded/west_slums
name = "Flooded Area - West Slums"
icon_state = "shed_7_ug"

/area/lv553/indoors/flooded/west_apartments
name = "Flooded Area - West Apartments"
icon_state = "shed_5_ug"

/area/lv553/indoors/flooded/east_apartments
name = "Flooded Area - East Apartments"
icon_state = "shed_6_ug"

/area/lv553/indoors/flooded/telecomms
name = "Flooded Area - Engineering Telecomms"
icon_state = "tcomms2"

/area/lv553/indoors/operations/reception
name = "Operations - Reception"
icon_state = "shed_1_ug"

/area/lv553/indoors/operations/offices/northwest
name = "Operations - Northwest Offices"
icon_state = "shed_2_ug"

/area/lv553/indoors/operations/offices/southwest
name = "Operations - Southwest Offices"
icon_state = "shed_3_ug"

/area/lv553/indoors/operations/offices/east
name = "Operations - East Offices"
icon_state = "shed_3_ug"

/area/lv553/indoors/operations/hallway/west
name = "Operations - West Hallway and Bathrooms"
icon_state = "shed_6_ug"

/area/lv553/indoors/operations/hallway/north
name = "Operations - North Central Hallway"
icon_state = "shed_7_ug"

/area/lv553/indoors/operations/hallway/south
name = "Operations - South Central Hallway"
icon_state = "shed_8_ug"

/area/lv553/indoors/operations/serverroom
name = "Operations - Server Room"
icon_state = "shed_1_ug"

/area/lv553/indoors/operations/lockerroom
name = "Operations - Locker Room"
icon_state = "shed_2_ug"

/area/lv553/indoors/operations/xenobiological_research
name = "Operations - Xenobiological Research"
icon_state = "shed_3_ug"

/area/lv553/indoors/operations/maintenance/north
name = "Operations - North Maintenance"
icon_state = "sewers4"

/area/lv553/indoors/operations/maintenance/south
name = "Operations - South Maintenance"
icon_state = "sewers4"

/area/lv553/indoors/lone_buildings
icon_state = "shed_x_ag"

/area/lv553/indoors/lone_buildings/liq_r_mart
name = "Issac's Lament - West - Liq-R-Mart"
icon_state = "shed_8_ag"

/area/lv553/indoors/lone_buildings/recruiter_house
name = "Issac's Lament - West - Recruiter's House"
icon_state = "shed_1_ag"

/area/lv553/indoors/lone_buildings/gas_n_gear
name = "Issac's Lament - West - Gas N' Gear"
icon_state = "shed_2_ag"

/area/lv553/indoors/lone_buildings/army_surplus
name = "Issac's Lament - West - Army Surplus"
icon_state = "shed_3_ag"

/area/lv553/indoors/lone_buildings/engineer_alcoholic_house
name = "Issac's Lament - West - Engineer's House"
icon_state = "shed_4_ag"

/area/lv553/indoors/lone_buildings/engineer_trucker_bunkhouse
name = "Issac's Lament - West - Bunkhouse"
icon_state = "shed_5_ag"

/area/lv553/indoors/lone_buildings/screenwriter_house
name = "Issac's Lament - West - Screenwriter's House"
icon_state = "shed_6_ag"

/area/lv553/indoors/lone_buildings/clf_house
name = "Issac's Lament - West - CLF Insurrectionist's House"
icon_state = "shed_7_ag"

/area/lv553/indoors/lone_buildings/multidoor_garage
name = "Issac's Lament - West - Multi-Door Garage"
icon_state = "shed_8_ag"

/area/lv553/indoors/lone_buildings/weyyu_hostel
name = "Issac's Lament - South-West - Weyland-Yutani Hostel"
icon_state = "shed_1_ag"

/area/lv553/indoors/lone_buildings/goon_and_chef_house
name = "Issac's Lament - South-West - Two Bedroom House"
icon_state = "shed_1_ag"
9 changes: 8 additions & 1 deletion code/game/objects/structures/flora.dm
Original file line number Diff line number Diff line change
Expand Up @@ -752,9 +752,16 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE.
health -= dam
healthcheck(src)


/obj/structure/flora/jungle/thickbush/jungle_plant
icon_state = "plant_1"
desc = "Looks like some of that fruit might be edible."
icon_tag = "plant"
variations = 7

/obj/structure/flora/jungle/hedge
name = "dense hedge"
desc = "Pretty thick hedge, it'll take something sharp and a lot of determination to clear away."
icon = 'icons/obj/structures/props/jungleplants.dmi'
layer = BUSH_LAYER
icon_state = "hedge"
health = 300
6 changes: 6 additions & 0 deletions code/game/objects/structures/landing_signs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,9 @@
name = "Chigusa Shipyard Sign"
desc = "A large sign that reads 'Chigusa Shipyard - Subsidary of Weyland-Yutani Corporation'. Acid burns checker the sign like buckshot."
icon_state = "laz_sign" //TODO make unique icon.

/obj/structure/lz_sign/isaacs_lament
name = "Isaacs Lament Sign"
desc = "A large sign for Isaacs Lament exhorting its values and organisations. it is smeared in blood and grafitti saying: liar."
icon = 'icons/obj/structures/props/landing_signs_128_64.dmi'
icon_state = "isaacs_lament"
Loading
Loading