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

Jump to bottom

Merge Upstream 14.09.2024 #1508

Merged
merged 35 commits into from
Sep 14, 2024
Merged

Merge Upstream 14.09.2024 #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
64f49e0
Update medical_designs.dm (#26723)
Truls20 Sep 12, 2024
512ec5c
Re-add removed toggle for prayer sounds (#26739)
dearmochi Sep 12, 2024
d8eb231
Adds the new R&D boards to secure tech storage on all maps (#26722)
AffectedArc07 Sep 12, 2024
d01fca6
Fix SMES not working after recharge (#26711)
m-dzianishchyts Sep 12, 2024
a450ad9
Move global access procs to the mapping subsystem (#26664)
m-dzianishchyts Sep 12, 2024
f67dbca
refactor: use signal for explosion sensors. (#26703)
warriorstar-orion Sep 12, 2024
f7472de
[FIX] Floorbots now actually use the colour of the toolbox they were …
Adrer Sep 12, 2024
62601ab
Various chemthrower fixes (#26697)
DGamerL Sep 12, 2024
7c3d87d
Update chameleon.dm (#26691)
XFirebirdX Sep 12, 2024
0a7873c
Makes the cryo anomaly more dangerous (#26614)
DGamerL Sep 12, 2024
fe834bf
Updates some salvage lore (#26595)
PopeDaveThe3th Sep 12, 2024
809769b
Fixes and Changes for Devchat (#26726)
Contrabang Sep 12, 2024
1f9945e
Captain's sabre - Resprite and rebrand (#26592)
Christasmurf Sep 12, 2024
6e36351
[SPRITES] Emissive mechs (#26589)
Adrer Sep 12, 2024
2b90084
Conveyer belts and Disposals units no longer steal items on nonhelp i…
HMBGERDO Sep 12, 2024
20f47a7
Adds Syndicate organizations (#24040)
datlo Sep 12, 2024
9704445
Farragus: Remaps Service Asteroid and Locker Room Area (#26493)
Fordoxia Sep 13, 2024
a71424d
Changes the permissions for the Door Remote of the RD, QM, Command. (…
XFirebirdX Sep 13, 2024
a1e250c
dsquad and SST to 45 (#26705)
Daylight2 Sep 13, 2024
32719e2
Adds map: EmeraldStation (NSS Diagoras) (#26438)
EmeraldCandy Sep 13, 2024
3b5cbf5
Pipe reconnection (#26708)
Fordoxia Sep 13, 2024
9c4a4c6
The cloner once again mulches people on emag or emp (#26653)
Qwertytoforty Sep 14, 2024
7be7ec7
reflectors anchor on mapload (#26745)
Qwertytoforty Sep 14, 2024
52442e6
Removes hoverboard from SOO starting inventory (#26661)
Coolrune206 Sep 14, 2024
515d3eb
Makes chemical flamethrowers more efficient (#26742)
DGamerL Sep 14, 2024
148eae5
fix squeak component (#26709)
Kenionatus Sep 14, 2024
e4d9337
fix: cere jani closet disposal pipe (#26773)
warriorstar-orion Sep 14, 2024
e571255
Fixes missing Unanchored Gas Meter Item sprite (#26767)
ATP-Engineer Sep 14, 2024
e2a7c80
Paradise's soul removal part 7: engineering jumpsuits and accessories…
ElorgRHG Sep 14, 2024
fc62bb3
Merge remote-tracking branch 'upstream/master' into merge-upstream
m-dzianishchyts Sep 14, 2024
9c5f6ac
Remove NSS Diagoras (EmeraldStation) from polls
m-dzianishchyts Sep 14, 2024
473b633
Add backup console and net controller circuits to the protected storage
m-dzianishchyts Sep 14, 2024
7c970c4
Bring ACCESS_EXPEDITION back to REGION_COMMAND
m-dzianishchyts Sep 14, 2024
b0aabfe
Add `Construction Area` to valid request console departments
m-dzianishchyts Sep 14, 2024
2a7aa64
Bring naming of nanomaps back
m-dzianishchyts Sep 14, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
strategy:
fail-fast: false # Let all map tests run to completion
matrix:
maptype: ['/datum/map/boxstation', '/datum/map/deltastation', '/datum/map/metastation', '/datum/map/cerestation']
maptype: ['/datum/map/boxstation', '/datum/map/deltastation', '/datum/map/metastation', '/datum/map/cerestation', '/datum/map/emeraldstation']
byondtype: ['STABLE']
services:
mariadb:
Expand Down
9 changes: 3 additions & 6 deletions _maps/map_files/stations/boxstation.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39118,6 +39118,8 @@
pixel_x = 3;
pixel_y = -3
},
/obj/item/circuitboard/rnd_backup_console,
/obj/item/circuitboard/rnd_network_controller,
/turf/simulated/floor/plasteel,
/area/station/engineering/tech_storage)
"cBs" = (
Expand Down Expand Up @@ -54610,7 +54612,6 @@
/area/station/maintenance/apmaint)
"fdg" = (
/obj/structure/reflector/single{
anchored = 1;
dir = 1
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -68254,7 +68255,6 @@
/area/station/aisat/service)
"lKP" = (
/obj/structure/reflector/single{
anchored = 1;
dir = 4
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -73967,9 +73967,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"oBR" = (
/obj/structure/reflector/double{
anchored = 1
},
/obj/structure/reflector/double,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
Expand Down Expand Up @@ -77728,7 +77726,6 @@
/area/station/maintenance/aft)
"qpq" = (
/obj/structure/reflector/box{
anchored = 1;
dir = 1
},
/turf/simulated/floor/plasteel{
Expand Down
Loading
Loading