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

Ports the Requests Manager, Minor Fax QOL, Adds factional offices to CentCom #2653

Merged
merged 15 commits into from
Feb 2, 2024
Merged

Ports the Requests Manager, Minor Fax QOL, Adds factional offices to CentCom #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bfa2300
requests manager
meemofcourse Jan 21, 2024
2d3291e
centcom + minor oopsie
meemofcourse Jan 21, 2024
0e267e5
oops
meemofcourse Jan 21, 2024
07affaf
LINTERS!!!
meemofcourse Jan 21, 2024
abb50c8
linters...
meemofcourse Jan 21, 2024
e3bbecf
sigh
meemofcourse Jan 22, 2024
a832aa0
fackx
meemofcourse Jan 22, 2024
a21c79b
removes check for duplicate faxes
meemofcourse Jan 22, 2024
cd8bec6
removes the ammo box so it works with hunters' pride
meemofcourse Jan 25, 2024
9a00495
fix fax_name, ruins spawn with ruin subtype
meemofcourse Jan 25, 2024
820e8ba
move the CMM fax over, plus some plants and a pie
meemofcourse Jan 26, 2024
6558636
oops
meemofcourse Jan 26, 2024
61eb8a2
advanced_html
meemofcourse Jan 30, 2024
256a3ed
oh that's why
meemofcourse Feb 2, 2024
4542c64
Merge branch 'master' into requests
meemofcourse Feb 2, 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 _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3119,7 +3119,7 @@
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
/obj/machinery/fax/frontiersmen,
/obj/machinery/fax/ruin,
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/bridge)
"Ls" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1330,7 +1330,7 @@
"OW" = (
/obj/structure/table/reinforced,
/obj/item/trash/syndi_cakes,
/obj/machinery/fax,
/obj/machinery/fax/ruin,
/turf/open/floor/plating,
/area/ruin/jungle/syndifort/jerry)
"Ph" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/corporate_mining.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@
/area/ruin/space)
"xK" = (
/obj/structure/table/wood,
/obj/machinery/fax,
/obj/machinery/fax/ruin,
/turf/open/floor/wood,
/area/ruin/space/has_grav/corporatemine/crewquarters)
"xT" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@
/area/ruin/powered)
"dT" = (
/obj/structure/table/wood,
/obj/machinery/fax,
/obj/machinery/fax/ruin,
/turf/open/floor/plating,
/area/ruin/powered)
"dU" = (
Expand Down
Loading
Loading