Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG
Browse files Browse the repository at this point in the history
…into upstream-mirror-613
  • Loading branch information
Iajret committed Jan 30, 2024
2 parents 1e9e6f1 + 571c53a commit 41ccd42
Show file tree
Hide file tree
Showing 190 changed files with 17,355 additions and 62,467 deletions.
16,172 changes: 11,787 additions & 4,385 deletions _maps/RandomRuins/SpaceRuins/nova/port_tarkon.dmm

Large diffs are not rendered by default.

296 changes: 296 additions & 0 deletions _maps/RandomRuins/SpaceRuins/nova/port_tarkon/cargo_secure.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,296 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/rack/shelf,
/turf/template_noop,
/area/template_noop)
"e" = (
/obj/structure/rack/shelf,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/door/window/brigdoor/right/directional/north{
req_access = list("tarkon")
},
/obj/machinery/door/window/brigdoor/right/directional/south{
req_access = list("tarkon")
},
/obj/item/clothing/gloves/color/yellow,
/obj/item/storage/belt/utility,
/turf/template_noop,
/area/template_noop)
"g" = (
/obj/structure/rack/shelf,
/obj/item/clothing/suit/hazardvest,
/obj/item/clothing/gloves/color/black,
/obj/item/clothing/head/utility/hardhat/orange,
/turf/template_noop,
/area/template_noop)
"h" = (
/obj/structure/rack/shelf,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo/starts_empty,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo/starts_empty,
/obj/item/ammo_box/magazine/c35sol_pistol/stendo/starts_empty,
/turf/template_noop,
/area/template_noop)
"m" = (
/obj/structure/rack/shelf,
/obj/item/stack/sheet/rglass{
amount = 50
},
/obj/item/stack/sheet/plasteel/fifty,
/turf/template_noop,
/area/template_noop)
"n" = (
/obj/structure/rack/shelf,
/obj/item/holosign_creator/janibarrier,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/grenade/chem_grenade/cleaner,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/reagent_containers/spray/cleaner,
/turf/template_noop,
/area/template_noop)
"s" = (
/obj/structure/rack/shelf,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/door/window/brigdoor/right/directional/north{
req_access = list("tarkon")
},
/obj/machinery/door/window/brigdoor/right/directional/south{
req_access = list("tarkon")
},
/obj/item/mod/core/standard,
/obj/item/mod/core/standard,
/obj/item/mod/core/standard,
/obj/item/mod/core/standard,
/obj/item/mod/core/standard,
/turf/template_noop,
/area/template_noop)
"v" = (
/obj/machinery/door/window/brigdoor/right/directional/north{
req_access = list("tarkon")
},
/turf/template_noop,
/area/template_noop)
"B" = (
/obj/structure/rack/shelf,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/door/window/brigdoor/left/directional/north{
req_access = list("tarkon")
},
/obj/machinery/door/window/brigdoor/left/directional/south{
req_access = list("tarkon")
},
/obj/item/construction/rcd/arcd/mattermanipulator,
/turf/template_noop,
/area/template_noop)
"C" = (
/obj/modular_map_connector,
/obj/structure/rack/shelf,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/obj/item/bedsheet/dorms_double,
/turf/template_noop,
/area/template_noop)
"D" = (
/turf/template_noop,
/area/template_noop)
"E" = (
/obj/structure/rack/shelf,
/obj/item/rcd_ammo/large,
/obj/item/rcd_ammo/large,
/obj/item/rcd_ammo/large,
/turf/template_noop,
/area/template_noop)
"F" = (
/obj/structure/rack/shelf,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/door/window/brigdoor/left/directional/north{
req_access = list("tarkon")
},
/obj/machinery/door/window/brigdoor/left/directional/south{
req_access = list("tarkon")
},
/obj/item/storage/medkit/advanced,
/obj/item/storage/medkit/brute,
/obj/item/storage/medkit/fire,
/obj/item/storage/medkit/regular,
/obj/item/storage/medkit/regular,
/turf/template_noop,
/area/template_noop)
"G" = (
/obj/structure/rack/shelf,
/obj/effect/spawner/random/decoration/carpet,
/turf/template_noop,
/area/template_noop)
"H" = (
/obj/machinery/door/window/brigdoor/left/directional/north{
req_access = list("tarkon")
},
/turf/template_noop,
/area/template_noop)
"L" = (
/obj/item/pizzabox/margherita,
/obj/item/pizzabox/meat,
/obj/item/pizzabox/mushroom,
/obj/item/pizzabox/margherita,
/obj/item/pizzabox/meat,
/obj/item/pizzabox/mushroom,
/obj/structure/closet/crate/freezer,
/obj/machinery/door/window/brigdoor/right/directional/north{
req_access = list("tarkon")
},
/turf/template_noop,
/area/template_noop)
"O" = (
/obj/structure/rack/shelf,
/obj/structure/window/reinforced/spawner/directional/west,
/obj/machinery/door/window/brigdoor/left/directional/north{
req_access = list("tarkon")
},
/obj/machinery/door/window/brigdoor/left/directional/south{
req_access = list("tarkon")
},
/obj/item/stack/sheet/mineral/plasma/thirty,
/turf/template_noop,
/area/template_noop)
"P" = (
/obj/structure/rack/shelf,
/obj/item/storage/backpack/duffelbag/mining_conscript,
/turf/template_noop,
/area/template_noop)
"T" = (
/obj/structure/rack/shelf,
/obj/structure/window/reinforced/spawner/directional/east,
/obj/machinery/door/window/brigdoor/right/directional/north{
req_access = list("tarkon")
},
/obj/machinery/door/window/brigdoor/right/directional/south{
req_access = list("tarkon")
},
/obj/item/stack/sheet/mineral/gold{
amount = 25
},
/turf/template_noop,
/area/template_noop)

(1,1,1) = {"
m
g
n
C
D
H
h
"}
(2,1,1) = {"
D
D
D
D
D
L
a
"}
(3,1,1) = {"
D
D
D
D
D
D
D
"}
(4,1,1) = {"
D
D
O
D
D
D
D
"}
(5,1,1) = {"
D
D
T
D
D
D
D
"}
(6,1,1) = {"
D
D
F
D
D
D
D
"}
(7,1,1) = {"
D
D
e
D
D
D
D
"}
(8,1,1) = {"
D
D
B
D
D
D
D
"}
(9,1,1) = {"
D
D
s
D
D
D
D
"}
(10,1,1) = {"
D
D
D
D
D
D
D
"}
(11,1,1) = {"
D
D
D
D
D
H
P
"}
(12,1,1) = {"
G
G
G
E
D
v
a
"}
Loading

0 comments on commit 41ccd42

Please sign in to comment.