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

Operation "Foxtrot" #12685

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Operation "Foxtrot" #12685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c69a29
Map changes and solgov flags added
DetectiveEnotsky Aug 11, 2024
2dde0cc
Merge remote-tracking branch 'upstream/dev' into Ebent
DetectiveEnotsky Aug 11, 2024
3882d4f
Areas clusterduck
DetectiveEnotsky Aug 11, 2024
e017b07
Revert changes to exodus_levels.dm
DetectiveEnotsky Aug 11, 2024
4029bef
fix(atmos): fixes atmos
Filatelele Aug 12, 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
10 changes: 10 additions & 0 deletions code/game/objects/structures/signs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,16 @@
icon_state = "flag_rainbow"
desc = "This piece of cloth will get you jailed in Nova Magnitka, love it or hate it."

/obj/structure/sign/flag/solgovleft
name = "SolGov Flag"
icon_state = "flag_soll"
desc = "Flag of Solar System Government. You should probably solute it, or whatever."

/obj/structure/sign/flag/solgovright
name = "SolGov Flag"
icon_state = "flag_solr"
desc = "Flag of Solar System Government. You should probably solute it, or whatever."

/obj/structure/sign/flag/coder
name = "\improper GitTrasen Contributor flag"
icon_state = "flag_coder"
Expand Down
Binary file modified icons/obj/decals.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions maps/derelicts/jungleplanet/jungleplanet_areas.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
icon = 'icons/turf/jungleplanet_areas.dmi'
icon_state = "jungle"
base_turf = /turf/simulated/floor/natural/jungle/dirt
area_flags = AREA_FLAG_EXTERNAL | AREA_FLAG_UNIQUE_AREA

/area/jungleplanet/jungle
name = "Jungle"
Expand Down
875 changes: 435 additions & 440 deletions maps/exodus/exodus-1.dmm
View file
Open in desktop

Large diffs are not rendered by default.

3,598 changes: 1,819 additions & 1,779 deletions maps/exodus/exodus-2.dmm
View file
Open in desktop

Large diffs are not rendered by default.

540 changes: 329 additions & 211 deletions maps/exodus/exodus-4.dmm
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading