cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Halloween event map (#17675)

Browse Source 
* 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 <99297919+SleepyGemmy@users.noreply.github.com>

* fixes some issues from feedback

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

This reverts commit 2fca262f69, reversing
changes made to fc0c9936b2.

* Adds Disposals

* Emergency decal correction

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
This commit is contained in:
Avery Marie
2023-11-02 11:04:22 +00:00
committed by GitHub
co-authored by SleepyGemmy
parent aa2e5e3f5b
commit 641c1b0905
6 changed files with 29535 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystems/ticker.dm
+1 -1
View File
@@ -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))