cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shuttle catastrophe can now get ANY shuttle (#16513)

Browse Source 
* Shuttle catastrophe can now get ANY shuttle

* Blacklist BYOS, Disco Inferno, Arena

* Update shuttle_catastrophe.dm
This commit is contained in:
Simplehorror
2022-11-26 12:14:09 +00:00
committed by GitHub
parent 799e3a782e
commit fd4fd67e7a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/events/shuttle_catastrophe.dm
View File

@@ -13,7 +13,8 @@
/datum/round_event/shuttle_catastrophe /datum/round_event/shuttle_catastrophe
var/datum/map_template/shuttle/new_shuttle var/datum/map_template/shuttle/new_shuttle
var/list/datum/map_template/shuttle/blacklisted_shuttles = list(/datum/map_template/shuttle/emergency/arena, /datum/map_template/shuttle/emergency/construction,
/datum/map_template/shuttle/emergency/construction/small, /datum/map_template/shuttle/emergency/discoinferno, /datum/map_template/shuttle/emergency/meteor)
/datum/round_event/shuttle_catastrophe/announce(fake) /datum/round_event/shuttle_catastrophe/announce(fake)
var/cause = pick("was attacked by [syndicate_name()] Operatives", "mysteriously teleported away", "had its refuelling crew mutiny", var/cause = pick("was attacked by [syndicate_name()] Operatives", "mysteriously teleported away", "had its refuelling crew mutiny",
"was found with its engines stolen", "\[REDACTED\]", "flew into the sunset, and melted", "fell into a black hole", "was found with its engines stolen", "\[REDACTED\]", "flew into the sunset, and melted", "fell into a black hole",
@@ -25,7 +26,8 @@
var/list/valid_shuttle_templates = list() var/list/valid_shuttle_templates = list()
for(var/shuttle_id in SSmapping.shuttle_templates) for(var/shuttle_id in SSmapping.shuttle_templates)
var/datum/map_template/shuttle/template = SSmapping.shuttle_templates[shuttle_id] var/datum/map_template/shuttle/template = SSmapping.shuttle_templates[shuttle_id]
if(!template.emag_buy && template.credit_cost < INFINITY) //if we could get it from the communications console, it's cool for us to get it here if(template.credit_cost < INFINITY) //if we could get it from the emagged communications console, it's cool for us to get it here
if (!(template in blacklisted_shuttles))
valid_shuttle_templates += template valid_shuttle_templates += template
new_shuttle = pick(valid_shuttle_templates) new_shuttle = pick(valid_shuttle_templates)