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

New Assjam Map: Wrestlemap #1055

Merged
merged 5 commits into from
Jun 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions _std/__build.dm
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ o+` `-` ``..-:yooos-..----------..`
//#define MAP_OVERRIDE_ICARUS
//#define MAP_OVERRIDE_GEHENNA // Warcrimes WIP do not use
//#define MAP_OVERRIDE_PAMGOC // Pamgoc
//#define MAP_OVERRIDE_WRESTLEMAP // Wrestlemap by Overtone


//////////// HOLIDAYS AND OTHER SUCH TOGGLES
Expand Down
46 changes: 46 additions & 0 deletions code/map.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ var/global/list/mapNames = list(
"Density" = list("id" = "DENSITY", "settings" = "density", "playerPickable" = ASS_JAM, "MaxPlayersAllowed" = 30),
"Atlas" = list("id" = "ATLAS", "settings" = "atlas", "playerPickable" = 1, "MaxPlayersAllowed" = 30),
"Manta" = list("id" = "MANTA", "settings" = "manta", "playerPickable" = 1),
"Wrestlemap" = list("id" = "WRESTLEMAP", "settings" = "wrestlemap", "playerPickable" = ASS_JAM)
)

/obj/landmark/map
Expand Down Expand Up @@ -687,6 +688,51 @@ var/global/list/mapNames = list(
"the chapel" = list(/area/station/chapel/main))
//"the radio lab" = list(/area/station/crew_quarters/radio))

/datum/map_settings/wrestlemap
name = "WRESTLEMAP"
walls = /turf/simulated/wall/auto/supernorn
rwalls = /turf/simulated/wall/auto/reinforced/supernorn
auto_walls = 1

arrivals_type = MAP_SPAWN_CRYO

windows = /obj/window/auto
windows_thin = /obj/window/pyro
rwindows = /obj/window/auto/reinforced
rwindows_thin = /obj/window/reinforced/pyro
windows_crystal = /obj/window/auto/crystal
windows_rcrystal = /obj/window/auto/crystal/reinforced
window_layer_full = COG2_WINDOW_LAYER
window_layer_north = GRILLE_LAYER+0.1
window_layer_south = FLY_LAYER+1
auto_windows = 1

ext_airlocks = /obj/machinery/door/airlock/pyro/external
airlock_style = "pyro"

escape_centcom = /area/shuttle/escape/centcom/destiny
escape_transit = /area/shuttle/escape/transit/destiny
escape_station = /area/shuttle/escape/station/destiny
escape_dir = NORTH

merchant_left_centcom = /area/shuttle/merchant_shuttle/left_centcom/cogmap
merchant_left_station = /area/shuttle/merchant_shuttle/left_station/cogmap
merchant_right_centcom = /area/shuttle/merchant_shuttle/right_centcom/cogmap
merchant_right_station = /area/shuttle/merchant_shuttle/right_station/cogmap


valid_nuke_targets = list("The Ring (near the bar)" = list(/area/station/crew_quarters/quarters),
"the monkeydome arena" = list(/area/station/medical/dome),
"the courtroom" = list(/area/station/crew_quarters/courtroom),
"outside the Ringularity" = list(/area/station/engine/inner),
"the courtroom" = list(/area/station/storage/warehouse),
"the medbay" = list(/area/station/medical/medbay, /area/station/medical/medbay),
"the security lobby" = list(/area/station/chapel/main),
"the chapel" = list(/area/station/security/secwing),
"the south crew quarters" = list(/area/station/crew_quarters/quarters_south))



/area/shuttle/escape/centcom
icon_state = "shuttle_escape"
donut2
Expand Down
2 changes: 1 addition & 1 deletion goonstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ var/datum/preMapLoad/preMapLoad = new
#include "code\datums\special_r.dm"
#include "code\datums\sun.dm"
#include "code\datums\supply_packs.dm"
#include "code\datums\tgs_event_handler.dm"
#include "code\datums\syndicate_buylist.dm"
#include "code\datums\teleport.dm"
#include "code\datums\tgs_event_handler.dm"
#include "code\datums\tooltip.dm"
#include "code\datums\traits.dm"
#include "code\datums\traits_disused.dm"
Expand Down
3 changes: 3 additions & 0 deletions maps/config/map.dm
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
#elif defined(MAP_OVERRIDE_GEHENNA)
#include "gehenna.dm"

#elif defined(MAP_OVERRIDE_WRESTLEMAP)
#include "wrestlemap.dm"

#elif defined(GOTTA_GO_FAST_BUT_ZLEVELS_TOO_SLOW)
#include "gottagofast.dm"

Expand Down
6 changes: 6 additions & 0 deletions maps/config/wrestlemap.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#include "..\wrestlemap.dmm"
#include "..\z2.dmm"
#include "..\z3.dmm"
#include "z4.dm"
#include "..\z5.dmm"
#define MAP_MODE "standard"