Skip to content

Commit

Permalink
map(Entrepot): adds a new small-scale map
Browse files Browse the repository at this point in the history
  • Loading branch information
TobyThorne authored Apr 4, 2024
1 parent 3878a79 commit 0441e63
Show file tree
Hide file tree
Showing 11 changed files with 3,483 additions and 0 deletions.
3 changes: 3 additions & 0 deletions baystation12.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3115,6 +3115,9 @@
#include "maps\eclipse\eclipse_define.dm"
#include "maps\eclipse\eclipse_levels.dm"
#include "maps\eclipse\eclipse_shuttles.dm"
#include "maps\entrepot\entrepot_areas.dm"
#include "maps\entrepot\entrepot_define.dm"
#include "maps\entrepot\entrepot_levels.dm"
#include "maps\example\example_areas.dm"
#include "maps\example\example_define.dm"
#include "maps\example\example_levels.dm"
Expand Down
23 changes: 23 additions & 0 deletions code/game/objects/structures/crates_lockers/largecrate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -73,38 +73,61 @@
name = "Mulebot crate"
held_type = /mob/living/bot/mulebot


/obj/structure/largecrate/animal/corgi
name = "corgi carrier"
held_type = /mob/living/simple_animal/corgi

/obj/structure/largecrate/animal/corgi/ian
held_type = /mob/living/simple_animal/corgi/Ian

/obj/structure/largecrate/animal/corgi/lisa
held_type = /mob/living/simple_animal/corgi/Lisa

/obj/structure/largecrate/animal/corgi/puppy
held_type = /mob/living/simple_animal/corgi/puppy


/obj/structure/largecrate/animal/cow
name = "cow crate"
held_type = /mob/living/simple_animal/cow


/obj/structure/largecrate/animal/goat
name = "goat crate"
held_type = /mob/living/simple_animal/hostile/retaliate/goat


/obj/structure/largecrate/animal/pig
name = "pig crate"
held_type = /mob/living/simple_animal/pig


/obj/structure/largecrate/animal/cat
name = "cat carrier"
held_type = /mob/living/simple_animal/cat

/obj/structure/largecrate/animal/cat/bones
held_type = /mob/living/simple_animal/cat/fluff/bones

/obj/structure/largecrate/animal/cat/runtime
held_type = /mob/living/simple_animal/cat/fluff/Runtime


/obj/structure/largecrate/animal/chick
name = "chicken crate"
held_count = 5
held_type = /mob/living/simple_animal/chick


/obj/structure/largecrate/animal/parrot
name = "parrot crate"
held_type = /mob/living/simple_animal/parrot

/obj/structure/largecrate/animal/parrot/poly
held_type = /mob/living/simple_animal/parrot/Poly


/obj/structure/largecrate/animal/vatgrownbody/male
name = "vat-grown body crate"
icon_state = "vatgrowncrate_male"
Expand Down
7 changes: 7 additions & 0 deletions code/modules/power/lighting.dm
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@
desc = "Light is almost the same as sunlight."
light_type = /obj/item/light/tube/quartz

/obj/machinery/light/nobreak
light_type = /obj/item/light/tube/nobreak

// the smaller bulb light fixture
/obj/machinery/light/small
icon_state = "bulb1"
Expand Down Expand Up @@ -753,6 +756,10 @@
sound_on = SFX_LIGHT_TUBE_ON
sound_on_volume = 50

/obj/item/light/tube/nobreak // For mapping's sake
desc = "A replacement light tube. This one seems to wield some extra quality."
broken_chance = 0

/obj/item/light/tube/large
w_class = ITEM_SIZE_SMALL
name = "large light tube"
Expand Down
23 changes: 23 additions & 0 deletions code/modules/power/smes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -594,3 +594,26 @@
OVERLIGHT_IMAGE(overlight_overlays_outputting[2], "overlight_smes-op1")
OVERLIGHT_IMAGE(overlight_overlays_outputting[3], "overlight_smes-op2")
#undef OVERLIGHT_IMAGE

/obj/machinery/power/smes/magical
name = "quantum power unit"
desc = "An archotech power relay, tuned to recieve energy from some distand source."
should_be_mapped = TRUE

/obj/machinery/power/smes/magical/Initialize()
. = ..()
charge = capacity
input_attempt = TRUE
output_attempt = TRUE
input_level = input_level_max
output_level = output_level_max

// Magic
/obj/machinery/power/smes/magical/add_charge(amount)
charge = capacity

/obj/machinery/power/smes/magical/remove_charge(amount)
charge = capacity

/obj/machinery/power/smes/magical/emp_act(severity)
return FALSE
Binary file modified icons/obj/musician.dmi
Binary file not shown.
1,000 changes: 1,000 additions & 0 deletions maps/entrepot/entrepot-1.dmm

Large diffs are not rendered by default.

974 changes: 974 additions & 0 deletions maps/entrepot/entrepot-2.dmm

Large diffs are not rendered by default.

1,291 changes: 1,291 additions & 0 deletions maps/entrepot/entrepot-3.dmm

