diff --git a/.github/workflows/build_rust.yml b/.github/workflows/build_rust.yml
index 7cbbdb508445..07aba0d4e975 100644
--- a/.github/workflows/build_rust.yml
+++ b/.github/workflows/build_rust.yml
@@ -83,7 +83,7 @@ jobs:
cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs.dll
# Build the para-specific version
- RUSTFLAGS='-C target-cpu=raptorlake' cargo build --release --target=i686-pc-windows-gnu
+ RUSTFLAGS='-C target-cpu=znver5' cargo build --release --target=i686-pc-windows-gnu
cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs_prod.dll
git commit -a -m "Build Rust library" --allow-empty
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm
index 33b1f8830e20..89f31d70ff7a 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/casino.dmm
@@ -214,7 +214,7 @@
/turf/simulated/floor/mineral/plastitanium,
/area/ruin/space/powered/casino/security)
"fT" = (
-/obj/item/kirbyplants/plant1,
+/obj/item/kirbyplants/medium/medium2,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/powered/casino/arrivals)
"fV" = (
@@ -432,7 +432,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/powered/casino/maints)
"kC" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/mineral/silver,
/area/ruin/space/powered/casino/hall)
"kH" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
index e062d4b683c5..60c631ab8219 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/deepstorage.dmm
@@ -831,7 +831,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/deepstorage)
"cP" = (
-/obj/item/kirbyplants/plant27,
+/obj/item/kirbyplants/large/plant10,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -845,7 +845,7 @@
/turf/simulated/floor/catwalk,
/area/ruin/space/deepstorage)
"cT" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -889,7 +889,7 @@
/area/ruin/space/deepstorage)
"dg" = (
/obj/effect/decal/cleanable/cobweb,
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -1294,7 +1294,7 @@
/area/ruin/space/deepstorage)
"gC" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/turf/simulated/floor/plasteel{
icon_state = "black"
},
@@ -1371,7 +1371,7 @@
},
/area/ruin/space/deepstorage)
"hg" = (
-/obj/item/kirbyplants/plant27,
+/obj/item/kirbyplants/large/plant10,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -2402,7 +2402,7 @@
},
/area/ruin/space/deepstorage)
"nM" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/small,
/turf/simulated/floor/plasteel{
@@ -2875,7 +2875,7 @@
/turf/simulated/floor/engine/airless,
/area/ruin/space/unpowered)
"re" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -3364,7 +3364,7 @@
/obj/machinery/light/small{
dir = 8
},
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/structure/sign/biohazard{
pixel_x = -32
},
@@ -4508,7 +4508,7 @@
/area/ruin/space/deepstorage)
"BF" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "white"
@@ -5328,7 +5328,7 @@
},
/area/ruin/space/deepstorage)
"Ha" = (
-/obj/item/kirbyplants/plant27,
+/obj/item/kirbyplants/large/plant10,
/obj/machinery/light/small{
dir = 8
},
@@ -5913,7 +5913,7 @@
/turf/simulated/floor/engine,
/area/ruin/space/deepstorage)
"LT" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -6300,7 +6300,7 @@
},
/area/ruin/space/deepstorage)
"Pq" = (
-/obj/item/kirbyplants/plant29,
+/obj/item/kirbyplants/large/plant11,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -6721,7 +6721,7 @@
},
/area/ruin/space/deepstorage)
"Sc" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -7348,7 +7348,7 @@
},
/area/ruin/space/deepstorage)
"Ww" = (
-/obj/item/kirbyplants/plant27,
+/obj/item/kirbyplants/large/plant10,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "vault"
@@ -7485,7 +7485,7 @@
},
/area/ruin/space/deepstorage)
"Xj" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -7545,7 +7545,7 @@
/area/ruin/space/deepstorage)
"Xy" = (
/obj/structure/table/glass,
-/obj/item/kirbyplants/plant15{
+/obj/item/kirbyplants/small/small4{
pixel_y = 13
},
/turf/simulated/floor/plasteel{
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
index 400c52a36c72..cae07a86a426 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict5.dmm
@@ -154,7 +154,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"sd" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/plasteel,
/area/ruin/space/unpowered)
"vg" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
index 591be2b910a3..80a2a2786ca9 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/dj.dmm
@@ -907,7 +907,7 @@
},
/area/ruin/space/djstation)
"yr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
name = "north bump";
pixel_y = 30
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
index 8ecdc1fa8d32..ec50ff2cecce 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/mechtransport.dmm
@@ -726,7 +726,7 @@
/turf/simulated/floor/redgrid,
/area/ruin/space/mech_transport)
"ZI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/mineral/plastitanium/red/airless,
/area/ruin/space/mech_transport)
"ZK" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
index 9c11b70d1351..0d000ab52059 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm
@@ -357,7 +357,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "caution"
@@ -574,7 +574,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "dark"
@@ -1440,7 +1440,7 @@
},
/area/ruin/space/moonbase19)
"ey" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 1
},
@@ -1491,7 +1491,7 @@
/turf/simulated/floor/grass,
/area/ruin/space/moonbase19)
"eK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/camera{
c_tag = "West Lobby";
@@ -1725,7 +1725,7 @@
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/moonbase19)
"fC" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "black";
dir = 10
@@ -1978,7 +1978,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"gv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "caution"
@@ -2108,7 +2108,7 @@
/turf/simulated/floor/mineral/titanium,
/area/ruin/space/powered)
"gP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "caution"
@@ -2210,7 +2210,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "caution";
@@ -2298,7 +2298,7 @@
},
/area/ruin/space/moonbase19)
"hs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "dark"
@@ -2640,7 +2640,7 @@
},
/area/ruin/space/moonbase19)
"io" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/directions/engineering{
pixel_x = -32;
dir = 8
@@ -2972,7 +2972,7 @@
},
/area/ruin/space/moonbase19)
"jj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "caution";
dir = 8
@@ -3022,7 +3022,7 @@
/area/ruin/space/moonbase19)
"jp" = (
/obj/structure/railing,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "dark"
@@ -3035,7 +3035,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"jr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"jt" = (
@@ -3130,7 +3130,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "caution"
@@ -3298,7 +3298,7 @@
},
/area/ruin/space/moonbase19)
"kg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/plasteel{
dir = 6;
@@ -3431,7 +3431,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/moonbase19)
"kB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/railing{
dir = 10
},
@@ -3458,7 +3458,7 @@
},
/area/ruin/space/moonbase19)
"kG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plasteel{
icon_state = "whitecorner"
@@ -3481,7 +3481,7 @@
/turf/simulated/floor/grass,
/area/ruin/space/moonbase19)
"kN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
@@ -3644,7 +3644,7 @@
},
/area/ruin/space/moonbase19)
"lD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -3681,7 +3681,7 @@
},
/area/ruin/space/moonbase19)
"lI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "caution";
@@ -3869,7 +3869,7 @@
},
/area/ruin/space/moonbase19)
"mv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "caution"
@@ -4502,7 +4502,7 @@
},
/area/ruin/space/moonbase19)
"oU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "freezerfloor"
@@ -4880,7 +4880,7 @@
/turf/simulated/floor/engine,
/area/ruin/space/moonbase19)
"qu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "escape"
@@ -5187,7 +5187,7 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/ruin/space/moonbase19)
"rH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "escape"
@@ -5413,7 +5413,7 @@
},
/area/ruin/space/moonbase19)
"sp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/railing,
/obj/structure/cable{
icon_state = "1-2"
@@ -5498,7 +5498,7 @@
/obj/structure/railing{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"td" = (
@@ -5979,7 +5979,7 @@
},
/area/ruin/space/moonbase19)
"vB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 4
},
@@ -6154,7 +6154,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"wp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "caution";
dir = 5
@@ -6175,7 +6175,7 @@
},
/area/ruin/space/moonbase19)
"wv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkfull";
dir = 8
@@ -6857,7 +6857,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "caution";
dir = 10
@@ -6870,7 +6870,7 @@
},
/area/ruin/space/moonbase19)
"zK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/biohazard{
pixel_y = 32
},
@@ -7747,7 +7747,7 @@
},
/area/ruin/space/moonbase19)
"Dy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/biohazard{
pixel_y = 32
},
@@ -7909,7 +7909,7 @@
/turf/simulated/floor/carpet/royalblue,
/area/ruin/space/moonbase19)
"Ep" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "escape";
@@ -8123,7 +8123,7 @@
},
/area/ruin/space/moonbase19)
"Fk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "caution";
dir = 4
@@ -8238,7 +8238,7 @@
},
/area/ruin/space/moonbase19)
"FO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/railing{
dir = 1
},
@@ -8266,7 +8266,7 @@
},
/area/ruin/space/moonbase19)
"FV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -8621,7 +8621,7 @@
/turf/simulated/floor/catwalk,
/area/ruin/space/moonbase19)
"HA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "caution";
dir = 10
@@ -9228,7 +9228,7 @@
},
/area/ruin/space/moonbase19)
"Kz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "escape";
dir = 4
@@ -9472,7 +9472,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitecorner";
dir = 4
@@ -9755,7 +9755,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"MY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plasteel{
@@ -10018,7 +10018,7 @@
},
/area/ruin/space/moonbase19)
"Od" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plasteel{
icon_state = "darkfull";
@@ -10095,7 +10095,7 @@
/turf/simulated/floor/carpet/royalblue,
/area/ruin/space/moonbase19)
"Oo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 1
},
@@ -10397,7 +10397,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/moonbase19)
"PQ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "caution"
@@ -11648,7 +11648,7 @@
},
/area/ruin/space/moonbase19)
"VG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "caution";
dir = 9
@@ -11801,7 +11801,7 @@
},
/area/ruin/space/moonbase19)
"Wn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "caution"
@@ -11896,7 +11896,7 @@
},
/area/ruin/space/moonbase19)
"WJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/railing{
dir = 9
},
@@ -12152,7 +12152,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitecorner";
dir = 1
@@ -12229,7 +12229,7 @@
},
/area/ruin/space/moonbase19)
"XY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitehall"
},
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
index d16c18e4fa5f..b289e3d5b4bb 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/oldstation.dmm
@@ -497,7 +497,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation)
@@ -535,7 +535,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation)
"bK" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation)
@@ -762,7 +762,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation/thetacorridor)
"ct" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -1214,7 +1214,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/hivebot/strong,
@@ -1407,7 +1407,7 @@
dir = 8
},
/obj/machinery/firealarm/directional/west,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -1563,7 +1563,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -3459,7 +3459,7 @@
icon_state = "1-4"
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation)
"jd" = (
@@ -3482,7 +3482,7 @@
/area/ruin/ancientstation)
"jg" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation)
"jh" = (
@@ -3490,7 +3490,7 @@
icon_state = "1-4"
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation/thetacorridor)
"ji" = (
@@ -3537,7 +3537,7 @@
/area/ruin/ancientstation/thetacorridor)
"jo" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/plasteel,
/area/ruin/ancientstation/thetacorridor)
"jp" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm b/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm
index 141a1e5e9276..c23f7567a650 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm
@@ -411,7 +411,7 @@
},
/area/ruin/space/powered)
"SL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/royalblack,
/area/ruin/space/powered)
"Tb" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm b/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm
index 8328a2a74ad7..cf5d136e5ccb 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/submaps/rocky_motel_submap.dmm
@@ -446,7 +446,7 @@
/turf/simulated/floor/carpet/royalblack,
/area/ruin/space/powered)
"SN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/royalblack,
/area/ruin/space/powered)
"TR" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
index d1b78f2c22c4..d2f4e5401074 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -1566,7 +1566,7 @@
/obj/effect/turf_decal/woodsiding{
dir = 5
},
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/carpet/grimey,
/area/ruin/unpowered/syndicate_space_base/service)
"iJ" = (
@@ -4230,7 +4230,7 @@
},
/area/ruin/unpowered/syndicate_space_base/arrivals)
"yR" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/grass,
/area/ruin/unpowered/syndicate_space_base/service)
"za" = (
@@ -8043,7 +8043,7 @@
/obj/effect/turf_decal/woodsiding{
dir = 9
},
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
index 444d04e2a668..2ab0ea1a3a99 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
@@ -1286,7 +1286,7 @@
/turf/simulated/floor/engine,
/area/ruin/space/syndicakefactory)
"YE" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/grass,
/area/ruin/space/syndicakefactory)
"YQ" = (
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
index 580fe6558302..6d1008f51330 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm
@@ -214,7 +214,7 @@
/turf/simulated/wall/indestructible/titanium/soviet/nodiagonal,
/area/ruin/space/derelict/bridge)
"aF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/bridge)
"aG" = (
@@ -736,7 +736,7 @@
},
/area/ruin/space/derelict/bridge)
"bZ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -1116,7 +1116,7 @@
},
/area/ruin/space/derelict/bridge)
"cW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 6;
@@ -1167,7 +1167,7 @@
},
/area/ruin/space/derelict/crew_quarters)
"dd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -1601,7 +1601,7 @@
dir = 1
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkblue"
@@ -2693,7 +2693,7 @@
},
/area/ruin/space/derelict/solar_control)
"ha" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkred"
@@ -2778,7 +2778,7 @@
},
/area/ruin/space/derelict/hallway/primary)
"hm" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/ruin/space/derelict/crew_quarters)
"hn" = (
@@ -3508,7 +3508,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/derelict/arrival)
"jr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "brown"
@@ -6497,7 +6497,7 @@
},
/area/ruin/space/derelict/arrival)
"rw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
index 0d5ebb8c4f2a..9e1cd11edcdb 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp_tele.dmm
@@ -218,7 +218,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/derelict/teleporter)
"uD" = (
-/obj/item/kirbyplants/dead{
+/obj/item/kirbyplants/large/dead{
desc = "A dead potted plant. Must have died from lack of EVA equipment.";
item_state = "plant-dead"
},
diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
index e7a3b1944276..aaab3c391768 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm
@@ -34,7 +34,7 @@
/area/space/nearstation)
"ca" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "caution"
@@ -772,7 +772,7 @@
dir = 4
},
/obj/effect/decal/cleanable/cobweb2,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "caution"
@@ -823,7 +823,7 @@
/obj/structure/railing{
dir = 9
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/ruin/space/wreck_cargoship)
"Ih" = (
diff --git a/_maps/map_files/generic/Lavaland.dmm b/_maps/map_files/generic/Lavaland.dmm
index 0356b3cf14b1..db4ed427fc3d 100644
--- a/_maps/map_files/generic/Lavaland.dmm
+++ b/_maps/map_files/generic/Lavaland.dmm
@@ -173,7 +173,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -1502,7 +1502,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/kiddieplaque/remembrance/mining{
pixel_x = 32
},
@@ -2282,7 +2282,7 @@
dir = 8;
pixel_y = -24
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkpurplecorners"
@@ -5203,7 +5203,7 @@
/turf/simulated/floor/plating,
/area/mine/outpost/mechbay)
"ur" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkyellowcorners"
@@ -6044,7 +6044,7 @@
dir = 1;
network = list("Mining Outpost")
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_y = -31
},
@@ -9523,7 +9523,7 @@
/area/lavaland/surface/outdoors/targetable)
"VV" = (
/obj/machinery/firealarm/directional/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/spawner/random/dirt/maybe,
/obj/item/radio/intercom{
name = "north bump";
diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm
index d0694546fc91..022f498bb0b1 100644
--- a/_maps/map_files/generic/centcomm.dmm
+++ b/_maps/map_files/generic/centcomm.dmm
@@ -1867,7 +1867,7 @@
/turf/simulated/floor/plating/abductor,
/area/abductor_ship)
"gY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/centcom/specops)
"gZ" = (
@@ -2079,7 +2079,7 @@
/area/shuttle/administration)
"hy" = (
/obj/effect/decal/cleanable/cobweb2,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/window/reinforced/clockwork{
dir = 4
},
@@ -3802,7 +3802,7 @@
/obj/item/radio/intercom/syndicate{
pixel_y = 25
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -3938,7 +3938,7 @@
/turf/simulated/floor/plasteel,
/area/admin)
"ni" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/tdome/tdomeadmin)
"nj" = (
@@ -3986,7 +3986,7 @@
/obj/structure/mirror/magic/nuclear{
pixel_x = 28
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/freezer,
/area/syndicate_mothership)
"np" = (
@@ -4231,7 +4231,7 @@
/turf/simulated/floor/plasteel/freezer,
/area/admin)
"nW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -4816,7 +4816,7 @@
/turf/simulated/wall/indestructible/riveted,
/area/ghost_bar)
"qg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/storage/secure/safe{
pixel_x = 32
},
@@ -4957,7 +4957,7 @@
pixel_y = -2;
req_access = list(151)
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -5005,7 +5005,7 @@
/turf/simulated/wall/indestructible,
/area/ghost_bar)
"qS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/centcom/control)
"qT" = (
@@ -5135,7 +5135,7 @@
/area/ghost_bar)
"rl" = (
/obj/structure/railing,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/centcom/evac)
"rn" = (
@@ -5236,7 +5236,7 @@
/turf/simulated/floor/plasteel/freezer,
/area/admin)
"rx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/railing,
/turf/simulated/floor/plasteel,
/area/centcom/evac)
@@ -5767,7 +5767,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/syndicate)
"tA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/trader_station/sol)
"tB" = (
@@ -6482,7 +6482,7 @@
/turf/simulated/floor/plasteel/freezer,
/area/admin)
"vQ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/tdome/tdomeobserve)
"vT" = (
@@ -7418,7 +7418,7 @@
/turf/simulated/floor/carpet/green,
/area/ghost_bar)
"Ai" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/computer/cryopod{
pixel_y = 32
},
@@ -7634,7 +7634,7 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/gamma)
"AV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/centcom/specops)
"AX" = (
@@ -8413,7 +8413,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -32
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
@@ -10230,7 +10230,7 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/control)
"Ke" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/centcom/evac)
"Kg" = (
@@ -11099,7 +11099,7 @@
/turf/simulated/floor/wood,
/area/wizard_station)
"MV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/wizard_station)
"MX" = (
@@ -11409,7 +11409,7 @@
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"Of" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "vault"
@@ -11575,7 +11575,7 @@
/turf/simulated/floor/wood,
/area/centcom/evac)
"OF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "green"
@@ -11647,7 +11647,7 @@
/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"OO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
@@ -11691,7 +11691,7 @@
/turf/simulated/floor/plasteel/freezer,
/area/ghost_bar)
"OV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/door_control/no_emag{
id = "CCDOCK2";
name = "Special Operations Secondary Dock";
@@ -11711,7 +11711,7 @@
/turf/simulated/floor/plasteel,
/area/tdome/arena)
"OX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
pixel_x = 28
},
@@ -11996,7 +11996,7 @@
/turf/simulated/floor/transparent/glass,
/area/tdome/tdomeobserve)
"PY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/centcom/evac)
"Qa" = (
@@ -12223,7 +12223,7 @@
},
/area/ghost_bar)
"QN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "green"
@@ -12596,7 +12596,7 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/evac)
"Sf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -12634,7 +12634,7 @@
/turf/simulated/floor/transparent/glass/reinforced,
/area/centcom/specops)
"Sn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "green"
@@ -12718,7 +12718,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"SF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
@@ -12731,7 +12731,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"SJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"SK" = (
@@ -13569,7 +13569,7 @@
/turf/simulated/floor/grass/jungle,
/area/wizard_station)
"Wl" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/door_control/no_emag{
id = "CCcustoms1";
name = "CentCom Outer Customs Shutters";
@@ -13868,14 +13868,14 @@
/turf/simulated/floor/wood,
/area/centcom/control)
"WW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "vault"
},
/area/centcom/specops)
"WX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/transparent/glass/reinforced,
/area/centcom/control)
"WZ" = (
@@ -14158,7 +14158,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/administration)
"XY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/tdome/tdomeobserve)
"XZ" = (
@@ -14535,7 +14535,7 @@
},
/area/centcom/specops)
"Zl" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/mirror{
pixel_y = 30
},
diff --git a/_maps/map_files/shuttles/emergency_bar.dmm b/_maps/map_files/shuttles/emergency_bar.dmm
index 44494f912be1..75d6d02e5fd9 100644
--- a/_maps/map_files/shuttles/emergency_bar.dmm
+++ b/_maps/map_files/shuttles/emergency_bar.dmm
@@ -101,7 +101,7 @@
/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"az" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -112,7 +112,7 @@
},
/area/shuttle/escape)
"aB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/royalblack,
/area/shuttle/escape)
"aC" = (
diff --git a/_maps/map_files/shuttles/emergency_cyb.dmm b/_maps/map_files/shuttles/emergency_cyb.dmm
index 817c268bda3e..f7fed9efd781 100644
--- a/_maps/map_files/shuttles/emergency_cyb.dmm
+++ b/_maps/map_files/shuttles/emergency_cyb.dmm
@@ -414,7 +414,7 @@
/turf/simulated/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape)
"br" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
@@ -432,7 +432,7 @@
/turf/simulated/floor/plating/airless,
/area/shuttle/escape)
"bx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
pixel_x = 28
},
@@ -544,14 +544,14 @@
},
/area/shuttle/escape)
"bJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"bK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 4
},
@@ -673,7 +673,7 @@
},
/area/shuttle/escape)
"cb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"cc" = (
diff --git a/_maps/map_files/shuttles/emergency_dept.dmm b/_maps/map_files/shuttles/emergency_dept.dmm
index 65849d5452ed..c0d2de07ba70 100644
--- a/_maps/map_files/shuttles/emergency_dept.dmm
+++ b/_maps/map_files/shuttles/emergency_dept.dmm
@@ -289,7 +289,7 @@
},
/area/shuttle/escape)
"aT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"aU" = (
@@ -1112,7 +1112,7 @@
},
/area/shuttle/escape)
"PW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
diff --git a/_maps/map_files/shuttles/emergency_shadow.dmm b/_maps/map_files/shuttles/emergency_shadow.dmm
index f5aa7fa5d8f9..7a969fbfbbc0 100644
--- a/_maps/map_files/shuttles/emergency_shadow.dmm
+++ b/_maps/map_files/shuttles/emergency_shadow.dmm
@@ -359,7 +359,7 @@
/obj/effect/turf_decal/stripes/white/line{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/shuttle/escape)
"qk" = (
@@ -531,7 +531,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/shuttle/escape)
"yg" = (
@@ -958,7 +958,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/shuttle/escape)
"OL" = (
diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm
index b53650afed0b..4eb1f89aea60 100644
--- a/_maps/map_files/stations/boxstation.dmm
+++ b/_maps/map_files/stations/boxstation.dmm
@@ -5538,7 +5538,7 @@
/turf/simulated/floor/plasteel,
/area/station/security/prisonershuttle)
"auF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -5556,7 +5556,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"auL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -8820,7 +8820,7 @@
name = "west bump";
pixel_x = -24
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "cult"
@@ -9191,7 +9191,7 @@
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
"aGu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/requests_console/directional/east,
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
@@ -9514,7 +9514,7 @@
},
/area/station/legal/courtroom/gallery)
"aHH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "redcorner"
@@ -9997,7 +9997,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aJu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "barber"
},
@@ -10244,7 +10244,7 @@
},
/area/station/legal/lawoffice)
"aKy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkred"
},
@@ -11836,7 +11836,7 @@
},
/area/station/legal/courtroom/gallery)
"aPH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "bluecorner"
@@ -12031,7 +12031,7 @@
},
/area/station/public/dorms)
"aQs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitecorner"
@@ -17125,7 +17125,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port/west)
"bgs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Office Supplies";
dir = 4
@@ -18246,7 +18246,7 @@
/turf/simulated/floor/plating,
/area/station/service/hydroponics)
"bjD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -18260,7 +18260,7 @@
/turf/simulated/floor/wood,
/area/station/service/library)
"bjI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
name = "north bump";
pixel_y = 24
@@ -19524,7 +19524,7 @@
c_tag = "Bar East"
},
/obj/machinery/newscaster/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/service/bar)
"bnm" = (
@@ -22646,7 +22646,7 @@
/area/station/service/chapel)
"bxE" = (
/obj/machinery/economy/atm/directional/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/service/bar)
"bxF" = (
@@ -23826,7 +23826,7 @@
/turf/simulated/floor/wood,
/area/station/service/library)
"bCR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/service/library)
"bCS" = (
@@ -23907,7 +23907,7 @@
},
/area/station/medical/reception)
"bDk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/obj/machinery/light_switch{
dir = 8;
@@ -28322,7 +28322,7 @@
},
/area/station/hallway/primary/central/se)
"bUH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
@@ -28641,7 +28641,7 @@
/turf/simulated/wall,
/area/station/science/robotics/chargebay)
"bWk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -31538,7 +31538,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"chJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/random{
pixel_y = -32
},
@@ -33079,7 +33079,7 @@
/turf/simulated/floor/plating,
/area/station/medical/patients_rooms1)
"coa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -33106,7 +33106,7 @@
},
/area/station/medical/medbay)
"coe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/south,
/obj/structure/cable,
/turf/simulated/floor/plasteel{
@@ -33261,7 +33261,7 @@
/area/station/medical/patients_rooms_secondary)
"cpb" = (
/obj/machinery/alarm/directional/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -36486,7 +36486,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/controlroom)
"cAS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -36865,7 +36865,7 @@
/turf/simulated/floor/plating,
/area/station/science/misc_lab)
"cCf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -37002,7 +37002,7 @@
},
/area/station/science/break_room)
"cCV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
pixel_y = 24;
name = "north bump"
@@ -37555,7 +37555,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
"cEL" = (
@@ -42682,7 +42682,7 @@
/turf/simulated/floor/plating,
/area/station/engineering/secure_storage)
"cYH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
@@ -42713,7 +42713,7 @@
/area/station/engineering/smes)
"cYN" = (
/obj/machinery/alarm/directional/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/procedure/trainer_office)
"cYO" = (
@@ -45001,7 +45001,7 @@
},
/area/station/hallway/primary/central/north)
"dix" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/north,
/obj/machinery/light{
dir = 1
@@ -45193,7 +45193,7 @@
/turf/space,
/area/space/nearstation)
"dje" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
icon_state = "0-2"
@@ -48499,7 +48499,7 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"dQe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "2-4"
},
@@ -51326,7 +51326,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/controlroom)
"fhe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkred"
@@ -54951,7 +54951,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/transmission_laser)
"gXD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/requests_console/directional/north,
/turf/simulated/floor/wood,
/area/station/command/meeting_room)
@@ -56685,7 +56685,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft)
"hVU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/nanotrasen_logo{
pixel_x = 32
},
@@ -56981,7 +56981,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"ifH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
icon_state = "0-2"
@@ -59377,7 +59377,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/north)
"jtP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood,
/area/station/maintenance/asmaint)
@@ -61680,7 +61680,7 @@
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"kDY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -64608,7 +64608,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"mdg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "barber"
@@ -65346,7 +65346,7 @@
},
/area/station/maintenance/asmaint)
"mxH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -66904,7 +66904,7 @@
},
/area/station/engineering/control)
"ntz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/west,
/turf/simulated/floor/wood,
/area/station/command/office/captain)
@@ -70120,7 +70120,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"oUv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "south bump";
pixel_y = -28
@@ -71252,7 +71252,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"pAp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "yellowcorner"
},
@@ -73240,7 +73240,7 @@
},
/area/station/science/xenobiology)
"qyq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -74049,7 +74049,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "1-8"
},
@@ -74358,7 +74358,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"raH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"raL" = (
@@ -74519,7 +74519,7 @@
},
/area/station/medical/reception)
"rdL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
name = "west bump";
pixel_x = -27
@@ -75406,7 +75406,7 @@
/turf/simulated/floor/carpet/arcade,
/area/station/public/arcade)
"rCT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
@@ -80541,7 +80541,7 @@
},
/area/station/supply/qm)
"uuo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "purplecorner"
@@ -82649,7 +82649,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"vFk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -82876,7 +82876,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "bluecorner"
@@ -83001,7 +83001,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"vOq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/east,
/turf/simulated/floor/plasteel{
dir = 6;
diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm
index d17e951acbc4..e87ccdcfcbcc 100644
--- a/_maps/map_files/stations/cerestation.dmm
+++ b/_maps/map_files/stations/cerestation.dmm
@@ -433,13 +433,13 @@
},
/area/station/hallway/primary/port/north)
"acO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/station/turret_protected/ai)
"acR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"acV" = (
@@ -1404,7 +1404,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/flasher{
id = "AI";
pixel_y = 21
@@ -2215,7 +2215,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/northeast)
"ata" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/wood,
/area/station/command/office/hos)
@@ -2557,7 +2557,7 @@
},
/area/station/turret_protected/aisat/interior/secondary)
"avv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/cobweb,
/obj/structure/disposalpipe/segment/corner{
dir = 1
@@ -2763,7 +2763,7 @@
name = "east bump";
pixel_x = 30
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -3005,7 +3005,7 @@
/turf/simulated/wall,
/area/station/command/office/hos)
"azX" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/item/radio/intercom{
name = "south bump";
pixel_y = -28
@@ -3937,7 +3937,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
@@ -4666,7 +4666,7 @@
/area/station/security/lobby)
"aPW" = (
/obj/machinery/light,
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
@@ -4806,7 +4806,7 @@
/area/station/public/toilet/lockerroom)
"aSf" = (
/obj/machinery/light,
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -5985,7 +5985,7 @@
c_tag = "Rehabilitation Dome Lobby East";
dir = 8
},
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
"bbU" = (
@@ -6607,7 +6607,7 @@
/turf/simulated/floor/grass/jungle,
/area/station/hallway/secondary/garden)
"bfV" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
"bfW" = (
@@ -6801,7 +6801,7 @@
c_tag = "Dorm Commons North";
dir = 4
},
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/machinery/economy/vending/wallmed/directional/north,
/turf/simulated/floor/plasteel,
/area/station/public/locker)
@@ -8571,7 +8571,7 @@
},
/area/station/aisat/atmos)
"brs" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
@@ -9784,7 +9784,7 @@
},
/area/station/engineering/break_room)
"bxv" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkyellowcorners"
@@ -9854,7 +9854,7 @@
/area/station/command/office/hop)
"bxG" = (
/obj/structure/disposalpipe/segment,
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -11516,7 +11516,7 @@
},
/area/station/engineering/control)
"bFo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -12216,7 +12216,7 @@
name = "Atmospherics Desk Shutters";
pixel_x = 24
},
-/obj/item/kirbyplants/plant13,
+/obj/item/kirbyplants/large/alien/alien5,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkyellow"
@@ -13638,7 +13638,7 @@
/turf/simulated/floor/plasteel,
/area/station/command/office/ce)
"bPE" = (
-/obj/item/kirbyplants/plant25,
+/obj/item/kirbyplants/large/plant7,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
@@ -14201,7 +14201,7 @@
/turf/simulated/wall/r_wall,
/area/station/engineering/smes)
"bSB" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -15557,7 +15557,7 @@
},
/area/station/command/bridge)
"bYn" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
@@ -16312,7 +16312,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"ceR" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel{
icon_state = "bcircuit"
@@ -21161,7 +21161,7 @@
/obj/structure/cable/orange{
icon_state = "2-8"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -25100,7 +25100,7 @@
/turf/space,
/area/station/engineering/solar/fore_port)
"duc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "floorgrime"
},
@@ -25282,7 +25282,7 @@
/turf/simulated/floor/wood,
/area/station/service/library)
"dvA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -31509,7 +31509,7 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port)
"eTJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -32998,7 +32998,7 @@
},
/area/station/supply/lobby)
"frn" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -38185,7 +38185,7 @@
},
/area/station/maintenance/port)
"gQP" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/machinery/light_switch{
dir = 1;
pixel_y = -24;
@@ -38327,7 +38327,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/disposal/external/southeast)
"gTe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -38951,7 +38951,7 @@
/obj/structure/cable/orange{
icon_state = "0-8"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/blueshield)
"hch" = (
@@ -39056,7 +39056,7 @@
/obj/structure/cable/orange{
icon_state = "0-4"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
"hdL" = (
@@ -40220,7 +40220,7 @@
/turf/simulated/floor/plating,
/area/station/hallway/secondary/entry/north)
"htq" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/structure/sign/xenobio{
pixel_x = 32
},
@@ -40935,7 +40935,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore/west)
"hDf" = (
-/obj/item/kirbyplants/plant25,
+/obj/item/kirbyplants/large/plant7,
/turf/simulated/floor/plasteel{
icon_state = "arrival"
},
@@ -44836,7 +44836,7 @@
},
/area/station/medical/medbay)
"iAa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -46917,7 +46917,7 @@
},
/area/station/hallway/secondary/entry/north)
"jag" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 4
},
@@ -47392,7 +47392,7 @@
/obj/structure/disposalpipe/junction/reversed{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable/orange{
icon_state = "4-8"
},
@@ -50228,7 +50228,7 @@
},
/area/station/security/prisonershuttle)
"jMh" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/requests_console/directional/west,
/turf/simulated/floor/carpet,
/area/station/medical/psych)
@@ -50494,7 +50494,7 @@
/turf/simulated/floor/plating/asteroid/ancient,
/area/station/maintenance/port2)
"jQl" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/machinery/alarm/directional/north,
/obj/machinery/light_switch{
dir = 8;
@@ -51389,7 +51389,7 @@
/area/station/hallway/primary/central/north)
"kbw" = (
/obj/machinery/firealarm/directional/south,
-/obj/item/kirbyplants/plant25,
+/obj/item/kirbyplants/large/plant7,
/turf/simulated/floor/plasteel{
icon_state = "darkpurple"
},
@@ -51873,7 +51873,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/window/reinforced{
dir = 8
},
@@ -52235,7 +52235,7 @@
},
/area/station/hallway/primary/central/west)
"knB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -54438,7 +54438,7 @@
/turf/simulated/floor/plasteel/freezer,
/area/station/service/kitchen)
"kPx" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/structure/cable/orange{
icon_state = "1-2"
},
@@ -54490,7 +54490,7 @@
/turf/simulated/floor/carpet/royalblack,
/area/station/command/office/ntrep)
"kQz" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel{
icon_state = "darkgreen"
},
@@ -55063,7 +55063,7 @@
},
/area/station/hallway/secondary/entry/north)
"kYE" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/carpet,
/area/station/medical/psych)
@@ -57376,7 +57376,7 @@
/turf/simulated/floor/carpet,
/area/station/service/bar)
"lBJ" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel,
/area/station/public/dorms)
"lBW" = (
@@ -61717,7 +61717,7 @@
},
/area/station/hallway/primary/fore/north)
"mHg" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/wood,
/area/station/service/library)
@@ -64306,7 +64306,7 @@
},
/area/station/hallway/spacebridge/comeng)
"nrh" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/structure/sign/securearea{
pixel_y = 32
},
@@ -65269,7 +65269,7 @@
"nEA" = (
/obj/structure/cable/orange,
/obj/machinery/power/apc/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "browncorner"
},
@@ -66148,7 +66148,7 @@
/obj/structure/sign/nosmoking_2{
pixel_y = 32
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whitepurple"
@@ -66994,7 +66994,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -69860,7 +69860,7 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "bluecorner"
@@ -74418,7 +74418,7 @@
name = "west bump";
pixel_x = -28
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/station/service/chapel/office)
"pWf" = (
@@ -75310,7 +75310,7 @@
},
/area/station/hallway/spacebridge/serveng)
"qhi" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel{
icon_state = "darkpurple"
},
@@ -75421,7 +75421,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/fore2)
"qjf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -78114,7 +78114,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"qSJ" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/structure/cable/orange{
icon_state = "2-4"
},
@@ -79789,7 +79789,7 @@
},
/area/station/engineering/break_room)
"rsq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -80709,7 +80709,7 @@
},
/area/station/maintenance/port2)
"rGm" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/machinery/light_switch{
dir = 4;
pixel_x = -24;
@@ -80863,7 +80863,7 @@
},
/area/station/maintenance/asmaint)
"rIq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -81444,7 +81444,7 @@
},
/area/station/command/office/cmo)
"rOY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -85081,7 +85081,7 @@
/area/mine/unexplored/cere/orbiting)
"sIP" = (
/obj/item/razor,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/west,
/obj/structure/cable/orange{
icon_state = "0-4"
@@ -86277,7 +86277,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -88666,7 +88666,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/window/reinforced{
dir = 4
},
@@ -89575,7 +89575,7 @@
},
/area/station/hallway/primary/fore/north)
"tQD" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/item/radio/intercom{
name = "east bump";
pixel_x = 28
@@ -92805,7 +92805,7 @@
/turf/simulated/floor/plasteel,
/area/station/public/fitness)
"uAH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -92872,7 +92872,7 @@
},
/area/station/science/xenobiology)
"uBY" = (
-/obj/item/kirbyplants/plant25,
+/obj/item/kirbyplants/large/plant7,
/turf/simulated/floor/plasteel{
icon_state = "whitegreen"
},
@@ -97449,7 +97449,7 @@
/area/station/maintenance/apmaint)
"vIu" = (
/obj/machinery/alarm/directional/north,
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/wood,
/area/station/legal/magistrate)
"vIz" = (
@@ -97656,7 +97656,7 @@
},
/area/station/public/storage/tools/auxiliary)
"vLy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "bluecorner"
@@ -102188,7 +102188,7 @@
},
/area/station/medical/medbay)
"wOW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -103456,7 +103456,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"xfK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/service/library)
"xfM" = (
@@ -106713,7 +106713,7 @@
/turf/simulated/floor/engine,
/area/station/medical/chemistry)
"xVF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkyellowcorners"
},
@@ -107129,7 +107129,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"ycw" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/effect/mapping_helpers/turfs/burn,
/obj/structure/sign/poster/contraband/random{
pixel_x = -32
diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm
index 7db15fe1d31e..20cd6300d0bc 100644
--- a/_maps/map_files/stations/deltastation.dmm
+++ b/_maps/map_files/stations/deltastation.dmm
@@ -555,7 +555,7 @@
},
/area/station/hallway/secondary/entry/north)
"afk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "brown"
@@ -1831,7 +1831,7 @@
},
/area/station/hallway/secondary/entry/east)
"anz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 4
},
@@ -2064,7 +2064,7 @@
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
"aow" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -2082,7 +2082,7 @@
},
/area/station/maintenance/fore2)
"aoA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "arrival"
},
@@ -2185,7 +2185,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/public/vacant_office)
"aoY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/wood,
/area/station/public/vacant_office)
@@ -2245,7 +2245,7 @@
},
/area/station/command/customs)
"apg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/north,
/obj/machinery/light_switch{
dir = 8;
@@ -2588,7 +2588,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/hallway/secondary/entry/lounge)
"aqc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
@@ -2706,7 +2706,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/electrical_shop)
"aqw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/electrical_shop)
"aqx" = (
@@ -2724,7 +2724,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/electrical_shop)
"aqz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/maintenance/electrical_shop)
"aqA" = (
@@ -2753,7 +2753,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/electrical_shop)
"aqD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 1
},
@@ -2982,7 +2982,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"arh" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/fore2)
@@ -2996,7 +2996,7 @@
},
/area/station/maintenance/fore2)
"arj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/contraband/random{
pixel_y = 32
},
@@ -3121,7 +3121,7 @@
/turf/simulated/floor/wood,
/area/station/public/vacant_office)
"arF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/public/vacant_office)
"arG" = (
@@ -3535,7 +3535,7 @@
},
/area/station/security/checkpoint/secondary)
"asI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"asJ" = (
@@ -3857,7 +3857,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/hallway/secondary/entry/lounge)
"atD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/south,
/turf/simulated/floor/plasteel/grimy,
/area/station/hallway/secondary/entry/lounge)
@@ -3970,7 +3970,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/fore2)
"atS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/fore2)
"atU" = (
@@ -4114,7 +4114,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/electrical_shop)
"auo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/south,
/obj/structure/cable{
icon_state = "0-8"
@@ -4163,7 +4163,7 @@
},
/area/station/maintenance/fore2)
"auw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 8
},
@@ -4353,7 +4353,7 @@
},
/area/station/hallway/secondary/entry/lounge)
"avc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -4373,7 +4373,7 @@
},
/area/station/maintenance/fore2)
"avg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -5472,7 +5472,7 @@
},
/area/station/security/prisonershuttle)
"axW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/nosmoking_2{
pixel_x = 32
},
@@ -5636,7 +5636,7 @@
/turf/simulated/wall,
/area/station/supply/sorting)
"ayB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
@@ -6626,7 +6626,7 @@
icon_state = "1-2"
},
/obj/effect/turf_decal/delivery/hollow,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/engine,
/area/station/engineering/controlroom)
"aBm" = (
@@ -7240,7 +7240,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/abandoned_garden)
"aDl" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 1
},
@@ -7276,7 +7276,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/abandoned_garden)
"aDq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -8512,7 +8512,7 @@
/turf/simulated/floor/engine,
/area/station/engineering/controlroom)
"aHd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/maintenance/abandoned_garden)
@@ -8946,7 +8946,7 @@
dir = 2
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/incinerator)
"aIv" = (
@@ -9006,7 +9006,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/incinerator)
"aIB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
@@ -9246,7 +9246,7 @@
/turf/space,
/area/space/nearstation)
"aJD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -9259,7 +9259,7 @@
/turf/simulated/floor/plating,
/area/station/supply/storage)
"aJF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "south bump";
pixel_y = -28
@@ -10489,7 +10489,7 @@
},
/area/station/supply/storage)
"aNl" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "brown"
@@ -10618,7 +10618,7 @@
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"aNL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "darkred"
@@ -10734,7 +10734,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/maintenance/gambling_den)
"aOq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/grimy,
/area/station/maintenance/gambling_den)
"aOr" = (
@@ -10744,7 +10744,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/maintenance/gambling_den)
"aOs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/gambling_den)
"aOt" = (
@@ -10756,7 +10756,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/gambling_den)
"aOu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/maintenance/gambling_den)
"aOv" = (
@@ -10810,7 +10810,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -11060,7 +11060,7 @@
},
/area/station/service/bar)
"aPv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"aPw" = (
@@ -11255,7 +11255,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/grimy,
/area/station/service/theatre)
"aQb" = (
@@ -11582,7 +11582,7 @@
},
/area/station/engineering/atmos)
"aQZ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -11868,7 +11868,7 @@
},
/area/station/supply/sorting)
"aRO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/east,
/turf/simulated/floor/plasteel{
dir = 6;
@@ -12952,7 +12952,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
name = "east bump";
pixel_x = 30
@@ -13005,7 +13005,7 @@
},
/area/station/supply/storage)
"aVb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -14354,7 +14354,7 @@
},
/area/station/engineering/atmos)
"aZn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
dir = 4;
name = "west bump";
@@ -14423,7 +14423,7 @@
/area/station/command/office/hos)
"aZz" = (
/obj/machinery/light,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "brown"
@@ -14730,7 +14730,7 @@
/turf/simulated/floor/plasteel,
/area/station/service/kitchen)
"baR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/west,
/turf/simulated/floor/plasteel{
icon_state = "bar"
@@ -14800,7 +14800,7 @@
},
/area/station/supply/office)
"baY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "brown"
},
@@ -15663,7 +15663,7 @@
},
/area/station/supply/lobby)
"bdW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "brown"
@@ -16139,7 +16139,7 @@
},
/area/station/supply/miningdock)
"bfC" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
@@ -16481,7 +16481,7 @@
/turf/simulated/wall,
/area/station/command/office/ce)
"bgK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -16503,7 +16503,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/turret_protected/ai)
"bgO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -16641,7 +16641,7 @@
/area/station/engineering/atmos)
"bhv" = (
/obj/effect/turf_decal/delivery/hollow,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/service/hydroponics)
"bhw" = (
@@ -17573,7 +17573,7 @@
},
/area/station/supply/miningdock)
"bjK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -18306,7 +18306,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/transparent/glass,
/area/station/aisat)
"bmq" = (
@@ -18324,7 +18324,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/transparent/glass,
/area/station/aisat)
"bms" = (
@@ -18869,7 +18869,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "2-4"
},
@@ -19427,7 +19427,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/service/library)
"bpU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellowcorner"
@@ -20672,7 +20672,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"buA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small,
/obj/machinery/atmospherics/pipe/simple/visible/yellow{
dir = 4
@@ -20923,7 +20923,7 @@
/turf/simulated/floor/plating,
/area/station/engineering/control)
"bvC" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/nosmoking_2{
pixel_y = 32
},
@@ -21405,7 +21405,7 @@
},
/area/station/engineering/atmos)
"bxc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "caution"
@@ -21761,7 +21761,7 @@
/turf/simulated/floor/greengrid,
/area/station/turret_protected/ai)
"byg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/turret_protected/ai)
"byh" = (
@@ -22426,7 +22426,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/tech_storage)
"bAi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/engineering/tech_storage)
@@ -22497,7 +22497,7 @@
},
/area/station/engineering/hardsuitstorage)
"bAr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 1
},
@@ -22510,7 +22510,7 @@
},
/area/station/command/bridge)
"bAt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/command/bridge)
"bAw" = (
@@ -22811,7 +22811,7 @@
},
/area/station/engineering/break_room)
"bBF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/north,
/obj/machinery/light{
dir = 1
@@ -23103,7 +23103,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/command/bridge)
"bCn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -23278,7 +23278,7 @@
pixel_y = 24;
req_access = list(19)
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -23748,7 +23748,7 @@
},
/area/station/hallway/primary/port/north)
"bDE" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display{
pixel_x = -32
},
@@ -23801,7 +23801,7 @@
},
/area/station/engineering/tech_storage)
"bDI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/ai_status_display{
pixel_x = 32
},
@@ -23961,7 +23961,7 @@
},
/area/station/command/bridge)
"bEd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkblue"
@@ -24004,7 +24004,7 @@
/turf/simulated/floor/carpet,
/area/station/command/bridge)
"bEj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
@@ -24160,7 +24160,7 @@
},
/area/station/engineering/break_room)
"bET" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
@@ -24169,7 +24169,7 @@
},
/area/station/engineering/break_room)
"bEU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/obj/machinery/alarm/directional/south,
/obj/effect/turf_decal/delivery,
@@ -24402,7 +24402,7 @@
},
/area/station/public/storage/tools)
"bFr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
@@ -24571,7 +24571,7 @@
},
/area/station/command/bridge)
"bFR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small,
/turf/simulated/floor/plasteel/dark,
/area/station/command/bridge)
@@ -25282,7 +25282,7 @@
},
/area/station/security/checkpoint)
"bHS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
@@ -25355,7 +25355,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/gravitygenerator)
"bIq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
"bIr" = (
@@ -25386,7 +25386,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
"bIv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
@@ -25612,7 +25612,7 @@
/turf/simulated/floor/wood,
/area/station/command/meeting_room)
"bJa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -25714,7 +25714,7 @@
/turf/simulated/floor/wood,
/area/station/command/office/captain)
"bJr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/captain)
"bJs" = (
@@ -25731,7 +25731,7 @@
},
/area/station/legal/courtroom/gallery)
"bJC" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/west,
/obj/structure/cable{
icon_state = "0-4"
@@ -25931,7 +25931,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/ai_transit_tube)
"bKc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/obj/machinery/door_control{
id = "transitlock";
@@ -25945,7 +25945,7 @@
},
/area/station/engineering/ai_transit_tube)
"bKd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
@@ -26089,7 +26089,7 @@
/turf/simulated/wall,
/area/station/engineering/break_room)
"bKy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/ai_status_display{
pixel_x = -32
},
@@ -26107,7 +26107,7 @@
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
"bKB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display{
pixel_x = 32
},
@@ -26717,7 +26717,7 @@
},
/area/station/engineering/break_room)
"bMw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "yellow"
@@ -26731,7 +26731,7 @@
name = "east bump";
pixel_x = 28
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "yellow"
@@ -27322,7 +27322,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/tech_storage)
"bOr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
@@ -27337,7 +27337,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/tech_storage)
"bOt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
dir = 1;
name = "south bump";
@@ -27386,7 +27386,7 @@
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
"bOz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
"bOA" = (
@@ -27763,7 +27763,7 @@
},
/area/station/turret_protected/aisat)
"bPJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -27777,7 +27777,7 @@
},
/area/station/turret_protected/aisat)
"bPN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -27961,7 +27961,7 @@
},
/area/station/security/brig)
"bQp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
@@ -28094,7 +28094,7 @@
/turf/simulated/floor/wood,
/area/station/command/meeting_room)
"bQG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/turf/simulated/floor/wood,
/area/station/command/meeting_room)
@@ -29135,7 +29135,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
"bUn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
@@ -29385,7 +29385,7 @@
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"bUT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"bUU" = (
@@ -29851,7 +29851,7 @@
pixel_x = 32
},
/obj/machinery/alarm/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "yellow"
@@ -30109,7 +30109,7 @@
},
/area/station/engineering/break_room)
"bXH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/obj/item/radio/intercom{
name = "south bump";
@@ -30136,7 +30136,7 @@
},
/area/station/turret_protected/aisat)
"bXK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel{
@@ -30187,7 +30187,7 @@
},
/area/station/turret_protected/aisat)
"bXP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
name = "east bump";
pixel_x = 27
@@ -30235,7 +30235,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"bYe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "cautioncorner"
@@ -30875,7 +30875,7 @@
/turf/simulated/floor/carpet/black,
/area/station/command/office/captain/bedroom)
"cat" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/security_unit/directional/east,
/turf/simulated/floor/carpet/black,
/area/station/command/office/captain/bedroom)
@@ -30903,7 +30903,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/legal/courtroom/gallery)
"cay" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/legal/courtroom/gallery)
"caz" = (
@@ -31008,7 +31008,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/hop)
"caV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -31188,7 +31188,7 @@
},
/area/station/engineering/control)
"cbu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Engine Room North";
network = list("Engineering","SS13")
@@ -31374,7 +31374,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"cbS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -31845,7 +31845,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"cdx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
@@ -31865,7 +31865,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/service/library)
"cdA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 4
},
@@ -32002,7 +32002,7 @@
/area/station/command/office/captain/bedroom)
"cdX" = (
/obj/machinery/firealarm/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Captain's Quarters";
dir = 1
@@ -32316,7 +32316,7 @@
/turf/simulated/floor/wood,
/area/station/service/library)
"cfs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/service/library)
"cft" = (
@@ -32842,7 +32842,7 @@
},
/area/station/telecomms/chamber)
"chX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -34115,7 +34115,7 @@
},
/area/station/hallway/primary/aft/south)
"cmo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -34439,7 +34439,7 @@
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"cnt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
dir = 1;
name = "south bump";
@@ -35034,7 +35034,7 @@
/turf/simulated/wall/r_wall,
/area/station/engineering/control)
"cpr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable/yellow{
icon_state = "1-4"
},
@@ -35762,7 +35762,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/equipmentstorage)
"crk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Library South";
dir = 1
@@ -35782,7 +35782,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/service/library)
"crm" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/obj/machinery/light_switch{
dir = 1;
@@ -35795,7 +35795,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/service/library)
"cro" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/grimy,
/area/station/service/library)
"crp" = (
@@ -36074,7 +36074,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/transparent/glass,
/area/station/aisat)
"csl" = (
@@ -36082,7 +36082,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/transparent/glass,
/area/station/aisat)
"csm" = (
@@ -36155,7 +36155,7 @@
/turf/simulated/floor/plating,
/area/station/engineering/control)
"csw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/firealarm/directional/east,
@@ -36518,7 +36518,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"ctH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/service/library)
"ctK" = (
@@ -36663,7 +36663,7 @@
},
/area/station/hallway/primary/central)
"cuf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -36764,7 +36764,7 @@
},
/area/station/hallway/primary/starboard/south)
"cuv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
@@ -37236,7 +37236,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/ai_monitored/storage/eva)
"cvz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -37415,7 +37415,7 @@
/turf/simulated/wall,
/area/station/public/fitness)
"cwq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel/white,
/area/station/maintenance/port2)
@@ -37456,7 +37456,7 @@
},
/area/station/engineering/control)
"cwy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/electricshock{
pixel_y = 32
},
@@ -37731,7 +37731,7 @@
/area/station/supply/expedition)
"cxl" = (
/obj/machinery/power/apc/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
@@ -37984,7 +37984,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"cxV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
name = "west bump";
pixel_x = -30
@@ -38046,7 +38046,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/service/library)
"cyb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/east,
/turf/simulated/floor/plasteel/dark,
/area/station/service/library)
@@ -38250,7 +38250,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/port2)
"cyF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/public/toilet/lockerroom)
"cyH" = (
@@ -38475,7 +38475,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/port)
"czo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "north bump";
pixel_y = 28
@@ -39015,7 +39015,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/service/library)
"cAU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "south bump";
pixel_y = -28
@@ -39115,7 +39115,7 @@
},
/area/station/hallway/primary/starboard/south)
"cBi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -39559,7 +39559,7 @@
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
"cCN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/obj/machinery/light,
/turf/simulated/floor/carpet,
@@ -39584,7 +39584,7 @@
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
"cCR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/turf/simulated/floor/carpet,
/area/station/science/robotics/showroom)
@@ -39627,7 +39627,7 @@
},
/area/station/supply/expedition)
"cCX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
@@ -39884,14 +39884,14 @@
/turf/simulated/floor/plasteel,
/area/station/science/robotics/chargebay)
"cDJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"cDK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/electricshock{
pixel_y = -32
},
@@ -39931,7 +39931,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"cDQ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"cDR" = (
@@ -39977,7 +39977,7 @@
},
/area/station/maintenance/port)
"cEb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "south bump";
pixel_y = -28
@@ -40010,7 +40010,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/ai_monitored/storage/eva)
"cEs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/ai_monitored/storage/eva)
"cEt" = (
@@ -40993,7 +40993,7 @@
},
/area/station/public/fitness)
"cGT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -41427,7 +41427,7 @@
},
/area/station/public/fitness)
"cId" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -41946,7 +41946,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/electrical)
"cJW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/maintenance/electrical)
@@ -42079,7 +42079,7 @@
},
/area/station/science/lobby)
"cKz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
},
@@ -42162,7 +42162,7 @@
},
/area/station/medical/reception)
"cKN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitebluecorner"
@@ -42362,7 +42362,7 @@
},
/area/station/maintenance/electrical)
"cLF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/electrical)
"cLG" = (
@@ -42529,7 +42529,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/science/research)
"cMn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurplecorner"
@@ -42556,7 +42556,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/medical/medbay)
"cMt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitebluecorner"
@@ -42743,7 +42743,7 @@
/turf/space,
/area/space/nearstation)
"cND" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -43098,7 +43098,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/electrical)
"cOz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display{
pixel_x = -32
},
@@ -43712,7 +43712,7 @@
},
/area/station/science/xenobiology)
"cQO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -43781,7 +43781,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
"cRd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -43801,7 +43801,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/solar_maintenance/aft_starboard)
"cRg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -43812,7 +43812,7 @@
},
/area/station/hallway/primary/aft/north)
"cRj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitebluecorner"
@@ -44434,7 +44434,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/science/xenobiology)
"cTy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
@@ -44994,7 +44994,7 @@
},
/area/station/science/rnd)
"cVu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -45386,7 +45386,7 @@
},
/area/station/science/xenobiology)
"cWV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
@@ -45491,7 +45491,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"cXO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -45949,7 +45949,7 @@
},
/area/station/maintenance/starboard)
"cZY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitebluecorner"
@@ -45976,12 +45976,12 @@
},
/area/station/maintenance/starboard)
"dae" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
/area/station/maintenance/abandonedbar)
"daf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/abandonedbar)
"dag" = (
@@ -46223,7 +46223,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/science/rnd)
"daM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -46243,7 +46243,7 @@
},
/area/station/maintenance/starboard)
"daS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"daT" = (
@@ -46389,7 +46389,7 @@
/turf/simulated/floor/grass,
/area/station/medical/medbay)
"dbG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/abandonedbar)
@@ -46415,7 +46415,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"dbJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/contraband/random{
pixel_x = 32
},
@@ -46457,7 +46457,7 @@
},
/area/station/hallway/secondary/exit)
"dbV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
@@ -46768,7 +46768,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/abandonedbar)
"dcY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
"dcZ" = (
@@ -46784,7 +46784,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/maintenance/port2)
"ddc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 1
},
@@ -47016,7 +47016,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/maintenance/port2)
"ddJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "purplefull"
},
@@ -48592,7 +48592,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/maintenance/port2)
"dky" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel/white,
@@ -48945,7 +48945,7 @@
/area/station/engineering/controlroom)
"dlV" = (
/obj/machinery/power/apc/directional/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -49123,7 +49123,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/abandonedbar)
"dmR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
dir = 8;
name = "east bump";
@@ -50009,7 +50009,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"drp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/ntrep)
"drs" = (
@@ -50706,7 +50706,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
"duR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/random{
pixel_y = -32
},
@@ -51074,7 +51074,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/theatre)
"dwW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood,
/area/station/maintenance/theatre)
@@ -51274,7 +51274,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/theatre)
"dyl" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 8
},
@@ -51878,7 +51878,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/medical/morgue)
"dCh" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 8
},
@@ -52276,11 +52276,11 @@
/turf/simulated/floor/plating,
/area/station/maintenance/theatre)
"dDJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/maintenance/theatre)
"dDK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/wood,
/area/station/maintenance/theatre)
@@ -52488,7 +52488,7 @@
dir = 4
},
/obj/machinery/alarm/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/east,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
@@ -52923,7 +52923,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
"dHO" = (
@@ -53178,7 +53178,7 @@
},
/area/station/hallway/secondary/exit)
"dJH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -53255,7 +53255,7 @@
},
/area/station/service/chapel)
"dKi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/service/chapel)
"dKj" = (
@@ -53324,7 +53324,7 @@
/turf/space,
/area/space/nearstation)
"dKB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/mounted/frame/apc_frame,
/obj/structure/cable{
icon_state = "0-2"
@@ -53682,7 +53682,7 @@
/turf/simulated/floor/grass/no_creep,
/area/station/hallway/secondary/exit)
"dNa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -53905,7 +53905,7 @@
},
/area/station/hallway/secondary/exit)
"dOv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
@@ -54457,7 +54457,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dQP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -55164,7 +55164,7 @@
},
/area/station/hallway/secondary/exit)
"dTC" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/turf_decal/delivery,
@@ -55268,7 +55268,7 @@
},
/area/station/service/chapel/office)
"dUi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -55291,7 +55291,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"dUm" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -55562,7 +55562,7 @@
},
/area/station/engineering/solar/aft_port)
"dVo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -55654,7 +55654,7 @@
/turf/simulated/floor/plating,
/area/station/engineering/control)
"dWm" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel/white,
/area/station/science/xenobiology)
@@ -56159,13 +56159,13 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/port2)
"dYG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel/white,
/area/station/maintenance/port2)
"dYH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/random{
pixel_y = -32
},
@@ -56377,7 +56377,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"eas" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 4
},
@@ -56467,7 +56467,7 @@
name = "east bump";
pixel_x = 28
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -56708,7 +56708,7 @@
/turf/simulated/floor/plasteel,
/area/station/supply/sorting)
"ejB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
name = "north bump";
pixel_y = 24
@@ -57335,11 +57335,11 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/ne)
"eyz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"eyG" = (
@@ -57522,7 +57522,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/medical/sleeper)
"eEh" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/controlroom)
"eEq" = (
@@ -57756,7 +57756,7 @@
/turf/simulated/floor/engine,
/area/station/science/testrange)
"eLI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -59692,7 +59692,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
"fOy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/obj/item/radio/intercom{
name = "south bump";
@@ -64426,7 +64426,7 @@
/obj/structure/bed,
/obj/item/bedsheet/orange,
/obj/machinery/flasher{
- id = "Cell 1";
+ id = "Cell 2";
pixel_y = 22
},
/turf/simulated/floor/plasteel{
@@ -64852,7 +64852,7 @@
},
/area/station/maintenance/starboard)
"iPP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/critical/directional/east{
shock_proof = 1
},
@@ -65395,7 +65395,7 @@
},
/area/station/medical/virology)
"jee" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
@@ -65422,7 +65422,7 @@
name = "west bump";
pixel_x = -28
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/aisat)
"jfB" = (
@@ -65985,7 +65985,7 @@
},
/area/station/hallway/primary/port/west)
"jyW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -66556,7 +66556,7 @@
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"jQA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "whitegreen"
@@ -67155,7 +67155,7 @@
/area/station/medical/medbay)
"khC" = (
/obj/effect/turf_decal/delivery/hollow,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/engine,
/area/station/engineering/controlroom)
"khM" = (
@@ -67395,7 +67395,7 @@
},
/area/station/security/prisonershuttle)
"koC" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 4
},
@@ -68092,7 +68092,7 @@
},
/area/station/hallway/primary/port/west)
"kJg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "east bump";
pixel_x = 28
@@ -68437,7 +68437,7 @@
pixel_x = -24;
req_access = list(39)
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitegreen"
@@ -69028,7 +69028,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"llV" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
icon_state = "plant-22"
},
/obj/structure/sign/nosmoking_1{
@@ -69635,8 +69635,8 @@
},
/area/station/medical/reception)
"lBJ" = (
-/obj/item/kirbyplants,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -69720,7 +69720,7 @@
/area/station/security/armory/secure)
"lEU" = (
/obj/machinery/flasher{
- id = "Cell 1";
+ id = "Cell 3";
pixel_y = 22
},
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -69938,7 +69938,7 @@
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
"lLY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -70774,7 +70774,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/grimey,
/area/station/maintenance/theatre)
"mod" = (
@@ -70961,7 +70961,7 @@
/turf/simulated/floor/plasteel,
/area/station/public/fitness)
"msD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "0-4"
},
@@ -75755,7 +75755,7 @@
dir = 4
},
/obj/machinery/alarm/directional/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "barber"
},
@@ -76187,7 +76187,7 @@
},
/area/station/science/toxins/mixing)
"plz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/aisat)
"plR" = (
@@ -76484,7 +76484,7 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"puH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "east bump";
pixel_x = 28
@@ -76700,7 +76700,7 @@
},
/area/station/medical/morgue)
"pBe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -76921,7 +76921,7 @@
pixel_x = 6;
pixel_y = -4
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 7
},
/obj/structure/railing/corner{
@@ -76962,7 +76962,7 @@
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"pHg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/mineral/titanium,
/area/shuttle/arrival/station)
"pHr" = (
@@ -79147,7 +79147,7 @@
/turf/simulated/floor/plating,
/area/station/security/execution)
"qVp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkred"
},
@@ -79206,7 +79206,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/fore2)
"qWx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/north,
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
@@ -79256,7 +79256,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/engine,
/area/station/engineering/controlroom)
"qYf" = (
@@ -79671,7 +79671,7 @@
},
/area/station/engineering/atmos)
"rgU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/west,
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
@@ -79770,7 +79770,7 @@
name = "south bump";
pixel_y = -28
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -79863,7 +79863,7 @@
/turf/space,
/area/space/nearstation)
"rlI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/abandonedbar)
"rlO" = (
@@ -80126,7 +80126,7 @@
},
/area/station/medical/reception)
"rsX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/maintenance/library)
"rsY" = (
@@ -80499,7 +80499,7 @@
/turf/simulated/floor/wood,
/area/station/security/detective)
"rCv" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
icon_state = "plant-18"
},
/turf/simulated/floor/plasteel{
@@ -82225,7 +82225,7 @@
/area/station/engineering/transmission_laser)
"ssh" = (
/obj/machinery/flasher{
- id = "Cell 2";
+ id = "Cell 1";
pixel_y = -26
},
/obj/structure/closet/secure_closet/brig/temp/cell_1,
@@ -82414,7 +82414,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
"syt" = (
@@ -83011,7 +83011,7 @@
/area/station/medical/storage)
"sMV" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/wood,
/area/station/hallway/secondary/entry/east)
@@ -84799,7 +84799,7 @@
},
/area/station/command/bridge)
"tJc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/obj/item/radio/intercom{
name = "north bump";
@@ -84988,7 +84988,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/ai_monitored/storage/eva)
"tQM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -87608,7 +87608,7 @@
/obj/structure/bed,
/obj/item/bedsheet/orange,
/obj/machinery/flasher{
- id = "Cell 1";
+ id = "Cell 4";
pixel_y = 22
},
/obj/structure/cable{
@@ -87672,7 +87672,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"vkn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkred"
@@ -89131,7 +89131,7 @@
},
/area/station/hallway/secondary/entry/north)
"vYF" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
icon_state = "plant-18"
},
/turf/simulated/floor/wood,
@@ -89853,7 +89853,7 @@
/turf/simulated/floor/plasteel,
/area/station/command/teleporter)
"wro" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitegreen"
@@ -90181,7 +90181,7 @@
/turf/simulated/floor/plasteel,
/area/station/science/testrange)
"wyS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable,
/obj/machinery/power/apc/important/directional/south,
/turf/simulated/floor/plasteel{
@@ -91663,7 +91663,7 @@
/turf/simulated/floor/wood,
/area/station/public/pet_store)
"xoT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "purplefull"
},
@@ -92053,7 +92053,7 @@
pixel_x = -6;
pixel_y = -4
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 7
},
/obj/structure/railing/corner{
@@ -92402,7 +92402,7 @@
},
/area/station/medical/cryo)
"xIJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/requests_console/directional/west,
/turf/simulated/floor/plasteel{
icon_state = "darkredfull"
@@ -93031,7 +93031,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/abandonedbar)
"yes" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkred"
@@ -93192,7 +93192,7 @@
/area/station/security/brig)
"yjA" = (
/obj/machinery/power/apc/directional/south,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
icon_state = "plant-10"
},
/obj/structure/cable,
diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm
index b7151690fb74..a68fc3bff64c 100644
--- a/_maps/map_files/stations/emeraldstation.dmm
+++ b/_maps/map_files/stations/emeraldstation.dmm
@@ -996,7 +996,7 @@
/obj/structure/railing/corner{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "cautioncorner"
@@ -1969,7 +1969,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"auh" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/random{
pixel_x = -32
},
@@ -3011,7 +3011,7 @@
},
/area/station/security/prisonlockers)
"aGx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
icon_state = "0-8"
@@ -3217,7 +3217,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"aIV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/aft)
@@ -3564,7 +3564,7 @@
/turf/simulated/floor/wood,
/area/station/service/theatre)
"aMI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
},
@@ -4352,7 +4352,7 @@
/obj/structure/sign/nosmoking_2{
pixel_y = 32
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/service/library)
"aUP" = (
@@ -5399,7 +5399,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/fpmaint)
"beD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitegreen"
@@ -7065,7 +7065,7 @@
},
/area/station/hallway/primary/starboard)
"bvm" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
name = "south bump";
pixel_y = -30
@@ -7116,7 +7116,7 @@
},
/area/station/public/dorms)
"bvG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 4
},
@@ -7437,7 +7437,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"byS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
@@ -8161,7 +8161,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
"bEV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/blueshield)
"bEW" = (
@@ -8177,7 +8177,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/west)
"bFa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/security/permabrig)
"bFc" = (
@@ -9085,7 +9085,7 @@
},
/area/station/hallway/secondary/exit)
"bNT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/random{
pixel_y = -32
},
@@ -10912,7 +10912,7 @@
},
/area/station/medical/surgery/observation)
"cfy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -13565,7 +13565,7 @@
/turf/simulated/floor/carpet/grimey,
/area/station/security/detective)
"cIf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/grimey,
/area/station/service/chapel/funeral)
"cIq" = (
@@ -14284,7 +14284,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"cQi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
icon_state = "0-2"
@@ -14785,7 +14785,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"cVs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/south,
/obj/machinery/camera{
c_tag = "Medbay Cloning";
@@ -17354,7 +17354,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"dwF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/north,
/obj/structure/sign/poster/official/random{
pixel_x = -32
@@ -19026,7 +19026,7 @@
},
/area/station/security/lobby)
"dNO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -19062,7 +19062,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/dorms/port)
"dOt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
"dOx" = (
@@ -20061,7 +20061,7 @@
},
/area/station/security/permabrig)
"ebg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkred"
@@ -21691,7 +21691,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"esr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
name = "west bump";
pixel_x = -30
@@ -21701,7 +21701,7 @@
},
/area/station/turret_protected/ai)
"esx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
},
@@ -22750,7 +22750,7 @@
},
/area/station/medical/medbay2)
"eDj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -23407,7 +23407,7 @@
},
/area/station/security/brig)
"eJP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -23576,7 +23576,7 @@
/turf/simulated/floor/engine/xenobio,
/area/station/science/xenobiology)
"eLF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/obj/structure/extinguisher_cabinet{
name = "north bump";
@@ -24741,7 +24741,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "arrival"
@@ -27692,7 +27692,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/electrical)
"fyF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -27767,7 +27767,7 @@
},
/area/station/medical/surgery/primary)
"fzx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "blackcorner"
},
@@ -28681,7 +28681,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/abandoned_garden)
"fIW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/random{
pixel_y = -32
},
@@ -28752,7 +28752,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
@@ -29094,7 +29094,7 @@
/turf/simulated/floor/carpet/black,
/area/station/service/chapel)
"fMQ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "cult"
@@ -29216,7 +29216,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/storage)
"fNG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/ai_monitored/storage/eva)
@@ -31412,7 +31412,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/security/fore)
"gkE" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/security_unit/directional/north,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
@@ -32458,7 +32458,7 @@
icon_state = "xenobio2";
pixel_y = -32
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/obj/structure/cable{
icon_state = "1-2"
@@ -32930,7 +32930,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/security/fore)
"gBN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/cmo)
"gBS" = (
@@ -35616,7 +35616,7 @@
},
/area/station/maintenance/apmaint)
"hcU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkgreen"
@@ -36087,7 +36087,7 @@
},
/area/station/security/permabrig)
"hhW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/obj/machinery/light_switch{
dir = 4;
@@ -36633,7 +36633,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"hna" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Central Hallway North"
},
@@ -36998,7 +36998,7 @@
/turf/simulated/floor/plating,
/area/station/security/interrogation)
"hqt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "whiteblue"
@@ -41272,7 +41272,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"ije" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
icon_state = "plant-10"
},
/turf/simulated/floor/wood,
@@ -41603,7 +41603,7 @@
},
/area/station/hallway/primary/fore/north)
"imB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/south)
"imE" = (
@@ -41673,7 +41673,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
"inj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/purple{
dir = 4
},
@@ -41733,7 +41733,7 @@
},
/area/station/engineering/ai_transit_tube)
"inF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "browncorner"
@@ -41954,7 +41954,7 @@
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"iqw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -43242,7 +43242,7 @@
},
/area/station/science/xenobiology)
"iDr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "yellowcorner"
@@ -43896,7 +43896,7 @@
},
/area/station/science/lobby)
"iJI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "north bump";
pixel_y = 28
@@ -45032,7 +45032,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
"iUM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/legal/courtroom/gallery)
"iUR" = (
@@ -46194,7 +46194,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"jgh" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
@@ -48549,7 +48549,7 @@
/area/station/public/fitness)
"jEW" = (
/obj/effect/turf_decal/stripes/line,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -49803,7 +49803,7 @@
/turf/simulated/floor/plasteel,
/area/station/command/bridge)
"jQN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/hop)
"jQP" = (
@@ -50083,7 +50083,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"jTf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/command/office/captain/bedroom)
"jTg" = (
@@ -50138,7 +50138,7 @@
/obj/structure/railing{
dir = 5
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "darkblue"
@@ -52367,7 +52367,7 @@
},
/area/station/public/sleep)
"krM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
@@ -54026,7 +54026,7 @@
},
/area/station/medical/storage)
"kLi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/ai_monitored/storage/eva)
"kLm" = (
@@ -54394,7 +54394,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"kNU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
@@ -55217,7 +55217,7 @@
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"kWH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "north bump";
pixel_y = 28
@@ -55547,7 +55547,7 @@
},
/area/station/science/lobby)
"laA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "2-8"
},
@@ -58696,7 +58696,7 @@
},
/area/station/security/permabrig)
"lGB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -59983,7 +59983,7 @@
},
/area/station/security/range)
"lWi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
@@ -60607,7 +60607,7 @@
},
/area/station/turret_protected/aisat/interior)
"mdw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Brig Lobby East";
dir = 9
@@ -61428,7 +61428,7 @@
},
/area/station/security/range)
"mmn" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/machinery/light/small{
dir = 1
},
@@ -62089,7 +62089,7 @@
/turf/simulated/floor/plasteel,
/area/station/ai_monitored/storage/eva)
"msz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -62560,7 +62560,7 @@
},
/area/station/medical/cryo)
"myc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkred"
@@ -62608,7 +62608,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
"mzp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/public/dorms)
"mzq" = (
@@ -63257,7 +63257,7 @@
/area/station/maintenance/starboard)
"mGn" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/effect/spawner/random/cobweb/left/rare,
/turf/simulated/floor/plating,
/area/station/maintenance/electrical)
@@ -63623,7 +63623,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint2)
"mKR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/random{
pixel_y = 32
},
@@ -64555,7 +64555,7 @@
/turf/simulated/floor/engine/n20,
/area/station/engineering/atmos)
"mTP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -65177,7 +65177,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
@@ -65358,7 +65358,7 @@
},
/area/station/supply/sorting)
"nco" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/obj/machinery/camera{
c_tag = "Medbay Treatment Center South-West";
@@ -65650,7 +65650,7 @@
},
/area/station/hallway/primary/central/se)
"neL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/purple,
/turf/simulated/floor/plasteel{
dir = 6;
@@ -66332,7 +66332,7 @@
},
/area/station/engineering/control)
"nmD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
},
@@ -66830,7 +66830,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/abandoned_office)
"nqj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -68698,7 +68698,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
"nIR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "1-4"
},
@@ -69423,7 +69423,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard)
"nPG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/public/storage/office)
"nPH" = (
@@ -69624,7 +69624,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/south)
"nRn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -71565,7 +71565,7 @@
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint2)
"okc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = 30
},
@@ -72755,7 +72755,7 @@
c_tag = "Fore Primary Hall";
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "bluecorner"
},
@@ -74764,7 +74764,7 @@
/turf/simulated/floor/grass,
/area/station/public/dorms)
"oQr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "north bump";
pixel_y = 28
@@ -75049,7 +75049,7 @@
},
/area/station/engineering/engine)
"oSZ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "arrival"
@@ -76451,7 +76451,7 @@
/turf/simulated/floor/carpet,
/area/station/medical/psych)
"pfP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -76726,7 +76726,7 @@
/turf/simulated/floor/wood,
/area/station/command/meeting_room)
"phN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
dir = 1;
name = "south bump";
@@ -77897,7 +77897,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/incinerator)
"puS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light,
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
@@ -78211,7 +78211,7 @@
},
/area/station/security/lobby)
"pyD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/service/bar)
"pyL" = (
@@ -80017,7 +80017,7 @@
/turf/simulated/floor/wood,
/area/station/public/fitness)
"pQp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet{
name = "north bump";
pixel_y = 30
@@ -80449,7 +80449,7 @@
name = "west bump";
pixel_x = -28
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/legal/courtroom/gallery)
"pVM" = (
@@ -80549,7 +80549,7 @@
},
/area/station/medical/reception)
"pWN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"pWQ" = (
@@ -80937,7 +80937,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"qbt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Security Port Space Bridge";
dir = 1
@@ -82686,7 +82686,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/security/fore)
"qvm" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/economy/vending/wallmed/directional/west,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -83072,7 +83072,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint2)
"qzu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/wood,
/area/station/command/office/rd)
@@ -85718,7 +85718,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
"rao" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display{
pixel_y = 32
},
@@ -86374,7 +86374,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard/south)
"rgV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -87113,7 +87113,7 @@
},
/area/station/supply/office)
"rnl" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkredcorners"
@@ -89550,7 +89550,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"rLU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
pixel_y = 24;
name = "north bump"
@@ -90270,7 +90270,7 @@
/area/station/hallway/primary/aft)
"rSk" = (
/obj/structure/window/reinforced,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet,
/area/station/service/bar)
"rSp" = (
@@ -91692,7 +91692,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"sgn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/service/library)
"sgr" = (
@@ -93545,7 +93545,7 @@
/obj/structure/railing{
dir = 5
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/hallway/secondary/exit)
"szH" = (
@@ -93952,7 +93952,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom{
name = "west bump";
pixel_x = -28
@@ -94567,7 +94567,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"sJM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 8
},
@@ -95545,7 +95545,7 @@
/turf/simulated/floor/wood,
/area/station/legal/courtroom/gallery)
"sUJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
dir = 4;
name = "west bump";
@@ -96031,7 +96031,7 @@
/turf/space,
/area/space)
"sYW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
dir = 1;
name = "south bump";
@@ -97208,7 +97208,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint2)
"tkO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/ai_status_display{
pixel_x = -32;
step_size = 0
@@ -98335,7 +98335,7 @@
},
/area/station/security/permabrig)
"tuf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "arrival"
@@ -98428,7 +98428,7 @@
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"tvZ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkredcorners"
@@ -99214,7 +99214,7 @@
/turf/simulated/floor/plating,
/area/station/engineering/break_room/secondary)
"tFg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"tFi" = (
@@ -101303,7 +101303,7 @@
},
/area/station/public/dorms)
"uaA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
},
@@ -101328,7 +101328,7 @@
pixel_x = 24;
pixel_y = -5
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 4
},
@@ -102420,7 +102420,7 @@
},
/area/station/maintenance/apmaint)
"umv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/east,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -102691,7 +102691,7 @@
},
/area/station/security/brig)
"upq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkredcorners"
},
@@ -104200,7 +104200,7 @@
c_tag = "Central Hallway South"
},
/obj/machinery/firealarm/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "arrival"
@@ -106039,7 +106039,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/dorms/starboard)
"uWU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkblue"
},
@@ -108282,7 +108282,7 @@
},
/area/station/security/execution)
"vuS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/religious{
pixel_x = 32
},
@@ -108413,7 +108413,7 @@
/turf/simulated/wall/r_wall,
/area/station/command/office/cmo)
"vwy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whiteblue"
@@ -108692,7 +108692,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"vzX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/west,
/turf/simulated/floor/plasteel/dark,
/area/station/legal/courtroom/gallery)
@@ -110979,7 +110979,7 @@
/obj/structure/railing/corner{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "cautioncorner"
@@ -112503,7 +112503,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/driver_button{
id_tag = "chapelgun";
name = "Chapel Mass Driver";
@@ -112624,7 +112624,7 @@
},
/area/station/security/interrogation)
"wmQ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -112662,7 +112662,7 @@
/turf/simulated/floor/plating,
/area/station/command/bridge)
"wnD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "bar"
},
@@ -113902,7 +113902,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/starboard)
"wBQ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/engineering/break_room)
"wBT" = (
@@ -113971,7 +113971,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"wCX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -114224,7 +114224,7 @@
/turf/simulated/floor/engine,
/area/station/engineering/engine)
"wFV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "purplefull"
},
@@ -121306,7 +121306,7 @@
/area/station/service/chapel/office)
"ycZ" = (
/obj/machinery/power/apc/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "0-2"
},
@@ -121389,7 +121389,7 @@
/turf/simulated/wall/r_wall,
/area/station/engineering/secure_storage)
"ydY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Fore Primary Hall South";
dir = 6
@@ -122003,7 +122003,7 @@
/turf/simulated/floor/carpet/blue,
/area/station/command/office/blueshield)
"yjS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/woodsiding{
dir = 5
},
diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm
index 9bd14a9d8a0c..b068bb5c43b1 100644
--- a/_maps/map_files/stations/metastation.dmm
+++ b/_maps/map_files/stations/metastation.dmm
@@ -744,7 +744,7 @@
/turf/simulated/wall,
/area/station/public/arcade)
"ajb" = (
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -2932,7 +2932,7 @@
},
/area/station/public/fitness)
"auV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "bluefull"
},
@@ -3253,7 +3253,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"awb" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel,
/area/station/supply/office)
"awe" = (
@@ -5770,7 +5770,7 @@
"aHH" = (
/obj/effect/decal/cleanable/cobweb,
/obj/effect/turf_decal/delivery/hollow,
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
"aHI" = (
@@ -7074,7 +7074,7 @@
/area/station/supply/qm)
"aLW" = (
/obj/machinery/alarm/directional/west,
-/obj/item/kirbyplants/plant25,
+/obj/item/kirbyplants/large/plant7,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/fore/east)
"aLY" = (
@@ -8247,7 +8247,7 @@
/obj/structure/sign/kiddieplaque{
pixel_y = 32
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 10
},
/obj/structure/table/wood/fancy/green,
@@ -8499,7 +8499,7 @@
/turf/simulated/floor/plating,
/area/station/supply/storage)
"aRn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkgrey"
},
@@ -8983,7 +8983,7 @@
/area/station/legal/courtroom)
"aTh" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aTi" = (
@@ -9600,7 +9600,7 @@
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/pod_1)
"aUX" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/structure/sign/botany{
pixel_x = 32
},
@@ -9978,7 +9978,7 @@
name = "east bump";
pixel_x = 27
},
-/obj/item/kirbyplants/plant11,
+/obj/item/kirbyplants/small/small3,
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
"aWj" = (
@@ -10576,7 +10576,7 @@
name = "west bump";
pixel_x = -27
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -11490,7 +11490,7 @@
/area/station/turret_protected/ai_upload)
"bbm" = (
/obj/machinery/alarm/directional/north,
-/obj/item/kirbyplants/applebush,
+/obj/item/kirbyplants/medium/medium8,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "neutral"
@@ -11670,7 +11670,7 @@
},
/area/station/command/office/ce)
"bbM" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/obj/structure/sign/electricshock{
pixel_x = -32
},
@@ -12843,7 +12843,7 @@
},
/area/station/command/office/ce)
"beP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
@@ -12868,7 +12868,7 @@
name = "east bump";
pixel_x = 27
},
-/obj/item/kirbyplants/plant16,
+/obj/item/kirbyplants/large/plant1,
/obj/item/radio/intercom{
name = "north bump";
pixel_y = 28
@@ -12982,7 +12982,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/south)
"bfn" = (
@@ -13581,7 +13581,7 @@
/turf/space,
/area/space/nearstation)
"bgV" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/effect/spawner/random/cobweb/left/rare,
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood,
@@ -14340,7 +14340,7 @@
/turf/simulated/floor/carpet,
/area/station/procedure/trainer_office)
"bja" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/woodsiding{
dir = 5
},
@@ -17009,7 +17009,7 @@
pixel_x = -32;
pixel_y = -32
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -18969,7 +18969,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/north)
"bwp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/service/bar)
"bwq" = (
@@ -19968,7 +19968,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry/east)
"bzA" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -20522,7 +20522,7 @@
},
/area/station/hallway/primary/port/east)
"bBr" = (
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -22082,7 +22082,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/bridge)
"bHx" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/wood,
/area/station/service/library)
"bHz" = (
@@ -22347,7 +22347,7 @@
/turf/simulated/floor/carpet/grimey,
/area/station/telecomms/computer)
"bIA" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/carpet/grimey,
/area/station/telecomms/computer)
"bIB" = (
@@ -25066,7 +25066,7 @@
icon_state = "map-right-MS";
pixel_y = -32
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
@@ -25723,7 +25723,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/item/kirbyplants/plant16,
+/obj/item/kirbyplants/large/plant1,
/obj/machinery/light{
dir = 4
},
@@ -26179,7 +26179,7 @@
/area/station/command/office/ntrep)
"bXy" = (
/obj/machinery/newscaster/directional/west,
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -26212,7 +26212,7 @@
/area/station/supply/office)
"bXF" = (
/obj/effect/turf_decal/stripes/corner,
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/obj/machinery/door_control{
id = "mechbay";
name = "Mech Bay Shutters Control";
@@ -27873,7 +27873,7 @@
/area/station/hallway/primary/central/south)
"cei" = (
/obj/machinery/firealarm/directional/east,
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
icon_state = "purplecorner"
},
@@ -28118,7 +28118,7 @@
name = "west bump";
pixel_x = -27
},
-/obj/item/kirbyplants/applebush,
+/obj/item/kirbyplants/medium/medium8,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "bluecorner"
@@ -32021,7 +32021,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft/south)
"cvJ" = (
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
},
@@ -32304,7 +32304,7 @@
/area/station/science/research)
"cwW" = (
/obj/machinery/firealarm/directional/west,
-/obj/item/kirbyplants/plant11,
+/obj/item/kirbyplants/small/small3,
/obj/machinery/light{
dir = 8
},
@@ -32494,7 +32494,7 @@
},
/area/station/medical/medbay)
"cxL" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whiteblue"
@@ -35669,7 +35669,7 @@
},
/area/station/medical/cloning)
"cKA" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkgreencorners"
@@ -37614,7 +37614,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/kirbyplants/plant24,
+/obj/item/kirbyplants/large/plant14,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -37761,7 +37761,7 @@
name = "east bump";
pixel_x = 27
},
-/obj/item/kirbyplants/plant14,
+/obj/item/kirbyplants/large/plant9,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -37792,7 +37792,7 @@
/turf/simulated/wall,
/area/station/maintenance/solar_maintenance/aft_port)
"cUq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -42794,7 +42794,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"etR" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -43291,7 +43291,7 @@
/area/station/medical/exam_room)
"eFH" = (
/obj/machinery/economy/vending/wallmed/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -44318,7 +44318,7 @@
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"fdz" = (
-/obj/item/kirbyplants/plant11,
+/obj/item/kirbyplants/small/small3,
/turf/simulated/floor/plasteel,
/area/station/supply/office)
"feu" = (
@@ -44478,7 +44478,7 @@
},
/area/station/engineering/atmos)
"fhC" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -45920,7 +45920,7 @@
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"fKW" = (
-/obj/item/kirbyplants/plant16,
+/obj/item/kirbyplants/large/plant1,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -46118,7 +46118,7 @@
},
/area/station/engineering/break_room)
"fQl" = (
-/obj/item/kirbyplants/plant24,
+/obj/item/kirbyplants/large/plant14,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
@@ -46353,7 +46353,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"fVB" = (
@@ -46599,7 +46599,7 @@
/turf/simulated/floor/wood,
/area/station/public/mrchangs)
"gbz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
dir = 4;
name = "custom placement";
@@ -47701,7 +47701,7 @@
},
/area/station/hallway/primary/central/ne)
"gCX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitebluecorner"
@@ -48890,7 +48890,7 @@
},
/area/station/medical/exam_room)
"hcI" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/machinery/light/small{
dir = 1
},
@@ -49216,7 +49216,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "brown"
@@ -49653,7 +49653,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"hty" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard2)
"htP" = (
@@ -53130,7 +53130,7 @@
},
/area/station/security/execution)
"iTN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light{
dir = 1
},
@@ -53563,7 +53563,7 @@
/turf/simulated/floor/plating,
/area/station/security/permabrig)
"jft" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/carpet/grimey,
/area/station/hallway/secondary/entry/lounge)
"jfN" = (
@@ -53801,7 +53801,7 @@
},
/area/station/procedure/trainer_office)
"jnZ" = (
-/obj/item/kirbyplants/plant24,
+/obj/item/kirbyplants/large/plant14,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/machinery/camera{
c_tag = "Brig Detective's Office";
@@ -55892,7 +55892,7 @@
},
/area/station/science/research)
"kiq" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -56584,7 +56584,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel,
/area/station/supply/storage)
"kCc" = (
@@ -57834,7 +57834,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants/applebush,
+/obj/item/kirbyplants/medium/medium8,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -58438,7 +58438,7 @@
},
/area/station/medical/medbay)
"loz" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/obj/machinery/light/small{
dir = 8
},
@@ -60427,7 +60427,7 @@
},
/area/station/command/office/cmo)
"mhA" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/obj/machinery/light/small{
dir = 4
},
@@ -67230,7 +67230,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -70325,7 +70325,7 @@
/turf/simulated/floor/wood,
/area/station/service/bar)
"qFz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint)
"qFI" = (
@@ -73443,7 +73443,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"rWy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "2-4"
},
@@ -76283,7 +76283,7 @@
/obj/effect/turf_decal/woodsiding{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/computer/security/telescreen/entertainment{
pixel_x = -31
},
@@ -76797,7 +76797,7 @@
},
/area/station/hallway/primary/central/north)
"tyW" = (
-/obj/item/kirbyplants/applebush,
+/obj/item/kirbyplants/medium/medium8,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
@@ -76953,7 +76953,7 @@
/area/station/engineering/break_room)
"tDc" = (
/obj/machinery/firealarm/directional/south,
-/obj/item/kirbyplants/plant30,
+/obj/item/kirbyplants/large/plant3,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "red"
@@ -77196,7 +77196,7 @@
},
/area/station/security/armory)
"tKL" = (
-/obj/item/kirbyplants/plant24,
+/obj/item/kirbyplants/large/plant14,
/obj/machinery/light_switch{
dir = 4;
name = "custom placement";
@@ -78662,7 +78662,7 @@
layer = 4;
pixel_y = 32
},
-/obj/item/kirbyplants/plant24,
+/obj/item/kirbyplants/large/plant14,
/turf/simulated/floor/plasteel{
icon_state = "whitepurplecorner"
},
@@ -78830,7 +78830,7 @@
},
/area/station/service/hydroponics)
"uBK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small{
dir = 4
},
@@ -81429,7 +81429,7 @@
},
/area/station/security/brig)
"vMO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
@@ -82591,7 +82591,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"wsf" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/obj/structure/window/reinforced{
dir = 8
},
@@ -86275,7 +86275,7 @@
},
/area/station/medical/storage)
"yah" = (
-/obj/item/kirbyplants/plant11,
+/obj/item/kirbyplants/small/small3,
/obj/machinery/alarm/directional/south,
/obj/machinery/requests_console/directional/west,
/turf/simulated/floor/wood,
@@ -86488,7 +86488,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"yeR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/north,
/turf/simulated/floor/plasteel{
dir = 9;
diff --git a/_maps/map_files/stations/submaps/cerestation.dmm b/_maps/map_files/stations/submaps/cerestation.dmm
index c2646c1413ff..5d91012a8a31 100644
--- a/_maps/map_files/stations/submaps/cerestation.dmm
+++ b/_maps/map_files/stations/submaps/cerestation.dmm
@@ -185,7 +185,7 @@
},
/area/station/hallway/spacebridge/scidock)
"vM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
diff --git a/_maps/map_files/templates/shelter_2.dmm b/_maps/map_files/templates/shelter_2.dmm
index ee94a4669302..523447e8a9dc 100644
--- a/_maps/map_files/templates/shelter_2.dmm
+++ b/_maps/map_files/templates/shelter_2.dmm
@@ -112,7 +112,7 @@
/area/survivalpod)
"u" = (
/obj/structure/tubes,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/pod,
/area/survivalpod)
"v" = (
diff --git a/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm b/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm
index 61112690678b..6ef0d58a469d 100644
--- a/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm
+++ b/_maps/map_files220/RandomRuins/LavaRuins/cheesus_temple.dmm
@@ -142,7 +142,7 @@
/turf/simulated/floor/plasteel/stairs/right,
/area/ruin/powered/cheesus)
"kG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/oak,
/area/ruin/powered/cheesus)
"kJ" = (
@@ -318,7 +318,7 @@
/area/ruin/powered/cheesus)
"AH" = (
/obj/structure/table/wood/fancy/orange,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 13
},
/obj/effect/spawner/random/dirt/maybe,
diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm
index 518b50d49579..fbb44fd1c3b3 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/infected_ship.dmm
@@ -1652,7 +1652,7 @@
/turf/simulated/wall/mineral/plastitanium,
/area/ruin/space/powered/requires_power_space)
"Yw" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/pod,
/area/ruin/space/powered/requires_power_space)
"Yy" = (
diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm
index a36cc4ffc61a..807f62849339 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/mechtransport_new.dmm
@@ -364,7 +364,7 @@
/turf/simulated/floor/mineral/titanium/yellow,
/area/ruin/space/powered)
"iU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_construct/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/mineral/titanium,
@@ -1208,7 +1208,7 @@
/turf/simulated/floor/mineral/titanium,
/area/ruin/space/powered)
"Bh" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/spot{
dir = 4
},
@@ -1701,7 +1701,7 @@
/turf/simulated/floor/bluegrid,
/area/ruin/space/powered)
"Jq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_construct/directional/east,
/turf/simulated/floor/mineral/titanium,
/area/ruin/space/powered)
@@ -2221,7 +2221,7 @@
/turf/simulated/floor/bluegrid,
/area/ruin/space/powered)
"TR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_construct/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/mineral/titanium/blue,
diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/sierra_1_4.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/sierra_1_4.dmm
index b5e0832226d0..a52e383e6cee 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/sierra_1_4.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/sierra_1_4.dmm
@@ -506,7 +506,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/sierra/hall)
"ee" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/plasteel/airless,
/area/ruin/space/sierra/rnd)
"eg" = (
@@ -842,7 +842,7 @@
/turf/simulated/floor/plating/airless,
/area/ruin/space/sierra/med)
"gq" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -897,7 +897,7 @@
},
/area/ruin/space/sierra/maint)
"gI" = (
-/obj/item/kirbyplants/plant19,
+/obj/item/kirbyplants/large/alien/alien4,
/turf/simulated/floor/plasteel,
/area/ruin/space/sierra/rnd)
"gJ" = (
@@ -5591,7 +5591,7 @@
},
/area/ruin/space/sierra/rnd)
"RD" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whiteblue"
diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
index 9385aa142bef..f7903bd8dd57 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/spacehotel.dmm
@@ -183,7 +183,7 @@
/obj/effect/turf_decal/siding/wood/neutral{
dir = 10
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/forehallway)
"by" = (
@@ -360,7 +360,7 @@
},
/area/ruin/space/spacehotelv1/entryhallway)
"db" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/neutral{
dir = 1
},
@@ -466,7 +466,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/forestarboardmaints)
"dH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/neutral{
dir = 9
},
@@ -486,7 +486,7 @@
/turf/simulated/floor/carpet/arcade,
/area/ruin/space/spacehotelv1/guestroom2)
"dT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/restoraunt3)
"dX" = (
@@ -804,7 +804,7 @@
/turf/simulated/floor/plasteel/freezer,
/area/ruin/space/spacehotelv1/kitchen)
"gO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/neutral{
dir = 10
},
@@ -2153,7 +2153,7 @@
/obj/effect/turf_decal/siding/wood/neutral{
dir = 6
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/forehallway)
"qX" = (
@@ -2241,7 +2241,7 @@
/obj/effect/turf_decal/siding/wood/neutral/end{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/forehallway)
"rD" = (
@@ -2609,7 +2609,7 @@
/obj/effect/turf_decal/siding/wood/neutral/end{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/forehallway)
"uD" = (
@@ -2638,7 +2638,7 @@
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/restoraunt1)
"uN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/neutral/end,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/entryhallway)
@@ -3033,7 +3033,7 @@
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/spacehotelv1/centralhallway)
"xt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -3571,7 +3571,7 @@
/turf/simulated/floor/plasteel/freezer,
/area/ruin/space/spacehotelv1/kitchen)
"Bs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/neutral{
dir = 6
},
@@ -3605,7 +3605,7 @@
},
/area/ruin/space/spacehotelv1/centralhallway)
"BJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -3729,7 +3729,7 @@
/turf/template_noop,
/area/space/nearstation)
"CM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/neutral{
dir = 10
},
@@ -3958,14 +3958,14 @@
/obj/structure/railing{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/restoraunt3)
"EG" = (
/obj/effect/turf_decal/siding/wood/neutral{
dir = 9
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/forehallway)
"EV" = (
@@ -4129,7 +4129,7 @@
/turf/simulated/floor/carpet/black,
/area/ruin/space/spacehotelv1/guestroom1)
"FS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/spacehotelv1/centralhallway)
"FU" = (
@@ -4461,7 +4461,7 @@
},
/area/ruin/space/spacehotelv1/guestroom5)
"IA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/neutral{
dir = 5
},
@@ -4496,7 +4496,7 @@
/obj/effect/turf_decal/siding/wood/neutral{
dir = 9
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/north,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/forehallway)
@@ -4904,7 +4904,7 @@
/obj/effect/turf_decal/siding/wood/neutral{
dir = 5
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/ruin/space/spacehotelv1/forehallway)
"LQ" = (
@@ -5049,7 +5049,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/spacehotelv1/forestarboardmaints)
"MX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/ruin/space/spacehotelv1/reception)
"MZ" = (
@@ -5330,7 +5330,7 @@
/turf/simulated/floor/plating/airless,
/area/ruin/space/spacehotelv1/tcomms)
"OY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet,
/area/ruin/space/spacehotelv1/restoraunt1)
"Pb" = (
@@ -5436,7 +5436,7 @@
icon_state = "1-8"
},
/obj/machinery/firealarm/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/ruin/space/spacehotelv1/restoraunt2)
"PO" = (
@@ -5682,7 +5682,7 @@
},
/area/ruin/space/spacehotelv1/entryhallway)
"Sx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/neutral{
dir = 5
},
@@ -5809,7 +5809,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/ruin/space/spacehotelv1/forehallway)
"TH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/south,
/turf/simulated/floor/carpet,
/area/ruin/space/spacehotelv1/restoraunt1)
@@ -6217,7 +6217,7 @@
},
/area/ruin/space/spacehotelv1/bar)
"Wv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/north,
/turf/simulated/floor/carpet,
/area/ruin/space/spacehotelv1/restoraunt1)
@@ -6335,7 +6335,7 @@
},
/area/ruin/space/spacehotelv1/bar)
"XI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/ruin/space/spacehotelv1/forehallway)
"XK" = (
diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/syndie_space_base.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/syndie_space_base.dmm
index 6176737b253a..49bba2ee67c7 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/syndie_space_base.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/syndie_space_base.dmm
@@ -1569,7 +1569,7 @@
/obj/effect/turf_decal/woodsiding{
dir = 5
},
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -4208,7 +4208,7 @@
},
/area/ruin/unpowered/syndicate_space_base/arrivals)
"yR" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/grass,
/area/ruin/unpowered/syndicate_space_base/service)
"za" = (
@@ -8017,7 +8017,7 @@
/obj/effect/turf_decal/woodsiding{
dir = 9
},
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
icon_state = "cafeteria"
},
diff --git a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm
index af6d9c94129e..1147ed2eaec9 100644
--- a/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm
+++ b/_maps/map_files220/RandomRuins/SpaceRuins/transit_bar.dmm
@@ -134,7 +134,7 @@
/turf/simulated/floor/plating,
/area/ruin/space/powered)
"z" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/red,
/area/ruin/space/powered)
"A" = (
diff --git a/_maps/map_files220/RandomZLevels/beach.dmm b/_maps/map_files220/RandomZLevels/beach.dmm
index d373a0a8b5db..460e78048b3d 100644
--- a/_maps/map_files220/RandomZLevels/beach.dmm
+++ b/_maps/map_files220/RandomZLevels/beach.dmm
@@ -88,7 +88,7 @@
/obj/structure/railing{
dir = 5
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/awaymission/beach)
"by" = (
@@ -986,7 +986,7 @@
/turf/simulated/floor/wood/fancy,
/area/awaymission/beach)
"mi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy,
/area/awaymission/beach)
"ml" = (
@@ -1001,7 +1001,7 @@
/area/awaymission/beach)
"ms" = (
/obj/structure/table,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_x = 6;
pixel_y = 10
},
@@ -1128,7 +1128,7 @@
/turf/simulated/floor/wood/fancy/birch,
/area/awaymission/beach)
"oc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark_diagonal"
},
@@ -2211,7 +2211,7 @@
pixel_y = -4;
pixel_x = 2
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark_diagonal"
},
@@ -2322,7 +2322,7 @@
/obj/structure/railing{
dir = 10
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/awaymission/beach)
"EX" = (
@@ -3998,7 +3998,7 @@
"ZZ" = (
/obj/effect/turf_decal/siding/wood,
/obj/machinery/light/directional/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/arcade,
/area/awaymission/beach)
diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm
index fee272bd6a61..fb060e7edb4d 100644
--- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm
+++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm
@@ -1837,7 +1837,7 @@
/area/awaymission/bmp_ship/buffer)
"fx" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/bmp_ship/containment)
@@ -1957,7 +1957,7 @@
/obj/structure/spider/stickyweb,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light_construct/small/north,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/bmp_ship/containment)
"fN" = (
@@ -2252,7 +2252,7 @@
/obj/structure/spider/stickyweb,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light_construct/small/south,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/bmp_ship/containment)
"gI" = (
@@ -3371,7 +3371,7 @@
/area/awaymission/bmp_ship/kitchen)
"mA" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/machinery/light_construct/small/north,
/obj/structure/spider/stickyweb,
/obj/structure/spider/stickyweb,
@@ -3484,7 +3484,7 @@
"nO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light_construct/small/south,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/bmp_ship/containment)
@@ -6364,7 +6364,7 @@
/area/awaymission/bmp_ship/fore)
"Qk" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/structure/spider/stickyweb,
/obj/structure/spider/stickyweb,
/turf/simulated/floor/mineral/plastitanium/red,
@@ -7006,7 +7006,7 @@
/obj/structure/spider/stickyweb,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light_construct/small/south,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/structure/spider/stickyweb,
/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/bmp_ship/containment)
@@ -7128,7 +7128,7 @@
/area/awaymission/bmp_ship/fore)
"YU" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/machinery/light/small/directional/north,
/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/bmp_ship/containment)
diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm
index ff5f1952466e..ad25b09432bf 100644
--- a/_maps/map_files220/RandomZLevels/blackmesa.dmm
+++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm
@@ -4360,7 +4360,7 @@
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/black_ops_server)
"fpQ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/smooth,
/area/awaymission/black_mesa/hecu_zone_atrium)
"fqj" = (
@@ -6581,7 +6581,7 @@
/area/awaymission/black_mesa/cryo_room)
"iiZ" = (
/obj/structure/alien/xenoweeds,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating/ironsand,
/area/awaymission/black_mesa)
"ijb" = (
@@ -11915,7 +11915,7 @@
/turf/simulated/floor/plasteel/stairs/right,
/area/awaymission/black_mesa/resonant_chamber)
"oDL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/blue,
/area/awaymission/black_mesa/high_security_servers)
"oDR" = (
@@ -14884,7 +14884,7 @@
/turf/simulated/floor/chasm/straight_down/lava_land_surface/normal_air/normal_temp,
/area/awaymission/black_mesa/entrance)
"sgC" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/awaymission/black_mesa/hecu_zone_atrium)
"sgF" = (
@@ -15560,7 +15560,7 @@
/turf/simulated/floor/plating,
/area/awaymission/black_mesa/cryo_hallway)
"sYP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/blue{
dir = 1
},
diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm
index 18d543c14567..bc46f9f1061c 100644
--- a/_maps/map_files220/RandomZLevels/caves.dmm
+++ b/_maps/map_files220/RandomZLevels/caves.dmm
@@ -976,7 +976,7 @@
/turf/simulated/floor/plasteel/lavaland_air,
/area/awaymission/caves)
"eG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/spawner/random/dirt/often,
/obj/machinery/light_construct/small/north,
/turf/simulated/floor/wood/oak,
@@ -1636,7 +1636,7 @@
},
/area/awaymission/caves/build)
"if" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plating,
/area/awaymission/caves/build/reqpower_build)
@@ -3692,7 +3692,7 @@
dir = 9
},
/obj/effect/spawner/random/dirt/often,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/railing,
/turf/simulated/floor/plating,
/area/awaymission/caves/build/reqpower_build)
@@ -4167,7 +4167,7 @@
/obj/structure/railing{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/miscellaneous/goldensiding{
dir = 10
},
@@ -7530,7 +7530,7 @@
},
/area/awaymission/caves/build/reqpower_build)
"Pe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/neutral{
dir = 9
},
@@ -7690,7 +7690,7 @@
/obj/effect/turf_decal/miscellaneous/goldensiding{
dir = 6
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -9291,7 +9291,7 @@
/turf/simulated/floor/engine/cult/lavaland_air,
/area/awaymission/caves)
"Yb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/spawner/random/dirt/often,
/turf/simulated/floor/plasteel/dark{
icon_state = "darkredalt"
diff --git a/_maps/map_files220/RandomZLevels/gate_lizard.dmm b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
index 2078507ab1ce..59bdad6d71b2 100644
--- a/_maps/map_files220/RandomZLevels/gate_lizard.dmm
+++ b/_maps/map_files220/RandomZLevels/gate_lizard.dmm
@@ -1225,7 +1225,7 @@
/area/awaymission/jungle_planet/outside/cave)
"bES" = (
/obj/effect/spawner/random/dirt/frequent,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/mob/living/simple_animal/hostile/poison_snake{
wander = 0
},
@@ -3014,7 +3014,7 @@
/turf/simulated/floor/beach/away/sand,
/area/awaymission/jungle_planet/outside)
"eag" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/inside/complex)
"eat" = (
@@ -4063,7 +4063,7 @@
pixel_y = -11;
amount = 2
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/mob/living/simple_animal/hostile/poison_snake{
wander = 0
},
@@ -6329,7 +6329,7 @@
/area/awaymission/jungle_planet/inside/complex)
"isn" = (
/obj/effect/decal/cleanable/cobweb2,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/mob/living/simple_animal/hostile/poison_snake{
wander = 0
},
@@ -7392,7 +7392,7 @@
/turf/simulated/floor/indestructible/grass,
/area/awaymission/jungle_planet/outside/river)
"jFa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/mob/living/simple_animal/hostile/poison_snake{
wander = 0
},
@@ -8221,7 +8221,7 @@
},
/area/awaymission/jungle_planet/outside/river)
"kHa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/awaymission/jungle_planet/inside/complex)
"kHh" = (
@@ -11340,7 +11340,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/outside)
"oDv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "purple";
dir = 10
@@ -11509,7 +11509,7 @@
/obj/structure/safe/floor,
/obj/item/documents/nanotrasen,
/obj/effect/spawner/random/dirt/frequent,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/mob/living/simple_animal/hostile/poison_snake{
wander = 0
},
@@ -12078,7 +12078,7 @@
/area/awaymission/jungle_planet/outside/river)
"pDO" = (
/obj/effect/spawner/random/dirt/maybe,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/awaymission/jungle_planet/inside/complex)
"pEk" = (
@@ -14442,7 +14442,7 @@
/area/awaymission/jungle_planet/inside/complex)
"szn" = (
/obj/effect/spawner/random/dirt/maybe,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkneutralfull"
diff --git a/_maps/map_files220/RandomZLevels/spacebattle.dmm b/_maps/map_files220/RandomZLevels/spacebattle.dmm
index 8dd9ae460647..30f3dc0dcbbf 100644
--- a/_maps/map_files220/RandomZLevels/spacebattle.dmm
+++ b/_maps/map_files220/RandomZLevels/spacebattle.dmm
@@ -640,7 +640,7 @@
},
/area/awaymission/space_battle/prhallway1)
"cd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutral";
dir = 5
@@ -3720,7 +3720,7 @@
/turf/simulated/floor/plating/airless,
/area/awaymission/space_battle/syndicate/syndicate2)
"lP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/airless,
/area/awaymission/space_battle/living)
"lQ" = (
@@ -5537,7 +5537,7 @@
/turf/simulated/floor/plasteel/airless,
/area/awaymission/space_battle/living)
"sd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutral";
dir = 6
@@ -5866,7 +5866,7 @@
/obj/effect/decal/fakelattice{
density = 0
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/space,
/area/space/nearstation)
"to" = (
@@ -5972,7 +5972,7 @@
},
/area/awaymission/space_battle/prhallway2)
"tF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutral";
dir = 10
@@ -6000,7 +6000,7 @@
/turf/simulated/floor/plasteel/freezer,
/area/awaymission/space_battle/kitchen)
"tI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutral";
dir = 6
@@ -6946,7 +6946,7 @@
},
/area/awaymission/space_battle/syndicate/syndicate1)
"wO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/plasteel{
icon_state = "neutral";
@@ -9571,7 +9571,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/space_battle/syndicate)
"Fv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/securearea{
pixel_x = 32
},
@@ -9642,7 +9642,7 @@
},
/area/awaymission/space_battle/hallway2)
"FD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel{
icon_state = "neutral";
@@ -9751,7 +9751,7 @@
/area/awaymission/space_battle/hallway2)
"FW" = (
/obj/structure/table,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 8
},
/turf/simulated/floor/plasteel{
@@ -9868,7 +9868,7 @@
},
/area/awaymission/space_battle/medbay)
"Gr" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 8
},
/turf/simulated/floor/plasteel{
@@ -10252,7 +10252,7 @@
/turf/simulated/floor/plasteel/dark,
/area/awaymission/space_battle/hallway4)
"Hz" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 8
},
/turf/space,
@@ -10436,7 +10436,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/space_battle/bridge)
"Ic" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 8
},
/turf/simulated/floor/plasteel/dark{
@@ -14585,7 +14585,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/space_battle/hallway7)
"VH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutral";
dir = 9
@@ -14687,7 +14687,7 @@
/turf/simulated/floor/plasteel,
/area/awaymission/space_battle/bridge)
"VY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutral";
dir = 10
diff --git a/_maps/map_files220/RandomZLevels/wildwest.dmm b/_maps/map_files220/RandomZLevels/wildwest.dmm
index d5ea015a882a..aea01c200397 100644
--- a/_maps/map_files220/RandomZLevels/wildwest.dmm
+++ b/_maps/map_files220/RandomZLevels/wildwest.dmm
@@ -285,7 +285,7 @@
/area/awaymission/wildwest/wildwest_mines)
"cQ" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/red,
/area/awaymission/wildwest/wildwest_mines)
"cS" = (
@@ -638,7 +638,7 @@
},
/area/awaymission/wildwest/wildwest_refine)
"ge" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/awaymission/wildwest/wildwest_mines)
"gk" = (
@@ -1733,7 +1733,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/awaymission/wildwest/wildwest_refine)
"pR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/mine/dnascramble,
/turf/simulated/floor/carpet/green,
/area/awaymission/wildwest/wildwest_mines)
@@ -1886,7 +1886,7 @@
/area/awaymission/wildwest/wildwest_mines)
"rp" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/awaymission/wildwest/wildwest_mines)
"rs" = (
@@ -2922,7 +2922,7 @@
},
/area/awaymission/wildwest/wildwest_mines)
"BH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "darkyellowfull"
@@ -3444,7 +3444,7 @@
/turf/simulated/floor/plating,
/area/awaymission/wildwest/wildwest_mines)
"GQ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/mine/dnascramble,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/wood/oak,
@@ -4854,7 +4854,7 @@
},
/area/awaymission/wildwest/wildwest_mines)
"Wa" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/structure/sign/poster/official/random/north,
/turf/simulated/floor/carpet/green,
/area/awaymission/wildwest/wildwest_mines)
diff --git a/_maps/map_files220/generic/Admin_Zone.dmm b/_maps/map_files220/generic/Admin_Zone.dmm
index 52eaea224404..7bddcad05978 100644
--- a/_maps/map_files220/generic/Admin_Zone.dmm
+++ b/_maps/map_files220/generic/Admin_Zone.dmm
@@ -908,7 +908,7 @@
/obj/effect/turf_decal/siding/wood/cherry{
dir = 6
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/royalblack,
/area/shuttle/trade/sol)
"dt" = (
@@ -2475,7 +2475,7 @@
},
/area/shuttle/vox)
"iK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/ghost_bar/indoor)
"iL" = (
@@ -2940,7 +2940,7 @@
/turf/simulated/floor/wood/oak,
/area/admin)
"kj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/mineral/plastitanium{
color = "#ff78f4";
nitrogen = 103.984;
@@ -3453,7 +3453,7 @@
},
/area/ghost_bar/outdoor/beach)
"lQ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/shuttle/trade/sol)
"lR" = (
@@ -3470,7 +3470,7 @@
},
/area/ninja/holding)
"lT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/tdome/tdomeadmin)
"lU" = (
@@ -3485,7 +3485,7 @@
/area/admin)
"lY" = (
/obj/effect/decal/cleanable/cobweb2,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/window/reinforced/clockwork{
dir = 4
},
@@ -4824,7 +4824,7 @@
},
/area/admin)
"qW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/computer/cryopod{
pixel_y = 28
},
@@ -5645,7 +5645,7 @@
/turf/simulated/floor/wood/parquet/tile,
/area/ghost_bar/indoor)
"tI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -6651,7 +6651,7 @@
/turf/simulated/floor/grass,
/area/ghost_bar/outdoor)
"xa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -6833,7 +6833,7 @@
},
/area/ninja/holding)
"xw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/mineral/plastitanium{
color = "#ff78f4";
@@ -7957,7 +7957,7 @@
},
/area/ghost_bar/outdoor/beach)
"Bv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/small{
dir = 8
},
@@ -8004,7 +8004,7 @@
/obj/structure/light_fake/small{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -8232,7 +8232,7 @@
/turf/simulated/floor/plating/nitrogen,
/area/shuttle/vox)
"Cn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/cherry,
/area/ghost_bar/indoor)
"Co" = (
@@ -8457,7 +8457,7 @@
/area/tdome/tdomeadmin)
"CS" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/mineral/plastitanium/red/nitrogen,
/area/vox_base)
"CT" = (
@@ -9764,7 +9764,7 @@
/turf/simulated/floor/grass,
/area/ghost_bar/indoor/cave)
"Hs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet/directional/north,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
@@ -10680,7 +10680,7 @@
},
/area/admin)
"KA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/trader_station/sol)
"KB" = (
@@ -10731,7 +10731,7 @@
/turf/simulated/floor/wood/oak,
/area/admin)
"KI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/birch,
/area/shuttle/trade/sol)
"KJ" = (
@@ -11659,7 +11659,7 @@
/turf/simulated/floor/carpet/arcade,
/area/admin)
"Og" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/wizard_station)
"Oh" = (
@@ -12055,7 +12055,7 @@
/turf/simulated/floor/beach/away/sand_alternative,
/area/ninja/holding)
"Pv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/red,
/area/ghost_bar/indoor)
"Pw" = (
@@ -13031,7 +13031,7 @@
},
/area/vox_base)
"SR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/admin)
"ST" = (
@@ -13281,7 +13281,7 @@
/obj/effect/turf_decal/siding/wood/cherry{
dir = 5
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/royalblack,
/area/shuttle/trade/sol)
"TG" = (
@@ -14593,7 +14593,7 @@
/turf/simulated/floor/wood/oak,
/area/admin)
"Yb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/blue,
/area/ghost_bar/indoor)
"Yc" = (
@@ -14673,7 +14673,7 @@
/turf/simulated/floor/plating/nitrogen,
/area/vox_base)
"Yq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/east,
/turf/simulated/floor/mineral/plastitanium{
color = "#ff78f4";
diff --git a/_maps/map_files220/generic/Lavaland.dmm b/_maps/map_files220/generic/Lavaland.dmm
index 4b9920ffe683..dbd1be9121ed 100644
--- a/_maps/map_files220/generic/Lavaland.dmm
+++ b/_maps/map_files220/generic/Lavaland.dmm
@@ -259,7 +259,7 @@
/area/mine/laborcamp)
"aN" = (
/obj/machinery/light/directional/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -2593,7 +2593,7 @@
dir = 8;
pixel_y = -24
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkpurplecorners"
},
@@ -3425,7 +3425,7 @@
/area/lavaland/surface/outdoors/legion)
"ie" = (
/obj/machinery/light/directional/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/kiddieplaque/remembrance/mining{
pixel_x = 32
},
@@ -7061,7 +7061,7 @@
dir = 1;
network = list("Mining Outpost")
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/computer/security/telescreen/entertainment/directional/south,
/turf/simulated/floor/plasteel{
icon_regular_floor = "yellowsiding";
@@ -7694,7 +7694,7 @@
/turf/simulated/floor/lava/lava_land_surface,
/area/lavaland/surface/outdoors/legion)
"EO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "darkyellowcorners"
@@ -10454,7 +10454,7 @@
/area/lavaland/surface/outdoors/legion)
"VV" = (
/obj/machinery/firealarm/directional/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/spawner/random/dirt/maybe,
/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm
index b512b276c9cc..d2eac63164d0 100644
--- a/_maps/map_files220/generic/centcomm.dmm
+++ b/_maps/map_files220/generic/centcomm.dmm
@@ -157,7 +157,7 @@
},
/area/syndicate_mothership/outside)
"afs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/admin3)
"agt" = (
@@ -458,7 +458,7 @@
/area/syndicate_mothership/elite_squad)
"arH" = (
/obj/structure/table/wood,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/mineral/plastitanium,
@@ -640,7 +640,7 @@
},
/area/syndicate_mothership/cargo)
"awS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/spot{
dir = 1
},
@@ -978,7 +978,7 @@
/obj/structure/light_fake{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkneutralfull"
},
@@ -1343,7 +1343,7 @@
},
/area/syndicate_mothership/cargo)
"aTF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -1527,7 +1527,7 @@
/obj/effect/turf_decal/woodsiding/end{
dir = 8
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 5
},
/turf/simulated/floor/plasteel/dark{
@@ -1679,7 +1679,7 @@
pixel_y = -32;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership/control)
"bfd" = (
@@ -1886,7 +1886,7 @@
},
/area/syndicate_mothership/elite_squad)
"bkk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/spot{
dir = 1
},
@@ -2825,7 +2825,7 @@
/turf/simulated/floor/transparent/glass/reinforced,
/area/centcom/ss220/admin2)
"bQj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "darkyellowaltstrip"
@@ -2865,7 +2865,7 @@
},
/area/centcom/ss220/medbay)
"bQR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/miscellaneous/goldensiding{
dir = 1
},
@@ -3383,7 +3383,7 @@
/area/shuttle/syndicate)
"bYr" = (
/obj/structure/table/glass/reinforced/plastitanium,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/plasteel/dark{
@@ -4194,7 +4194,7 @@
},
/area/syndicate_mothership)
"cyD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "dark"
@@ -4490,7 +4490,7 @@
dir = 8;
color = "#36454F"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/parquet,
/area/centcom/ss220/admin2)
"cMg" = (
@@ -5384,7 +5384,7 @@
/turf/simulated/floor/carpet/purple,
/area/centcom/ss220/admin2)
"dow" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkbluecornersalt"
@@ -5700,7 +5700,7 @@
/area/centcom/ss220/bar)
"dwn" = (
/obj/structure/table/wood/fancy/purple,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/plasteel/dark,
@@ -6016,7 +6016,7 @@
},
/area/syndicate_mothership/infteam)
"dEp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/miscellaneous/goldensiding{
dir = 5
},
@@ -6865,7 +6865,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/black,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -6903,7 +6903,7 @@
},
/area/centcom/ss220/admin3)
"eiJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "navybluealt"
},
@@ -6920,7 +6920,7 @@
},
/area/syndicate_mothership/elite_squad)
"ejk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/centcom/ss220/admin2)
"ejo" = (
@@ -7216,7 +7216,7 @@
},
/area/syndicate_mothership/cargo)
"esf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/spot{
dir = 8
},
@@ -7364,7 +7364,7 @@
},
/area/centcom/ss220/court)
"ewa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/miscellaneous/goldensiding,
/turf/simulated/floor/carpet/black,
/area/syndicate_mothership/control)
@@ -7560,7 +7560,7 @@
pixel_x = 32;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/syndicate_mothership/infteam)
"eBZ" = (
@@ -7622,7 +7622,7 @@
},
/area/syndicate_mothership/elite_squad)
"eDP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/court)
"eEg" = (
@@ -7997,7 +7997,7 @@
/area/centcom/ss220/admin1)
"eNV" = (
/obj/structure/curtain/open/shower/security,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/bar)
"eOh" = (
@@ -8020,7 +8020,7 @@
/turf/simulated/floor/carpet/red,
/area/centcom/ss220/bar)
"eOK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating{
icon = 'icons/turf/floors.dmi';
icon_state = "elevatorshaft";
@@ -8287,7 +8287,7 @@
color = "#36454F";
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/parquet,
/area/centcom/ss220/admin2)
"eVk" = (
@@ -9127,7 +9127,7 @@
anchored = 1;
layer = 5
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
layer = 5
},
/turf/simulated/floor/wood/parquet/tile,
@@ -9320,7 +9320,7 @@
/turf/simulated/floor/plating,
/area/syndicate_mothership/cargo)
"fxn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/mineral/plastitanium,
/area/centcom/ss220/supply)
"fxv" = (
@@ -9423,7 +9423,7 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/supply)
"fzb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership/elite_squad)
"fzc" = (
@@ -9649,7 +9649,7 @@
/turf/simulated/floor/carpet,
/area/centcom/ss220/court)
"fGn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkyellowaltstrip"
},
@@ -10908,7 +10908,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/nanotrasen_logo{
pixel_y = 32
},
@@ -11031,7 +11031,7 @@
},
/area/syndicate_mothership)
"gFr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/button/windowtint/west{
id = "CC_Dip"
},
@@ -11983,7 +11983,7 @@
},
/area/syndicate_mothership/control)
"hdP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake{
dir = 4
},
@@ -12614,7 +12614,7 @@
},
/area/centcom/ss220/command)
"hwb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkbrown"
},
@@ -12728,7 +12728,7 @@
},
/area/centcom/ss220/medbay)
"hBJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark{
dir = 1;
icon_state = "darkbluecorners"
@@ -12908,7 +12908,7 @@
/turf/simulated/wall/indestructible/fakeglass,
/area/centcom/ss220/bar)
"hGG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/tile/neutral/full{
color = "#000000"
},
@@ -14785,7 +14785,7 @@
},
/area/centcom/ss220/park)
"iFH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
@@ -14872,7 +14872,7 @@
},
/area/centcom/ss220/admin3)
"iJb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/supply)
"iJr" = (
@@ -15016,7 +15016,7 @@
/area/centcom/ss220/medbay)
"iNh" = (
/obj/structure/table/glass/reinforced/titanium,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/carpet/royalblack,
@@ -15184,7 +15184,7 @@
/area/shuttle/syndicate)
"iSW" = (
/obj/structure/table/wood/fancy/black,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/carpet/black,
@@ -15360,7 +15360,7 @@
},
/area/centcom/ss220/jail)
"iYp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/parquet,
/area/centcom/ss220/bar)
"iYq" = (
@@ -15906,7 +15906,7 @@
/turf/simulated/floor/plating,
/area/syndicate_mothership/elite_squad)
"jrH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/curtain/open/shower/security,
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/bar)
@@ -16134,7 +16134,7 @@
},
/area/centcom/ss220/park)
"jBg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkbrown";
dir = 1
@@ -16231,7 +16231,7 @@
/turf/simulated/floor/carpet,
/area/centcom/ss220/court)
"jEZ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/spot{
dir = 4
},
@@ -16489,7 +16489,7 @@
/area/syndicate_mothership/cargo)
"jLd" = (
/obj/structure/table/wood/fancy/blue,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/carpet/black,
@@ -16622,7 +16622,7 @@
/area/centcom/ss220/bar)
"jNw" = (
/obj/structure/table/glass/reinforced/plastitanium,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/obj/structure/light_fake,
@@ -17588,7 +17588,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/admin2)
"kwP" = (
@@ -17855,7 +17855,7 @@
/area/centcom/ss220/admin1)
"kEs" = (
/obj/effect/decal/cleanable/blood,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership)
"kEB" = (
@@ -19066,7 +19066,7 @@
/turf/simulated/floor/plasteel/dark,
/area/shuttle/administration)
"ljw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark{
dir = 4;
icon_state = "darkbluecorners"
@@ -19847,7 +19847,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/syndicate_mothership/elite_squad)
"lEw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/parquet/tile,
/area/centcom/ss220/admin2)
"lEI" = (
@@ -20238,7 +20238,7 @@
/turf/simulated/floor/carpet/red,
/area/centcom/ss220/admin2)
"lPW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -20614,7 +20614,7 @@
/turf/simulated/floor/carpet/black,
/area/centcom/ss220/court)
"mcw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake,
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/general)
@@ -20634,7 +20634,7 @@
/area/centcom/ss220/command)
"mcR" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership)
"mcX" = (
@@ -20970,7 +20970,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/black{
dir = 1
},
@@ -21214,7 +21214,7 @@
},
/area/centcom/ss220/admin3)
"muB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership)
"muV" = (
@@ -21239,7 +21239,7 @@
},
/area/syndicate_mothership)
"mvD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake{
dir = 1
},
@@ -21494,7 +21494,7 @@
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership/elite_squad)
"mGB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/general)
"mGP" = (
@@ -21866,7 +21866,7 @@
},
/area/centcom/ss220/admin3)
"mTP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/tile/neutral/full{
color = "#000000"
},
@@ -21883,7 +21883,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/small{
dir = 8
},
@@ -21927,7 +21927,7 @@
/obj/structure/light_fake/spot{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/admin2)
"mVX" = (
@@ -22332,7 +22332,7 @@
/area/syndicate_mothership/jail)
"nhJ" = (
/obj/structure/table/glass/reinforced/plastitanium,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/plasteel/dark{
@@ -22834,7 +22834,7 @@
},
/area/syndicate_mothership)
"nwK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "black";
dir = 1
@@ -22991,7 +22991,7 @@
},
/area/centcom/ss220/park)
"nBZ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
@@ -23045,7 +23045,7 @@
/turf/simulated/floor/wood/fancy/oak,
/area/centcom/ss220/park)
"nDq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet/directional/east,
/obj/machinery/light/directional/east,
/turf/simulated/floor/plasteel{
@@ -23173,7 +23173,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/centcom/ss220/admin2)
"nGF" = (
@@ -23902,7 +23902,7 @@
/turf/simulated/floor/wood/parquet,
/area/centcom/ss220/admin2)
"odq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/miscellaneous/goldensiding{
dir = 9
},
@@ -23935,7 +23935,7 @@
/turf/simulated/floor/carpet/black,
/area/centcom/ss220/admin2)
"ofn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/admin1)
"ofW" = (
@@ -24651,7 +24651,7 @@
pixel_x = 32;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/miscellaneous/goldensiding{
dir = 6
},
@@ -25584,7 +25584,7 @@
/obj/structure/table/wood{
color = "#996633"
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/carpet/lone,
@@ -25684,7 +25684,7 @@
/area/centcom/ss220/jail)
"phM" = (
/obj/structure/table/glass/reinforced/titanium,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/obj/structure/light_fake,
@@ -26312,13 +26312,13 @@
dir = 1
},
/obj/structure/railing,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
/area/syndicate_mothership/jail)
"pFo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/centcom/ss220/court)
"pFz" = (
@@ -26446,7 +26446,7 @@
},
/area/syndicate_mothership/control)
"pKm" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/curtain/black{
pixel_x = -32;
anchored = 1
@@ -26577,7 +26577,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/admin2)
"pNx" = (
@@ -27495,7 +27495,7 @@
},
/area/centcom/ss220/medbay)
"qqi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "navybluealt"
@@ -29044,7 +29044,7 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/supply)
"rkn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/parquet/tile,
/area/centcom/ss220/bar)
"rks" = (
@@ -29083,7 +29083,7 @@
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/admin2)
"rlb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/nanotrasen_logo{
pixel_y = 32
},
@@ -30331,7 +30331,7 @@
dir = 8
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership)
"rSG" = (
@@ -30553,7 +30553,7 @@
pixel_x = -32;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/syndicate_mothership)
"rYm" = (
@@ -30612,7 +30612,7 @@
/turf/simulated/floor/carpet/royalblack,
/area/centcom/ss220/general)
"rZF" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 15
},
/turf/simulated/floor/plasteel{
@@ -31131,7 +31131,7 @@
/area/shuttle/administration)
"snm" = (
/obj/structure/table/glass/reinforced/plastitanium,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/plasteel/dark,
@@ -31742,7 +31742,7 @@
},
/area/syndicate_mothership/cargo)
"sJR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkred"
@@ -31824,7 +31824,7 @@
/area/centcom/ss220/supply)
"sKW" = (
/obj/structure/table/glass/reinforced/plastitanium,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/carpet/royalblack,
@@ -32381,7 +32381,7 @@
/area/centcom/ss220/evac)
"taV" = (
/obj/structure/light_fake,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/mineral/plastitanium,
/area/centcom/ss220/supply)
"taW" = (
@@ -32433,7 +32433,7 @@
},
/area/syndicate_mothership/jail)
"tca" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/spot{
dir = 4
},
@@ -32718,7 +32718,7 @@
/turf/simulated/floor/carpet,
/area/centcom/ss220/general)
"toq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/spot,
/turf/simulated/floor/carpet/black,
/area/centcom/ss220/admin1)
@@ -33262,7 +33262,7 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/supply)
"tDK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/blue,
/area/centcom/ss220/admin2)
"tEp" = (
@@ -33351,7 +33351,7 @@
/turf/simulated/floor/mineral/plastitanium,
/area/syndicate_mothership)
"tId" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake{
dir = 4
},
@@ -33523,7 +33523,7 @@
},
/area/syndicate_mothership)
"tMg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/shuttle/escape)
"tMn" = (
@@ -33556,7 +33556,7 @@
},
/area/centcom/ss220/admin1)
"tNq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/admin2)
"tOi" = (
@@ -33706,7 +33706,7 @@
pixel_y = -32;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/syndicate_mothership/infteam)
"tTm" = (
@@ -34401,7 +34401,7 @@
color = "#000000"
},
/obj/effect/turf_decal/siding/wood/end,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/parquet/tile,
/area/centcom/ss220/admin2)
"upU" = (
@@ -34423,7 +34423,7 @@
pixel_x = -32;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/syndicate_mothership/infteam)
"urd" = (
@@ -35111,7 +35111,7 @@
pixel_y = 32;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet/black,
/area/syndicate_mothership/infteam)
"uOx" = (
@@ -35279,7 +35279,7 @@
/obj/effect/turf_decal/woodsiding/end{
dir = 4
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 5
},
/turf/simulated/floor/plasteel/dark{
@@ -35930,7 +35930,7 @@
pixel_x = 28;
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkbrown";
dir = 1
@@ -35989,7 +35989,7 @@
/area/centcom/ss220/bar)
"vpP" = (
/obj/structure/table/wood/fancy/black,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/carpet/royalblack,
@@ -36138,7 +36138,7 @@
},
/area/centcom/ss220/supply)
"vsO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/miscellaneous/goldensiding{
dir = 1
},
@@ -36875,7 +36875,7 @@
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/park)
"vKj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkbluecornersalt"
},
@@ -37495,7 +37495,7 @@
pixel_y = -32;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/miscellaneous/goldensiding{
dir = 10
},
@@ -38267,7 +38267,7 @@
/obj/structure/light_fake/spot{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/centcom/ss220/admin2)
"wAa" = (
@@ -38704,7 +38704,7 @@
/area/centcom/ss220/admin3)
"wKe" = (
/obj/structure/table/glass/reinforced/plastitanium,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/turf/simulated/floor/carpet/royalblue,
@@ -38968,7 +38968,7 @@
/area/centcom/ss220/admin1)
"wRC" = (
/obj/structure/table/wood/fancy/royalblack,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 9
},
/obj/structure/light_fake{
@@ -39489,7 +39489,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 4
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 5
},
/obj/effect/turf_decal/siding/wood{
@@ -39709,7 +39709,7 @@
},
/area/syndicate_mothership/cargo)
"xny" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkred"
@@ -40692,7 +40692,7 @@
/turf/simulated/floor/mineral/plastitanium/red,
/area/shuttle/assault_pod)
"xSN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/spot{
dir = 8
},
@@ -40821,7 +40821,7 @@
/turf/simulated/floor/mineral/plastitanium,
/area/syndicate_mothership/elite_squad)
"xWF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/centcom/ss220/command)
"xWJ" = (
diff --git a/_maps/map_files220/generic/centcomm_test.dmm b/_maps/map_files220/generic/centcomm_test.dmm
index bd13252f45e6..d904f90c2e82 100644
--- a/_maps/map_files220/generic/centcomm_test.dmm
+++ b/_maps/map_files220/generic/centcomm_test.dmm
@@ -1275,7 +1275,7 @@
/turf/simulated/floor/wood/oak,
/area/admin)
"tI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -1788,7 +1788,7 @@
},
/area/shuttle/escape)
"Bv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/light_fake/small{
dir = 8
},
@@ -1806,7 +1806,7 @@
/obj/structure/light_fake/small{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -3037,7 +3037,7 @@
/turf/simulated/floor/wood/oak,
/area/admin)
"SR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/admin)
"SU" = (
diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm
index 56c898f0be28..d3ab0908d780 100644
--- a/_maps/map_files220/stations/boxstation.dmm
+++ b/_maps/map_files220/stations/boxstation.dmm
@@ -3296,7 +3296,7 @@
},
/area/station/engineering/solar/fore_starboard)
"aps" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/station/service/bar/atrium)
"apu" = (
@@ -4529,7 +4529,7 @@
/turf/simulated/floor/plating,
/area/station/security/processing)
"auF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
@@ -4575,7 +4575,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"auL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "red"
@@ -7833,7 +7833,7 @@
/area/station/security/interrogation)
"aFo" = (
/obj/machinery/light_switch/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/wood/fancy/cherry,
/area/station/legal/magistrate)
@@ -8218,7 +8218,7 @@
},
/area/station/legal/courtroom)
"aGu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/east,
/obj/machinery/camera{
c_tag = "Courtroom North";
@@ -8576,7 +8576,7 @@
/turf/simulated/floor/wood/fancy,
/area/station/legal/courtroom/gallery)
"aHC" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/south,
/obj/structure/cable,
/turf/simulated/floor/wood/fancy,
@@ -8599,7 +8599,7 @@
/turf/simulated/floor/wood/fancy/cherry,
/area/station/legal/courtroom/gallery)
"aHH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/west,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -9316,7 +9316,7 @@
/turf/simulated/floor/wood/fancy/cherry,
/area/station/legal/magistrate)
"aKy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkred"
},
@@ -10535,7 +10535,7 @@
/turf/simulated/floor/wood/fancy,
/area/station/legal/courtroom/gallery)
"aPH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "bluecorner"
@@ -10752,7 +10752,7 @@
/obj/machinery/camera{
c_tag = "Theatre"
},
-/obj/item/kirbyplants/plant31,
+/obj/item/kirbyplants/large/plant6,
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
icon_state = "0-2"
@@ -13785,7 +13785,7 @@
dir = 8;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -14526,7 +14526,7 @@
},
/area/station/ai_monitored/storage/eva)
"bdz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
"bdA" = (
@@ -15145,7 +15145,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/port)
"bgs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Office Supplies";
dir = 4
@@ -15916,7 +15916,7 @@
},
/area/station/service/chapel)
"bjD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -15934,7 +15934,7 @@
/turf/simulated/floor/wood/oak,
/area/station/service/library)
"bjI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/north,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -17362,7 +17362,7 @@
/turf/simulated/floor/wood,
/area/station/public/mrchangs)
"bpX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "arrival"
@@ -18197,7 +18197,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"btF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -18879,7 +18879,7 @@
/area/station/hallway/primary/central/nw)
"bxp" = (
/obj/structure/table/wood/fancy/blue,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 10
},
/obj/machinery/ai_status_display/west,
@@ -18904,7 +18904,7 @@
/area/station/command/bridge)
"bxs" = (
/obj/structure/table/wood/fancy/blue,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 10
},
/turf/simulated/floor/plasteel{
@@ -19877,7 +19877,7 @@
},
/area/station/hallway/primary/central/west)
"bCH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "blue"
@@ -19920,7 +19920,7 @@
/turf/simulated/floor/wood/oak,
/area/station/service/library)
"bCR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/station/service/library)
"bCS" = (
@@ -20033,7 +20033,7 @@
},
/area/station/medical/reception)
"bDk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/east,
/turf/simulated/floor/wood/fancy,
/area/station/legal/courtroom)
@@ -21975,7 +21975,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"bLY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "arrival"
@@ -23042,7 +23042,7 @@
},
/area/station/medical/chemistry)
"bQT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitebluecorner"
},
@@ -23352,7 +23352,7 @@
},
/area/station/command/office/cmo)
"bSy" = (
-/obj/item/kirbyplants/plant32,
+/obj/item/kirbyplants/large/plant2,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whiteblue"
@@ -23941,7 +23941,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/se)
"bUH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
@@ -24247,7 +24247,7 @@
/turf/simulated/wall,
/area/station/science/robotics/chargebay)
"bWk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
},
@@ -28177,7 +28177,7 @@
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"cmI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -29063,7 +29063,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"cqM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitebluecorner"
@@ -29181,7 +29181,7 @@
},
/area/station/science/server)
"crp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -31467,7 +31467,7 @@
},
/area/station/medical/surgery/primary)
"czY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/north,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -31667,7 +31667,7 @@
/turf/simulated/floor/engine/o2,
/area/station/engineering/atmos)
"cAS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurplecorner"
@@ -31985,7 +31985,7 @@
/turf/simulated/floor/plating,
/area/station/science/misc_lab)
"cCf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitepurplecorner"
@@ -32135,7 +32135,7 @@
},
/area/station/science/break_room)
"cCV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch{
pixel_y = 24;
name = "north bump"
@@ -33105,7 +33105,7 @@
/turf/simulated/floor/plasteel,
/area/station/supply/miningdock)
"cGJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/random/north,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -36872,7 +36872,7 @@
},
/area/station/engineering/atmos/control)
"cUm" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkyellowfull"
},
@@ -37927,7 +37927,7 @@
/turf/simulated/floor/plating,
/area/station/engineering/control)
"cYH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
@@ -40481,7 +40481,7 @@
},
/area/station/hallway/primary/central/north)
"dix" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/north,
/obj/machinery/light/directional/north,
/turf/simulated/floor/plasteel{
@@ -40667,7 +40667,7 @@
/turf/space,
/area/space/nearstation)
"dje" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/north,
/obj/machinery/light/directional/north,
/obj/structure/cable{
@@ -45167,7 +45167,7 @@
/area/station/engineering/atmos/storage)
"egR" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -47756,7 +47756,7 @@
},
/area/station/medical/surgery/primary)
"fhe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "1-2"
},
@@ -48364,7 +48364,7 @@
},
/area/station/medical/morgue)
"fsR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display/directional/west,
/obj/structure/cable{
icon_state = "2-4"
@@ -50575,7 +50575,7 @@
/area/station/science/storage)
"gkn" = (
/obj/machinery/light_switch/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
icon_state = "0-2"
@@ -53168,7 +53168,7 @@
/turf/simulated/floor/plating/airless,
/area/station/engineering/control)
"hcz" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -58581,7 +58581,7 @@
/obj/structure/cable{
icon_state = "0-2"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whitegreen"
@@ -58840,7 +58840,7 @@
dir = 4;
anchored = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -59111,7 +59111,7 @@
/turf/simulated/floor/grass/no_creep,
/area/station/public/dorms)
"jtP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood/oak,
/area/station/maintenance/asmaint)
@@ -59542,7 +59542,7 @@
},
/area/station/science/hallway)
"jCU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/east,
/obj/effect/turf_decal/siding/wood/oak{
dir = 6
@@ -62163,7 +62163,7 @@
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai_upload)
"kDY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/south,
/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
dir = 4
@@ -62303,7 +62303,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"kGL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
@@ -63001,7 +63001,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
@@ -63916,7 +63916,7 @@
},
/area/station/hallway/primary/fore)
"lnP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "darkgreen"
@@ -64788,7 +64788,7 @@
},
/area/station/maintenance/apmaint)
"lEE" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whitegreen"
@@ -67292,7 +67292,7 @@
},
/area/station/maintenance/asmaint)
"mxH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -68858,7 +68858,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "4-8"
},
@@ -74571,7 +74571,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"pin" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Medbay Reception Break Room"
},
@@ -75526,7 +75526,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"pyl" = (
-/obj/item/kirbyplants/plant32,
+/obj/item/kirbyplants/large/plant2,
/turf/simulated/floor/plasteel{
dir = 10;
icon_state = "whiteblue"
@@ -76691,7 +76691,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint2)
"pVu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "blue"
@@ -77906,7 +77906,7 @@
/obj/effect/turf_decal/siding/wood/oak{
dir = 5
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/east,
/turf/simulated/floor/wood/fancy/oak,
/area/station/command/meeting_room)
@@ -78210,7 +78210,7 @@
},
/area/station/security/main)
"qyq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -78995,7 +78995,7 @@
},
/area/station/science/xenobiology)
"qLc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -79280,7 +79280,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/disposal)
"qPx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -79817,7 +79817,7 @@
},
/area/station/public/dorms)
"raH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/maintenance/asmaint)
"raL" = (
@@ -80978,7 +80978,7 @@
},
/area/station/service/hydroponics)
"rCT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -88574,7 +88574,7 @@
},
/area/station/supply/qm)
"uuo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/west,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -91911,7 +91911,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint2)
"vFk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"vFw" = (
@@ -92208,7 +92208,7 @@
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "bluecorner"
@@ -92376,7 +92376,7 @@
},
/area/station/engineering/supermatter_room)
"vOq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whitepurple"
@@ -94884,7 +94884,7 @@
},
/area/station/medical/sleeper)
"wNa" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/item/cigbutt,
/obj/item/cigbutt,
/obj/item/cigbutt,
@@ -95577,7 +95577,7 @@
/turf/simulated/floor/carpet,
/area/station/service/library)
"xbT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -95710,7 +95710,7 @@
},
/area/station/science/hallway)
"xdA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy/cherry,
/area/station/command/office/captain)
"xdJ" = (
@@ -96993,7 +96993,7 @@
},
/area/station/science/toxins/mixing)
"xBf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -98712,7 +98712,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm
index 5b8fe1ce5163..167566e8a71c 100644
--- a/_maps/map_files220/stations/deltastation.dmm
+++ b/_maps/map_files220/stations/deltastation.dmm
@@ -349,7 +349,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"aec" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
@@ -578,7 +578,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/solar_maintenance/port)
"afj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -1009,7 +1009,7 @@
/turf/simulated/floor/plasteel,
/area/station/security/range)
"ahV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/mineral/titanium/blue,
/area/shuttle/arrival/station)
"ahW" = (
@@ -1047,7 +1047,7 @@
/area/shuttle/arrival/station)
"aio" = (
/obj/machinery/light/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
@@ -1150,7 +1150,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"ajy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
@@ -1584,7 +1584,7 @@
icon_state = "0-4"
},
/obj/machinery/power/apc/directional/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/public/locker)
"amG" = (
@@ -1805,7 +1805,7 @@
},
/area/station/hallway/primary/central/nw)
"anz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/east,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
@@ -2012,7 +2012,7 @@
},
/area/station/hallway/secondary/entry)
"aow" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
},
@@ -2030,7 +2030,7 @@
},
/area/station/security/permabrig)
"aoA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutralcorner"
@@ -2153,7 +2153,7 @@
/turf/simulated/floor/carpet/black,
/area/station/procedure/trainer_office)
"aoY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/north,
/obj/structure/cable{
icon_state = "4-8"
@@ -2214,7 +2214,7 @@
},
/area/station/command/customs)
"apg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/north,
/obj/machinery/light_switch/east,
/turf/simulated/floor/plasteel{
@@ -2526,7 +2526,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/hallway/secondary/entry)
"aqc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/grimy,
/area/station/hallway/secondary/entry)
"aqd" = (
@@ -2646,7 +2646,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/electrical_shop)
"aqw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/electrical_shop)
"aqx" = (
@@ -2663,7 +2663,7 @@
/turf/simulated/floor/wood/oak,
/area/station/maintenance/electrical_shop)
"aqz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/station/maintenance/electrical_shop)
"aqA" = (
@@ -3067,7 +3067,7 @@
},
/area/station/procedure/trainer_office)
"arF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/window/reinforced{
dir = 8
},
@@ -3839,7 +3839,7 @@
/turf/simulated/floor/plasteel/grimy,
/area/station/hallway/secondary/entry)
"atD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/south,
/obj/machinery/light/directional/south,
/turf/simulated/floor/plasteel/grimy,
@@ -4047,7 +4047,7 @@
/turf/simulated/floor/wood/oak,
/area/station/maintenance/electrical_shop)
"auo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/wood/oak,
/area/station/maintenance/electrical_shop)
@@ -4230,7 +4230,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/disposal/east)
"avc" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -4263,7 +4263,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"avg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -5024,7 +5024,7 @@
},
/area/station/engineering/controlroom)
"axW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/nosmoking_2{
pixel_x = 32
},
@@ -7211,7 +7211,7 @@
icon_state = "1-8"
},
/obj/effect/turf_decal/delivery,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/engineering/controlroom)
"aGd" = (
@@ -7535,7 +7535,7 @@
},
/area/station/security/permabrig)
"aHA" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "hydrofloor"
},
@@ -7870,7 +7870,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/engineering/controlroom)
"aID" = (
@@ -7959,7 +7959,7 @@
/obj/structure/railing{
dir = 6
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/railing/cap/normal{
dir = 4
},
@@ -8351,7 +8351,7 @@
/area/station/security/detective)
"aKq" = (
/obj/structure/railing,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Theatre East";
dir = 8
@@ -8661,7 +8661,7 @@
},
/area/station/service/clown)
"aLE" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/blue{
dir = 9
},
@@ -9418,7 +9418,7 @@
/area/station/maintenance/turbine)
"aPy" = (
/obj/machinery/light/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -9768,7 +9768,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/atmos)
"aQZ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -9827,7 +9827,7 @@
/area/station/service/bar/atrium)
"aRA" = (
/obj/structure/railing,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -9921,7 +9921,7 @@
/area/station/supply/office)
"aRT" = (
/obj/effect/turf_decal/delivery,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft)
@@ -10131,7 +10131,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/atmos)
"aSL" = (
@@ -10182,7 +10182,7 @@
},
/area/station/service/bar)
"aTp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet,
/area/station/service/bar/atrium)
"aTr" = (
@@ -10630,7 +10630,7 @@
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 9
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/atmos)
"aVE" = (
@@ -11611,7 +11611,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -11776,7 +11776,7 @@
/obj/structure/cable{
icon_state = "1-2"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/east,
/obj/machinery/economy/vending/wallmed/directional/east,
/turf/simulated/floor/carpet,
@@ -12713,7 +12713,7 @@
/area/station/maintenance/fsmaint)
"beB" = (
/obj/structure/railing/corner,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/public/pool)
"beC" = (
@@ -12837,7 +12837,7 @@
},
/area/station/service/kitchen)
"bfp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -13729,7 +13729,7 @@
},
/area/station/engineering/atmos)
"biT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/west,
/turf/simulated/floor/wood/oak,
/area/station/service/bar/atrium)
@@ -14313,7 +14313,7 @@
/turf/simulated/floor/plating,
/area/station/service/kitchen)
"blk" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/turf/simulated/floor/wood/oak,
/area/station/service/bar/atrium)
@@ -14373,7 +14373,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/aisat)
"blw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/south,
/obj/machinery/light_switch/south,
/turf/simulated/floor/plasteel{
@@ -14524,7 +14524,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/aisat)
"bmq" = (
@@ -14542,7 +14542,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/aisat)
"bms" = (
@@ -14709,7 +14709,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"bmL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/visible/purple{
dir = 9
},
@@ -15430,7 +15430,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/dormitory_maintenance)
"bpU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "yellowcorner"
@@ -16574,7 +16574,7 @@
},
/area/station/science/lobby)
"bvC" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/nosmoking_2{
pixel_y = 32
},
@@ -17251,7 +17251,7 @@
/turf/simulated/floor/bluegrid,
/area/station/turret_protected/ai)
"byg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/turret_protected/ai)
"byh" = (
@@ -17281,7 +17281,7 @@
/turf/simulated/wall,
/area/station/engineering/hardsuitstorage)
"byu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -17739,7 +17739,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/tech_storage)
"bAi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
/area/station/engineering/tech_storage)
@@ -17772,7 +17772,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/tech_storage)
"bAr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/plasteel/dark,
/area/station/command/bridge)
@@ -17790,7 +17790,7 @@
},
/area/station/command/bridge)
"bAt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/command/bridge)
"bAw" = (
@@ -18647,7 +18647,7 @@
},
/area/station/hallway/primary/port)
"bDE" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display/directional/west,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/tech_storage)
@@ -18683,7 +18683,7 @@
},
/area/station/engineering/tech_storage)
"bDI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/ai_status_display/east,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/tech_storage)
@@ -18806,7 +18806,7 @@
},
/area/station/maintenance/port)
"bEd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "darkblue"
@@ -18851,7 +18851,7 @@
/turf/simulated/floor/carpet,
/area/station/command/bridge)
"bEj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkblue"
@@ -19037,7 +19037,7 @@
},
/area/station/engineering/break_room/secondary)
"bET" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/west,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel{
@@ -19046,7 +19046,7 @@
},
/area/station/engineering/break_room/secondary)
"bEU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/obj/machinery/alarm/directional/south,
/obj/effect/turf_decal/delivery,
@@ -19260,7 +19260,7 @@
},
/area/station/public/storage/tools)
"bFr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
@@ -19432,7 +19432,7 @@
},
/area/station/command/bridge)
"bFR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/north,
/turf/simulated/floor/plasteel/dark,
/area/station/command/bridge)
@@ -20224,7 +20224,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/gravitygenerator)
"bIq" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
"bIr" = (
@@ -20256,7 +20256,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
"bIv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/north,
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
@@ -20431,7 +20431,7 @@
/turf/simulated/floor/wood/oak,
/area/station/command/meeting_room)
"bJa" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/oak,
/obj/effect/turf_decal/siding/wood/oak{
dir = 1
@@ -20568,7 +20568,7 @@
/turf/simulated/floor/wood/oak,
/area/station/command/office/captain)
"bJr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/oak{
dir = 5
},
@@ -20759,7 +20759,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"bKd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/west,
/obj/item/radio/intercom/directional/west,
/turf/simulated/floor/plasteel/dark,
@@ -20906,7 +20906,7 @@
},
/area/station/engineering/tech_storage)
"bKy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/ai_status_display/west,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/tech_storage)
@@ -20941,7 +20941,7 @@
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
"bKB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display/directional/east,
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/tech_storage)
@@ -21492,7 +21492,7 @@
"bMA" = (
/obj/structure/sign/poster/official/random/north,
/obj/item/radio/intercom/directional/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "yellow"
@@ -22091,7 +22091,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/engineering/tech_storage)
"bOr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
@@ -22104,7 +22104,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/tech_storage)
"bOt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/south,
/obj/effect/turf_decal/delivery,
/turf/simulated/floor/plasteel,
@@ -22161,7 +22161,7 @@
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
"bOz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/public/storage/tools)
"bOA" = (
@@ -22540,7 +22540,7 @@
},
/area/station/turret_protected/aisat)
"bPJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -22554,7 +22554,7 @@
},
/area/station/turret_protected/aisat)
"bPN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -22907,7 +22907,7 @@
/turf/simulated/floor/wood/oak,
/area/station/command/meeting_room)
"bQG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/north,
/obj/effect/turf_decal/siding/wood/oak,
/obj/effect/turf_decal/siding/wood/oak{
@@ -23192,7 +23192,7 @@
},
/area/station/aisat)
"bRM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkneutralfull"
},
@@ -24116,7 +24116,7 @@
/turf/simulated/floor/wood/oak,
/area/station/command/office/hop)
"bUR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/oak{
dir = 1
},
@@ -24285,13 +24285,13 @@
/turf/simulated/floor/wood/oak,
/area/station/medical/psych)
"bVz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutralfull"
},
/area/station/hallway/secondary/bridge)
"bVB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
icon_state = "0-2"
@@ -24358,7 +24358,7 @@
},
/area/station/turret_protected/aisat)
"bVN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -24561,7 +24561,7 @@
/area/station/engineering/break_room)
"bWy" = (
/obj/machinery/status_display/directional/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/plasteel{
dir = 6;
@@ -24794,7 +24794,7 @@
/turf/space,
/area/space/nearstation)
"bXH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -24817,7 +24817,7 @@
},
/area/station/turret_protected/aisat)
"bXK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/south,
/obj/machinery/alarm/directional/south,
/turf/simulated/floor/plasteel{
@@ -24865,7 +24865,7 @@
},
/area/station/turret_protected/aisat)
"bXP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet/directional/east,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -24964,7 +24964,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"bYe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "cautioncorner"
@@ -25397,7 +25397,7 @@
/turf/simulated/floor/carpet,
/area/station/service/library)
"bZN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/east,
/turf/simulated/floor/wood/parquet,
/area/station/service/library)
@@ -25547,7 +25547,7 @@
/turf/simulated/floor/carpet/black,
/area/station/command/office/captain/bedroom)
"cat" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/security_unit/directional/north,
/turf/simulated/floor/carpet/black,
/area/station/command/office/captain/bedroom)
@@ -25612,7 +25612,7 @@
/area/station/legal/magistrate)
"caH" = (
/obj/effect/turf_decal/stripes/line,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/east,
/turf/simulated/floor/plasteel,
/area/station/engineering/hallway)
@@ -25694,7 +25694,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/security/podpilot)
"caV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/north,
/turf/simulated/floor/plasteel{
icon_state = "dark_large"
@@ -25836,7 +25836,7 @@
},
/area/station/medical/reception)
"cbu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Engine Room North";
network = list("Engineering","SS13")
@@ -25992,7 +25992,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"cbS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/hop)
"cbU" = (
@@ -26644,7 +26644,7 @@
/area/station/command/office/captain/bedroom)
"cdX" = (
/obj/machinery/firealarm/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Captain's Quarters";
dir = 1
@@ -27144,7 +27144,7 @@
},
/area/station/hallway/primary/starboard)
"cgh" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/plasteel{
dir = 6;
@@ -27498,7 +27498,7 @@
/turf/simulated/floor/wood/fancy/oak,
/area/station/legal/magistrate)
"chN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/oak,
/turf/simulated/floor/wood/fancy/oak,
/area/station/legal/magistrate)
@@ -27543,7 +27543,7 @@
},
/area/station/telecomms/chamber)
"chX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark_large"
},
@@ -27937,7 +27937,7 @@
/obj/structure/cable{
icon_state = "2-4"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -28845,7 +28845,7 @@
},
/area/station/hallway/primary/central/sw)
"cnt" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/south,
/obj/effect/turf_decal/siding/wood/oak{
dir = 6
@@ -29525,7 +29525,7 @@
/area/station/hallway/secondary/bridge)
"cqt" = (
/obj/machinery/firealarm/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
"cqu" = (
@@ -29950,7 +29950,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/aisat)
"csl" = (
@@ -29958,7 +29958,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/aisat)
"cso" = (
@@ -30027,7 +30027,7 @@
/turf/simulated/floor/plating,
/area/station/engineering/control)
"csw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery/hollow,
/obj/machinery/firealarm/directional/east,
@@ -30852,7 +30852,7 @@
/turf/simulated/floor/carpet,
/area/station/service/library)
"cwH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/carpet,
/area/station/service/library)
@@ -32027,7 +32027,7 @@
/turf/simulated/floor/carpet,
/area/station/service/library)
"cAU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/south,
/turf/simulated/floor/carpet,
/area/station/service/library)
@@ -32478,7 +32478,7 @@
/turf/simulated/floor/carpet,
/area/station/public/vacant_office/secondary)
"cCN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/carpet,
/area/station/public/vacant_office/secondary)
@@ -32501,7 +32501,7 @@
/turf/simulated/floor/carpet,
/area/station/public/vacant_office/secondary)
"cCR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/south,
/turf/simulated/floor/carpet,
/area/station/public/vacant_office/secondary)
@@ -32753,7 +32753,7 @@
},
/area/station/science/robotics/chargebay)
"cDJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -32786,7 +32786,7 @@
},
/area/station/maintenance/port)
"cEb" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel/dark,
/area/station/ai_monitored/storage/eva)
@@ -32836,7 +32836,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/ai_monitored/storage/eva)
"cEs" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/ai_monitored/storage/eva)
"cEt" = (
@@ -33364,7 +33364,7 @@
"cHo" = (
/obj/effect/decal/cleanable/cobweb,
/obj/structure/table/wood,
-/obj/item/kirbyplants/dead{
+/obj/item/kirbyplants/large/dead{
pixel_y = 12
},
/obj/machinery/light/small/directional/north,
@@ -34383,7 +34383,7 @@
},
/area/station/science/robotics)
"cLx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "caution"
@@ -34462,7 +34462,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/electrical)
"cLJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/plasteel,
/area/station/maintenance/electrical)
@@ -34534,7 +34534,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/science/research)
"cMn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
@@ -34798,7 +34798,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"cND" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display/directional/north,
/turf/simulated/floor/plasteel{
dir = 1;
@@ -34839,7 +34839,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/science/robotics)
"cNT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/north,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -35541,7 +35541,7 @@
/obj/effect/turf_decal/siding/wood/oak/end{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/east,
/turf/simulated/floor/wood/oak,
/area/station/medical/psych)
@@ -35560,7 +35560,7 @@
},
/area/station/hallway/secondary/exit)
"cRd" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
@@ -35571,7 +35571,7 @@
},
/area/station/science/research)
"cRg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whitepurple"
@@ -35673,7 +35673,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -35707,7 +35707,7 @@
},
/area/station/science/xenobiology)
"cRP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -35780,7 +35780,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/engineering/hallway)
"cRY" = (
@@ -36090,7 +36090,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -37706,12 +37706,12 @@
},
/area/station/science/genetics)
"dae" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor/plating,
/area/station/maintenance/abandonedbar)
"daf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/abandonedbar)
"dag" = (
@@ -38007,7 +38007,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dbG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel/dark,
/area/station/maintenance/abandonedbar)
@@ -38024,7 +38024,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/apmaint)
"dbJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/contraband/random/east,
/turf/simulated/floor/plating,
/area/station/maintenance/abandonedbar)
@@ -38401,7 +38401,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central/sw)
"ddo" = (
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/wood/oak,
/area/station/maintenance/old_kitchen)
"ddr" = (
@@ -38883,7 +38883,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"dfU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
@@ -39175,7 +39175,7 @@
/area/station/science/toxins/mixing)
"dhE" = (
/obj/structure/closet/walllocker/emerglocker/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -41269,7 +41269,7 @@
},
/area/station/medical/medbay)
"drp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/oak,
/turf/simulated/floor/wood/oak,
/area/station/command/office/ntrep)
@@ -43162,7 +43162,7 @@
/turf/simulated/floor/plasteel/airless,
/area/station/science/toxins/test)
"dBH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery,
/obj/machinery/light/small/directional/north,
/turf/simulated/floor/plasteel,
@@ -43580,7 +43580,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"dDJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/station/service/bar/atrium)
"dDN" = (
@@ -44247,7 +44247,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/south,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -44529,7 +44529,7 @@
/turf/simulated/floor/carpet/cyan,
/area/station/command/office/cmo)
"dJu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "chapel"
@@ -44660,7 +44660,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/apmaint)
"dKi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel/dark,
/area/station/service/chapel/funeral)
"dKk" = (
@@ -45379,7 +45379,7 @@
},
/area/station/maintenance/apmaint)
"dOS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "chapel"
@@ -45934,7 +45934,7 @@
/turf/simulated/floor/carpet/black,
/area/station/service/chapel/study)
"dRl" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -46427,7 +46427,7 @@
/turf/simulated/floor/carpet,
/area/station/service/library)
"dSY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/north,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -46995,7 +46995,7 @@
/turf/simulated/floor/carpet/black,
/area/station/service/chapel/study)
"dVp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
@@ -47175,7 +47175,7 @@
/area/station/science/server)
"dWm" = (
/obj/machinery/light/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/south,
/turf/simulated/floor/plasteel{
icon_state = "whitepurple"
@@ -47314,7 +47314,7 @@
},
/area/station/hallway/secondary/exit)
"dWL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -47417,7 +47417,7 @@
/turf/simulated/floor/wood/fancy/birch,
/area/station/maintenance/starboard)
"dXv" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/south,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -47644,7 +47644,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom/directional/east,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -47836,7 +47836,7 @@
"dZp" = (
/obj/structure/cable,
/obj/machinery/power/apc/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "red"
@@ -47926,7 +47926,7 @@
/area/station/command/office/cmo)
"eak" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "neutralcorner"
@@ -48035,7 +48035,7 @@
/area/station/engineering/break_room/secondary)
"ebU" = (
/obj/machinery/light/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -48816,7 +48816,7 @@
/area/station/security/range)
"enE" = (
/obj/structure/cable,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/port2)
"enH" = (
@@ -49116,7 +49116,7 @@
/turf/simulated/floor/plasteel,
/area/station/security/permabrig)
"erX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "vault"
@@ -50149,7 +50149,7 @@
/area/station/security/evidence)
"eJn" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "AI Transit Tube Access";
network = list("SS13","Engineering");
@@ -50305,7 +50305,7 @@
/area/station/legal/magistrate)
"eLd" = (
/obj/effect/turf_decal/stripes/line,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/engineering/hallway)
"eLg" = (
@@ -50364,7 +50364,7 @@
/turf/simulated/floor/plating,
/area/station/legal/lawoffice)
"eLJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "darkpurple"
@@ -50563,7 +50563,7 @@
/obj/structure/cable{
icon_state = "2-8"
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/engineering/controlroom)
"ePD" = (
@@ -50609,7 +50609,7 @@
},
/area/station/engineering/atmos)
"ePX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "chapel"
@@ -50874,7 +50874,7 @@
/area/station/security/lobby)
"eTd" = (
/obj/effect/decal/cleanable/ants,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/obj/structure/sign/poster/contraband/communist_state{
pixel_x = 32
},
@@ -51308,7 +51308,7 @@
/turf/simulated/floor/carpet/black,
/area/station/legal/courtroom)
"fbB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -51370,7 +51370,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/fsmaint)
"fdj" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/random/south,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -51501,7 +51501,7 @@
},
/area/station/medical/chemistry)
"ffM" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood/oak{
dir = 10
},
@@ -52618,7 +52618,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/public/locker)
"fxV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable{
icon_state = "0-4"
},
@@ -54736,7 +54736,7 @@
/area/station/science/toxins/test)
"giE" = (
/obj/structure/table/glass,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 12
},
/obj/machinery/light_switch/north,
@@ -54986,7 +54986,7 @@
/turf/simulated/floor/carpet,
/area/station/service/library)
"gmG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "chapel"
},
@@ -55124,7 +55124,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/port)
"gpy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet/directional/west,
/turf/simulated/floor/wood/oak,
/area/station/service/bar/atrium)
@@ -55261,7 +55261,7 @@
/area/station/maintenance/electrical_shop)
"gru" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/dead,
+/obj/item/kirbyplants/large/dead,
/turf/simulated/floor/plating,
/area/station/maintenance/aft)
"gry" = (
@@ -55542,7 +55542,7 @@
/turf/simulated/floor/plating,
/area/station/service/hydroponics)
"gwg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/old_kitchen)
"gwh" = (
@@ -55659,7 +55659,7 @@
},
/area/station/science/genetics)
"gxV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/random/north,
/turf/simulated/floor/wood/parquet,
/area/station/service/library)
@@ -55983,7 +55983,7 @@
/obj/structure/railing{
dir = 10
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/fancy,
/area/station/service/theatre)
"gEs" = (
@@ -56253,7 +56253,7 @@
/turf/simulated/floor/wood,
/area/station/command/office/hos)
"gJS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"gJT" = (
@@ -57388,7 +57388,7 @@
/turf/simulated/floor/carpet/black,
/area/station/command/office/captain/bedroom)
"hbH" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/effect/turf_decal/stripes/corner,
@@ -58278,7 +58278,7 @@
},
/area/station/supply/miningdock)
"hrB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -59069,7 +59069,7 @@
c_tag = "Dorm Hallway West";
dir = 1
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
},
@@ -59888,7 +59888,7 @@
},
/area/station/medical/chemistry)
"hOR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display/directional/south,
/turf/simulated/floor/carpet,
/area/station/service/library)
@@ -60235,7 +60235,7 @@
/turf/simulated/floor/wood/parquet/tile,
/area/station/service/library)
"hVL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
@@ -60635,7 +60635,7 @@
/turf/simulated/floor/wood/fancy,
/area/station/service/theatre)
"idr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/south,
/turf/simulated/floor/wood/parquet,
/area/station/service/library)
@@ -61217,7 +61217,7 @@
/turf/simulated/floor/carpet/black,
/area/station/procedure/trainer_office)
"imx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whitegreen"
@@ -61703,7 +61703,7 @@
/turf/simulated/floor/carpet/cyan,
/area/station/command/office/cmo)
"itw" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "whitepurple"
@@ -62170,7 +62170,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/dormitory_maintenance)
"iBr" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/extinguisher_cabinet/directional/north,
/turf/simulated/floor/wood/parquet,
/area/station/service/library)
@@ -65588,7 +65588,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/old_kitchen)
"jCz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -68066,7 +68066,7 @@
},
/area/station/service/chapel)
"kpD" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
@@ -71751,7 +71751,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/ai_monitored/storage/eva)
"lzG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/south,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -72037,7 +72037,7 @@
/area/station/command/office/hop)
"lEt" = (
/obj/machinery/firealarm/directional/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Chief Medical Officer's Office";
dir = 8;
@@ -73687,7 +73687,7 @@
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"mga" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood{
dir = 9
},
@@ -74058,7 +74058,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"mmE" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "yellow"
@@ -74080,7 +74080,7 @@
},
/area/station/medical/morgue)
"mmP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/visible/cyan,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -74690,7 +74690,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/old_kitchen)
"mwK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -75240,7 +75240,7 @@
dir = 6
},
/obj/machinery/light/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whitepurple"
@@ -75577,7 +75577,7 @@
/turf/simulated/floor/plating,
/area/station/engineering/controlroom)
"mPR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/white{
dir = 10
},
@@ -76503,7 +76503,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/old_kitchen)
"ncG" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/east,
/obj/structure/cable{
icon_state = "0-8"
@@ -76515,7 +76515,7 @@
/area/station/medical/paramedic)
"ncN" = (
/obj/structure/table/wood,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 12
},
/turf/simulated/floor/wood/oak,
@@ -78368,7 +78368,7 @@
/turf/simulated/floor/grass,
/area/station/service/hydroponics)
"nEe" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/south,
/obj/structure/cable{
icon_state = "0-4"
@@ -80680,7 +80680,7 @@
},
/area/station/command/office/rd)
"oky" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
icon_state = "redbluefull"
@@ -81722,7 +81722,7 @@
/turf/simulated/floor/plating,
/area/station/supply/warehouse)
"oCK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom/directional/north,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -81870,7 +81870,7 @@
/turf/simulated/floor/engine,
/area/station/maintenance/incinerator)
"oEP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/item/radio/intercom/directional/south,
/turf/simulated/floor/wood/oak,
/area/station/service/bar/atrium)
@@ -81886,7 +81886,7 @@
/turf/simulated/floor/plasteel,
/area/station/maintenance/port2)
"oEY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/south,
/obj/effect/turf_decal/siding/white{
dir = 6
@@ -82759,7 +82759,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -83279,7 +83279,7 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/item/radio/intercom/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"pdq" = (
@@ -83345,7 +83345,7 @@
},
/area/station/medical/sleeper)
"pey" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -83610,7 +83610,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/old_detective)
"phT" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/door_control/shutter/west{
req_access = list(3);
id = "shooting_range1";
@@ -83822,7 +83822,7 @@
icon_state = "0-8"
},
/obj/machinery/power/apc/directional/east,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "barber"
},
@@ -84778,7 +84778,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos/control)
"pAu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Brig Security Equipment West";
dir = 8
@@ -85841,7 +85841,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"pPR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light_switch/south,
/turf/simulated/floor/wood/parquet,
/area/station/service/library)
@@ -85982,7 +85982,7 @@
},
/area/station/maintenance/starboard)
"pRY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Medbay Virology Restroom";
network = list("Medical","SS13");
@@ -87274,7 +87274,7 @@
},
/area/station/security/warden)
"qpf" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/landmark/spawner/xeno,
/turf/simulated/floor/plating,
/area/station/hallway/secondary/exit/maintenance)
@@ -88032,7 +88032,7 @@
/turf/simulated/floor/wood/oak,
/area/station/maintenance/starboard)
"qBu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel,
/area/station/public/toilet/unisex)
@@ -88450,7 +88450,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/service/bar/atrium)
"qGY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "neutral"
@@ -88504,7 +88504,7 @@
/turf/simulated/floor/carpet,
/area/station/command/office/hop)
"qHY" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/south,
/turf/simulated/floor/plasteel{
dir = 10;
@@ -89339,7 +89339,7 @@
/turf/simulated/floor/grass,
/area/station/security/permabrig)
"qTE" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/power/apc/directional/north,
/obj/structure/cable{
icon_state = "0-2"
@@ -89549,7 +89549,7 @@
},
/area/station/maintenance/disposal/west)
"qWx" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/north,
/turf/simulated/floor/plasteel/dark,
/area/station/command/office/ce)
@@ -89751,7 +89751,7 @@
/obj/structure/railing/corner{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/transparent/glass/reinforced,
/area/station/public/pool)
"qZV" = (
@@ -90400,7 +90400,7 @@
/area/station/service/bar/atrium)
"riK" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/alarm/directional/north,
/turf/simulated/floor/plasteel{
dir = 9;
@@ -90499,7 +90499,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/control)
"rlI" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/abandonedbar)
"rlK" = (
@@ -90742,7 +90742,7 @@
/obj/structure/railing{
dir = 8
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
@@ -90861,7 +90861,7 @@
},
/area/station/engineering/atmos/control)
"rsX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/station/maintenance/library)
"rtm" = (
@@ -91693,7 +91693,7 @@
/turf/simulated/floor/wood/oak,
/area/station/security/permabrig)
"rFU" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Chaplain's Quarters"
},
@@ -92036,7 +92036,7 @@
/area/station/security/armory/secure)
"rML" = (
/obj/machinery/firealarm/directional/north,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
"rMW" = (
@@ -92189,7 +92189,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore2)
"rPF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/nightshifted/east,
/turf/simulated/floor/plasteel{
icon_state = "dark"
@@ -92561,7 +92561,7 @@
icon_state = "1-4"
},
/obj/machinery/firealarm/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -92846,7 +92846,7 @@
/area/station/service/kitchen)
"rZH" = (
/obj/structure/table/wood,
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 12
},
/turf/simulated/floor/plating,
@@ -94194,7 +94194,7 @@
/turf/simulated/floor/plasteel,
/area/station/engineering/controlroom)
"suy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/random{
pixel_y = -32
},
@@ -94555,7 +94555,7 @@
/turf/simulated/floor/carpet,
/area/station/legal/lawoffice)
"szi" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/south,
/turf/simulated/floor/plasteel{
icon_state = "neutralcorner"
@@ -94629,7 +94629,7 @@
/turf/simulated/floor/plasteel/white,
/area/station/science/break_room)
"sAo" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "redfull"
},
@@ -95169,7 +95169,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/command/bridge)
"sHJ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/delivery/hollow,
/obj/effect/decal/cleanable/cobweb2,
/turf/simulated/floor/plasteel,
@@ -95425,7 +95425,7 @@
/turf/simulated/floor/engine,
/area/station/science/toxins/mixing)
"sMu" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/status_display/directional/north,
/obj/structure/sign/poster/contraband/borg_fancy_2{
pixel_x = -32
@@ -96106,7 +96106,7 @@
/area/station/hallway/secondary/exit)
"sZb" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "red"
@@ -97808,7 +97808,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"tAW" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard)
"tBk" = (
@@ -97948,7 +97948,7 @@
},
/area/station/science/lobby)
"tDl" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/west,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
@@ -101027,7 +101027,7 @@
/turf/simulated/floor/wood/fancy/cherry,
/area/station/legal/lawoffice)
"uGp" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/siding/wood{
dir = 9
},
@@ -101104,7 +101104,7 @@
/turf/simulated/floor/plating,
/area/station/legal/lawoffice)
"uHX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/mapping_helpers/turfs/damage,
/turf/simulated/floor/wood/oak,
/area/station/maintenance/old_kitchen)
@@ -101112,7 +101112,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dust,
/obj/effect/spawner/random/oil/maybe,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"uIk" = (
@@ -102892,7 +102892,7 @@
/turf/simulated/floor/plating/airless,
/area/station/security/permabrig)
"vjg" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/north,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -103091,7 +103091,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel,
/area/station/maintenance/port2)
@@ -103680,7 +103680,7 @@
},
/area/station/hallway/primary/central)
"vyl" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/camera{
c_tag = "Research Break Room";
network = list("Research","SS13");
@@ -104420,7 +104420,7 @@
/area/station/supply/qm)
"vLn" = (
/obj/effect/decal/cleanable/dust,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plating,
/area/station/maintenance/fsmaint)
"vLp" = (
@@ -107334,7 +107334,7 @@
},
/area/station/science/toxins/mixing)
"wIS" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -107961,7 +107961,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "neutral"
@@ -109171,7 +109171,7 @@
/turf/simulated/floor/wood/fancy/oak,
/area/station/legal/courtroom)
"xlZ" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -110039,7 +110039,7 @@
/turf/simulated/floor/plasteel/dark,
/area/station/service/hydroponics)
"xyV" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whiteblue"
@@ -111472,7 +111472,7 @@
/turf/simulated/floor/carpet,
/area/station/service/library)
"xUX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -112024,7 +112024,7 @@
/turf/space,
/area/station/engineering/atmos)
"yff" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/sign/poster/official/random/east,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -112080,7 +112080,7 @@
},
/area/station/command/vault)
"yfO" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood/oak,
/area/station/maintenance/old_kitchen)
"yfP" = (
@@ -112288,7 +112288,7 @@
/turf/simulated/floor/carpet/red,
/area/station/command/office/hos)
"yil" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/east,
/obj/machinery/door_control/shutter/north{
id = "transitlock";
diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm
index 1924b75834f0..77c3e4080190 100644
--- a/_maps/map_files220/stations/metastation.dmm
+++ b/_maps/map_files220/stations/metastation.dmm
@@ -823,7 +823,7 @@
/turf/simulated/wall,
/area/station/public/arcade)
"ajb" = (
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/turf/simulated/floor/plasteel{
icon_state = "darkneutralfull"
},
@@ -3389,7 +3389,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fpmaint)
"awb" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel,
/area/station/supply/office)
"awe" = (
@@ -5943,7 +5943,7 @@
"aHH" = (
/obj/effect/decal/cleanable/cobweb,
/obj/effect/turf_decal/delivery/hollow,
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/turf/simulated/floor/plasteel,
/area/station/engineering/hardsuitstorage)
"aHI" = (
@@ -7218,7 +7218,7 @@
/area/station/supply/lobby)
"aLW" = (
/obj/machinery/alarm/directional/west,
-/obj/item/kirbyplants/plant25,
+/obj/item/kirbyplants/large/plant7,
/turf/simulated/floor/plasteel,
/area/station/supply/lobby)
"aLY" = (
@@ -8380,7 +8380,7 @@
/obj/structure/sign/kiddieplaque{
pixel_y = 32
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
pixel_y = 10
},
/obj/structure/table/wood/fancy/green,
@@ -8635,7 +8635,7 @@
/turf/simulated/floor/plating,
/area/station/supply/storage)
"aRn" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "darkneutralfull"
},
@@ -9124,7 +9124,7 @@
/area/station/maintenance/starboard2)
"aTh" = (
/obj/effect/decal/cleanable/dirt,
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"aTi" = (
@@ -10096,7 +10096,7 @@
/area/station/service/janitor)
"aWi" = (
/obj/structure/extinguisher_cabinet/directional/east,
-/obj/item/kirbyplants/plant11,
+/obj/item/kirbyplants/small/small3,
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
"aWj" = (
@@ -10644,7 +10644,7 @@
"aXZ" = (
/obj/machinery/light/directional/west,
/obj/structure/extinguisher_cabinet/directional/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "neutralcorner"
@@ -11570,7 +11570,7 @@
/area/station/turret_protected/ai_upload)
"bbm" = (
/obj/machinery/alarm/directional/north,
-/obj/item/kirbyplants/applebush,
+/obj/item/kirbyplants/medium/medium8,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "neutral"
@@ -11727,7 +11727,7 @@
},
/area/station/command/office/ce)
"bbM" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/obj/structure/sign/electricshock{
pixel_x = -32
},
@@ -12885,7 +12885,7 @@
},
/area/station/command/office/ce)
"beP" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/effect/turf_decal/stripes/line{
dir = 10
},
@@ -12907,7 +12907,7 @@
/area/station/hallway/secondary/entry)
"beR" = (
/obj/structure/extinguisher_cabinet/directional/east,
-/obj/item/kirbyplants/plant16,
+/obj/item/kirbyplants/large/plant1,
/obj/item/radio/intercom/directional/north,
/turf/simulated/floor/plasteel{
dir = 5;
@@ -13013,7 +13013,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
level = 4.1
},
/turf/simulated/floor/plasteel,
@@ -14338,7 +14338,7 @@
/turf/simulated/floor/carpet/black,
/area/station/procedure/trainer_office)
"bja" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -16993,7 +16993,7 @@
pixel_x = -32;
pixel_y = -32
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
@@ -18894,7 +18894,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/central)
"bwp" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
level = 4.1
},
/turf/simulated/floor/wood,
@@ -19906,7 +19906,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"bzA" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -19914,7 +19914,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/entry)
"bzB" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -20438,7 +20438,7 @@
},
/area/station/hallway/primary/port)
"bBr" = (
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/obj/effect/turf_decal/stripes/line{
dir = 9
},
@@ -22094,7 +22094,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/bridge)
"bHx" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/wood,
/area/station/service/library)
"bHz" = (
@@ -22146,7 +22146,7 @@
/turf/simulated/floor/carpet,
/area/station/command/office/captain)
"bHI" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
level = 4.1
},
/obj/effect/turf_decal/woodsiding{
@@ -22338,7 +22338,7 @@
},
/area/station/telecomms/computer)
"bIA" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel{
icon_state = "grimy"
},
@@ -22352,7 +22352,7 @@
},
/area/station/telecomms/computer)
"bID" = (
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/obj/structure/disposalpipe/segment,
/obj/effect/turf_decal/woodsiding{
dir = 1
@@ -25173,7 +25173,7 @@
icon_state = "map-right-MS";
pixel_y = -32
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
@@ -25825,7 +25825,7 @@
},
/area/station/service/kitchen)
"bVF" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 6;
icon_state = "whiteblue"
@@ -25892,7 +25892,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 6
},
-/obj/item/kirbyplants/plant16,
+/obj/item/kirbyplants/large/plant1,
/obj/machinery/light/directional/east,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
@@ -26391,7 +26391,7 @@
/area/station/command/office/ntrep)
"bXy" = (
/obj/machinery/newscaster/directional/west,
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
icon_state = "cult"
},
@@ -26419,7 +26419,7 @@
/area/station/supply/office)
"bXF" = (
/obj/effect/turf_decal/stripes/corner,
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/obj/machinery/door_control/shutter/south{
id = "mechbay";
name = "Mech Bay Shutters Control";
@@ -28296,7 +28296,7 @@
/area/station/hallway/primary/central)
"cei" = (
/obj/machinery/firealarm/directional/east,
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
icon_state = "purplecorner"
},
@@ -28543,7 +28543,7 @@
/area/station/command/bridge)
"cfi" = (
/obj/structure/extinguisher_cabinet/directional/west,
-/obj/item/kirbyplants/applebush,
+/obj/item/kirbyplants/medium/medium8,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "bluecorner"
@@ -32755,7 +32755,7 @@
/turf/simulated/floor/plasteel,
/area/station/hallway/primary/aft)
"cvJ" = (
-/obj/item/kirbyplants/plant20,
+/obj/item/kirbyplants/large/alien/alien6,
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
},
@@ -33078,7 +33078,7 @@
/area/station/science/research)
"cwW" = (
/obj/machinery/firealarm/directional/west,
-/obj/item/kirbyplants/plant11,
+/obj/item/kirbyplants/small/small3,
/obj/machinery/light/directional/west,
/turf/simulated/floor/plasteel{
icon_state = "darkgreycheck"
@@ -36676,7 +36676,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/asmaint)
"cKu" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"cKv" = (
@@ -36721,7 +36721,7 @@
},
/area/station/medical/cloning)
"cKA" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "darkgreencorners"
@@ -36899,7 +36899,7 @@
/turf/simulated/floor/grass,
/area/station/maintenance/aft2)
"cLm" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/obj/machinery/light/small/directional/west,
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
@@ -37306,7 +37306,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/medmaint)
"cNy" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -37549,7 +37549,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/aft2)
"cOk" = (
-/obj/item/kirbyplants/plant18,
+/obj/item/kirbyplants/large/plant8,
/obj/machinery/light/small/directional/east,
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
@@ -38610,7 +38610,7 @@
/area/station/security/prison/cell_block/a)
"cTq" = (
/obj/machinery/light/directional/west,
-/obj/item/kirbyplants/plant24,
+/obj/item/kirbyplants/large/plant14,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -38760,7 +38760,7 @@
"cTV" = (
/obj/machinery/light/directional/east,
/obj/structure/extinguisher_cabinet/directional/east,
-/obj/item/kirbyplants/plant14,
+/obj/item/kirbyplants/large/plant9,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -41566,7 +41566,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/starboard2)
"drv" = (
-/obj/item/kirbyplants{
+/obj/item/kirbyplants/large{
level = 4.1
},
/obj/structure/disposalpipe/segment{
@@ -41787,7 +41787,7 @@
/area/station/engineering/break_room)
"dAq" = (
/obj/machinery/firealarm/directional/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 9;
icon_state = "whiteblue"
@@ -43996,7 +43996,7 @@
/area/station/medical/exam_room)
"eFH" = (
/obj/machinery/economy/vending/wallmed/directional/south,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -44874,7 +44874,7 @@
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"fdz" = (
-/obj/item/kirbyplants/plant11,
+/obj/item/kirbyplants/small/small3,
/turf/simulated/floor/plasteel,
/area/station/supply/office)
"feD" = (
@@ -44991,7 +44991,7 @@
/turf/simulated/floor/plasteel,
/area/station/service/janitor)
"fhC" = (
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "red"
@@ -46228,7 +46228,7 @@
},
/area/station/public/fitness)
"fKW" = (
-/obj/item/kirbyplants/plant16,
+/obj/item/kirbyplants/large/plant1,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
@@ -46598,7 +46598,7 @@
dir = 10
},
/obj/machinery/light/directional/west,
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel,
/area/station/hallway/secondary/exit)
"fVB" = (
@@ -46845,7 +46845,7 @@
/turf/simulated/floor/wood,
/area/station/public/mrchangs)
"gbz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/firealarm/directional/west,
/turf/simulated/floor/plasteel{
dir = 8;
@@ -46955,7 +46955,7 @@
},
/area/station/security/permabrig)
"geC" = (
-/obj/item/kirbyplants/plant24,
+/obj/item/kirbyplants/large/plant14,
/obj/machinery/camera{
c_tag = "Science Hallway - Research";
network = list("Research","SS13")
@@ -47685,7 +47685,7 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/item/kirbyplants/plant10,
+/obj/item/kirbyplants/large/plant12,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "purple"
@@ -47798,7 +47798,7 @@
},
/area/station/medical/chemistry)
"gCX" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -49141,7 +49141,7 @@
/area/station/command/office/cmo)
"hjr" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/item/kirbyplants/plant22,
+/obj/item/kirbyplants/medium/medium6,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -52834,7 +52834,7 @@
},
/area/station/security/execution)
"iTN" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/directional/north,
/turf/simulated/floor/plasteel{
icon_state = "white"
@@ -53290,7 +53290,7 @@
c_tag = "Detective's Office";
dir = 8
},
-/obj/item/kirbyplants/plant24,
+/obj/item/kirbyplants/large/plant14,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/carpet,
/area/station/security/detective)
@@ -55116,7 +55116,7 @@
},
/area/station/science/research)
"kiq" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -56496,7 +56496,7 @@
/turf/simulated/floor/plating/airless,
/area/space/nearstation)
"kQx" = (
-/obj/item/kirbyplants/plant11,
+/obj/item/kirbyplants/small/small3,
/turf/simulated/floor/wood,
/area/station/legal/courtroom)
"kQD" = (
@@ -57046,7 +57046,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants/applebush,
+/obj/item/kirbyplants/medium/medium8,
/obj/effect/turf_decal/stripes/line{
dir = 6
},
@@ -57859,7 +57859,7 @@
},
/area/station/security/main)
"lvB" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -59045,7 +59045,7 @@
/turf/simulated/floor/plasteel,
/area/station/science/xenobiology)
"lXL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/plasteel{
dir = 5;
icon_state = "whiteblue"
@@ -65423,7 +65423,7 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/effect/turf_decal/stripes/line{
dir = 5
},
@@ -67491,7 +67491,7 @@
/turf/simulated/floor/carpet,
/area/station/legal/courtroom)
"qnY" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/turf/simulated/floor/plasteel,
/area/station/maintenance/starboard2)
"qof" = (
@@ -68095,7 +68095,7 @@
},
/area/station/science/robotics)
"qFz" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint)
"qFI" = (
@@ -73689,7 +73689,7 @@
},
/area/station/hallway/primary/central)
"tyW" = (
-/obj/item/kirbyplants/applebush,
+/obj/item/kirbyplants/medium/medium8,
/obj/effect/turf_decal/stripes/corner{
dir = 4
},
@@ -74105,7 +74105,7 @@
},
/area/station/security/armory)
"tKL" = (
-/obj/item/kirbyplants/plant24,
+/obj/item/kirbyplants/large/plant14,
/obj/machinery/light_switch/west{
pixel_y = 6
},
@@ -74126,7 +74126,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable/yellow{
icon_state = "4-8"
},
@@ -75488,7 +75488,7 @@
},
/area/station/service/hydroponics)
"uBK" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/light/small/directional/east,
/turf/simulated/floor/wood,
/area/station/maintenance/apmaint)
@@ -78689,7 +78689,7 @@
/turf/simulated/floor/engine,
/area/station/engineering/control)
"wkL" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/structure/cable/yellow{
icon_state = "2-4"
},
@@ -80833,7 +80833,7 @@
},
/area/station/security/checkpoint/south)
"xtP" = (
-/obj/item/kirbyplants/plant21,
+/obj/item/kirbyplants/large/plant4,
/obj/structure/sign/botany{
pixel_x = 32
},
@@ -82343,7 +82343,7 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"yeR" = (
-/obj/item/kirbyplants,
+/obj/item/kirbyplants/large,
/obj/machinery/newscaster/directional/north,
/turf/simulated/floor/plasteel{
dir = 9;
diff --git a/code/__HELPERS/trait_helpers.dm b/code/__HELPERS/trait_helpers.dm
index 824927828226..e41cb2713498 100644
--- a/code/__HELPERS/trait_helpers.dm
+++ b/code/__HELPERS/trait_helpers.dm
@@ -314,6 +314,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Prevents seeing this item on examine when on a mob, or seeing it in the strip menu. It's like ABSTRACT, without making the item fail to interact in several ways. The item can still be stripped however, combine with no_strip unless you have a reason not to.
#define TRAIT_SKIP_EXAMINE "skip_examine"
+/// A general trait for tracking whether a zombie owned the organ or limb
+#define TRAIT_I_WANT_BRAINS_ORGAN "zombie_organ"
//****** OBJ TRAITS *****//
///An /obj that should not increase the "depth" of the search for adjacency,
diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm
index c9a69c212ba9..1211797e7674 100644
--- a/code/_globalvars/traits.dm
+++ b/code/_globalvars/traits.dm
@@ -140,7 +140,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_HYPOSPRAY_IMMUNE" = TRAIT_HYPOSPRAY_IMMUNE,
"TRAIT_ITEM_ACTIVE" = TRAIT_ITEM_ACTIVE,
"TRAIT_NO_STRIP" = TRAIT_NO_STRIP,
- "TRAIT_SKIP_EXAMINE" = TRAIT_SKIP_EXAMINE
+ "TRAIT_SKIP_EXAMINE" = TRAIT_SKIP_EXAMINE,
+ "TRAIT_I_WANT_BRAINS_ORGAN" = TRAIT_I_WANT_BRAINS_ORGAN
),
/turf = list(
diff --git a/code/datums/diseases/zombie_virus.dm b/code/datums/diseases/zombie_virus.dm
index 37b96d68420f..4f41eb8483d6 100644
--- a/code/datums/diseases/zombie_virus.dm
+++ b/code/datums/diseases/zombie_virus.dm
@@ -29,6 +29,8 @@
for(var/obj/item/organ/limb as anything in H.bodyparts)
if(!(limb.status & ORGAN_DEAD) && !limb.is_robotic())
limb.necrotize(TRUE, TRUE)
+ if(!HAS_TRAIT(limb, TRAIT_I_WANT_BRAINS_ORGAN))
+ ADD_TRAIT(limb, TRAIT_I_WANT_BRAINS_ORGAN, ZOMBIE_TRAIT)
if(!..())
return FALSE
@@ -105,11 +107,15 @@
for(var/obj/item/organ/limb as anything in H.bodyparts)
if(!(limb.status & ORGAN_DEAD) && !limb.vital && !limb.is_robotic())
limb.necrotize()
+ if(!HAS_TRAIT(limb, TRAIT_I_WANT_BRAINS_ORGAN))
+ ADD_TRAIT(limb, TRAIT_I_WANT_BRAINS_ORGAN, ZOMBIE_TRAIT)
return FALSE
for(var/obj/item/organ/limb as anything in H.bodyparts)
if(!(limb.status & ORGAN_DEAD) && !limb.is_robotic())
limb.necrotize(FALSE, TRUE)
+ if(!HAS_TRAIT(limb, TRAIT_I_WANT_BRAINS_ORGAN))
+ ADD_TRAIT(limb, TRAIT_I_WANT_BRAINS_ORGAN, ZOMBIE_TRAIT)
return FALSE
if(!HAS_TRAIT(affected_mob, TRAIT_I_WANT_BRAINS))
@@ -148,6 +154,10 @@
/datum/disease/zombie/cure()
affected_mob.mind?.remove_antag_datum(/datum/antagonist/zombie)
REMOVE_TRAIT(affected_mob, TRAIT_I_WANT_BRAINS, ZOMBIE_TRAIT)
+ var/mob/living/carbon/human/H = affected_mob
+ for(var/obj/item/organ/limb as anything in H.bodyparts)
+ if(HAS_TRAIT(limb, TRAIT_I_WANT_BRAINS_ORGAN))
+ REMOVE_TRAIT(limb, TRAIT_I_WANT_BRAINS_ORGAN, ZOMBIE_TRAIT)
affected_mob.DeleteComponent(/datum/component/zombie_regen)
affected_mob.med_hud_set_health()
affected_mob.med_hud_set_status()
diff --git a/code/game/gamemodes/dynamic/antag_rulesets.dm b/code/game/gamemodes/dynamic/antag_rulesets.dm
index 9e251becabb5..62293adf6cbf 100644
--- a/code/game/gamemodes/dynamic/antag_rulesets.dm
+++ b/code/game/gamemodes/dynamic/antag_rulesets.dm
@@ -161,7 +161,7 @@
/datum/ruleset/traitor
name = "Traitor"
ruleset_weight = 11
- antag_cost = 5
+ antag_cost = 7
antag_weight = 2
antagonist_type = /datum/antagonist/traitor
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 4a61e40a3fdd..45c498fe5c0a 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -163,6 +163,9 @@
do_sparks(5, 0, loc)
qdel(src)
+/obj/effect/portal/newtonian_move(direction, instant, start_delay)
+ return TRUE
+
#define UNSTABLE_TIME_DELAY 2 SECONDS
/obj/effect/portal/hand_tele
diff --git a/code/game/objects/items/robot/cyborg_gripper.dm b/code/game/objects/items/robot/cyborg_gripper.dm
index cac644d7c839..6bfb28825bca 100644
--- a/code/game/objects/items/robot/cyborg_gripper.dm
+++ b/code/game/objects/items/robot/cyborg_gripper.dm
@@ -16,6 +16,7 @@
icon_state = "gripper"
actions_types = list(/datum/action/item_action/drop_gripped_item)
flags = ABSTRACT
+ new_attack_chain = TRUE
/// Set to TRUE to removal of cells/lights from machine objects containing them.
var/engineering_machine_interaction = FALSE
/// Defines what items the gripper can carry.
@@ -58,39 +59,46 @@
gripped_item = null
return TRUE
-/obj/item/gripper/attack_self__legacy__attackchain(mob/user)
+/obj/item/gripper/activate_self(mob/user)
+ . = ..()
if(!gripped_item)
to_chat(user, "[src] is empty.")
- return
+ return ITEM_INTERACT_COMPLETE
+
if(gripped_item.new_attack_chain)
gripped_item.activate_self(user)
else
gripped_item.attack_self__legacy__attackchain(user)
+ return ITEM_INTERACT_COMPLETE
// This is required to ensure that the forceMove checks on some objects don't rip the gripper out of the borg's inventory and toss it on the floor. That would hurt, a lot!
/obj/item/gripper/forceMove(atom/destination)
return
-
-/obj/item/gripper/afterattack__legacy__attackchain(atom/target, mob/living/user, proximity, params)
- // Target is invalid or we are not adjacent.
- if(!target || !proximity)
- return
+
+/obj/item/gripper/interact_with_atom(atom/target, mob/living/user, list/modifiers)
+ if(!target)
+ return ITEM_INTERACT_COMPLETE
// Does the gripper already have an item?
if(gripped_item)
// Pass the attack on to the target. This might delete/relocate gripped_item. If the attackby doesn't resolve or delete the target or gripped_item, afterattack.
- if(!target.attackby__legacy__attackchain(gripped_item, user, params))
- gripped_item?.afterattack__legacy__attackchain(target, user, 1, params)
+ // We also need to check if it's the old or new attack chain until the migration is complete.
+ if(new_attack_chain)
+ if(!target.item_interaction(user, gripped_item, modifiers))
+ gripped_item.melee_attack_chain(user, target, modifiers)
+ else
+ if(!target.attackby__legacy__attackchain(gripped_item, user, modifiers))
+ gripped_item?.afterattack__legacy__attackchain(target, user, 1, modifiers)
// Check to see if there is still an item in the gripper (stackable items trigger this).
if(!gripped_item && length(contents))
gripped_item = contents[1]
- return
+ return ITEM_INTERACT_COMPLETE
// If the gripper thinks it has something but it actually doesn't, we fix this.
if(gripped_item && !length(contents))
gripped_item = null
- return
+ return ITEM_INTERACT_COMPLETE
- return TRUE
+ return ITEM_INTERACT_COMPLETE
// Is the gripper interacting with an item?
if(isitem(target))
@@ -100,17 +108,14 @@
to_chat(user, "You collect [I].")
I.forceMove(src)
gripped_item = I
- return
+ return ITEM_INTERACT_COMPLETE
to_chat(user, "You hold your gripper over [target], but no matter how hard you try, you cannot make yourself grab it.")
- return
-
- // Attack code will handle this.
- if(ismob(target))
- return
+ return ITEM_INTERACT_COMPLETE
// Everything past this point requires being able to engineer.
if(!engineering_machine_interaction)
+ // Allow attack chain to continue into pre_attack()
return
// Removing cells from APCs.
@@ -128,7 +133,7 @@
"[user] removes the cell from [A]!",
"You remove the cell from [A]."
)
- return
+ return ITEM_INTERACT_COMPLETE
// Removing cells from cell chargers.
if(istype(target, /obj/machinery/cell_charger))
@@ -142,7 +147,7 @@
"[user] removes the cell from [cell_charger].",
"You remove the cell from [cell_charger]."
)
- return
+ return ITEM_INTERACT_COMPLETE
// Removing lights from fixtures.
if(istype(target, /obj/machinery/light))
@@ -154,19 +159,28 @@
"[user] removes [L] from [light].",
"You remove [L] from [light]."
)
+ return ITEM_INTERACT_COMPLETE
/obj/item/gripper/emag_act(mob/user)
emagged = !emagged
..()
return TRUE
-/obj/item/gripper/attack__legacy__attackchain(mob/living/M, mob/living/silicon/robot/user, params)
+/obj/item/gripper/pre_attack(atom/A, mob/living/user, params)
if(gripped_item)
- return
-
+ gripped_item.attack(A, user)
+ return TRUE
+
+ if(!ismob(A))
+ return ..()
+
+ // This is required to avoid hypersonic interaction speed.
+ user.changeNext_move(CLICK_CD_MELEE)
+ . = TRUE
+ var/mob/living/target = A
// If a human target is horizonal, try to help them up. Unless you're trying to kill them.
- if(ishuman(M) && user.a_intent == INTENT_HELP && can_help_up)
- var/mob/living/carbon/human/pickup_target = M
+ if(ishuman(target) && user.a_intent == INTENT_HELP && can_help_up)
+ var/mob/living/carbon/human/pickup_target = target
if(IS_HORIZONTAL(pickup_target))
// Same restorative effects as when a human tries to help someone up.
pickup_target.AdjustSleeping(-10 SECONDS)
@@ -185,7 +199,7 @@
return
if(user.a_intent == INTENT_HELP)
- if(M == user)
+ if(target == user)
user.visible_message(
"[user] gives [user.p_themselves()] a hug to make [user.p_themselves()] feel better.",
"You give yourself a hug to make yourself feel better."
@@ -194,35 +208,36 @@
return
// Checks if holder_type exists to prevent picking up animals like mice, because we're about to use the hands that borgs secretly have.
- if(isanimal(M) && !M.holder_type)
+ if(isanimal(target) && !target.holder_type)
var/list/modifiers = params2list(params)
// This enables borgs to get the floating heart icon and mob emote from simple_animals that have petbonus == TRUE.
- M.attack_hand(user, modifiers)
+ target.attack_hand(user, modifiers)
+ return
if(user.zone_selected == BODY_ZONE_HEAD)
user.visible_message(
- "[user] playfully boops [M] on the head.",
- "You playfully boop [M] on the head."
+ "[user] playfully boops [target] on the head.",
+ "You playfully boop [target] on the head."
)
- user.do_attack_animation(M, ATTACK_EFFECT_BOOP)
+ user.do_attack_animation(target, ATTACK_EFFECT_BOOP)
playsound(loc, 'sound/weapons/tap.ogg', 50, TRUE, -1)
return
- if(ishuman(M))
+ if(ishuman(target))
user.visible_message(
- "[user] hugs [M] to make [M.p_them()] feel better.",
- "You hug [M] to make [M.p_them()] feel better."
+ "[user] hugs [target] to make [target.p_them()] feel better.",
+ "You hug [target] to make [target.p_them()] feel better."
)
else
user.visible_message(
- "[user] pets [M]!",
- "You pet [M]!"
+ "[user] pets [target]!",
+ "You pet [target]!"
)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
return
if(user.a_intent == INTENT_HARM && !emagged)
- if(M == user)
+ if(target == user)
user.visible_message(
"[user] gives [user.p_themselves()] a firm bear-hug to make [user.p_themselves()] feel better.",
"You give yourself a firm bear-hug to make yourself feel better."
@@ -230,17 +245,17 @@
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
return
- if(!ishuman(M) || user.zone_selected == BODY_ZONE_HEAD)
+ if(!ishuman(target) || user.zone_selected == BODY_ZONE_HEAD)
user.visible_message(
- "[user] bops [M] on the head!",
- "You bop [M] on the head!"
+ "[user] bops [target] on the head!",
+ "You bop [target] on the head!"
)
- user.do_attack_animation(M, ATTACK_EFFECT_PUNCH)
+ user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
playsound(loc, 'sound/weapons/tap.ogg', 50, TRUE, -1)
else
user.visible_message(
- "[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...",
- "You hug [M] firmly to make [M.p_them()] feel better! [M] looks uncomfortable..."
+ "[user] hugs [target] in a firm bear-hug! [target] looks uncomfortable...",
+ "You hug [target] firmly to make [target.p_them()] feel better! [target] looks uncomfortable..."
)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
return
@@ -249,36 +264,36 @@
if(!emagged)
return
- if(M == user)
+ if(target == user)
user.visible_message(
"[user] punches [user.p_themselves()] in the face!.",
"You punch yourself in the face!"
)
- user.do_attack_animation(M, ATTACK_EFFECT_PUNCH)
+ user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
playsound(loc, 'sound/weapons/smash.ogg', 50, TRUE, -1)
user.adjustBruteLoss(15)
return
- if(ishuman(M))
+ if(ishuman(target))
// Try to punch them in the face... Unless it fell off or something.
- if(user.zone_selected == BODY_ZONE_HEAD && M.get_organ("head"))
+ if(user.zone_selected == BODY_ZONE_HEAD && target.get_organ("head"))
user.visible_message(
- "[user] punches [M] squarely in the face!",
- "You punch [M] in the face!"
+ "[user] punches [target] squarely in the face!",
+ "You punch [target] in the face!"
)
- var/obj/item/organ/external/head/their_face = M.get_organ("head")
- user.do_attack_animation(M, ATTACK_EFFECT_PUNCH)
+ var/obj/item/organ/external/head/their_face = target.get_organ("head")
+ user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
playsound(loc, 'sound/weapons/smash.ogg', 50, TRUE, -1)
their_face.receive_damage(15)
- M.UpdateDamageIcon()
+ target.UpdateDamageIcon()
return
user.visible_message(
- "[user] crushes [M] in [user.p_their()] grip!",
- "You crush [M] in your grip!"
+ "[user] crushes [target] in [user.p_their()] grip!",
+ "You crush [target] in your grip!"
)
playsound(loc, 'sound/weapons/smash.ogg', 50, TRUE, -1)
- M.adjustBruteLoss(15)
+ target.adjustBruteLoss(15)
// MARK: Gripper Types
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 522881d1a453..b3eabd256af5 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -249,37 +249,36 @@
. = ..()
icon_state = "fullgrass_[rand(1, 3)]"
-// Kirby plants
+//////////////////////
+////// MARK: Kirbyplants
+//////////////////////
+
/obj/item/kirbyplants
name = "potted plant"
desc = "Some greenery, how nice."
icon = 'icons/obj/flora/plants.dmi'
- icon_state = "random_plant"
+ icon_state = "random-medium"
anchored = FALSE
layer = ABOVE_MOB_LAYER
- w_class = WEIGHT_CLASS_HUGE
force = 10
throwforce = 13
throw_speed = 2
throw_range = 4
- /// Method to track plant overlay on mob for later removal
+ /// Variable to track plant overlay on mob for later removal
var/mutable_appearance/mob_overlay
+ var/hideable = FALSE
/obj/item/kirbyplants/Initialize(mapload)
. = ..()
- if(prob(1) && icon_state == "random_plant")
- icon_state = "plant-eye"
- if(icon_state == "random_plant")
- icon_state = "plant-[rand(1, 34)]"
- update_appearance(UPDATE_ICON_STATE)
- AddComponent(/datum/component/two_handed, require_twohands = TRUE)
-
-/obj/item/kirbyplants/Destroy()
- if(iscarbon(loc))
- unhide_user(loc)
+ if(hideable)
+ AddComponent(/datum/component/two_handed, require_twohands = TRUE)
- QDEL_NULL(mob_overlay)
- return ..()
+/obj/item/kirbyplants/examine(mob/user)
+ . = ..()
+ if(hideable)
+ . += "You can hide behind [src] by picking it up with both hands free."
+ else
+ . += "It's too small to hide behind."
/obj/item/kirbyplants/equipped(mob/living/carbon/user)
. = ..()
@@ -288,6 +287,13 @@
return
unhide_user(user)
+/obj/item/kirbyplants/Destroy()
+ if(iscarbon(loc))
+ unhide_user(loc)
+
+ QDEL_NULL(mob_overlay)
+ return ..()
+
/// User has decided to hold a plant, apply stealth.
/obj/item/kirbyplants/proc/hide_user(mob/living/carbon/user)
RegisterSignal(user, COMSIG_CARBON_REGENERATE_ICONS, PROC_REF(reapply_hide))
@@ -320,118 +326,136 @@
..()
unhide_user(user)
-/obj/item/kirbyplants/plant1
- icon_state = "plant-1"
+//Large Plants
+/obj/item/kirbyplants/large
+ name = "large potted plant"
+ icon_state = "random-big"
+ w_class = WEIGHT_CLASS_HUGE
+ desc = "A big potted plant. In enclosed starships and space stations, a bit of greenery is good for morale."
+ hideable = TRUE
-/obj/item/kirbyplants/plant2
- icon_state = "plant-2"
+/obj/item/kirbyplants/large/Initialize(mapload)
+ . = ..()
+ if(icon_state == "random-big")
+ icon_state = "plant-[rand(1, 15)]"
-/obj/item/kirbyplants/plant3
+/obj/item/kirbyplants/large/plant1
+ icon_state = "plant-1"
+/obj/item/kirbyplants/large/plant2
+ icon_state = "plant-2"
+/obj/item/kirbyplants/large/plant3
icon_state = "plant-3"
-
-/obj/item/kirbyplants/plant4
+/obj/item/kirbyplants/large/plant4
icon_state = "plant-4"
-
-/obj/item/kirbyplants/plant5
+/obj/item/kirbyplants/large/plant5
icon_state = "plant-5"
-
-/obj/item/kirbyplants/plant6
+/obj/item/kirbyplants/large/plant6
icon_state = "plant-6"
-
-/obj/item/kirbyplants/plant7
+/obj/item/kirbyplants/large/plant7
icon_state = "plant-7"
-
-/obj/item/kirbyplants/plant8
+/obj/item/kirbyplants/large/plant8
icon_state = "plant-8"
-
-/obj/item/kirbyplants/plant9
+/obj/item/kirbyplants/large/plant9
icon_state = "plant-9"
-
-/obj/item/kirbyplants/plant10
+/obj/item/kirbyplants/large/plant10
icon_state = "plant-10"
-
-/obj/item/kirbyplants/plant11
+/obj/item/kirbyplants/large/plant11
icon_state = "plant-11"
-
-/obj/item/kirbyplants/plant12
+/obj/item/kirbyplants/large/plant12
icon_state = "plant-12"
-
-/obj/item/kirbyplants/plant13
+/obj/item/kirbyplants/large/plant13
icon_state = "plant-13"
-
-/obj/item/kirbyplants/plant14
+/obj/item/kirbyplants/large/plant14
icon_state = "plant-14"
-
-/obj/item/kirbyplants/plant15
+/obj/item/kirbyplants/large/plant15
icon_state = "plant-15"
-/obj/item/kirbyplants/plant16
- icon_state = "plant-16"
-
-/obj/item/kirbyplants/plant17
- icon_state = "plant-17"
-
-/obj/item/kirbyplants/plant18
- icon_state = "plant-18"
-
-/obj/item/kirbyplants/plant19
- icon_state = "plant-19"
-
-/obj/item/kirbyplants/plant20
- icon_state = "plant-20"
-
-/obj/item/kirbyplants/plant21
- icon_state = "plant-21"
-
-/obj/item/kirbyplants/plant22
- icon_state = "plant-22"
-
-/obj/item/kirbyplants/plant23
- icon_state = "plant-23"
-
-/obj/item/kirbyplants/plant24
- icon_state = "plant-24"
-
-/obj/item/kirbyplants/plant25
- icon_state = "plant-25"
-
-/obj/item/kirbyplants/plant26
- icon_state = "plant-26"
-
-/obj/item/kirbyplants/plant27
- icon_state = "plant-27"
-
-/obj/item/kirbyplants/plant28
- icon_state = "plant-28"
-
-/obj/item/kirbyplants/plant29
- icon_state = "plant-29"
-
-/obj/item/kirbyplants/plant30
- icon_state = "plant-30"
-
-/obj/item/kirbyplants/plant31
- icon_state = "plant-31"
-
-/obj/item/kirbyplants/plant32
- icon_state = "plant-32"
-
-/obj/item/kirbyplants/plant33
- icon_state = "plant-33"
-
-/obj/item/kirbyplants/plant34
- icon_state = "plant-34"
-
-/obj/item/kirbyplants/applebush
- icon_state = "applebush"
-
-/obj/item/kirbyplants/dead
+/obj/item/kirbyplants/large/dead
icon_state = "plant-dead"
-/obj/item/kirbyplants/dead/rd
+/obj/item/kirbyplants/large/dead/rd
name = "\improper RD's potted plant"
desc = "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..."
+//Medium Plants
+/obj/item/kirbyplants/medium
+ name = "potted plant"
+ icon_state = "random-medium"
+ desc = "An understated houseplant. In enclosed starships and space stations, a bit of greenery is good for morale."
+ w_class = WEIGHT_CLASS_BULKY
+ hideable = TRUE
+
+/obj/item/kirbyplants/medium/Initialize(mapload)
+ . = ..()
+ if(icon_state == "random-medium")
+ icon_state = "medium-[rand(1,8)]"
+
+/obj/item/kirbyplants/medium/medium1
+ icon_state = "medium-1"
+/obj/item/kirbyplants/medium/medium2
+ icon_state = "medium-2"
+/obj/item/kirbyplants/medium/medium3
+ icon_state = "medium-3"
+/obj/item/kirbyplants/medium/medium4
+ icon_state = "medium-4"
+/obj/item/kirbyplants/medium/medium5
+ icon_state = "medium-5"
+/obj/item/kirbyplants/medium/medium6
+ icon_state = "medium-6"
+/obj/item/kirbyplants/medium/medium7
+ icon_state = "medium-7"
+/obj/item/kirbyplants/medium/medium8
+ icon_state = "medium-8"
+
+//Small Plants
+/obj/item/kirbyplants/small
+ name = "small potted plant"
+ icon_state = "random-small"
+ w_class = WEIGHT_CLASS_NORMAL
+ desc = "A small potted houseplant, for setting on tables and shelves."
+
+/obj/item/kirbyplants/small/Initialize(mapload)
+ . = ..()
+ if(icon_state == "random-small")
+ icon_state = "small-[rand(1,5)]"
+
+/obj/item/kirbyplants/small/small1
+ icon_state = "small-1"
+/obj/item/kirbyplants/small/small2
+ icon_state = "small-2"
+/obj/item/kirbyplants/small/small3
+ icon_state = "small-3"
+/obj/item/kirbyplants/small/small4
+ icon_state = "small-4"
+/obj/item/kirbyplants/small/small5
+ icon_state = "small-5"
+
+//Alien Plants
+/obj/item/kirbyplants/large/alien
+ name = "potted alien plant"
+ icon_state = "random-alien"
+ desc = "An alien potted plant. Nanotrasen and the TSF usually favor Earthen plants for decor, so plants like this are an exotic novelty in this part of the galaxy."
+
+/obj/item/kirbyplants/large/alien/Initialize(mapload)
+ . = ..()
+ if(icon_state == "random-alien")
+ icon_state = "alien-[rand(1,8)]"
+
+/obj/item/kirbyplants/large/alien/alien1
+ icon_state = "alien-1"
+/obj/item/kirbyplants/large/alien/alien3
+ icon_state = "alien-3"
+/obj/item/kirbyplants/large/alien/alien4
+ icon_state = "alien-4"
+/obj/item/kirbyplants/large/alien/alien5
+ icon_state = "alien-5"
+/obj/item/kirbyplants/large/alien/alien6
+ icon_state = "alien-6"
+/obj/item/kirbyplants/large/alien/alien7
+ icon_state = "alien-7"
+/obj/item/kirbyplants/large/alien/alien8
+ icon_state = "alien-8"
+
//a rock is flora according to where the icon file is
//and now these defines
/obj/structure/flora/rock
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 26d4692461b2..66703986234a 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -171,7 +171,6 @@
/obj/structure/kitchenspike/post_unbuckle_mob(mob/living/M)
M.pixel_y = M.get_standard_pixel_y_offset(0)
- M.set_lying_angle(0)
M.update_transform()
/obj/structure/kitchenspike/Destroy()
diff --git a/code/modules/hallucinations/effects/major.dm b/code/modules/hallucinations/effects/major.dm
index c17b03e7667c..8dda88c3ff40 100644
--- a/code/modules/hallucinations/effects/major.dm
+++ b/code/modules/hallucinations/effects/major.dm
@@ -362,14 +362,14 @@
if(!length(locs))
return INITIALIZE_HINT_QDEL
var/turf/T = get_turf(pick(locs))
- color = pick(COLOR_BLACK,
- COLOR_RIPPING_TENDRILS,
- COLOR_BOILING_OIL,
- COLOR_ENVENOMED_FILAMENTS,
+ color = pick(COLOR_BLACK,
+ COLOR_RIPPING_TENDRILS,
+ COLOR_BOILING_OIL,
+ COLOR_ENVENOMED_FILAMENTS,
COLOR_LEXORIN_JELLY,
- COLOR_KINETIC_GELATIN,
- COLOR_CRYOGENIC_LIQUID,
- COLOR_SORIUM,
+ COLOR_KINETIC_GELATIN,
+ COLOR_CRYOGENIC_LIQUID,
+ COLOR_SORIUM,
COLOR_TESLIUM_PASTE)
create_blob(T, core = TRUE)
target.playsound_local(T, 'sound/effects/splat.ogg', 50, 1)
@@ -476,3 +476,103 @@
I.color = blob.color
target.client.images += I
blob.target_blob_head = I
+
+/**
+ * # Hallucination - Sniper
+ *
+ * Fires a penetrator round at the target. On hit, knockdown + stam loss + hallucinated blood splatter for a bit.
+ */
+/obj/effect/hallucination/sniper
+ duration = 15 SECONDS
+
+/obj/effect/hallucination/sniper/Initialize(mapload, mob/living/carbon/target)
+ . = ..()
+ // Make sure the target has a client. Otherwise, stop the hallucination
+ if(!target.client)
+ qdel(src)
+ return
+ // Find a start spot for the sniper bullet
+ var/list/possible_turfs = list()
+ for(var/turf/T in RANGE_EDGE_TURFS(13, target.loc))
+ possible_turfs += T
+ if(!length(possible_turfs))
+ log_debug("Unable to find possible turf for [src].")
+ qdel(src)
+ return
+ var/turf/shot_loc = get_turf(pick(possible_turfs))
+ fire_bullet(shot_loc, target)
+
+/obj/effect/hallucination/sniper/proc/fire_bullet(turf/shot_loc, mob/living/carbon/target)
+ // Fire the bullet
+ var/obj/item/projectile/bullet/sniper/penetrator/hallucination/bullet = new(shot_loc)
+ bullet.hallucinator = target
+ bullet.def_zone = BODY_ZONE_HEAD
+ bullet.suppressed = TRUE
+
+ // Turn right away
+ var/matrix/M = new
+ var/angle = round(get_angle(shot_loc, target))
+ M.Turn(angle)
+ bullet.transform = M
+
+ // Handle who can see the bullet
+ bullet.bullet_image = image(bullet.icon, bullet, bullet.icon_state, OBJ_LAYER, bullet.dir)
+ bullet.bullet_image.transform = M
+ target.client.images += bullet.bullet_image
+
+ // Start flying
+ bullet.trajectory = new(bullet.x, bullet.y, bullet.z, bullet.pixel_x, bullet.pixel_y, angle, SSprojectiles.global_pixel_speed)
+ bullet.last_projectile_move = world.time
+ bullet.has_been_fired = TRUE
+ target.playsound_local(target.loc, 'sound/weapons/gunshots/gunshot_sniper.ogg', 50)
+ START_PROCESSING(SSprojectiles, bullet)
+
+/obj/effect/hallucination/sniper_bloodsplatter
+ duration = 15 SECONDS
+ hallucination_icon = 'icons/effects/blood.dmi'
+ hallucination_icon_state = "mfloor1"
+ hallucination_color = "#A10808"
+
+/obj/effect/hallucination/sniper_bloodsplatter/Initialize(mapload, mob/living/carbon/target)
+ var/list/b_data = target.get_blood_data(target.get_blood_id())
+ if(b_data && !isnull(b_data["blood_color"]))
+ hallucination_color = b_data["blood_color"]
+ . = ..()
+ hallucination_icon_state = pick("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
+
+
+/obj/item/projectile/bullet/sniper/penetrator/hallucination
+ nodamage = TRUE
+ invisibility = INVISIBILITY_MAXIMUM // You no see boolet
+ /// The hallucinator
+ var/mob/living/carbon/hallucinator = null
+ /// Handles only the victim seeing it
+ var/image/bullet_image = null
+
+/obj/item/projectile/bullet/sniper/penetrator/hallucination/on_hit(atom/target, blocked, hit_zone)
+ if(!isliving(target))
+ return
+ if(target != hallucinator)
+ return
+ var/mob/living/hit_target = target
+ var/organ_hit_text = ""
+ if(hit_target.has_limbs)
+ organ_hit_text = " in \the [parse_zone(def_zone)]"
+ hit_target.playsound_local(loc, hitsound, 5, TRUE)
+ hit_target.apply_damage(60, STAMINA, def_zone)
+ hit_target.KnockDown(2 SECONDS)
+ new /obj/effect/hallucination/sniper_bloodsplatter(get_turf(src), hit_target)
+ to_chat(hit_target, "You're shot by \a [src][organ_hit_text]!")
+
+/obj/item/projectile/bullet/sniper/penetrator/hallucination/Bump(atom/A, yes)
+ if(!yes) // prevents double bumps.
+ return
+ var/turf/target_turf = get_turf(A)
+ prehit(A)
+ var/mob/living/hit_target = A
+ if(hit_target == hallucinator)
+ hit_target.bullet_act(src, def_zone)
+ loc = target_turf
+ if(A)
+ permutated += A
+ return 0
diff --git a/code/modules/hallucinations/effects/xeno_pounce.dm b/code/modules/hallucinations/effects/xeno_pounce.dm
index 17954fe47f30..d1da9609533e 100644
--- a/code/modules/hallucinations/effects/xeno_pounce.dm
+++ b/code/modules/hallucinations/effects/xeno_pounce.dm
@@ -66,7 +66,7 @@
"[name] pounces on you!")
to_chat(target, "[name] begins climbing into the ventilation system...")
- QDEL_IN(src, 2 SECONDS)
+ QDEL_IN(src, 2 SECONDS)
/**
* Throws the xeno towards the given loc.
diff --git a/code/modules/hallucinations/hallucinations.dm b/code/modules/hallucinations/hallucinations.dm
index 59172b6a1b99..29dcc6448a75 100644
--- a/code/modules/hallucinations/hallucinations.dm
+++ b/code/modules/hallucinations/hallucinations.dm
@@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(hallucinations, list(
/datum/hallucination_manager/blind_rush = 1,
/datum/hallucination_manager/waves = 2,
/obj/effect/hallucination/blob = 10,
+ /obj/effect/hallucination/sniper = 10
)
))
@@ -51,6 +52,8 @@ GLOBAL_LIST_INIT(hallucinations, list(
var/hallucination_icon_state
/// Hallucination override.
var/hallucination_override = FALSE
+ /// Hallucination color
+ var/hallucination_color
/// Hallucination layer.
var/hallucination_layer = MOB_LAYER
///Hallucination plane.
@@ -70,6 +73,8 @@ GLOBAL_LIST_INIT(hallucinations, list(
target = hallucination_target
if(hallucination_icon && hallucination_icon_state)
var/image/I = image(hallucination_icon, hallucination_override ? src : get_turf(src), hallucination_icon_state)
+ if(hallucination_color)
+ I.color = hallucination_color
I.override = hallucination_override
I.layer = hallucination_layer
I.plane = hallucination_plane
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 237f37897ddf..db4ba936b6ca 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -376,33 +376,42 @@
addtimer(CALLBACK(src, PROC_REF(try_attach_to_owner)), 0) // Do this once the drop call stack is done. The holding limb might be getting removed
/obj/item/rod_of_asclepius/proc/try_attach_to_owner()
- if(ishuman(owner) && !QDELETED(owner))
- if(ishuman(loc))
- var/mob/living/carbon/human/thief = loc
- thief.drop_item_to_ground(src, force = TRUE, silent = TRUE) // You're not my owner!
- if(owner.stat == DEAD)
- qdel(src) // Oh no! Oh well a new rod will be made from the STATUS_EFFECT_HIPPOCRATIC_OATH
- return
- flags |= NODROP // Readd the nodrop
- var/mob/living/carbon/human/H = owner
- var/limb_regrown = FALSE
- if(usedHand == LEFT_HAND)
- limb_regrown = H.regrow_external_limb_if_missing("l_arm")
- limb_regrown = H.regrow_external_limb_if_missing("l_hand") || limb_regrown
- H.drop_l_hand(TRUE)
- H.put_in_l_hand(src, TRUE)
- else
- limb_regrown = H.regrow_external_limb_if_missing("r_arm")
- limb_regrown = H.regrow_external_limb_if_missing("r_hand") || limb_regrown
- H.drop_r_hand(TRUE)
- H.put_in_r_hand(src, TRUE)
- if(!limb_regrown)
- to_chat(H, "The Rod of Asclepius suddenly grows back out of your arm!")
- else
- H.update_body() // Update the limb sprites
- to_chat(H, "Your arm suddenly grows back with the Rod of Asclepius still attached!")
- else
+ if(!ishuman(owner) || QDELETED(owner))
deactivate()
+ return
+
+ var/mob/living/carbon/human/thief = loc
+
+ if(thief == owner) // stealing from yourself, huh?
+ return
+
+ if(ishuman(thief))
+ thief.drop_item_to_ground(src, force = TRUE, silent = TRUE) // You're not my owner!
+
+ if(owner.stat == DEAD)
+ qdel(src) // Oh no! Oh well a new rod will be made from the STATUS_EFFECT_HIPPOCRATIC_OATH
+ return
+
+ flags |= NODROP // Readd the nodrop
+ var/mob/living/carbon/human/H = owner
+ var/limb_regrown = FALSE
+
+ if(usedHand == LEFT_HAND)
+ limb_regrown = H.regrow_external_limb_if_missing("l_arm")
+ limb_regrown = H.regrow_external_limb_if_missing("l_hand") || limb_regrown
+ H.drop_l_hand(TRUE)
+ H.put_in_l_hand(src, TRUE)
+ else
+ limb_regrown = H.regrow_external_limb_if_missing("r_arm")
+ limb_regrown = H.regrow_external_limb_if_missing("r_hand") || limb_regrown
+ H.drop_r_hand(TRUE)
+ H.put_in_r_hand(src, TRUE)
+
+ if(!limb_regrown)
+ to_chat(H, "The Rod of Asclepius suddenly grows back out of your arm!")
+ else
+ H.update_body() // Update the limb sprites
+ to_chat(H, "Your arm suddenly grows back with the Rod of Asclepius still attached!")
/obj/item/rod_of_asclepius/proc/activated(mob/living/carbon/new_owner)
owner = new_owner
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 962c4d62e7b6..ab70affbe508 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -158,7 +158,7 @@
if(user.zone_selected == "eyes")
user.visible_message("[user] holds up a paper and shows it to [H].",
"You show the paper to [H].")
- H.examinate(src)
+ to_chat(H, "Read \the [src]")
else if(user.zone_selected == "mouth")
if(H == user)
@@ -392,6 +392,12 @@
var/id = href_list["write"]
var/input_element = input("Enter what you want to write:", "Write") as message
topic_href_write(id, input_element)
+ if(href_list["show_content"])
+ var/dist = get_dist(src, usr)
+ if(dist < 2)
+ show_content(usr)
+ else
+ to_chat(usr, "I'm too far away from \the [src] to read it.")
/obj/item/paper/attackby__legacy__attackchain(obj/item/P, mob/living/user, params)
..()
diff --git a/code/modules/power/engines/singularity/collector.dm b/code/modules/power/engines/singularity/collector.dm
index 971b11ff0edd..1fb0cf1922fc 100644
--- a/code/modules/power/engines/singularity/collector.dm
+++ b/code/modules/power/engines/singularity/collector.dm
@@ -77,6 +77,7 @@
loaded_tank = used
used.forceMove(src)
update_icons()
+ return ITEM_INTERACT_COMPLETE
else if(used.tool_behaviour == TOOL_CROWBAR)
if(loaded_tank && !locked)
eject()
diff --git a/code/modules/power/engines/supermatter/engineering_event.dm b/code/modules/power/engines/supermatter/engineering_event.dm
index ab0db7f5b6a6..f603554cd179 100644
--- a/code/modules/power/engines/supermatter/engineering_event.dm
+++ b/code/modules/power/engines/supermatter/engineering_event.dm
@@ -8,13 +8,14 @@
/// Starts an event
/datum/engi_event/proc/start_event()
on_start()
+ alert_engi()
+ if(duration)
+ addtimer(CALLBACK(src, PROC_REF(on_end)), duration)
return
/// To be executed once an event has been started
/datum/engi_event/proc/on_start()
- alert_engi()
- if(duration)
- addtimer(CALLBACK(src, PROC_REF(on_end)), duration)
+ return
/// Send an alert to engineering about the event
/datum/engi_event/proc/alert_engi()
diff --git a/code/modules/power/engines/supermatter/supermatter.dm b/code/modules/power/engines/supermatter/supermatter.dm
index 0d401198b583..e0afec9fa40c 100644
--- a/code/modules/power/engines/supermatter/supermatter.dm
+++ b/code/modules/power/engines/supermatter/supermatter.dm
@@ -570,7 +570,7 @@
var/crush_ratio = combined_gas / MOLE_CRUNCH_THRESHOLD
- gas_coefficient = 1 + (crush_ratio ** 2 * (crush_ratio <= 1) + (crush_ratio > 1) * crush_ratio ** 0.5) * (plasmacomp * PLASMA_CRUNCH + o2comp * O2_CRUNCH + co2comp * CO2_CRUNCH + n2comp * N2_CRUNCH + n2ocomp * N2O_CRUNCH)
+ gas_coefficient = 1 + (crush_ratio ** 2 * (crush_ratio <= 1) + (crush_ratio > 1) * 2 * crush_ratio / (crush_ratio + 1)) * (plasmacomp * PLASMA_CRUNCH + o2comp * O2_CRUNCH + co2comp * CO2_CRUNCH + n2comp * N2_CRUNCH + n2ocomp * N2O_CRUNCH)
if(prob(50))
radiation_pulse(src, power * (gas_coefficient + max(0, ((power_transmission_bonus / 10)))))
diff --git a/code/modules/research/scientific_analyzer.dm b/code/modules/research/scientific_analyzer.dm
index 694a4e00ce28..65c52632f387 100644
--- a/code/modules/research/scientific_analyzer.dm
+++ b/code/modules/research/scientific_analyzer.dm
@@ -49,7 +49,7 @@ Note: Must be placed within 3 tiles of the R&D Console
/obj/machinery/r_n_d/scientific_analyzer/item_interaction(mob/living/user, obj/item/used, list/modifiers)
- if(istype(used, /obj/item/storage/part_replacer))
+ if(istype(used, /obj/item/storage/part_replacer) || istype(used, /obj/item/gripper))
return ..()
if(default_deconstruction_screwdriver(user, "s_analyzer_t", "s_analyzer", used))
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 36c4b86aaf93..3e17ce220f3c 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -394,7 +394,7 @@ This function completely restores a damaged organ to perfect condition.
surgeryize()
if(is_robotic()) //Robotic organs stay robotic.
status = ORGAN_ROBOT
- else if(HAS_TRAIT(owner, TRAIT_I_WANT_BRAINS))
+ else if(HAS_TRAIT(src, TRAIT_I_WANT_BRAINS_ORGAN))
status = ORGAN_DEAD
else
status = 0
@@ -402,7 +402,7 @@ This function completely restores a damaged organ to perfect condition.
perma_injury = 0
brute_dam = 0
burn_dam = 0
- if(!HAS_TRAIT(owner, TRAIT_I_WANT_BRAINS)) // zombies's wounds don't close. Because thats cool.
+ if(!HAS_TRAIT(src, TRAIT_I_WANT_BRAINS_ORGAN)) // zombies's wounds don't close. Because thats cool.
open = ORGAN_CLOSED //Closing all wounds.
// handle internal organs
diff --git a/code/tests/_game_test.dm b/code/tests/_game_test.dm
index e94e10d85e65..a7853c1d277b 100644
--- a/code/tests/_game_test.dm
+++ b/code/tests/_game_test.dm
@@ -17,6 +17,8 @@ GLOBAL_LIST_EMPTY(game_test_chats)
#define TEST_ASSERT_LAST_CHATLOG(puppet, text) if(!puppet.last_chatlog_has_text(text)) { return Fail("Expected `[text]` in last chatlog but got `[puppet.get_last_chatlog()]`", __FILE__, __LINE__) }
+#define TEST_ASSERT_ANY_CHATLOG(puppet, text) if(!puppet.any_chatlog_has_text(text)) { return Fail("Expected `[text]` in any chatlog but got [jointext(puppet.get_chatlogs(), "\n")]", __FILE__, __LINE__) }
+
/// Asserts that the two parameters passed are equal, fails otherwise
/// Optionally allows an additional message in the case of a failure
#define TEST_ASSERT_EQUAL(a, b, message) do { \
diff --git a/code/tests/_game_test_puppeteer.dm b/code/tests/_game_test_puppeteer.dm
index 7bab096ebece..e4c6c039a7c2 100644
--- a/code/tests/_game_test_puppeteer.dm
+++ b/code/tests/_game_test_puppeteer.dm
@@ -52,9 +52,9 @@
var/datum/test_puppeteer/puppet_target = target
if(istype(puppet_target))
puppet.ClickOn(puppet_target.puppet, params)
- return
+ else
+ puppet.ClickOn(target, params)
- puppet.ClickOn(target, params)
puppet.next_click = world.time
puppet.next_move = world.time
@@ -94,14 +94,25 @@
puppet.rejuvenate()
/datum/test_puppeteer/proc/get_last_chatlog()
- if(!(puppet.mind.key in GLOB.game_test_chats))
- return FALSE
- var/list/puppet_chat_list = GLOB.game_test_chats[puppet.mind.key]
- return puppet_chat_list[length(puppet_chat_list)]
+ var/list/puppet_chat_list = get_chatlogs()
+ if(length(puppet_chat_list))
+ return puppet_chat_list[length(puppet_chat_list)]
/datum/test_puppeteer/proc/last_chatlog_has_text(snippet)
return findtextEx_char(get_last_chatlog(), snippet)
+/datum/test_puppeteer/proc/any_chatlog_has_text(snippet)
+ for(var/chat_line in get_chatlogs())
+ if(findtextEx(chat_line, snippet))
+ return TRUE
+
+ return FALSE
+
+/datum/test_puppeteer/proc/get_chatlogs()
+ if(!(puppet.mind.key in GLOB.game_test_chats))
+ return list()
+ return GLOB.game_test_chats[puppet.mind.key]
+
/datum/test_puppeteer/proc/find_nearby(atom_type)
for(var/turf/T in RANGE_TURFS(1, puppet))
for(var/atom/A in T.contents)
diff --git a/icons/mob/human_races/vox/cyberlimbs/wardtakahashi.dmi b/icons/mob/human_races/vox/cyberlimbs/wardtakahashi.dmi
index 02e08843ceea..f80576a2f2e9 100644
Binary files a/icons/mob/human_races/vox/cyberlimbs/wardtakahashi.dmi and b/icons/mob/human_races/vox/cyberlimbs/wardtakahashi.dmi differ
diff --git a/icons/obj/flora/plants.dmi b/icons/obj/flora/plants.dmi
index f1bcedaa312a..9f14a3cb960f 100644
Binary files a/icons/obj/flora/plants.dmi and b/icons/obj/flora/plants.dmi differ
diff --git a/modular_ss220/silicons/code/items/gripper.dm b/modular_ss220/silicons/code/items/gripper.dm
index 61f9b320148e..08133fe12768 100644
--- a/modular_ss220/silicons/code/items/gripper.dm
+++ b/modular_ss220/silicons/code/items/gripper.dm
@@ -27,9 +27,6 @@
/obj/item/reagent_containers/syringe,
)
-/obj/item/gripper/medical/attack_self__legacy__attackchain(mob/user)
- return
-
/obj/item/gripper/service/Initialize(mapload)
. = ..()
can_hold |= list(
diff --git a/rustlibs.dll b/rustlibs.dll
index 85c67349f2df..1c7b3cec49f6 100644
Binary files a/rustlibs.dll and b/rustlibs.dll differ
diff --git a/rustlibs_prod.dll b/rustlibs_prod.dll
index fb16983a6a7f..7b60ae6cf9e5 100644
Binary files a/rustlibs_prod.dll and b/rustlibs_prod.dll differ
diff --git a/tools/UpdatePaths/Scripts/28046_kirbyplants_sizes.txt b/tools/UpdatePaths/Scripts/28046_kirbyplants_sizes.txt
new file mode 100644
index 000000000000..d7a7faf3825e
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/28046_kirbyplants_sizes.txt
@@ -0,0 +1,39 @@
+/obj/item/kirbyplants/applebush : /obj/item/kirbyplants/medium/medium8{@OLD}
+/obj/item/kirbyplants/dead : /obj/item/kirbyplants/large/dead{@OLD}
+/obj/item/kirbyplants/eye : /obj/item/kirbyplants/large/alien/alien2{@OLD}
+/obj/item/kirbyplants/plant1 : /obj/item/kirbyplants/medium/medium2{@OLD}
+/obj/item/kirbyplants/plant2 : /obj/item/kirbyplants/medium/medium5{@OLD}
+/obj/item/kirbyplants/plant3 : /obj/item/kirbyplants/large/alien/alien7{@OLD}
+/obj/item/kirbyplants/plant4 : /obj/item/kirbyplants/medium/medium1{@OLD}
+/obj/item/kirbyplants/plant5 : /obj/item/kirbyplants/medium/medium7{@OLD}
+/obj/item/kirbyplants/plant6 : /obj/item/kirbyplants/medium/medium4{@OLD}
+/obj/item/kirbyplants/plant7 : /obj/item/kirbyplants/large/alien/alien1{@OLD}
+/obj/item/kirbyplants/plant8 : /obj/item/kirbyplants/medium/medium3{@OLD}
+/obj/item/kirbyplants/plant9 : /obj/item/kirbyplants/large/alien/alien3{@OLD}
+/obj/item/kirbyplants/plant10 : /obj/item/kirbyplants/large/plant12{@OLD}
+/obj/item/kirbyplants/plant11 : /obj/item/kirbyplants/small/small3{@OLD}
+/obj/item/kirbyplants/plant12 : /obj/item/kirbyplants/small/small2{@OLD}
+/obj/item/kirbyplants/plant13 : /obj/item/kirbyplants/large/alien/alien5{@OLD}
+/obj/item/kirbyplants/plant14 : /obj/item/kirbyplants/large/plant9{@OLD}
+/obj/item/kirbyplants/plant15 : /obj/item/kirbyplants/small/small4{@OLD}
+/obj/item/kirbyplants/plant16 : /obj/item/kirbyplants/large/plant1{@OLD}
+/obj/item/kirbyplants/plant17 : /obj/item/kirbyplants/small/small5{@OLD}
+/obj/item/kirbyplants/plant18 : /obj/item/kirbyplants/large/plant8{@OLD}
+/obj/item/kirbyplants/plant19 : /obj/item/kirbyplants/large/alien/alien4{@OLD}
+/obj/item/kirbyplants/plant20 : /obj/item/kirbyplants/large/alien/alien6{@OLD}
+/obj/item/kirbyplants/plant21 : /obj/item/kirbyplants/large/plant4{@OLD}
+/obj/item/kirbyplants/plant22 : /obj/item/kirbyplants/medium/medium6{@OLD}
+/obj/item/kirbyplants/plant23 : /obj/item/kirbyplants/small/small1{@OLD}
+/obj/item/kirbyplants/plant24 : /obj/item/kirbyplants/large/plant14{@OLD}
+/obj/item/kirbyplants/plant25 : /obj/item/kirbyplants/large/plant7{@OLD}
+/obj/item/kirbyplants/plant26 : /obj/item/kirbyplants/large/plant15{@OLD}
+/obj/item/kirbyplants/plant27 : /obj/item/kirbyplants/large/plant10{@OLD}
+/obj/item/kirbyplants/plant28 : /obj/item/kirbyplants/large/plant5{@OLD}
+/obj/item/kirbyplants/plant29 : /obj/item/kirbyplants/large/plant11{@OLD}
+/obj/item/kirbyplants/plant30 : /obj/item/kirbyplants/large/plant3{@OLD}
+/obj/item/kirbyplants/plant31 : /obj/item/kirbyplants/large/plant6{@OLD}
+/obj/item/kirbyplants/plant32 : /obj/item/kirbyplants/large/plant2{@OLD}
+/obj/item/kirbyplants/plant33 : /obj/item/kirbyplants/large/plant13{@OLD}
+/obj/item/kirbyplants/plant34 : /obj/item/kirbyplants/large/alien/alien8{@OLD}
+/obj/item/kirbyplants/dead/rd : /obj/item/kirbyplants/large/dead/rd{@OLD}
+/obj/item/kirbyplants : /obj/item/kirbyplants/large{@OLD}