cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repaths a bunch of plants

Browse Source
This commit is contained in:
Jack Edge
2016-06-22 21:15:44 +01:00
parent c44ff9b897
commit 423f17c571
10 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+1 -1
View File
@@ -516,7 +516,7 @@
},
/area/ruin/powered)
"bt" = (
/obj/structure/flora/kirbyplants,
/obj/item/weapon/twohanded/required/kirbyplants,
/turf/open/floor/plasteel{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
_maps/RandomZLevels/centcomAway.dmm
+1 -1
View File
@@ -2519,7 +2519,7 @@
/turf/open/floor/engine,
/area/awaymission/centcomAway/general)
"hW" = (
/obj/structure/flora/kirbyplants,
/obj/item/weapon/twohanded/required/kirbyplants,
/turf/open/floor/plasteel/vault{
dir = 5
},
_maps/RandomZLevels/moonoutpost19.dmm
+2 -2
View File
@@ -7030,7 +7030,7 @@
name = "MO19 Research"
})
"jq" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
desc = "A plastic potted plant.";
layer = 4.1;
pixel_y = 3
@@ -10176,7 +10176,7 @@
name = "MO19 Arrivals"
})
"ob" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
desc = "A plastic potted plant.";
layer = 4.1;
pixel_y = 3
_maps/RandomZLevels/research.dmm
+10 -10
View File
@@ -123,7 +123,7 @@
/turf/open/floor/plasteel/whiteyellow/side,
/area/awaymission/research/interior/engineering)
"ax" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-20";
layer = 4.1;
pixel_y = 3
@@ -1385,7 +1385,7 @@
/turf/open/floor/plasteel/black,
/area/awaymission/research/interior/secure)
"dN" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-16";
layer = 4.1
},
@@ -3001,7 +3001,7 @@
/turf/open/floor/plasteel/purple,
/area/awaymission/research/interior/genetics)
"hV" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-10";
layer = 4.1
},
@@ -3086,8 +3086,8 @@
/turf/open/floor/plasteel/red,
/area/awaymission/research/interior/security)
"ii" = (
/obj/structure/flora/kirbyplants/dead{
desc = "A potted plant, it doesn't look very healthy..";
/obj/item/weapon/twohanded/required/kirbyplants{
desc = "A potted plant, it doesn't look very healthy...";
name = "dead potted plant"
},
/turf/open/floor/plasteel/whitered/corner{
@@ -3508,7 +3508,7 @@
/turf/open/floor/wood,
/area/awaymission/research/interior/dorm)
"jm" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-14";
layer = 4.1
},
@@ -3978,7 +3978,7 @@
/turf/open/floor/plating,
/area/awaymission/research/interior/medbay)
"kC" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/yellowsiding{
@@ -4316,7 +4316,7 @@
},
/area/awaymission/research/interior/medbay)
"ly" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-16";
layer = 4.1
},
@@ -4773,7 +4773,7 @@
},
/area/awaymission/research/interior/escapepods)
"mJ" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
layer = 4.1
},
/turf/open/floor/plasteel/whitegreen/side{
@@ -4809,7 +4809,7 @@
/turf/open/floor/grass,
/area/awaymission/research/interior/escapepods)
"mN" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "applebush";
layer = 4.1
},
_maps/RandomZLevels/undergroundoutpost45.dmm
+7 -7
View File
@@ -2030,7 +2030,7 @@
name = "UO45 Central Hall"
})
"do" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -3814,7 +3814,7 @@
name = "UO45 Central Hall"
})
"fT" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -6672,7 +6672,7 @@
name = "UO45 Gateway"
})
"kh" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -8742,7 +8742,7 @@
})
"mQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
layer = 5
},
/turf/open/floor/plasteel/cafeteria{
@@ -10726,7 +10726,7 @@
name = "UO45 Research"
})
"pl" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -12210,7 +12210,7 @@
name = "UO45 Engineering"
})
"rk" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
layer = 5
},
/turf/open/floor/plasteel/yellow/side{
@@ -16005,7 +16005,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,
_maps/shuttles/emergency_bar.dmm
+3 -3
View File
@@ -174,7 +174,7 @@
pixel_x = 6;
pixel_y = 24
},
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-21";
layer = 4.1;
pixel_x = -3;
@@ -324,7 +324,7 @@
/turf/open/floor/plasteel/bar,
/area/shuttle/escape)
"bc" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-21";
layer = 4.1;
pixel_x = -3;
@@ -505,7 +505,7 @@
/turf/open/floor/plasteel/shuttle/red,
/area/shuttle/escape)
"bG" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-21";
layer = 4.1;
pixel_x = -3;
_maps/shuttles/emergency_birdboat.dmm
+2 -2
View File
@@ -98,7 +98,7 @@
/turf/open/floor/plasteel/shuttle,
/area/shuttle/escape)
"ar" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/shuttle,
@@ -217,7 +217,7 @@
},
/area/shuttle/escape)
"aM" = (
/obj/structure/flora/kirbyplants{
/obj/item/weapon/twohanded/required/kirbyplants{
icon_state = "plant-21";
layer = 4.1
},
_maps/shuttles/emergency_imfedupwiththisworld.dmm
+1 -1
View File
@@ -136,7 +136,7 @@
/turf/open/floor/carpet,
/area/shuttle/escape)
"y" = (
/obj/structure/flora/kirbyplants,
/obj/item/weapon/twohanded/required/kirbyplants,
/turf/open/floor/wood,
/area/shuttle/escape)
"z" = (
_maps/shuttles/ferry_lighthouse.dmm
+1 -1
View File
@@ -282,7 +282,7 @@
/turf/open/floor/wood,
/area/shuttle/transport)
"bd" = (
/obj/structure/flora/kirbyplants/dead{
/obj/item/weapon/twohanded/required/kirbyplants/dead{
desc = "It doesn't look very healthy...";
name = "potted plant"
},
tools/travis/dm.sh
+4 -4
View File
@@ -50,7 +50,7 @@ done
if [[ `uname` == MINGW* ]]
then
dm=""
if hash dm.exe 2>/dev/null
then
dm='dm.exe'
@@ -61,13 +61,13 @@ then
then
dm='/c/Program Files/BYOND/bin/dm.exe'
fi
if [[ $dm == "" ]]
then
echo "Couldn't find the DreamMaker executable, aborting."
exit 3
fi
"$dm" $dmepath.mdme 2>&1 | tee result.log
retval=$?
if ! grep '\- 0 errors, 0 warnings' result.log
@@ -79,7 +79,7 @@ else
then
DreamMaker $dmepath.mdme 2>&1 | tee result.log
retval=$?
if ! grep '0 errors, 0 warnings' result.log
if ! grep '\- 0 errors, 0 warnings' result.log
then
retval=1 #hard fail, due to warnings or errors
fi