cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds a new catslug, Miros, to the fuel depot

Browse Source
This commit is contained in:
Casey
2022-03-27 15:19:08 -04:00
committed by CHOMPStation2
parent 4bab64bc68
commit a1a389a571
5 changed files with 152 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
maps/expedition_vr/space/fueldepot.dmm
View File

@@ -1294,7 +1294,15 @@
icon_state = "1-4"
},
/turf/simulated/shuttle/plating/airless,
<<<<<<< HEAD
/area/sc_away/fueldepot)
=======
/area/tether_away/fueldepot)
"ow" = (
/obj/machinery/vending/weeb,
/turf/simulated/floor/tiled/techmaint/airless,
/area/tether_away/fueldepot)
>>>>>>> bd65b8dc0f... Merge pull request #12551 from BonniePandora/spaceslug
"rE" = (
/obj/machinery/atmospherics/pipe/manifold/visible/aux{
dir = 1
@@ -1339,7 +1347,15 @@
/obj/structure/table/rack/shelf/steel,
/obj/random/powercell,
/turf/simulated/floor/tiled/techmaint/airless,
<<<<<<< HEAD
/area/sc_away/fueldepot)
=======
/area/tether_away/fueldepot)
"Gh" = (
/obj/machinery/vending/fitness,
/turf/simulated/floor/tiled/techmaint/airless,
/area/tether_away/fueldepot)
>>>>>>> bd65b8dc0f... Merge pull request #12551 from BonniePandora/spaceslug
"IR" = (
/obj/machinery/atmospherics/pipe/simple/visible/aux{
dir = 8
@@ -1365,14 +1381,36 @@
/obj/structure/table/rack/steel,
/obj/item/weapon/storage/toolbox/mechanical,
/turf/simulated/floor/tiled/techmaint/airless,
<<<<<<< HEAD
/area/sc_away/fueldepot)
=======
/area/tether_away/fueldepot)
"QY" = (
/obj/machinery/atmospherics/pipe/simple/visible/universal{
dir = 1
},
/obj/structure/catwalk,
/mob/living/simple_mob/vore/alienanimals/catslug/spaceslug,
/turf/simulated/shuttle/plating/airless,
/area/tether_away/fueldepot)
>>>>>>> bd65b8dc0f... Merge pull request #12551 from BonniePandora/spaceslug
"Vy" = (
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/catwalk,
/turf/simulated/shuttle/plating/airless,
<<<<<<< HEAD
/area/sc_away/fueldepot)
=======
/area/tether_away/fueldepot)
"XR" = (
/obj/machinery/vending/foodfast{
dir = 0
},
/turf/simulated/floor/tiled/techmaint/airless,
/area/tether_away/fueldepot)
>>>>>>> bd65b8dc0f... Merge pull request #12551 from BonniePandora/spaceslug
"Ys" = (
/obj/structure/table/steel_reinforced,
/turf/simulated/floor/tiled/techmaint/airless,
@@ -11246,7 +11284,7 @@ ao
aS
bc
bo
bC
QY
rE
cc
cn
@@ -11954,12 +11992,12 @@ aa
aG
aa
aF
aG
Gh
aG
bz
IR
aG
aG
XR
aF
aa
aG
@@ -12238,7 +12276,7 @@ aD
aM
aa
aF
aG
ow
bs
bz
bN