Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Refactors cassettes and the cassette player #4572

Draft
wants to merge 20 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
59476a5
Refactors cassettes and the cassette player
Absolucy Dec 15, 2024
f0139ee
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Dec 31, 2024
47a8f42
update usage of `GLOB.is_http_protocol`
Absolucy Dec 31, 2024
aa3d87a
fix mixtape spawner
Absolucy Dec 31, 2024
30b9353
rework logic around whether a mob can hear dj music or not to use a t…
Absolucy Dec 31, 2024
94c40dc
add some sanity checks
Absolucy Dec 31, 2024
77f45ab
radio mics also always allow hearing music
Absolucy Dec 31, 2024
a869744
additional sanity check in the dj_music field
Absolucy Dec 31, 2024
8f09991
dj music field is now recursive
Absolucy Dec 31, 2024
dcfbaff
Begin refactoring the cassette tapes themselves.
Absolucy Dec 31, 2024
ababe61
more work
Absolucy Dec 31, 2024
efa28e2
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jan 2, 2025
96a49c4
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jan 3, 2025
0493d99
comment out some warnings and such
Absolucy Jan 3, 2025
e32a955
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jan 8, 2025
fc09f66
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jan 19, 2025
1790146
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Jan 30, 2025
50783c4
Merge branch 'master' of https://github.com/Monkestation/Monkestation…
Absolucy Feb 6, 2025
e1630f4
fix use of `GLOB.is_http_protocol`
Absolucy Feb 6, 2025
f84365c
add `NOBLUDGEON` to cassette tapes
Absolucy Feb 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions SQL/tgstation_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,23 @@ CREATE TABLE `subsystem_metrics` (
PRIMARY KEY (`id`) USING BTREE
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

--
-- Table structure for table `cassettes`
--
DROP TABLE IF EXISTS `cassettes`;
CREATE TABLE `cassettes` (
`id` VARCHAR(255) NOT NULL PRIMARY KEY,
`name` VARCHAR(42) NOT NULL,
`desc` VARCHAR(144) NOT NULL,
`status` TINYINT UNSIGNED NOT NULL,
`author_name` VARCHAR(42) NOT NULL,
`author_ckey` VARCHAR(30) NOT NULL,
`front` TEXT NOT NULL DEFAULT '{}',
`back` TEXT NOT NULL DEFAULT '{}',
CONSTRAINT `front` CHECK (json_valid(`front`)),
CONSTRAINT `back` CHECK (json_valid(`back`))
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;

/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
Expand Down
236 changes: 118 additions & 118 deletions _maps/map_files/BoxStation/BoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1643,16 +1643,6 @@
/obj/effect/spawner/random/structure/crate,
/turf/open/floor/plating,
/area/station/maintenance/starboard/aft)
"aAY" = (
/obj/effect/turf_decal/box,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/holopad,
/obj/machinery/duct,
/mob/living/basic/bot/cleanbot/medbay,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/storage)
"aBj" = (
/obj/effect/turf_decal/stripes/line,
/obj/effect/turf_decal/stripes/line{
Expand Down Expand Up @@ -3633,6 +3623,16 @@
},
/turf/open/floor/iron/dark,
/area/station/hallway/primary/port)
"bjF" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/duct,
/obj/effect/mapping_helpers/mail_sorting/engineering/general,
/obj/structure/disposalpipe/sorting/mail,
/turf/open/floor/iron/dark/side,
/area/station/engineering/break_room)
"bjY" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
Expand Down Expand Up @@ -18604,6 +18604,26 @@
/obj/effect/spawner/random/trash/garbage,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
"gbO" = (
/obj/effect/turf_decal/tile/darkest_green/full,
/obj/structure/table/reinforced/rglass,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/machinery/door/window/brigdoor/left/directional/west{
name = "Core Modules";
req_access = list("rd")
},
/obj/effect/spawner/random/aimodule/neutral{
pixel_x = -3;
pixel_y = -3
},
/obj/effect/spawner/random/aimodule/neutral{
pixel_y = 3;
pixel_x = 3
},
/obj/effect/spawner/random/aimodule/harmless,
/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"gcp" = (
/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{
dir = 1
Expand Down Expand Up @@ -21387,53 +21407,6 @@
/obj/machinery/quantum_server,
/turf/open/floor/iron/dark,
/area/station/security/bitden)
"gSC" = (
/obj/structure/sign/painting/library_private{
pixel_y = -32
},
/obj/structure/table/wood,
/obj/item/device/cassette_tape/friday{
pixel_y = 2;
pixel_x = 9
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/turf/open/floor/iron/vaporwave,
/area/station/service/library/printer)
"gSE" = (
/turf/open/floor/carpet/purple,
/area/station/command/heads_quarters/rd)
Expand Down Expand Up @@ -45064,26 +45037,6 @@
/obj/machinery/airalarm/directional/east,
/turf/open/floor/iron/dark,
/area/station/command/bridge)
"oFm" = (
/obj/effect/turf_decal/tile/darkest_green/full,
/obj/structure/table/reinforced/rglass,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/south,
/obj/machinery/door/window/brigdoor/left/directional/west{
name = "Core Modules";
req_access = list("rd")
},
/obj/effect/spawner/random/aimodule/neutral{
pixel_x = -3;
pixel_y = -3
},
/obj/effect/spawner/random/aimodule/neutral{
pixel_y = 3;
pixel_x = 3
},
/obj/effect/spawner/random/aimodule/harmless,
/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"oFy" = (
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/trimline/red/filled/corner{
Expand Down Expand Up @@ -46333,6 +46286,16 @@
/obj/machinery/stasis,
/turf/open/floor/iron/white,
/area/station/medical/exam_room)
"oZG" = (
/obj/effect/turf_decal/box,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/holopad,
/obj/machinery/duct,
/mob/living/basic/bot/cleanbot/medbay,
/turf/open/floor/iron/white/smooth_large,
/area/station/medical/storage)
"oZQ" = (
/obj/effect/turf_decal/trimline/neutral/corner{
dir = 4
Expand Down Expand Up @@ -55210,6 +55173,53 @@
dir = 4
},
/area/station/cargo/office)
"rYS" = (
/obj/structure/sign/painting/library_private{
pixel_y = -32
},
/obj/structure/table/wood,
/obj/item/cassette_tape/friday{
pixel_y = 2;
pixel_x = 9
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/obj/item/device/walkman{
pixel_y = 7;
pixel_x = -8
},
/turf/open/floor/iron/vaporwave,
/area/station/service/library/printer)
"rZq" = (
/turf/closed/wall/r_wall,
/area/station/ai_monitored/turret_protected/aisat/foyer)
Expand Down Expand Up @@ -59783,6 +59793,15 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/turf/open/floor/engine,
/area/station/ai_monitored/turret_protected/aisat/atmos)
"tys" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
},
/obj/machinery/rnd/production/circuit_imprinter/department/engineering,
/turf/open/floor/iron/dark/side{
dir = 5
},
/area/station/engineering/break_room)
"tyt" = (
/obj/machinery/exodrone_launcher,
/obj/item/exodrone,
Expand Down Expand Up @@ -60851,16 +60870,6 @@
/obj/structure/cable,
/turf/open/floor/iron,
/area/station/engineering/break_room)
"tQC" = (
/obj/effect/turf_decal/trimline/yellow/filled/warning,
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/cable,
/obj/machinery/duct,
/obj/effect/mapping_helpers/mail_sorting/engineering/general,
/obj/structure/disposalpipe/sorting/mail,
/turf/open/floor/iron/dark/side,
/area/station/engineering/break_room)
"tQD" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/spawner/random/trash/graffiti,
Expand Down Expand Up @@ -60901,22 +60910,6 @@
/obj/effect/spawner/random/trash/garbage,
/turf/open/floor/plating,
/area/station/maintenance/department/cargo)
"tRj" = (
/obj/effect/turf_decal/tile/dark_red/full,
/obj/structure/table/reinforced/rglass,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/door/window/brigdoor/right/directional/west{
name = "High-Risk Modules";
req_access = list("rd")
},
/obj/item/ai_module/reset/purge{
pixel_y = 4;
pixel_x = -5
},
/obj/item/ai_module/reset,
/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"tRo" = (
/obj/machinery/door/airlock/maintenance{
name = "Chapel Office Maintenance"
Expand Down Expand Up @@ -63585,6 +63578,22 @@
/obj/effect/mapping_helpers/requests_console/information,
/turf/open/floor/wood,
/area/station/command/meeting_room)
"uLm" = (
/obj/effect/turf_decal/tile/dark_red/full,
/obj/structure/table/reinforced/rglass,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/structure/window/reinforced/spawner/directional/north,
/obj/machinery/door/window/brigdoor/right/directional/west{
name = "High-Risk Modules";
req_access = list("rd")
},
/obj/item/ai_module/reset/purge{
pixel_y = 4;
pixel_x = -5
},
/obj/item/ai_module/reset,
/turf/open/floor/iron/dark/smooth_large,
/area/station/ai_monitored/turret_protected/ai_upload)
"uLo" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
Expand Down Expand Up @@ -74246,15 +74255,6 @@
dir = 4
},
/area/station/service/hydroponics)
"yaQ" = (
/obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 5
},
/obj/machinery/rnd/production/circuit_imprinter/department/engineering,
/turf/open/floor/iron/dark/side{
dir = 5
},
/area/station/engineering/break_room)
"yaX" = (
/obj/effect/turf_decal/siding/wood{
dir = 8
Expand Down Expand Up @@ -98110,11 +98110,11 @@ btp
sYe
ufV
nga
tRj
uLm
uDB
hfF
sTW
oFm
gbO
jFo
jFo
jFo
Expand Down Expand Up @@ -105628,7 +105628,7 @@ iUc
aFN
nBJ
nBp
tQC
bjF
bfT
tmQ
dPO
Expand Down Expand Up @@ -106650,7 +106650,7 @@ jnS
xtS
jnS
ufs
yaQ
tys
onk
oNF
tMn
Expand Down Expand Up @@ -112290,7 +112290,7 @@ hDo
sxS
uvI
skz
aAY
oZG
sna
pFu
ocd
Expand Down Expand Up @@ -123078,7 +123078,7 @@ qaG
gji
dOL
nVc
gSC
rYS
nBE
nep
mhc
Expand Down
Loading
Loading