cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into tackling_and_lunge

Browse Source
This commit is contained in:
Artur
2020-04-15 12:19:37 +03:00
parent aecbce222a db1ecff52f
commit 2134515d5c
499 changed files with 5377 additions and 3805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
_maps/RandomRuins/SpaceRuins/bus.dmm
View File

@@ -66,7 +66,7 @@
/obj/structure/fluff/bus/passable/seat{
icon_state = "backseat"
},
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -90,7 +90,7 @@
/obj/structure/fluff/bus/passable/seat{
icon_state = "backseat"
},
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
@@ -158,9 +158,9 @@
"aA" = (
/obj/structure/fluff/bus/passable,
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -182,7 +182,7 @@
/area/ruin/unpowered/no_grav)
"aD" = (
/obj/structure/fluff/bus/passable,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -256,7 +256,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aP" = (
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aQ" = (
@@ -282,7 +282,7 @@
icon_state = "backseat"
},
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -318,7 +318,7 @@
"aZ" = (
/obj/structure/fluff/bus/passable,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},

333
_maps/RandomRuins/SpaceRuins/spacehermit.dmm
View File

@@ -145,9 +145,6 @@
"aE" = (
/turf/open/floor/plating/asteroid/airless,
/area/ruin/powered)
"aF" = (
/turf/open/floor/plating/asteroid,
/area/ruin/powered)
"aG" = (
/obj/structure/sink/puddle,
/turf/open/floor/plating/asteroid,
@@ -241,7 +238,7 @@
/turf/closed/mineral/random/low_chance/earth_like,
/area/ruin/powered)
"bb" = (
/turf/closed/mineral/random/earth_like,
/turf/closed/mineral/random/no_caves/earth_like,
/area/ruin/powered)
"bc" = (
/obj/item/circuitboard/machine/circuit_imprinter,
@@ -1137,7 +1134,7 @@ ao
ao
ak
af
aF
am
bb
bb
bb
@@ -1189,7 +1186,7 @@ an
an
ae
ae
aF
am
bb
bb
bb
@@ -1223,8 +1220,8 @@ bb
bb
bb
ba
aF
aF
am
am
ba
ba
ba
@@ -1241,7 +1238,7 @@ ar
af
at
at
aF
am
bb
fp
bb
@@ -1275,10 +1272,10 @@ bb
bb
bb
ad
aF
aF
aF
aF
am
am
am
am
ba
aH
aJ
@@ -1286,13 +1283,13 @@ aL
bb
bb
aT
aF
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
am
aR
bb
bb
@@ -1328,23 +1325,23 @@ bb
bb
ad
au
aF
am
aB
aF
aF
aF
aF
aF
am
am
am
am
am
ba
bb
aF
aF
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
am
am
bg
bb
fp
@@ -1384,19 +1381,19 @@ bs
aC
bC
WH
aF
aF
aF
am
am
am
ba
bb
bb
aF
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
am
bb
bb
bb
@@ -1432,23 +1429,23 @@ bb
bb
ad
ax
aF
am
aD
aF
aF
aF
aF
am
am
am
am
bb
bb
bb
aU
bd
aF
aF
am
am
bl
bm
aF
aF
am
am
bb
bb
bb
@@ -1484,20 +1481,20 @@ bb
bb
ad
ay
aF
aF
aF
am
am
am
aG
aF
aF
am
am
bb
bb
ba
av
be
aF
aF
aF
am
am
am
bn
bo
bo
@@ -1535,24 +1532,24 @@ bb
bb
bb
ba
aF
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
am
bb
bb
bb
bc
bf
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
br
bb
bb
@@ -1590,22 +1587,22 @@ bb
bb
bb
bb
aF
aF
aF
aF
aF
am
am
am
am
am
bb
bb
aF
aF
aF
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
am
am
am
bb
bb
bb
@@ -1642,21 +1639,21 @@ bb
bb
bb
bb
aF
aF
aF
aF
aF
am
am
am
am
am
aN
aF
aF
aF
aF
am
am
am
am
aR
aF
aF
aF
aF
am
am
am
am
bb
bb
fp
@@ -1695,22 +1692,22 @@ bb
bb
bb
ba
aF
aF
aF
am
am
am
ba
ba
aF
aF
aF
aF
aF
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
am
am
am
am
am
ba
ba
ba
@@ -1752,16 +1749,16 @@ ba
aK
ba
ba
aF
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
am
bp
aF
aF
am
am
aR
ba
ba
@@ -1805,15 +1802,15 @@ ba
fp
ba
aP
aF
aF
aF
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
am
am
am
aR
ba
ba
@@ -1858,15 +1855,15 @@ ba
ba
aQ
aP
aF
aF
am
am
aR
aF
aF
aF
aF
am
am
am
am
bb
aF
am
ba
ba
aZ
@@ -1910,12 +1907,12 @@ ba
ba
ba
ba
aF
aF
aF
aF
am
am
am
am
aP
aF
am
bg
bb
bb
@@ -1962,12 +1959,12 @@ bb
bb
ba
ba
aF
aF
aF
aF
aF
aF
am
am
am
am
am
am
aS
bb
fp
@@ -2015,11 +2012,11 @@ bb
bb
ba
bg
aF
aF
aF
aF
aF
am
am
am
am
am
aS
bb
fp
@@ -2066,12 +2063,12 @@ bb
bb
fp
ba
aF
aF
am
am
bj
aF
aF
aF
am
am
am
aS
fp
bb
@@ -2120,9 +2117,9 @@ ba
ba
aS
bi
aF
aF
aF
am
am
am
aS
aS
bb
@@ -2171,10 +2168,10 @@ ba
aZ
ba
aS
aF
aF
aF
aF
am
am
am
am
aS
aS
ba