Skip to content

Commit c5fae39

Browse files
authored
typo (#38025)
i meant to name this branch cult and juke but im not fixing it now
1 parent 7b7f938 commit c5fae39

File tree

4 files changed

+9
-21
lines changed

4 files changed

+9
-21
lines changed

code/datums/gamemode/factions/bloodcult/bloodcult.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,15 @@
9191
eclipse_trigger_cult()
9292
for(var/obj/structure/cult/spire/S in cult_spires)
9393
S.upgrade(3)
94+
ticker.StartThematic("eclipse")
9495
if (BLOODCULT_STAGE_MISSED)
9596
for (var/datum/role/cultist in members)
9697
var/mob/M = cultist.antag.current
9798
if (M)
9899
to_chat(M, "<span class='sinister'>The Eclipse has passed. You won't be able to tear reality aboard this station anymore. Escape the station alive with your fellow cultists so you may try again another day.</span>")
99100
for(var/obj/structure/cult/spire/S in cult_spires)
100101
S.upgrade(1)
102+
ticker.StopThematic()
101103
if (BLOODCULT_STAGE_ECLIPSE)
102104
update_all_parallax()
103105
var/datum/zLevel/ZL = map.zLevels[map.zMainStation]

code/modules/media/jukebox.dm

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var/global/global_playlists = list()
99
set waitfor = 0//tentative fix so the proc stops hanging if it takes too long
1010
if(!config.media_base_url)
1111
return
12-
for(var/playlist_id in list("lilslugger", "bar", "jazzswing", "bomberman", "depresso", "echoes", "electronica", "emagged", "endgame", "filk", "funk", "folk", "IDM", "malfdelta", "medbay", "metal", "muzakjazz", "nukesquad", "rap", "rock", "shoegaze", "security", "shuttle", "thunderdome", "upbeathypedancejam", "vidya", "SCOTLANDFOREVER", "halloween", "christmas"))
12+
for(var/playlist_id in list("bar", "jazzswing", "bomberman", "depresso", "eclipse", "electronica", "emagged", "endgame", "filk", "funk", "folk", "malfdelta", "medbay", "metal", "muzakjazz", "nukesquad", "rap", "rock", "shoegaze", "security", "shuttle", "thunderdome", "upbeathypedancejam", "vidya", "SCOTLANDFOREVER", "halloween", "christmas"))
1313
var/url="[config.media_base_url]/index.php?playlist=[playlist_id]"
1414
log_debug("Begin updating playlist: [playlist_id]...")
1515

@@ -878,7 +878,6 @@ var/global/list/loopModeNames=list(
878878
playlist_id="bar"
879879
// Must be defined on your server.
880880
playlists=list(
881-
"lilslugger" = "Battle of Lil Slugger",
882881
"bar" = "Bar Mix",
883882
"jazzswing" = "Jazz & Swing",
884883
"depresso" ="Depresso",
@@ -914,7 +913,6 @@ var/global/list/loopModeNames=list(
914913
"filk" = "Filk",
915914
"funk" = "Funk",
916915
"folk" = "Folk",
917-
"IDM" = "90's IDM",
918916
"medbay" = "Medbay",
919917
"metal" = "Heavy Metal",
920918
"muzakjazz" = "Muzak",
@@ -944,15 +942,13 @@ var/global/list/loopModeNames=list(
944942
playlist_id="bar"
945943
// Must be defined on your server.
946944
playlists=list(
947-
"lilslugger" = "Battle of Lil' Slugger",
948945
"bar" = "Bar Mix",
949946
"jazzswing" = "Jazz & Swing",
950947
"depresso" ="Depresso",
951948
"electronica" = "Electronica",
952949
"filk" = "Filk",
953950
"funk" = "Funk",
954951
"folk" = "Folk",
955-
"IDM" = "90's IDM",
956952
"medbay" = "Medbay",
957953
"metal" = "Heavy Metal",
958954
"muzakjazz" = "Muzak",
@@ -973,7 +969,7 @@ var/global/list/loopModeNames=list(
973969
"malfdelta"= "Silicon Assault",
974970
"bomberman" = "Bomberman",
975971
"SCOTLANDFOREVER"= "Highlander",
976-
"echoes" = "Echoes"
972+
"eclipse" = "Eclipse"
977973
)
978974

979975
/obj/machinery/media/jukebox/superjuke/New()
@@ -1170,10 +1166,11 @@ var/global/list/loopModeNames=list(
11701166
unformatted = "depresso"
11711167
formatted = "Depresso"
11721168
mask = "#000000"//black
1173-
/obj/item/weapon/vinyl/echoes
1174-
name = "nanovinyl - echoes"
1175-
unformatted = "echoes"
1176-
formatted = "Echoes"
1169+
/obj/item/weapon/vinyl/eclipse
1170+
name = "nanovinyl - Vague Threat"
1171+
unformatted = "eclipse"
1172+
formatted = "Eclipse"
1173+
desc = "For when a vague threat plagues the station."
11771174
/obj/item/weapon/vinyl/electronica
11781175
name = "nanovinyl - electronic"
11791176
unformatted = "electronica"
@@ -1199,10 +1196,6 @@ var/global/list/loopModeNames=list(
11991196
name = "nanovinyl - folk"
12001197
unformatted = "folk"
12011198
formatted = "Folk"
1202-
/obj/item/weapon/vinyl/idm
1203-
name = "nanovinyl - 90's IDM"
1204-
unformatted = "IDM"
1205-
formatted = "90's IDM"
12061199
/obj/item/weapon/vinyl/jazz
12071200
name = "nanovinyl - jazz & swing"
12081201
unformatted = "jazzswing"
@@ -1273,11 +1266,6 @@ var/global/list/loopModeNames=list(
12731266
name = "nanovinyl - halloween"
12741267
unformatted = "halloween"
12751268
formatted = "Halloween"
1276-
/obj/item/weapon/vinyl/slugger
1277-
name = "nanovynil - slugger"
1278-
desc = "A go-to for bars all over the sector. Every time you walk in one, you can almost bet it's playing."
1279-
unformatted = "lilslugger"
1280-
formatted = "Battle of Lil Slugger"
12811269
/obj/item/weapon/vinyl/christmas
12821270
name = "nanovynil - christmas"
12831271
unformatted = "christmas"

code/modules/trader/crates/shoaljunk.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ var/global/list/shoal_stuff = list(
99
/obj/item/clothing/accessory/wristwatch/black,/obj/item/clothing/accessory/wristwatch/black,/obj/item/clothing/accessory/wristwatch/black,
1010
//1 of a kind
1111
/obj/item/weapon/reagent_containers/food/snacks/borer_egg,
12-
/obj/item/weapon/vinyl/echoes,
1312
/obj/item/fish_eggs/seadevil,
1413
/obj/structure/bed/therapy,
1514
/obj/item/weapon/grenade/station/discount,

code/modules/trader/crates/zincsaucier.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ var/global/list/chef_stuff = list(
77
/obj/item/fish_eggs/seadevil,/obj/item/fish_eggs/seadevil, //fish_items.dm
88
/obj/item/apiary/langstroth,/obj/item/apiary/langstroth,
99
//one of a kind
10-
/obj/item/weapon/vinyl/echoes, //media/jukebox.dm
1110
/obj/item/sushimat,
1211
/obj/structure/dishwasher,
1312
/obj/item/cricketfarm,

0 commit comments

Comments
 (0)