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

Remaps Wasteplanet_tradepost + Adds The Concrete Caves #2257

Closed
wants to merge 25 commits into from
Closed

Remaps Wasteplanet_tradepost + Adds The Concrete Caves #2257

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
58d5d33
WOOOO
Erikafox Aug 7, 2023
d5b2bce
Update independent_trader.dmm
Erikafox Apr 30, 2023
2f831da
marker beacon antics
Erikafox May 3, 2023
a19a8d4
fuck you baltimore
Erikafox Aug 7, 2023
080db7b
Update srm_glaive.dmm
Erikafox Aug 7, 2023
49a60d1
Update shuttles.dm
Erikafox Aug 7, 2023
3765b72
catalog updates
Erikafox Aug 7, 2023
73a1e3e
Update independent_trader.dmm
Erikafox Aug 7, 2023
440b0c1
review
Erikafox Aug 7, 2023
eb49850
Update independent_trader.dmm
Erikafox Aug 7, 2023
d2abdf3
reduces overall threat
Erikafox Aug 10, 2023
facb58c
more loot
Erikafox Aug 10, 2023
21ba292
Merge branch 'master' into fuck-you
Erikafox Aug 12, 2023
d6b4603
Merge remote-tracking branch 'upstream/master' into fuck-you
Erikafox Aug 18, 2023
a9b63b0
Merge branch 'master' into pr/2257
Erikafox Sep 6, 2023
b59ea64
Update WasteGenerator.dm
Erikafox Sep 6, 2023
6e26f5d
Update wasteplanet_tradepost.dmm
Erikafox Sep 6, 2023
fb3376c
Merge branch 'master' into fuck-you
spockye Sep 10, 2023
711fe61
Merge branch 'master' into fuck-you
Erikafox Sep 17, 2023
7e98858
Merge branch 'master' into fuck-you
Erikafox Sep 29, 2023
b699995
Merge remote-tracking branch 'upstream/master' into fuck-you
Erikafox Nov 8, 2023
c6ec94c
z
Erikafox Nov 8, 2023
7cc502e
a
Erikafox Nov 8, 2023
3e0d113
Merge branch 'master' into fuck-you
Erikafox Nov 14, 2023
267d9fa
ba
Erikafox Nov 14, 2023
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
4 changes: 2 additions & 2 deletions _maps/RandomRuins/IceRuins/icemoon_underground_slimelab.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,8 +1298,8 @@
/obj/item/mining_scanner,
/obj/item/mining_scanner,
/obj/machinery/light/directional/west,
/obj/item/stack/marker_beacon/thirty,
/obj/item/stack/marker_beacon/thirty,
/obj/item/stack/marker_beacon/default/thirty,
/obj/item/stack/marker_beacon/default/thirty,
/obj/item/clothing/suit/hooded/wintercoat/miner,
/turf/open/floor/plasteel,
/area/ruin/powered/slimelab)
Expand Down
Loading
Loading