Skip to content

Research pass, expierments, and deconstructive analysis #5762

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Mar 31, 2025
Merged

Research pass, expierments, and deconstructive analysis #5762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e0d2324
Im sorry ROLLER BEDS ARE MADE OF WHAT?
notghosti Mar 2, 2025
a2e95db
Reduce emergancy roller beds.
notghosti Mar 2, 2025
14810cd
serverlink experiment and revolution discounts update
notghosti Mar 3, 2025
76d0185
cargo teleport shift
notghosti Mar 3, 2025
1d447b8
grenade casing salvage
notghosti Mar 3, 2025
4700e3c
More expierements
notghosti Mar 3, 2025
7f6d00b
fixin the bug
notghosti Mar 3, 2025
1e24efd
a
notghosti Mar 3, 2025
55ca32c
rust
notghosti Mar 18, 2025
155bf40
Merge remote-tracking branch 'upstream/master' into Research-pass,-th…
notghosti Mar 18, 2025
6cd5551
Merge stuff
notghosti Mar 18, 2025
7109b8c
Update monkestation/code/modules/experisci/experiment/experiments.dm
notghosti Mar 26, 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
94 changes: 49 additions & 45 deletions _maps/map_files/Blueshift/Blueshift.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,10 +2055,10 @@
/area/station/service/bar/backroom)
"avy" = (
/obj/effect/turf_decal/bot,
/obj/structure/bed/medical/emergency,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
/obj/structure/bed/medical,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"avB" = (
Expand Down Expand Up @@ -6657,10 +6657,10 @@
/area/station/engineering/storage/tcomms)
"bpj" = (
/obj/machinery/iv_drip,
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/machinery/defibrillator_mount/directional/south,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"bpn" = (
Expand Down Expand Up @@ -15549,8 +15549,8 @@
/turf/open/floor/iron,
/area/station/cargo/office)
"cUY" = (
/obj/structure/bed/medical/emergency{
dir = 1
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/mineral/titanium/tiled/white{
name = "Padded tile"
Expand Down Expand Up @@ -17120,9 +17120,6 @@
/turf/open/floor/iron,
/area/station/engineering/storage/tech)
"dlc" = (
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/machinery/iv_drip,
/obj/item/bedsheet/medical,
/obj/effect/turf_decal/trimline/green/filled/line{
Expand All @@ -17131,6 +17128,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
dir = 1
},
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
"dld" = (
Expand Down Expand Up @@ -18993,15 +18993,15 @@
/turf/open/floor/iron,
/area/station/medical/break_room)
"dFL" = (
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/machinery/iv_drip,
/obj/item/bedsheet/medical,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
/obj/effect/spawner/random/trash/mopbucket,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/security/checkpoint/medical)
"dFP" = (
Expand Down Expand Up @@ -21086,11 +21086,11 @@
/area/station/science/xenobiology)
"eaD" = (
/obj/effect/turf_decal/bot,
/obj/structure/bed/medical/emergency,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
/obj/structure/extinguisher_cabinet/directional/north,
/obj/structure/bed/medical,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"eaO" = (
Expand Down Expand Up @@ -45670,11 +45670,11 @@
/area/station/medical/medbay/lobby)
"iRZ" = (
/obj/machinery/iv_drip,
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/machinery/defibrillator_mount/directional/north,
/obj/item/radio/intercom/directional/east,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/treatment_center)
"iSa" = (
Expand Down Expand Up @@ -47850,8 +47850,10 @@
"jnG" = (
/obj/structure/window/reinforced/spawner/directional/south,
/obj/machinery/iv_drip,
/obj/structure/bed/medical/emergency,
/obj/effect/turf_decal/bot_white,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/medical/morgue)
"jnJ" = (
Expand Down Expand Up @@ -49578,15 +49580,15 @@
/turf/open/floor/wood,
/area/station/service/kitchen/diner)
"jEJ" = (
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/machinery/iv_drip,
/obj/item/bedsheet/medical,
/obj/effect/turf_decal/trimline/green/filled/line{
dir = 5
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/virology)
"jEP" = (
Expand Down Expand Up @@ -58445,16 +58447,16 @@
/turf/open/floor/iron/dark,
/area/station/security/warden)
"lnD" = (
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/item/bedsheet/medical,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 4
},
/obj/structure/window/reinforced/spawner/directional/north{
pixel_y = 1
},
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/security/execution/transfer)
"lnJ" = (
Expand Down Expand Up @@ -74297,13 +74299,13 @@
/turf/open/floor/mineral/plastitanium,
/area/station/maintenance/cult_chapel_maint)
"otH" = (
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/item/bedsheet/medical,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 6
},
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/security/execution/transfer)
"otQ" = (
Expand Down Expand Up @@ -86451,10 +86453,10 @@
/obj/effect/turf_decal/siding/wood{
dir = 8
},
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/structure/sign/clock/directional/south,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/exam_room)
"qMv" = (
Expand Down Expand Up @@ -87261,11 +87263,11 @@
},
/area/station/command/heads_quarters/nt_rep)
"qUO" = (
/obj/structure/bed/medical/emergency,
/obj/effect/turf_decal/bot,
/obj/structure/window/spawner/directional/north,
/obj/machinery/iv_drip,
/obj/machinery/vending/wallmed/directional/west,
/obj/structure/bed/medical/anchored,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
"qUP" = (
Expand Down Expand Up @@ -91928,10 +91930,10 @@
/area/station/hallway/primary/port)
"rNG" = (
/obj/item/radio/intercom/directional/east,
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"rNT" = (
Expand Down Expand Up @@ -92692,10 +92694,12 @@
/turf/open/floor/circuit,
/area/station/ai_monitored/turret_protected/ai)
"rXe" = (
/obj/structure/bed/medical/emergency,
/obj/machinery/iv_drip,
/obj/effect/turf_decal/bot,
/obj/machinery/light/small/directional/east,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/maintenance/abandon_exam/cat)
"rXg" = (
Expand Down Expand Up @@ -99689,10 +99693,12 @@
/turf/closed/wall,
/area/station/security/prison/shower)
"tnz" = (
/obj/structure/bed/medical/emergency,
/obj/machinery/iv_drip,
/obj/effect/turf_decal/bot,
/obj/machinery/anesthetic_machine,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/medical/surgery/theatre)
"tnI" = (
Expand Down Expand Up @@ -106188,10 +106194,10 @@
/turf/open/floor/iron,
/area/station/commons/vacant_room/commissary)
"uzm" = (
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"uzo" = (
Expand Down Expand Up @@ -108290,9 +108296,9 @@
},
/area/station/service/theater)
"uUl" = (
/obj/structure/bed/medical/emergency,
/obj/effect/turf_decal/bot,
/obj/machinery/iv_drip,
/obj/structure/bed/medical/anchored,
/turf/open/floor/iron/dark,
/area/station/medical/medbay/central)
"uUq" = (
Expand Down Expand Up @@ -111407,14 +111413,14 @@
/turf/open/floor/iron/cafeteria,
/area/station/service/kitchen)
"vyF" = (
/obj/structure/bed/medical/emergency{
dir = 1
},
/obj/machinery/iv_drip,
/obj/item/bedsheet/medical,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
/obj/structure/bed/medical/anchored{
dir = 4
},
/turf/open/floor/iron/white,
/area/station/security/checkpoint/medical)
"vyG" = (
Expand Down Expand Up @@ -113121,10 +113127,8 @@
/turf/open/floor/iron,
/area/station/commons/fitness)
"vOB" = (
/obj/structure/bed/medical/emergency{
dir = 8
},
/obj/effect/turf_decal/tile/blue/fourcorners,
/obj/structure/bed/medical/anchored,
/turf/open/floor/iron/white,
/area/station/medical/medbay/central)
"vOJ" = (
Expand Down
13 changes: 3 additions & 10 deletions _maps/map_files/BoxStation/BoxStation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55162,10 +55162,8 @@
dir = 10
},
/obj/machinery/newscaster/directional/west,
/obj/structure/chair/sofa/corp/right{
dir = 4
},
/obj/effect/landmark/start/hangover,
/obj/structure/bed/medical,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"rQA" = (
Expand Down Expand Up @@ -58314,10 +58312,7 @@
},
/obj/machinery/light/small/directional/west,
/obj/item/radio/intercom/directional/west,
/obj/structure/chair/sofa/corp{
dir = 4
},
/obj/effect/landmark/start/assistant,
/obj/structure/bed/medical,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"sUK" = (
Expand Down Expand Up @@ -70254,10 +70249,8 @@
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 8
},
/obj/structure/chair/sofa/corp/left{
dir = 4
},
/obj/effect/landmark/start/hangover,
/obj/structure/bed/medical,
/turf/open/floor/iron/white,
/area/station/medical/medbay/lobby)
"wDy" = (
Expand Down
Loading
Loading