cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remaps the Lavaland Outpost. Again. (#22391)

Browse Source 
* a remap begins...

* tweaks

* bye-bye, QM's handheld crew monitor

* brings back the abandoned crate

* oop

* more tweaks

* tcomm pipes

* brad update

* more firelocks

* more windows

* tweaks

* denth review part 1

* renaming doors

* crowbars

* changes walls, new locker

* Oyu's review

* more tweaks

* signs

* MAYBE will be deconflicted

* now deconfllicted hopefully

* some more tweaks

* no more wall helpers!

* fluff

* IDs for polarized windows

* slight tweaks to firelocks

* added grilles

* more tweaks

* tiny lil maint update

* more maint tweaks

* maint rework part 3

* oopsie

* jani has dark floors now

* reworked robotics, gave brad more love

* stationary defibs

* stuff

* bug fix

* more tweaks

* aaaaa

* Revert "aaaaa"

This reverts commit f70ba3a89a.

* more tweaks

* fixed scrubbers, tweaks

* should compile

* reshuffles maint loot

* request consoles + tweaks

* more tweaks

* access helper tweaks

* very minor access tweaks

* you can now pet Brad

* Update code/modules/mob/living/simple_animal/friendly/cockroach.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* renames access

* shuttle decorations + other tweaks

* oopsie

* bjam's reviews

* split the QM's locker
Exa's approval, rest of design team did not share opinions

* OH UH

* this too

* this is a better way to do it actually

* sean review + floodlight subtype

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Sadhorizon
2023-10-21 22:30:28 +02:00
committed by GitHub
parent a35591eb67
commit d3ea6b2620
12 changed files with 6927 additions and 4386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/generic/Lavaland.dmm
+6809 -4333
View File
File diff suppressed because it is too large Load Diff
code/game/area/areas/mining_areas.dm
+68 -40
View File
@@ -62,47 +62,84 @@
/area/mine/unexplored/cere/orbiting
name = "Near Station Asteroids"
/area/mine/lobby
/**********************Outpost areas**************************/
/area/mine/outpost
name = "Mining Station"
icon_state = "mining"
sound_environment = SOUND_AREA_STANDARD_STATION
/area/mine/storage
name = "Mining Station Storage"
/area/mine/production
name = "Mining Station Starboard Wing"
icon_state = "mining_production"
/area/mine/abandoned
name = "Abandoned Mining Station"
/area/mine/comms
name = "Mining Station Communications"
/area/mine/living_quarters
name = "Mining Station Port Wing"
icon_state = "mining_living"
/area/mine/eva
name = "Mining Station EVA"
/area/mine/outpost/airlock
name = "Mining Station Airlock"
icon_state = "mining_eva"
/area/mine/maintenance
/area/mine/outpost/cafeteria
name = "Mining Station Cafeteria"
icon_state = "mining_living"
/area/lavaland/surface/outdoors/outpost/catwalk //subtype of /surface so storms hit there
name = "Mining Station Catwalk"
icon_state = "mining"
/area/mine/outpost/comms
name = "Mining Station Communications"
icon_state = "tcomms"
/area/mine/cafeteria
name = "Mining station Cafeteria"
/area/mine/outpost/custodial
name = "Mining Station Custodial Storage"
icon_state = "janitor"
/area/mine/hydroponics
name = "Mining station Hydroponics"
/area/mine/outpost/engineering // basically engi and atmos combined. I'm keeping it as "engineering" code wise, but "Life Support" sounds cooler in-game
name = "Mining Station Life Support"
icon_state = "engi"
/area/mine/sleeper
name = "Mining station Emergency Sleeper"
/area/mine/outpost/hallway
name = "Mining Station Central Wing"
icon_state = "hallC"
/area/mine/north_outpost
name = "North Mining Outpost"
/area/mine/outpost/hallway/east
name = "Mining Station East Wing"
icon_state = "hallS"
/area/mine/west_outpost
name = "West Mining Outpost"
/area/mine/outpost/hallway/west
name = "Mining Station West Wing"
icon_state = "hallP"
/area/mine/outpost/lockers
name = "Mining Station Locker Room"
icon_state = "locker"
/area/mine/outpost/storage
name = "Mining Station Storage"
icon_state = "storage"
/area/mine/outpost/maintenance
name = "Mining Station Maintenance"
icon_state = "maintcentral"
/area/mine/outpost/maintenance/south
name = "Mining Station South Maintenance"
icon_state = "amaint"
/area/mine/outpost/maintenance/east
name = "Mining Station East Maintenance"
icon_state = "smaint"
/area/mine/outpost/medbay
name = "Mining Station Infirmary"
icon_state = "medbay"
/area/mine/outpost/mechbay
name = "Mining Station Mechbay"
icon_state = "mechbay"
/area/mine/outpost/production
name = "Mining Station Production Room"
icon_state = "mining_production"
/area/mine/outpost/quartermaster
name = "Mining Station Quartermaster's Office"
icon_state = "qm"
/area/mine/laborcamp
name = "Labor Camp"
@@ -113,15 +150,6 @@
icon_state = "security"
ambientsounds = HIGHSEC_SOUNDS
/area/mine/podbay
name = "Mining Podbay"
/area/mine/airlock
name = "Mining Airlock"
/area/mine/mechbay
name = "Mining Mechbay Storage"
/**********************Lavaland Areas**************************/
code/game/jobs/access.dm
+2 -2
View File
@@ -291,7 +291,7 @@
if(ACCESS_RESEARCH)
return "Science"
if(ACCESS_MINING)
return "Mining"
return "Mining Dock"
if(ACCESS_MINING_OFFICE)
return "Mining Office"
if(ACCESS_MAILSORTING)
@@ -303,7 +303,7 @@
if(ACCESS_HEADS_VAULT)
return "Main Vault"
if(ACCESS_MINING_STATION)
return "Mining EVA"
return "Mining Outpost"
if(ACCESS_XENOBIOLOGY)
return "Xenobiology Lab"
if(ACCESS_XENOARCH)
code/game/machinery/defib_mount.dm
+3
View File
@@ -38,6 +38,9 @@
defib = new/obj/item/defibrillator/loaded(src)
update_icon(UPDATE_OVERLAYS)
/obj/machinery/defibrillator_mount/loaded/locked
clamps_locked = TRUE
/obj/machinery/defibrillator_mount/Destroy()
QDEL_NULL(defib)
return ..()
code/game/machinery/floodlight.dm
+3
View File
@@ -161,3 +161,6 @@
. +="<span class='notice'>The panel is <b>pried</b> open, looks like you could fit a cell in there.</span>"
else
. +="<span class='notice'>The panel looks like it could be <b>pried</b> open, or <b>screwed</b> shut.</span>"
/obj/machinery/floodlight/anchored
anchored = TRUE
code/game/machinery/requests_console.dm
+5 -3
View File
@@ -1,7 +1,8 @@
/******************** Requests Console ********************/
/** Originally written by errorage, updated by: Carn, needs more work though. I just added some security fixes */
//Request Console Department Types
//Request Console Department Types.
//For one console to be under multiple categories, you need to add the numbers with each other. For example, value of 6 will allow you to request supplies and relay info to that specific console.
#define RC_ASSIST 1 //Request Assistance
#define RC_SUPPLY 2 //Request Supplies
#define RC_INFO 4 //Relay Info
@@ -19,13 +20,14 @@
#define RCS_SHIPPING 9 // Print Shipping Labels/Packages
#define RCS_SHIP_LOG 10 // View Shipping Label Log
//Radio list
//Radio list. For a console to announce messages on a specific radio, it's "department" variable must be in the list below.
#define ENGI_ROLES list("Atmospherics", "Engineering", "Chief Engineer's Desk")
#define SEC_ROLES list("Warden", "Security", "Detective", "Head of Security's Desk")
#define MISC_ROLES list("Bar", "Chapel", "Kitchen", "Hydroponics", "Janitorial")
#define MED_ROLES list("Virology", "Chief Medical Officer's Desk", "Medbay")
#define COM_ROLES list("Blueshield", "NT Representative", "Head of Personnel's Desk", "Captain's Desk", "Bridge")
#define SCI_ROLES list("Robotics", "Science", "Research Director's Desk")
#define SUPPLY_ROLES list("Cargo Bay", "Mining Dock", "Mining Outpost", "Quartermaster's Desk")
GLOBAL_LIST_EMPTY(req_console_assistance)
GLOBAL_LIST_EMPTY(req_console_supplies)
@@ -244,7 +246,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
radiochannel = "Science"
else if(recipient == "AI")
radiochannel = "AI Private"
else if(recipient == "Cargo Bay")
else if(recipient in SUPPLY_ROLES)
radiochannel = "Supply"
message_log.Add(list(list("Message sent to [recipient] at [station_time_timestamp()]", "[message]")))
Radio.autosay("Alert; a new requests console message received for [recipient] from [department]", null, "[radiochannel]")
code/game/machinery/suit_storage_unit.dm
+1 -1
View File
@@ -113,7 +113,7 @@
/obj/machinery/suit_storage_unit/qm
name = "quartermaster's suit storage unit"
suit_type = /obj/item/mod/control/pre_equipped/loader
mask_type = /obj/item/clothing/mask/gas/explorer
mask_type = /obj/item/clothing/mask/breath
req_access = list(ACCESS_QM)
/obj/machinery/suit_storage_unit/qm/secure
code/game/objects/items/weapons/storage/garment.dm
+2 -3
View File
@@ -192,12 +192,11 @@
new /obj/item/clothing/under/rank/cargo/quartermaster/skirt(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
new /obj/item/clothing/suit/hooded/wintercoat/miner(src)
new /obj/item/clothing/suit/jacket/cargobomber(src)
new /obj/item/clothing/suit/jacket/miningbomber(src)
new /obj/item/clothing/head/hardhat/orange(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/clothing/suit/hooded/explorer(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/clothing/gloves/color/black(src)
new /obj/item/tank/internals/emergency_oxygen/double(src)
code/game/objects/structures/crates_lockers/closets/secure/cargo_lockers.dm
+13 -4
View File
@@ -25,10 +25,6 @@
new /obj/item/organ/internal/eyes/cybernetic/meson(src)
new /obj/item/storage/bag/garment/quartermaster(src)
new /obj/item/clothing/accessory/medal/supply(src)
new /obj/item/fulton_core(src)
new /obj/item/extraction_pack(src)
new /obj/item/gps/mining(src)
new /obj/item/sensor_device(src)
new /obj/item/rcs(src)
new /obj/item/destTagger(src)
new /obj/item/reagent_containers/food/drinks/mug/qm(src)
@@ -36,3 +32,16 @@
new /obj/item/cartridge/qm(src)
new /obj/item/storage/bag/mail(src)
/obj/structure/closet/secure_closet/quartermaster/lavaland //used in mining outpost
name = "quartermaster's secondary locker"
/obj/structure/closet/secure_closet/quartermaster/lavaland/populate_contents()
new /obj/item/fulton_core(src)
new /obj/item/extraction_pack(src)
new /obj/item/gps/mining(src)
new /obj/item/clothing/mask/gas/explorer(src)
new /obj/item/clothing/suit/hooded/explorer(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/book/manual/wiki/sop_supply(src)
new /obj/item/folder/yellow(src)
new /obj/item/fan(src)
code/game/objects/structures/signs.dm
+8
View File
@@ -103,6 +103,11 @@
if(user.client)
user.client.webmap()
/obj/structure/sign/nanotrasen
name = "\improper NANOTRASEN"
desc = "A sign that indicates an NT turf."
icon_state = "nanotrasen"
/obj/structure/sign/securearea
name = "\improper SECURE AREA"
desc = "A warning sign which reads 'SECURE AREA'"
@@ -208,6 +213,9 @@
name = "Remembrance Plaque"
desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the stars. Someone has drawn a picture of a crying badger at the bottom."
/obj/structure/sign/kiddieplaque/remembrance/mining
desc = "A plaque commemorating the fallen, may they rest in peace, forever asleep amongst the ashes. Someone has drawn a picture of a crying badger at the bottom."
/obj/structure/sign/kiddieplaque/perfect_man
name = "\improper 'Perfect Man' sign"
desc = "A guide to the exhibit, explaining how recent developments in mindshield implant and cloning technologies by Nanotrasen Corporation have led to the development and the effective immortality of the 'perfect man', the loyal Nanotrasen Employee."
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+5
View File
@@ -280,3 +280,8 @@
desc = "A comfy-looking cat bed. You can even strap your pet in, in case the gravity turns off."
name = "Runtime's bed"
anchored = TRUE
/obj/structure/bed/dogbed/brad
name = "Brad's bed"
desc = "Brad's bed! Why does a cockroach get this amount of love?"
anchored = TRUE
code/modules/mob/living/simple_animal/friendly/cockroach.dm
+8
View File
@@ -45,3 +45,11 @@
/mob/living/simple_animal/cockroach/ex_act() //Explosions are a terrible way to handle a cockroach.
return
//mining pet
/mob/living/simple_animal/cockroach/Brad
name = "Brad"
desc = "Lavaland's most resilient cockroach. Seeing this little guy walk through the wastes almost makes you wish for nuclear winter."
response_help = "carefully pets"
weather_immunities = list("ash")
unique_pet = TRUE
gold_core_spawnable = NO_SPAWN