Skip to content

Commit

Permalink
Mapfix: Sierra map issues (#1893)
Browse files Browse the repository at this point in the history
Co-authored-by: SuhEugene <[email protected]>
  • Loading branch information
YegorKandziuba and SuhEugene authored Feb 13, 2024
1 parent 3b2772f commit bcf000f
Show file tree
Hide file tree
Showing 20 changed files with 7,183 additions and 3,565 deletions.
1 change: 1 addition & 0 deletions maps/sierra/areas/z2_sierra_deck3.dm
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
/area/crew_quarters/head/deck3
name = "Third Deck - Head"
holomap_color = HOLOMAP_AREACOLOR_CREW
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED

/area/crew_quarters/bar
name = "Third Deck - Service - Bar"
Expand Down
8 changes: 6 additions & 2 deletions maps/sierra/areas/z3_sierra_deck2.dm
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
name = "Second Deck - Living - Restroom"
icon_state = "toilet"
sound_env = SMALL_ENCLOSED
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
holomap_color = HOLOMAP_AREACOLOR_CREW

/area/crew_quarters/garden_room
Expand Down Expand Up @@ -248,8 +249,9 @@
holomap_color = HOLOMAP_AREACOLOR_CREW

/area/crew_quarters/sleep/cryo/south
name = "Second Deck - Living - Cryogenic Storage - South"
icon_state = "cryo_south"
name = "Second Deck - Living - Dormitory - South"
icon_state = "Sleep"
sound_env = SMALL_SOFTFLOOR
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED
holomap_color = HOLOMAP_AREACOLOR_CREW

Expand Down Expand Up @@ -291,10 +293,12 @@
/area/medical/ward
name = "Second Deck - Patient Ward - Patients"
icon_state = "patients"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED

/area/medical/wardhallway
name = "Second Deck - Patient Ward - Hallway"
icon_state = "medbay2"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED

/area/medical/maintenance_equipstorage
name = "Second Deck - Infirmary - Lower Storage"
Expand Down
1 change: 1 addition & 0 deletions maps/sierra/areas/z4_sierra_deck1.dm
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@

/area/security/sierra/breakroom
name = "First Deck - Security - Break Room"
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_ION_SHIELDED

/area/security/sierra/forensic
name = "First Deck - Security - Forensic"
Expand Down
53 changes: 53 additions & 0 deletions maps/sierra/items/items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,22 @@ Unique items
/obj/item/paper/sierrau/liason_note
)

/obj/item/storage/belt/utility/chief/New()
..()
new /obj/item/swapper/power_drill(src)
new /obj/item/weldingtool/largetank(src)
new /obj/item/swapper/jaws_of_life(src)
new /obj/random/single/color/cable_coil(src, 30)
new /obj/item/device/multitool/multimeter(src)
update_icon()

/obj/item/storage/secure/safe/captain_sierra
startswith = list(
/obj/item/paper = 1,
/obj/item/pen = 1,
/obj/item/card/id/captains_spare = 1
)

/obj/paint/hull
color = "#436b8e"

Expand Down Expand Up @@ -490,3 +506,40 @@ Passports
#undef REMOTE_OPEN
#undef REMOTE_BOLT
#undef REMOTE_ELECT

/obj/item/storage/belt/utility
contents_allowed = list(
/obj/item/crowbar,
/obj/item/screwdriver,
/obj/item/weldingtool,
/obj/item/wirecutters,
/obj/item/wrench,
/obj/item/device/multitool,
/obj/item/device/flashlight,
/obj/item/stack/cable_coil,
/obj/item/device/t_scanner,
/obj/item/device/scanner/gas,
/obj/item/taperoll/engineering,
/obj/item/inducer,
/obj/item/device/robotanalyzer,
/obj/item/material/minihoe,
/obj/item/material/hatchet,
/obj/item/device/scanner/plant,
/obj/item/taperoll,
/obj/item/extinguisher/mini,
/obj/item/marshalling_wand,
/obj/item/device/geiger,
/obj/item/hand_labeler,
/obj/item/clothing/gloves,
/obj/item/tape_roll,
/obj/item/clothing/head/beret,
/obj/item/material/knife/folding,
/obj/item/swapper,
/obj/item/device/drone_designator,
/obj/item/modular_computer/tablet,
/obj/item/modular_computer/pda,
/obj/item/welder_tank,
/obj/item/device/paint_sprayer,
/obj/item/rcd,
/obj/item/rcd_ammo
)
1 change: 1 addition & 0 deletions maps/sierra/job/outfits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ Keeping them simple for now, just spawning with basic EC uniforms, and pretty mu
// pda_type = /obj/item/modular_computer/pda/heads/ce
pda_slot = slot_l_store
flags = OUTFIT_FLAGS_JOB_DEFAULT | OUTFIT_EXTENDED_SURVIVAL
belt = /obj/item/storage/belt/utility/chief

/singleton/hierarchy/outfit/job/sierra/crew/command/chief_engineer/New()
..()
Expand Down
2 changes: 2 additions & 0 deletions maps/sierra/sierra.dm
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@
#include "../../mods/_maps/liberia/_map_liberia.dme"
#include "../../mods/_maps/sentinel/_map_sentinel.dme"
#include "../../mods/_maps/farfleet/_map_farfleet.dme"
#include "../../mods/_maps/miningpirate/_map_miningpirate.dme"

#include "../../mods/antagonists/_antagonists.dme"
#include "../../mods/bluespace_kitty/_bluespace_kitty.dme"
Expand All @@ -187,6 +188,7 @@
#include "../../mods/petting_zoo/_petting_zoo.dme"
#include "../../mods/screentips/_screentips.dme"
#include "../../mods/tajara/_tajara.dme"
#include "../../mods/sauna_props/_sauna_props.dme"

// UNUSED MODS
// Keep them in ascending alphabetical order too, please
Expand Down
4 changes: 2 additions & 2 deletions maps/sierra/structures/closets/engineering.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/obj/item/material/clipboard,
/obj/item/device/flashlight/upgraded,
/obj/item/storage/box/armband/engine,
/obj/item/device/multitool,
/obj/item/device/multitool/multimeter,
/obj/item/storage/box/secret_project_disks,
new /datum/atom_creator/weighted(list(/obj/item/storage/backpack/industrial, /obj/item/storage/backpack/satchel/eng)),
new /datum/atom_creator/weighted(list(/obj/item/storage/backpack/dufflebag/eng, /obj/item/storage/backpack/messenger/engi)),
Expand Down Expand Up @@ -146,7 +146,7 @@
/obj/item/device/multitool,
/obj/item/clothing/gloves/insulated,
/obj/item/device/flashlight/upgraded,
/obj/item/storage/belt/utility/full,
/obj/item/storage/belt,
/obj/item/clothing/head/beret/engineering,
/obj/item/device/radio/headset/headset_eng,
/obj/item/device/radio/headset/headset_eng/alt,
Expand Down
Loading

0 comments on commit bcf000f

Please sign in to comment.