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

New sand ruin - the E-11 Manufacturing Plant. #3304

Merged
merged 43 commits into from
Oct 28, 2024
Merged

New sand ruin - the E-11 Manufacturing Plant. #3304

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
66afa7d
Woop woop, ruin time!
Sadhorizon Aug 22, 2024
fb6b302
oops
Sadhorizon Aug 22, 2024
9bcff86
better icons
Sadhorizon Aug 23, 2024
dce5abe
factions, rust, checks
Sadhorizon Aug 23, 2024
452d2a6
outside
Sadhorizon Aug 23, 2024
b54af07
outside
Sadhorizon Aug 23, 2024
3cad3e8
fire alarm
Sadhorizon Aug 23, 2024
f287224
slippery's annoying
Sadhorizon Aug 23, 2024
cff0673
also this
Sadhorizon Aug 23, 2024
a789090
ruin desc
Sadhorizon Aug 23, 2024
f4b1055
troopers
Sadhorizon Aug 23, 2024
a88f7a8
croquette's fate
Sadhorizon Aug 23, 2024
c0c8d2a
hunger
Sadhorizon Aug 23, 2024
eb939ba
anchors and bear traps
Sadhorizon Aug 24, 2024
57bacb4
more stuff
Sadhorizon Aug 25, 2024
5d387f5
slightly less E-11s
Sadhorizon Aug 28, 2024
e468b3d
more stuff
Sadhorizon Aug 31, 2024
359c1c5
document desc
Sadhorizon Aug 31, 2024
590ad14
SOMEONE can't place cables. Wonder who.
Sadhorizon Aug 31, 2024
ae59d55
made the documents an object
Sadhorizon Sep 12, 2024
007288e
Merge remote-tracking branch 'upstream/master' into e11_manufactory
Sadhorizon Sep 21, 2024
71ef383
tags
Sadhorizon Sep 21, 2024
f3a9b6a
idk a bit better I guess
Sadhorizon Sep 27, 2024
9e75d66
moved the table
Sadhorizon Sep 27, 2024
87a5a39
sand
Sadhorizon Sep 27, 2024
1fbaf70
kills the rock
Sadhorizon Sep 27, 2024
495e5e4
Merge remote-tracking branch 'upstream/master' into e11_manufactory
Sadhorizon Sep 28, 2024
e771a0f
should work
Sadhorizon Sep 28, 2024
dd25b77
bit more sand
Sadhorizon Sep 28, 2024
f3fb4b5
more sand
Sadhorizon Sep 28, 2024
c5c0607
hate that
Sadhorizon Oct 2, 2024
595a6af
???
Sadhorizon Oct 2, 2024
71af3de
T2s
Sadhorizon Oct 2, 2024
fd923d0
coffee
Sadhorizon Oct 5, 2024
b8640f0
better mechs
Sadhorizon Oct 5, 2024
38525cf
Merge remote-tracking branch 'upstream/master' into e11_manufactory
Sadhorizon Oct 14, 2024
e5199a9
swappity
Sadhorizon Oct 16, 2024
1bfa315
Merge remote-tracking branch 'upstream/master' into e11_manufactory
Sadhorizon Oct 25, 2024
607485b
updatepaths
Sadhorizon Oct 25, 2024
f4ffb99
will you work?
Sadhorizon Oct 25, 2024
0f2836d
didn't save this one
Sadhorizon Oct 25, 2024
0e31593
Merge remote-tracking branch 'upstream/master' into e11_manufactory
Sadhorizon Oct 26, 2024
ffecf91
ig
Sadhorizon Oct 26, 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
Prev Previous commit
Next Next commit
coffee
  • Loading branch information
@Sadhorizon
Sadhorizon committed Oct 5, 2024
commit fd923d0acf24f020f506810a4cdb6652a3252110
16 changes: 8 additions & 8 deletions _maps/RandomRuins/SandRuins/whitesands_surface_e11_manufactory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2341,15 +2341,15 @@
/obj/effect/turf_decal/box/corners{
dir = 4
},
/obj/item/seeds/coffee/robusta,
/obj/item/seeds/coffee/robusta,
/obj/item/seeds/coffee/robusta,
/obj/item/seeds/coffee/robusta,
/obj/item/seeds/coffee/robusta,
/obj/item/seeds/tea,
/obj/item/seeds/tea,
/obj/item/seeds/tea,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta,
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta,
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta,
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta,
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta,
/obj/item/reagent_containers/food/snacks/grown/tea,
/obj/item/reagent_containers/food/snacks/grown/tea,
/obj/item/reagent_containers/food/snacks/grown/tea,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ruin/whitesands/e11manufactory/barracks)
"rR" = (
Expand Down
Loading