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.

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

Merge Upstream 27.01.2025 #1768

Merged
merged 46 commits into from
Jan 26, 2025
Merged

Merge Upstream 27.01.2025 #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
72a06a1
Gives full tile R-Windows and Plasma R-Windows and Plastitanium heavy…
Bm0n Jan 24, 2025
a809609
Handheld EFTPOS offering (#27978)
FunnyMan3595 Jan 24, 2025
ef0fe20
Kills changeling autoparry (#27868)
Adrer Jan 24, 2025
01e19a0
this one is correct (#28001)
kyunkyunkyun Jan 24, 2025
b7e1042
Lazarus Reagent no longer forces you Alive (#28011)
Erikos66 Jan 25, 2025
0a08b79
add slime people to the magic mirror (#28027)
pwbokie Jan 25, 2025
ad4e5a6
[PTBF] Hallucination: The Backrooms (#27710)
pwbokie Jan 25, 2025
e8f7806
Update VV to work better in 516 (#28078)
FunnyMan3595 Jan 25, 2025
1668427
Fixes some display issues with the next step on the surgical computer…
lewcc Jan 25, 2025
f8e0e28
One space!!! (#28081)
DGamerL Jan 25, 2025
bde8b03
Which is which does matter (#28079)
Vi3trice Jan 25, 2025
9c9bdab
Fixes cone spells accidentally going diagonal (#28077)
DGamerL Jan 25, 2025
9de6d5b
fixes mantis blade implant surgery (#28073)
Toastical Jan 25, 2025
6c715ae
Adds color boxes to View Variable hex colors (#28064)
Vi3trice Jan 25, 2025
445e691
adds fire alarm to kerberos medbay (#28061)
Kholdstare2 Jan 25, 2025
99d18c8
Remove an old proc (#28041)
FunnyMan3595 Jan 25, 2025
754a868
[FIX] Better slices (#27807)
Drsmail Jan 25, 2025
4e06e69
making it better? (#27828)
kyunkyunkyun Jan 25, 2025
47cec93
Makes One-Click-Antag report who was made antag (#28058)
Erikos66 Jan 25, 2025
98bf5f0
fix (#28099)
PopeDaveThe3th Jan 25, 2025
ad43a1d
fix flaky vetus test failures in the dumbest way possible (#28100)
warriorstar-orion Jan 25, 2025
22216bb
Adds more logging to dynamic (#28090)
Contrabang Jan 26, 2025
f479ace
Attack chain migration: /obj/machinery (#27784)
warriorstar-orion Jan 26, 2025
fbf8540
Refactor /proc/get_mobs_in_view for speed (#28102)
FunnyMan3595 Jan 26, 2025
1b25306
fix immovable rods looping continuously (#28108)
warriorstar-orion Jan 26, 2025
521413f
Update clothing.dm (#28115)
Vi3trice Jan 26, 2025
a9134fa
fix catwalk cabling placement when clicking on space (#28117)
warriorstar-orion Jan 26, 2025
c95ef29
kills flick from jetpacks again (#28114)
Qwertytoforty Jan 26, 2025
dd45fc5
fix cabling placement on plating (#28118)
warriorstar-orion Jan 26, 2025
e214704
Update hydroponics_tray.dm (#28119)
Fordoxia Jan 26, 2025
fc2e10f
Prevents TGUI crash when slime tries to feed with 0 valid targets (#2…
Drsmail Jan 26, 2025
5120053
Remove redundant block that results in duplicate messages (#28120)
FunnyMan3595 Jan 26, 2025
8e1df0d
Adds unaccounted for volumes to the gas analyzer's scan and allows fo…
Migratingcocofruit Jan 26, 2025
574b025
Touches up deltas science a little (#27802)
1080pCat Jan 26, 2025
34f3823
Creation (#27955)
Fordoxia Jan 26, 2025
509e795
Easier banning of DC'd players. (#28032)
FunnyMan3595 Jan 26, 2025
21ec00f
fix recursion limit triggering in hiero blasts (#28038)
warriorstar-orion Jan 26, 2025
a79dd40
Return maximize research levels button for admins (#28076)
MiraHell Jan 26, 2025
769ccab
[FIX] Slimes can now resist to stop feeding (#28025)
Erikos66 Jan 26, 2025
1ecbe34
Fixes #28022: mecha/AI/hologram bugs from #25078 (#28026)
asciodev Jan 26, 2025
9938a0c
Fix a vending migration bug (#28128)
FunnyMan3595 Jan 26, 2025
a94c517
fix brped distance check (#28129)
warriorstar-orion Jan 26, 2025
1f26b78
reset glide size for thrown objects once throw ends (#28126)
warriorstar-orion Jan 26, 2025
8f3e2e3
fix cloning pods not accepting beaker transfers (#28133)
warriorstar-orion Jan 26, 2025
b037d71
Merge remote-tracking branch 'origin/master' into merge-upstream
m-dzianishchyts Jan 26, 2025
888b321
Enable harddel
m-dzianishchyts Jan 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
6 changes: 3 additions & 3 deletions _maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/powered/pizza_party)
"j" = (
/obj/item/food/mushroompizzaslice,
/obj/item/food/sliced/mushroom_pizza,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating/lavaland_air,
/area/ruin/powered/pizza_party)
Expand Down Expand Up @@ -144,13 +144,13 @@
/area/ruin/powered/pizza_party)
"D" = (
/obj/structure/table/wood,
/obj/item/food/margheritapizzaslice,
/obj/item/food/sliced/margherita_pizza,
/obj/item/trash/plate,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/powered/pizza_party)
"E" = (
/obj/structure/table/wood,
/obj/item/food/meatpizzaslice,
/obj/item/food/sliced/meat_pizza,
/turf/simulated/floor/wood/lavaland_air,
/area/ruin/powered/pizza_party)
"F" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@
/turf/simulated/wall/r_wall,
/area/space/nearstation)
"Nw" = (
/obj/item/food/xenomeatbreadslice{
/obj/item/food/sliced/xeno_meat_bread{
name = "green mold bread slice"
},
/turf/simulated/floor/plating/airless,
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2001,7 +2001,7 @@
},
/area/ruin/space/moonbase19)
"gy" = (
/obj/item/food/xenomeatbreadslice{
/obj/item/food/sliced/xeno_meat_bread{
pixel_y = 5
},
/obj/item/reagent_containers/drinks/coffee{
Expand Down Expand Up @@ -6702,12 +6702,12 @@
},
/area/ruin/space/moonbase19)
"yR" = (
/obj/item/food/xenomeatbreadslice,
/obj/item/food/xenomeatbreadslice{
/obj/item/food/sliced/xeno_meat_bread,
/obj/item/food/sliced/xeno_meat_bread{
pixel_y = 7;
pixel_x = 6
},
/obj/item/food/xenomeatbreadslice{
/obj/item/food/sliced/xeno_meat_bread{
pixel_y = 9;
pixel_x = -5
},
Expand Down
8 changes: 4 additions & 4 deletions _maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,11 @@
/area/ruin/space/syndicakefactory)
"qd" = (
/obj/structure/table/glass/reinforced/plastitanium,
/obj/item/food/breadslice,
/obj/item/food/breadslice{
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread{
pixel_y = 4
},
/obj/item/food/breadslice{
/obj/item/food/sliced/bread{
pixel_y = 8
},
/obj/machinery/light/small{
Expand Down Expand Up @@ -1076,7 +1076,7 @@
pixel_x = 8;
pixel_y = 8
},
/obj/item/food/birthdaycakeslice,
/obj/item/food/sliced/birthday_cake,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@
/area/ruin/space/wreck_cargoship)
"jm" = (
/obj/item/toy/plushie/ipcplushie,
/obj/item/food/breadslice,
/obj/item/food/breadslice,
/obj/item/food/sliced/bread,
/obj/item/food/sliced/bread,
/obj/item/paper/crumpled{
name = "unintelligible scribbles";
info = "toast... i must... the plushie..."
Expand Down
Loading
Loading