shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14418 from LetterN/perlin-genny

Browse Source 
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
This commit is contained in:
silicons
2021-04-06 04:10:00 -06:00
committed by GitHub
parent d1040001f6 e950bfcbe4
commit cbd7e0de6a
164 changed files with 303046 additions and 302956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/anomaly.dm
+9 -6
View File
@@ -19,18 +19,21 @@
var/list/safe_area_types = typecacheof(list(
/area/ai_monitored/turret_protected/ai,
/area/ai_monitored/turret_protected/ai_upload,
/area/engine,
/area/solar,
/area/engineering,
/area/solars,
/area/holodeck,
/area/shuttle)
/area/shuttle,
/area/maintenance,
/area/science/test_area)
)
//Subtypes from the above that actually should explode.
var/list/unsafe_area_subtypes = typecacheof(list(/area/engine/break_room))
var/list/unsafe_area_subtypes = typecacheof(list(/area/engineering/break_room))
allowed_areas = make_associative(GLOB.the_station_areas) - safe_area_types + unsafe_area_subtypes
return safepick(typecache_filter_list(GLOB.sortedAreas,allowed_areas))
var/list/possible_areas = typecache_filter_list(GLOB.sortedAreas,allowed_areas)
if (length(possible_areas))
return pick(possible_areas)
/datum/round_event/anomaly/setup()
impact_area = findEventArea()
code/modules/events/prison_break.dm
+3 -4
View File
@@ -8,15 +8,14 @@
announceWhen = 50
endWhen = 20
var/list/area/areasToOpen = list()
var/list/potential_areas = list(/area/bridge,
/area/engine,
var/list/potential_areas = list(/area/command,
/area/engineering,
/area/medical,
/area/security,
/area/quartermaster,
/area/cargo,
/area/science)
var/severity = 1
/datum/round_event/grey_tide/setup()
announceWhen = rand(50, 60)
endWhen = rand(20, 30)
code/modules/events/stray_cargo.dm
+2 -2
View File
@@ -71,12 +71,12 @@
var/list/safe_area_types = typecacheof(list(
/area/ai_monitored/turret_protected/ai,
/area/ai_monitored/turret_protected/ai_upload,
/area/engine,
/area/engineering,
/area/shuttle)
)
///Subtypes from the above that actually should explode.
var/list/unsafe_area_subtypes = typecacheof(list(/area/engine/break_room))
var/list/unsafe_area_subtypes = typecacheof(list(/area/engineering/break_room))
allowed_areas = make_associative(GLOB.the_station_areas) - safe_area_types + unsafe_area_subtypes
var/list/possible_areas = typecache_filter_list(GLOB.sortedAreas,allowed_areas)
if (length(possible_areas))