Skip to content
This repository has been archived by the owner on Jan 23, 2024. It is now read-only.

Commit

Permalink
Halloween event map (Aurorastation#17675)
Browse files Browse the repository at this point in the history
* Establishes the Halloween Event File

* Includes the dm

* wooohooo

* Fixes some stuff

* Removes the dmm from the dme

* Fixes Spawning

* Finishing Touches I think

* Additional changes

* map fix

* Wood/Floor fixes

* fixes major map corruption

* wtf is happening to the map bro

* ugh.

* Changes all windows and stuff

* guh

* Decal/Background Corrections

* Update aurorastation.dme

Co-authored-by: SleepyGemmy <[email protected]>

* fixes some issues from feedback

* Revert "Merge remote-tracking branch 'origin/HalloweenEvent' into HalloweenEvent"

This reverts commit 2fca262, reversing
changes made to fc0c993.

* Adds Disposals

* Emergency decal correction

---------

Co-authored-by: SleepyGemmy <[email protected]>
  • Loading branch information
Eyeveri and SleepyGemmy authored Nov 2, 2023
1 parent aa2e5e3 commit 641c1b0
Show file tree
Hide file tree
Showing 6 changed files with 29,535 additions and 1 deletion.
2 changes: 2 additions & 0 deletions aurorastation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3632,6 +3632,8 @@
#include "maps\event\code\event.dm"
#include "maps\event\generic_dock\code\generic_dock.dm"
#include "maps\event\generic_dock\code\generic_dock_areas.dm"
#include "maps\event\halloween\halloween.dm"
#include "maps\event\halloween\halloweenareas.dm"
#include "maps\event\idris_cruise\code\idris_cruise.dm"
#include "maps\event\idris_cruise\code\idris_cruise_areas.dm"
#include "maps\event\rooftop\code\rooftop.dm"
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystems/ticker.dm
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ var/datum/controller/subsystem/ticker/SSticker
available_ghostroles |= G.name

// Special case, to list the Merchant in case it is available at roundstart
if(SSjobs.type_occupations[/datum/job/merchant].total_positions)
if(SSjobs.type_occupations[/datum/job/merchant]?.total_positions)
available_ghostroles |= SSjobs.type_occupations[/datum/job/merchant].title

if(length(available_ghostroles))
Expand Down
7 changes: 7 additions & 0 deletions code/game/ambience.dm
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,13 @@
'sound/ambience/expoutpost/expoutpost4.ogg'\
)

//Defines Tension Ambience
#define AMBIENCE_TENSION list(\
'sound/ambience/tension/tension.ogg',\
'sound/ambience/tension/argitoth.ogg',\
'sound/ambience/tension/horror.ogg',\
'sound/ambience/tension/burning_terror.ogg'\
)
//CHOMP Edit Sounds for Substation rooms. Just electrical sounds, really.
#define AMBIENCE_SUBSTATION list(\
'sound/ambience/substation/substation1.ogg',\
Expand Down
29 changes: 29 additions & 0 deletions maps/event/halloween/halloween.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/datum/map/event/halloween
name = "Skyscraper"
full_name = "Xanu Skyscraper Rooftops"
path = "event/halloween"
lobby_icons = list('icons/misc/titlescreens/sccv_horizon/sccv_horizon.dmi')
lobby_transitions = FALSE
allowed_jobs = list(/datum/job/visitor)
force_spawnpoint = TRUE

station_levels = list(1)
admin_levels = list()
contact_levels = list(1)
player_levels = list(1)
accessible_z_levels = list(1)

station_name = "The Infinity Reach Towers Top Floor"
station_short = "Infinity Reach"
dock_name = "Top Floor"
dock_short = "Rooftop"
boss_name = "Central Command"
boss_short = "CentCom"
company_name = "Stellar Corporate Conglomerate"
company_short = "SCC"

use_overmap = FALSE

allowed_spawns = list("Living Quarters Lift")
spawn_types = list(/datum/spawnpoint/living_quarters_lift)
default_spawn = "Living Quarters Lift"
Loading

0 comments on commit 641c1b0

Please sign in to comment.