Large diffs are not rendered by default.

85 changes: 85 additions & 0 deletions maps/entrepot/entrepot_areas.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@

/area/entrepot
name = "\improper NTS Entrepot-17"
icon_state = "dark"


/area/entrepot/deck_1
name = "\improper Main Module 1F"
icon_state = "hallC1"

/area/entrepot/deck_2
name = "\improper Main Module 2F"
icon_state = "hallC1"

/area/entrepot/cargo
name = "\improper Main Module 1F - Warehouse"
icon_state = "quartstorage"

/area/entrepot/dock
name = "\improper Main Module 2F - Space Dock"
icon_state = "escape"

/area/entrepot/arrivals
name = "\improper Main Module 2F - Arrivals"
icon_state = "escape"

/area/entrepot/crew_1
name = "\improper Living Module 1F"
icon_state = "udorm"

/area/entrepot/crew_2
name = "\improper Living Module 2F"
icon_state = "udorm"

/area/entrepot/crew_1/dorm
name = "\improper Living Module 1F - Dormitories"
icon_state = "Sleep"

/area/entrepot/crew_2/dorm
name = "\improper Living Module 2F - Dormitories"
icon_state = "Sleep"

/area/entrepot/crew_1/fitness
name = "\improper Living Module 1F - Gym"
icon_state = "fitness"

/area/entrepot/crew_2/fitness
name = "\improper Living Module 2F - Gym"
icon_state = "fitness"

/area/entrepot/medbay
name = "\improper Living Module 2F - Medbay"
icon_state = "medbay"


/area/entrepot/cafe_1
name = "\improper Refectory Module 1F"
icon_state = "cafeteria"
sound_env = LARGE_SOFTFLOOR

/area/entrepot/cafe_2
name = "\improper Refectory Module 2F"
icon_state = "cafeteria"
sound_env = LARGE_SOFTFLOOR


/area/entrepot/engi_1
name = "\improper Technical Module 1F"
icon_state = "engineering"
ambience_powered = list(SFX_AMBIENT_ENGINEERING)

/area/entrepot/engi_2
name = "\improper Technical Module 2F"
icon_state = "engineering"
ambience_powered = list(SFX_AMBIENT_ENGINEERING)


/area/entrepot/engi_1
name = "\improper Technical Module 1F"
icon_state = "Sleep"

/area/entrepot/engi_2
name = "\improper Technical Module 2F"
icon_state = "Sleep"

42 changes: 42 additions & 0 deletions maps/entrepot/entrepot_define.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@

/datum/map/entrepot
name = "Entrepot"
full_name = "NTS Entrepot-17"
path = "entrepot"

shuttle_types = list(
/datum/shuttle/autodock/ferry/emergency/centcom,
/datum/shuttle/autodock/multi/antag/syndicate,
/datum/shuttle/autodock/multi/antag/skipjack,
)

map_levels = list(
new /datum/space_level/entrepot_1,
new /datum/space_level/entrepot_2,
new /datum/space_level/entrepot_3, // Exodus-shaped CentCom
new /datum/space_level/null_space,
new /datum/space_level/telecomms,
new /datum/space_level/derelict
)

station_name = "NTS Entrepot-17"
station_short = "Entrepot-17"
dock_name = "NSS Exodus"
boss_name = "Central Command"
boss_short = "Centcomm"
company_name = "Nanotrasen"
company_short = "NT"
system_name = "Nyx"

evac_controller_type = /datum/evacuation_controller/shuttle

station_networks = list(
NETWORK_EXODUS,
NETWORK_TELECOM,
NETWORK_MASTER
)

post_round_safe_areas = list (
/area/centcom,
/area/shuttle/escape/centcom
)
35 changes: 35 additions & 0 deletions maps/entrepot/entrepot_levels.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/datum/space_level/entrepot_1
path = 'entrepot-1.dmm'
traits = list(
ZTRAIT_STATION,
ZTRAIT_CONTACT
)
travel_chance = 10

/datum/space_level/entrepot_1/generate(z)
// Create the mining Z-level.
new /datum/random_map/automata/cave_system(null, 1, 1, z, 200, 200)
// Create the mining ore distribution map.
new /datum/random_map/noise/ore(null, 1, 1, z, 200, 200)

/datum/space_level/entrepot_2
path = 'entrepot-2.dmm'
traits = list(
ZTRAIT_STATION,
ZTRAIT_CONTACT
)
travel_chance = 10

/datum/space_level/entrepot_2/generate(z)
// Create the mining Z-level.
new /datum/random_map/automata/cave_system(null, 1, 1, z, 200, 200)
// Create the mining ore distribution map.
new /datum/random_map/noise/ore(null, 1, 1, z, 200, 200)

/datum/space_level/entrepot_3
path = 'entrepot-3.dmm'
traits = list(
ZTRAIT_CENTCOM,
ZTRAIT_CONTACT,
ZTRAIT_SEALED
)

0 comments on commit 0441e63

Please sign in to comment.