Skip to content

[CHERRYPICK] September Part 1 #626

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

Open
Ossa88 wants to merge 34 commits into
base: master
Choose a base branch
from
Open

[CHERRYPICK] September Part 1 #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8723e80
adds some crop tops (#5279)
thearbiber Sep 3, 2025
5d32360
lets headphones and earmuffs layer over hair when in the ear slot (#5…
generalthrax Sep 3, 2025
1514081
Chem Cleanup 2025 (#5162)
Erikafox Sep 3, 2025
d954899
Immediately fixes bleed_mod
Ossa88 Mar 12, 2026
4b11458
Day 0 Correction - force_pain_noise had an incorreclty set switch.
Ossa88 Mar 12, 2026
90ab1dc
Restores the abductor operation table
Ossa88 Mar 12, 2026
7fed1e4
Restores hot potato
Ossa88 Mar 12, 2026
66d32ed
restores decloning
Ossa88 Mar 12, 2026
f6b3358
forgo toys readme
Ossa88 Mar 12, 2026
d05e340
restores d20 of fate
Ossa88 Mar 12, 2026
9a25d22
restores spider injector
Ossa88 Mar 12, 2026
6aaa9f4
restores the spider extract syringe
Ossa88 Mar 12, 2026
4e73a1e
Converts old Omnizine to Panacea
Ossa88 Mar 13, 2026
eb60612
Start of the new chem module
Ossa88 Mar 13, 2026
fb9b544
Restores xeno cits and corrects some descriptions
Ossa88 Mar 13, 2026
5a5ba42
working copy of medicine reagents
Ossa88 Mar 13, 2026
ce51d48
enables files with code currently
Ossa88 Mar 13, 2026
5beed4f
Just not dealing with unholy water
Ossa88 Mar 13, 2026
4f68733
restores slime toxin
Ossa88 Mar 13, 2026
77922b4
fixes a missing define that was only used once ever
Ossa88 Mar 13, 2026
9d69c3f
updating progress
Ossa88 Mar 13, 2026
86b0c0a
Saved: Melatonin Skeletons Boom, Rem: Thializid+OD
Ossa88 Mar 13, 2026
500a6ac
Final listing selected
Ossa88 Mar 14, 2026
036534b
Corrects these niche chemicals with their useage
Ossa88 Mar 14, 2026
39b0521
corrects to Ship Chem
Ossa88 Mar 14, 2026
0ee6f08
Final corrections
Ossa88 Mar 14, 2026
133bc17
Corrects 2 pentest maps while I work on the changelog
Ossa88 Mar 17, 2026
f8f851b
updated references to non existant chems
Ossa88 Mar 17, 2026
36dffab
fixing more pentest bad paths
Ossa88 Mar 17, 2026
5b064e9
fixes removed chem
Ossa88 Mar 17, 2026
3e87ecc
another fix, i wish the github would just give me all of the errors a…
Ossa88 Mar 17, 2026
b681e9a
another fix... god is it over yet?
Ossa88 Mar 17, 2026
1c4474c
corrects me being stupid
Ossa88 Mar 19, 2026
18fa864
Merge branch 'master' into cherrypick-sept2
Ossa88 Mar 19, 2026
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
4 changes: 2 additions & 2 deletions _maps/PentestMaps/BeachRuins/beach_pirate_crash.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,11 +568,11 @@
/obj/item/stack/medical/gauze/improvised,
/obj/item/stack/medical/gauze/improvised,
/obj/item/stack/medical/gauze/improvised,
/obj/item/reagent_containers/pill/patch/silver_sulf{
/obj/item/reagent_containers/pill/patch/alvitane{
pixel_x = 5;
pixel_y = 3
},
/obj/item/reagent_containers/pill/patch/styptic,
/obj/item/reagent_containers/pill/patch/indomide,
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/wood,
/area/ruin/beach/piratecrash)
Expand Down
2 changes: 1 addition & 1 deletion _maps/PentestMaps/JungleRuins/jungle_medtech_outbreak.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
"hF" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/paper{
default_raw_text = "<h1>Export expectations</h1><p>By the end of the month facility No.475-24 is expected to provide the following amounts of medicine to be ready for export:</p><ol><li>300u of Perfluorodecalin</li><li>270u of Thializid</li><li>50 Burnpatches</li><li>65 Synthflesh patches</li><li>275u of atropine</li></ol><p>Production is to be proceeded with imidiately.</p>";
default_raw_text = "<h1>Export expectations</h1><p>By the end of the month facility No.475-24 is expected to provide the following amounts of medicine to be ready for export:</p><ol><li>300u of Panacea</li><li>270u of Thializid</li><li>50 Burnpatches</li><li>65 Synthflesh patches</li><li>275u of atropine</li></ol><p>Production is to be proceeded with imidiately.</p>";
name = "Export orders";
pixel_x = 4;
pixel_y = 5
Expand Down
4 changes: 2 additions & 2 deletions _maps/PentestMaps/LavaRuins/lavaland_surface_codelab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1616,7 +1616,7 @@
/obj/item/slimecrossbeaker/autoinjector/slimestimulant{
pixel_y = 11
},
/obj/item/slimecrossbeaker/omnizine,
/obj/item/slimecrossbeaker/panacea,
/obj/item/reagent_containers/glass/beaker{
pixel_y = 10;
pixel_x = -9
Expand Down Expand Up @@ -2493,7 +2493,7 @@
/obj/structure/closet/crate/medical{
anchored = 1
},
/obj/item/reagent_containers/syringe/thializid,
/obj/item/reagent_containers/syringe/pancrazine,
/turf/open/floor/plasteel/tech,
/area/ruin/unpowered/codelab/storage)
"DZ" = (
Expand Down
1 change: 0 additions & 1 deletion _maps/PentestMaps/LavaRuins/lavaland_surface_secretnightclub.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@
/area/ruin/unpowered)
"fY" = (
/obj/structure/closet/crate/miningcar,
/obj/item/storage/pill_bottle/mining,
/obj/item/storage/belt/mining/primitive,
/obj/item/pickaxe/improvised,
/turf/open/floor/plating/asteroid/basalt,
Expand Down
4 changes: 0 additions & 4 deletions _maps/PentestMaps/RockRuins/rockplanet_nomadcrash.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,10 +917,6 @@
/obj/effect/turf_decal/techfloor{
dir = 1
},
/obj/structure/cursed_money{
pixel_x = 3;
pixel_y = 10
},
/turf/open/floor/plasteel/tech,
/area/ruin/rockplanet/nomad)
"Me" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/PentestMaps/SandRuins/whitesands_surface_medipen_plant.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@
/turf/open/floor/plasteel,
/area/ruin/powered)
"gy" = (
/obj/item/reagent_containers/hypospray/medipen/oxandrolone,
/obj/item/reagent_containers/hypospray/medipen/ysiltane,
/turf/open/floor/plating{
icon_state = "platingdmg2"
},
Expand Down Expand Up @@ -410,7 +410,7 @@
/area/ruin/powered)
"jh" = (
/obj/structure/rack,
/obj/item/reagent_containers/hypospray/medipen/salacid{
/obj/item/reagent_containers/hypospray/medipen/silfrine{
pixel_x = 3;
pixel_y = -3
},
Expand Down
5 changes: 1 addition & 4 deletions _maps/PentestMaps/Shuttles/horizon/horizon_apis.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,10 +1247,7 @@
pixel_x = 5;
pixel_y = 8
},
/obj/item/reagent_containers/glass/bottle{
list_reagents = list(/datum/reagent/medicine/thializid=30);
name = "thializid bottle"
},
/obj/item/reagent_containers/glass/bottle/gjalrazine,
/obj/item/storage/box/bodybags,
/obj/structure/cable{
icon_state = "1-8"
Expand Down
5 changes: 1 addition & 4 deletions _maps/PentestMaps/Shuttles/independent/independent_box.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,10 +429,7 @@
pixel_x = -3;
pixel_y = 8
},
/obj/item/reagent_containers/glass/bottle{
list_reagents = list(/datum/reagent/medicine/thializid=30);
name = "thializid bottle"
},
/obj/item/reagent_containers/glass/bottle/gjalrazine,
/obj/structure/closet/secure_closet{
icon_state = "med";
name = "medicine locker"
Expand Down
5 changes: 1 addition & 4 deletions _maps/PentestMaps/Shuttles/independent/independent_tranquility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3404,10 +3404,7 @@
pixel_x = 5;
pixel_y = 8
},
/obj/item/reagent_containers/glass/bottle{
list_reagents = list(/datum/reagent/medicine/thializid=30);
name = "thializid bottle"
},
/obj/item/reagent_containers/glass/bottle/gjalrazine,
/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/borderfloorwhite{
dir = 10
Expand Down
4 changes: 1 addition & 3 deletions _maps/PentestMaps/Shuttles/independent/independent_wyvern.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,9 +387,7 @@
pixel_x = 8;
pixel_y = 8
},
/obj/item/reagent_containers/glass/bottle{
list_reagents = list(/datum/reagent/medicine/thializid=30);
name = "thializid bottle";
/obj/item/reagent_containers/glass/bottle/gjalrazine{
pixel_x = 5
},
/obj/structure/closet/secure_closet/wall/directional/east{
Expand Down
5 changes: 1 addition & 4 deletions _maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_cheyenne.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8503,10 +8503,7 @@
},
/obj/item/clothing/gloves/color/latex/nitrile,
/obj/item/storage/box/rxglasses,
/obj/item/reagent_containers/glass/bottle{
list_reagents = list(/datum/reagent/medicine/thializid = 30);
name = "thializid bottle"
},
/obj/item/reagent_containers/glass/bottle/gjalrazine,
/obj/item/reagent_containers/glass/bottle{
list_reagents = list(/datum/reagent/medicine/rezadone = 30);
name = "rezadone bottle";
Expand Down
2 changes: 1 addition & 1 deletion _maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_heron.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4152,7 +4152,7 @@
/obj/effect/decal/cleanable/vomit/old,
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/closet/wall/directional/west,
/obj/item/reagent_containers/syringe/contraband/fentanyl{
/obj/item/reagent_containers/syringe/contraband/morphine{
pixel_x = -3;
pixel_y = 4
},
Expand Down
4 changes: 1 addition & 3 deletions _maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_osprey.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5136,9 +5136,7 @@
pixel_x = 8;
pixel_y = 8
},
/obj/item/reagent_containers/glass/bottle{
list_reagents = list(/datum/reagent/medicine/thializid=30);
name = "thializid bottle";
/obj/item/reagent_containers/glass/bottle/gjalrazine{
pixel_x = 5
},
/obj/effect/turf_decal/industrial/warning/corner{
Expand Down
5 changes: 1 addition & 4 deletions _maps/PentestMaps/Shuttles/nanotrasen/nanotrasen_skipper.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,10 +1471,7 @@
/obj/item/storage/pill_bottle/charcoal/less{
pixel_x = -9
},
/obj/item/reagent_containers/glass/bottle{
list_reagents = list(/datum/reagent/medicine/thializid=30);
name = "thializid bottle"
},
/obj/item/reagent_containers/glass/bottle/gjalrazine,
/obj/item/reagent_containers/glass/bottle/formaldehyde{
pixel_x = 6;
pixel_y = 8
Expand Down
4 changes: 2 additions & 2 deletions _maps/PentestMaps/SpaceRuins/cryocontainment.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@
/area/ruin/unpowered)
"CL" = (
/obj/structure/table/chem,
/obj/item/reagent_containers/glass/beaker/large/styptic,
/obj/item/reagent_containers/glass/beaker/large/epinephrine,
/obj/item/stock_parts/micro_laser/high,
/turf/open/floor/plasteel/dark/airless,
/area/ruin/unpowered)
Expand Down Expand Up @@ -1374,7 +1374,7 @@
/area/ruin/unpowered)
"WS" = (
/obj/structure/table/chem,
/obj/item/reagent_containers/glass/beaker/large/silver_sulfadiazine,
/obj/item/reagent_containers/glass/beaker/large/hadrakine,
/obj/machinery/light/dim/directional/north,
/turf/open/floor/plasteel/dark/airless,
/area/ruin/unpowered)
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/BeachRuins/beach_ancient_ruin.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,11 +486,11 @@
/turf/open/floor/concrete/slab_1,
/area/ruin/beach/complex/wall)
"iB" = (
/obj/item/reagent_containers/pill/patch/styptic{
/obj/item/reagent_containers/pill/patch/indomide{
name = "industrial medicine";
pixel_y = 5
},
/obj/item/reagent_containers/pill/patch/styptic{
/obj/item/reagent_containers/pill/patch/indomide{
name = "industrial medicine"
},
/obj/structure/table,
Expand Down Expand Up @@ -1726,10 +1726,10 @@
/area/ruin/beach/complex)
"Cb" = (
/obj/structure/table,
/obj/item/reagent_containers/pill/patch/silver_sulf{
/obj/item/reagent_containers/pill/patch/alvitane{
name = "industrial medicine"
},
/obj/item/reagent_containers/pill/patch/silver_sulf{
/obj/item/reagent_containers/pill/patch/alvitane{
pixel_y = -5;
name = "industrial medicine"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/IceRuins/icemoon_tesla_lab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5257,7 +5257,7 @@
pixel_y = 5;
pixel_x = -5
},
/obj/item/reagent_containers/pill/trophazole{
/obj/item/reagent_containers/pill/indomide{
pixel_x = 11;
pixel_y = -10
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2568,10 +2568,6 @@
/turf/open/floor/plating,
/area/ruin/jungle/cavecrew/ship)
"IZ" = (
/obj/item/reagent_containers/syringe/contraband/fentanyl{
pixel_x = -3;
pixel_y = 4
},
/obj/item/reagent_containers/syringe/contraband/methamphetamine,
/obj/item/reagent_containers/food/drinks/beer{
pixel_x = -4
Expand All @@ -2590,6 +2586,10 @@
pixel_y = 11;
pixel_x = 5
},
/obj/item/reagent_containers/syringe/contraband/morphine{
pixel_y = 4;
pixel_x = -4
},
/turf/open/floor/wood{
icon_state = "wood-broken2"
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4452,7 +4452,7 @@
/area/overmap_encounter/planetoid/cave/explored)
"FM" = (
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/reagent_containers/syringe/oxandrolone{
/obj/item/reagent_containers/syringe/ysiltane{
pixel_x = 5;
pixel_y = -7
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/RockRuins/rockplanet_distillery.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,11 +1207,11 @@
/obj/effect/turf_decal/industrial/outline/red,
/obj/structure/closet/crate/medical,
/obj/item/storage/firstaid/regular,
/obj/item/reagent_containers/glass/bottle/bicaridine{
/obj/item/reagent_containers/glass/bottle/indomide{
pixel_x = -6
},
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/bicaridine{
/obj/item/reagent_containers/glass/bottle/indomide{
pixel_x = 6
},
/turf/open/floor/plasteel/patterned/brushed/rockplanet,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_rustbase.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@
pixel_x = 6;
pixel_y = 2
},
/obj/item/reagent_containers/hypospray/medipen/stimulants{
/obj/item/reagent_containers/hypospray/medipen/stimpack/crisis{
pixel_x = 10;
pixel_y = 7
},
Expand Down
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/spacemall.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9910,7 +9910,6 @@
/obj/effect/turf_decal/road/line/transparent/solgovblue,
/obj/effect/turf_decal/corner/transparent/black/diagonal,
/obj/structure/rack,
/obj/item/hot_potato/harmless/toy,
/obj/item/toy/talking/AI,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/spacemall/shop2)
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/vi_deepstorage.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6839,8 +6839,8 @@
/obj/item/reagent_containers/hypospray/medipen/rabbit,
/obj/item/reagent_containers/hypospray/medipen/survival,
/obj/item/reagent_containers/hypospray/medipen/survival,
/obj/item/reagent_containers/hypospray/medipen/tricord,
/obj/item/reagent_containers/hypospray/medipen/tricord,
/obj/item/reagent_containers/hypospray/medipen/cureall,
/obj/item/reagent_containers/hypospray/medipen/cureall,
/obj/item/reagent_containers/hypospray/medipen/bonefixingjuice,
/obj/item/reagent_containers/hypospray/medipen/bonefixingjuice,
/obj/item/reagent_containers/hypospray/medipen/morphine,
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/WasteRuins/wasteplanet_facility.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,7 @@
pixel_y = 2;
pixel_x = 8
},
/obj/item/reagent_containers/glass/bottle/antitoxin{
pixel_x = -4;
pixel_y = 2
},
/obj/item/reagent_containers/glass/bottle/charcoal,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{
dir = 9
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/generic/CentCom.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@
/turf/open/floor/plating/abductor,
/area/abductor_ship)
"alE" = (
/obj/structure/table/optable/abductor,
/obj/structure/table/optable,
/turf/open/floor/plating/abductor,
/area/abductor_ship)
"alF" = (
Expand Down Expand Up @@ -18594,7 +18594,7 @@ aaa
akq
aJB
ali
alE
ali
ali
amu
and
Expand All @@ -18621,7 +18621,7 @@ aaa
akq
akN
ali
alE
ali
ali
amu
and
Expand All @@ -18648,7 +18648,7 @@ aaa
akq
aAv
ali
alE
ali
ali
amu
and
Expand Down
11 changes: 3 additions & 8 deletions _maps/shuttles/cybersun/cybersun_nimbus.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,9 @@
/obj/item/storage/firstaid/medical{
pixel_x = -4
},
/obj/item/hypospray/mkii/tricord{
pixel_x = 7;
pixel_y = 2
},
/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord,
/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord{
pixel_x = -5
},
/obj/item/hypospray/mkii/cureall,
/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall,
/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall,
/turf/open/floor/plasteel/mono/white,
/area/ship/cargo)
"aL" = (
Expand Down
Loading
Loading