Skip to content

Commit

Permalink
Merge upstream (#294)
Browse files Browse the repository at this point in the history 
## About The Pull Request

Merge upstream

---------

Co-authored-by: Andrew <[email protected]>
Co-authored-by: orange man <[email protected]>
Co-authored-by: jwc1015 <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: Changelogs <[email protected]>
Co-authored-by: Mothblocks <[email protected]>
Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: Iajret <[email protected]>
Co-authored-by: Time-Green <[email protected]>
Co-authored-by: DrAmazing343 <[email protected]>
Co-authored-by: Lucy <[email protected]>
Co-authored-by: Wayland-Smithy <[email protected]>
Co-authored-by: Derpguy3 <[email protected]>
Co-authored-by: Goat <[email protected]>
Co-authored-by: carlarctg <[email protected]>
Co-authored-by: vendingmachine24 <[email protected]>
Co-authored-by: PapaMichael <[email protected]>
Co-authored-by: necromanceranne <[email protected]>
Co-authored-by: san7890 <[email protected]>
Co-authored-by: githubuser4141 <[email protected]>
Co-authored-by: jimmyl <[email protected]>
Co-authored-by: Jeremiah <[email protected]>
Co-authored-by: lessthanthree <[email protected]>
Co-authored-by: norsvenska <[email protected]>
Co-authored-by: MelokGleb <[email protected]>
Co-authored-by: grungussuss <[email protected]>
Co-authored-by: Jacquerel <[email protected]>
Co-authored-by: SyncIt21 <[email protected]>
Co-authored-by: Rhials <[email protected]>
Co-authored-by: Ben10Omintrix <[email protected]>
Co-authored-by: RedBaronFlyer <[email protected]>
Co-authored-by: Pickle-Coding <[email protected]>
Co-authored-by: nikothedude <[email protected]>
Co-authored-by: _0Steven <[email protected]>
Co-authored-by: EEASAS <[email protected]>
Co-authored-by: zxaber <[email protected]>
Co-authored-by: Afevis <[email protected]>
Co-authored-by: Whoneedspacee <[email protected]>
Co-authored-by: Fazzie <[email protected]>
Co-authored-by: Erol509 <[email protected]>
Co-authored-by: IsaacExists <[email protected]>
Co-authored-by: thegrb93 <[email protected]>
Co-authored-by: LemonInTheDark <[email protected]>
Co-authored-by: MichiRecRoom <[email protected]>
Co-authored-by: EnterTheJake <[email protected]>
Co-authored-by: projectkepler-RU <[email protected]>
Co-authored-by: Kian <[email protected]>
Co-authored-by: sylvia <[email protected]>
Co-authored-by: lizelive <[email protected]>
Co-authored-by: Da Cool Boss <[email protected]>
Co-authored-by: Watermelon914 <[email protected]>
Co-authored-by: Watermelon914 <[email protected]>
Co-authored-by: DATAxPUNGED <[email protected]>
Co-authored-by: Jackraxxus <[email protected]>
Co-authored-by: FinancialGoose <[email protected]>
Co-authored-by: oranges <[email protected]>
  • Loading branch information
@Gaxeer @MTandi
@comfyorange @jwc1015 @MrMelbert @actions-user @Mothblocks @GoldenAlpharex @Iajret @Time-Green @DrAmazing343 @Absolucy @Wayland-Smithy @Derpguy3 @Goat-Real @carlarctg @PapaMichae1 @necromanceranne @san7890 @githubuser4141 @mc-oofert @jlsnow301 @lessthnthree @norsvenska @Sadboysuss @Jacquerel @SyncIt21 @Rhials @Ben10Omintrix @RedBaronFlyer @Pickle-Coding @nikothedude @00-Steven @EEASAS @zxaber @ShizCalev @Whoneedspacee @EuSouAFazer @Erol509 @BlitzArde @thegrb93 @LemonInTheDark @LikeLakers2 @EnterTheJake @projectkepler-ru @sylvia-from-fulp-station @lizelive @DaCoolBoss @Watermelon914 @DATA-xPUNGED @Jackraxxus @TheBoondock @optimumtact
57 people authored Jun 8, 2024
1 parent 83521dc commit e53f624
Show file tree
Hide file tree
Showing 268 changed files with 208,147 additions and 900 deletions.
4,215 changes: 4,215 additions & 0 deletions _maps/RandomRuins/IceRuins/icemoon_underground_comms_agent.dmm
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/anomaly_research.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
dir = 6
},
/obj/structure/table/reinforced,
/obj/item/reactive_armour_shell,
/obj/item/reactive_armor_shell,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron/dark,
/area/misc/anomaly_research)
Expand Down
1 change: 1 addition & 0 deletions _maps/_basemap.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "map_files\Mining\Lavaland.dmm"
#include "map_files\NorthStar\north_star.dmm"
#include "map_files\tramstation\tramstation.dmm"
#include "map_files\wawastation\wawastation.dmm"

#ifdef CIBUILDING
#include "templates.dm"
Expand Down
Loading

0 comments on commit e53f624

Please sign in to comment.