shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Porting the twohanded component.

Browse Source
This commit is contained in:
Ghommie
2020-05-17 18:16:53 +02:00
parent 0a298c2361
commit 30ab79e09e
138 changed files with 2861 additions and 2601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm
+2 -2
View File
@@ -188,13 +188,13 @@
/area/ruin/unpowered/xenonest) /area/ruin/unpowered/xenonest)
"aT" = ( "aT" = (
/obj/structure/alien/weeds, /obj/structure/alien/weeds,
/obj/item/twohanded/required/chainsaw, /obj/item/chainsaw,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest) /area/ruin/unpowered/xenonest)
"aU" = ( "aU" = (
/obj/structure/alien/weeds, /obj/structure/alien/weeds,
/obj/structure/bed/nest, /obj/structure/bed/nest,
/obj/item/twohanded/fireaxe/boneaxe, /obj/item/fireaxe/boneaxe,
/obj/item/clothing/head/helmet/gladiator, /obj/item/clothing/head/helmet/gladiator,
/obj/item/clothing/mask/facehugger/impregnated, /obj/item/clothing/mask/facehugger/impregnated,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm
+1 -1
View File
@@ -517,7 +517,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/powered/animal_hospital) /area/ruin/powered/animal_hospital)
"bt" = ( "bt" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/powered/animal_hospital) /area/ruin/powered/animal_hospital)
"bu" = ( "bu" = (
_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm
+7 -7
View File
@@ -724,7 +724,7 @@
/area/lavaland/surface/outdoors) /area/lavaland/surface/outdoors)
"bP" = ( "bP" = (
/obj/structure/stone_tile/block, /obj/structure/stone_tile/block,
/obj/item/twohanded/spear, /obj/item/spear,
/obj/effect/mapping_helpers/no_lava, /obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors) /area/lavaland/surface/outdoors)
@@ -896,7 +896,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors) /area/lavaland/surface/outdoors)
"ck" = ( "ck" = (
/obj/item/twohanded/spear, /obj/item/spear,
/obj/structure/stone_tile{ /obj/structure/stone_tile{
dir = 4 dir = 4
}, },
@@ -910,7 +910,7 @@
/obj/structure/stone_tile/cracked{ /obj/structure/stone_tile/cracked{
dir = 8 dir = 8
}, },
/obj/item/twohanded/spear, /obj/item/spear,
/obj/effect/mapping_helpers/no_lava, /obj/effect/mapping_helpers/no_lava,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors) /area/lavaland/surface/outdoors)
@@ -1014,7 +1014,7 @@
/obj/structure/stone_tile/cracked{ /obj/structure/stone_tile/cracked{
dir = 1 dir = 1
}, },
/obj/item/twohanded/spear, /obj/item/spear,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
"cA" = ( "cA" = (
@@ -1058,7 +1058,7 @@
dir = 1 dir = 1
}, },
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/spear, /obj/item/spear,
/obj/item/storage/belt, /obj/item/storage/belt,
/turf/open/indestructible/boss, /turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
@@ -1100,7 +1100,7 @@
dir = 4 dir = 4
}, },
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/spear, /obj/item/spear,
/obj/item/scythe, /obj/item/scythe,
/turf/open/indestructible/boss, /turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
@@ -1128,7 +1128,7 @@
dir = 4 dir = 4
}, },
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/spear, /obj/item/spear,
/obj/item/clothing/head/helmet/roman/legionnaire, /obj/item/clothing/head/helmet/roman/legionnaire,
/turf/open/indestructible/boss, /turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm
+1 -1
View File
@@ -367,7 +367,7 @@
/turf/open/floor/pod/dark, /turf/open/floor/pod/dark,
/area/ruin/powered/snow_biodome) /area/ruin/powered/snow_biodome)
"KS" = ( "KS" = (
/obj/item/twohanded/required/chainsaw, /obj/item/chainsaw,
/obj/structure/closet, /obj/structure/closet,
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 4 dir = 4
_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+1 -1
View File
@@ -5181,7 +5181,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/unpowered/syndicate_lava_base/arrivals) /area/ruin/unpowered/syndicate_lava_base/arrivals)
"mu" = ( "mu" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
_maps/RandomRuins/SpaceRuins/arcade.dmm
+1 -1
View File
@@ -151,7 +151,7 @@
/turf/open/floor/engine, /turf/open/floor/engine,
/area/ruin/powered) /area/ruin/powered)
"J" = ( "J" = (
/obj/item/twohanded/dualsaber/toy, /obj/item/dualsaber/toy,
/turf/open/floor/light/colour_cycle/dancefloor_b, /turf/open/floor/light/colour_cycle/dancefloor_b,
/area/ruin/powered) /area/ruin/powered)
"K" = ( "K" = (
_maps/RandomRuins/SpaceRuins/hilbertshoteltestingsite.dmm
+1 -1
View File
@@ -165,7 +165,7 @@
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/hilbertresearchfacility) /area/ruin/space/has_grav/hilbertresearchfacility)
"D" = ( "D" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/ruin/space/has_grav/hilbertresearchfacility) /area/ruin/space/has_grav/hilbertresearchfacility)
"E" = ( "E" = (
_maps/RandomRuins/SpaceRuins/mrow_thats_right.dmm
+3 -3
View File
@@ -185,7 +185,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/space/has_grav/powered/cat_man) /area/ruin/space/has_grav/powered/cat_man)
"aF" = ( "aF" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
@@ -294,7 +294,7 @@
/area/ruin/space/has_grav/powered/cat_man) /area/ruin/space/has_grav/powered/cat_man)
"aV" = ( "aV" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
@@ -552,7 +552,7 @@
/area/ruin/space/has_grav/powered/cat_man) /area/ruin/space/has_grav/powered/cat_man)
"bF" = ( "bF" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
_maps/RandomRuins/SpaceRuins/oldstation.dmm
+9 -9
View File
@@ -597,7 +597,7 @@
icon_state = "2-4" icon_state = "2-4"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -639,7 +639,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation) /area/ruin/space/has_grav/ancientstation)
"bW" = ( "bW" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -858,7 +858,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/deltacorridor) /area/ruin/space/has_grav/ancientstation/deltacorridor)
"cz" = ( "cz" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/structure/cable{ /obj/structure/cable{
@@ -918,7 +918,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/deltacorridor) /area/ruin/space/has_grav/ancientstation/deltacorridor)
"cH" = ( "cH" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -1127,7 +1127,7 @@
/area/ruin/space/has_grav/ancientstation) /area/ruin/space/has_grav/ancientstation)
"dn" = ( "dn" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/machinery/light/small{ /obj/machinery/light/small{
@@ -1179,7 +1179,7 @@
/area/ruin/space/has_grav/ancientstation/hydroponics) /area/ruin/space/has_grav/ancientstation/hydroponics)
"ds" = ( "ds" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/machinery/light/small{ /obj/machinery/light/small{
@@ -3980,7 +3980,7 @@
icon_state = "1-4" icon_state = "1-4"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -4015,7 +4015,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation) /area/ruin/space/has_grav/ancientstation)
"jJ" = ( "jJ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/structure/cable{ /obj/structure/cable{
@@ -5010,7 +5010,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/space/has_grav/ancientstation) /area/ruin/space/has_grav/ancientstation)
"PV" = ( "PV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
_maps/RandomRuins/SpaceRuins/spacehermit.dmm
+1 -1
View File
@@ -112,7 +112,7 @@
/turf/open/floor/plating/asteroid, /turf/open/floor/plating/asteroid,
/area/ruin/powered) /area/ruin/powered)
"ax" = ( "ax" = (
/obj/item/twohanded/spear, /obj/item/spear,
/turf/open/floor/plating/asteroid, /turf/open/floor/plating/asteroid,
/area/ruin/powered) /area/ruin/powered)
"ay" = ( "ay" = (
_maps/RandomRuins/SpaceRuins/spacehotel.dmm
+11 -11
View File
@@ -148,7 +148,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/guestroom/room_3) /area/ruin/space/has_grav/hotel/guestroom/room_3)
"aD" = ( "aD" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02" icon_state = "plant-02"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -189,7 +189,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/guestroom/room_4) /area/ruin/space/has_grav/hotel/guestroom/room_4)
"aL" = ( "aL" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -230,7 +230,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/guestroom/room_5) /area/ruin/space/has_grav/hotel/guestroom/room_5)
"aT" = ( "aT" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -271,7 +271,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/guestroom/room_6) /area/ruin/space/has_grav/hotel/guestroom/room_6)
"bb" = ( "bb" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18" icon_state = "plant-18"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -1113,7 +1113,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/guestroom/room_2) /area/ruin/space/has_grav/hotel/guestroom/room_2)
"dq" = ( "dq" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -1177,7 +1177,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/ruin/space/has_grav/hotel/guestroom/room_1) /area/ruin/space/has_grav/hotel/guestroom/room_1)
"dy" = ( "dy" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -1855,7 +1855,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/space/has_grav/hotel/bar) /area/ruin/space/has_grav/hotel/bar)
"fI" = ( "fI" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02" icon_state = "plant-02"
}, },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -2035,7 +2035,7 @@
}, },
/area/ruin/space/has_grav/hotel/dock) /area/ruin/space/has_grav/hotel/dock)
"gh" = ( "gh" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -2435,7 +2435,7 @@
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/ruin/space/has_grav/hotel) /area/ruin/space/has_grav/hotel)
"hq" = ( "hq" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18" icon_state = "plant-18"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -3013,7 +3013,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/ruin/space/has_grav/hotel/power) /area/ruin/space/has_grav/hotel/power)
"iM" = ( "iM" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/ruin/space/has_grav/hotel) /area/ruin/space/has_grav/hotel)
"iN" = ( "iN" = (
@@ -4817,7 +4817,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/hotel/pool) /area/ruin/space/has_grav/hotel/pool)
"mD" = ( "mD" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-25" icon_state = "plant-25"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
_maps/RandomRuins/SpaceRuinsStation/roid6.dmm
+1 -1
View File
@@ -44,7 +44,7 @@
/area/ruin/space/has_grav) /area/ruin/space/has_grav)
"C" = ( "C" = (
/obj/effect/decal/remains/human, /obj/effect/decal/remains/human,
/obj/item/twohanded/spear, /obj/item/spear,
/turf/open/floor/mineral/titanium/blue, /turf/open/floor/mineral/titanium/blue,
/area/ruin/space/has_grav) /area/ruin/space/has_grav)
"F" = ( "F" = (
_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm
+1 -1
View File
@@ -948,7 +948,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/engineering) /area/engine/engineering)
"BT" = ( "BT" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/engineering) /area/engine/engineering)
"BY" = ( "BY" = (
_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm
+2 -2
View File
@@ -399,7 +399,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/mine/laborcamp/security) /area/mine/laborcamp/security)
"hf" = ( "hf" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/mine/living_quarters) /area/mine/living_quarters)
"hm" = ( "hm" = (
@@ -1565,7 +1565,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/mine/laborcamp) /area/mine/laborcamp)
"zy" = ( "zy" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/brown{ /obj/effect/turf_decal/tile/brown{
dir = 1 dir = 1
}, },
_maps/RandomZLevels/VR/syndicate_trainer.dmm
+2 -2
View File
@@ -1370,7 +1370,7 @@
/turf/open/indestructible, /turf/open/indestructible,
/area/awaymission/centcomAway/general) /area/awaymission/centcomAway/general)
"hW" = ( "hW" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/indestructible, /turf/open/indestructible,
/area/awaymission/centcomAway/general) /area/awaymission/centcomAway/general)
"hX" = ( "hX" = (
@@ -1951,7 +1951,7 @@
"lv" = ( "lv" = (
/obj/structure/rack, /obj/structure/rack,
/obj/item/restraints/legcuffs/beartrap, /obj/item/restraints/legcuffs/beartrap,
/obj/item/twohanded/fireaxe, /obj/item/fireaxe,
/turf/open/indestructible, /turf/open/indestructible,
/area/awaymission/centcomAway/thunderdome) /area/awaymission/centcomAway/thunderdome)
"lw" = ( "lw" = (
_maps/RandomZLevels/away_mission/Cabin.dmm
+1 -1
View File
@@ -54,7 +54,7 @@
/area/awaymission/snowforest/lumbermill) /area/awaymission/snowforest/lumbermill)
"am" = ( "am" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/required/chainsaw, /obj/item/chainsaw,
/turf/open/floor/wood/cold, /turf/open/floor/wood/cold,
/area/awaymission/snowforest/lumbermill) /area/awaymission/snowforest/lumbermill)
"an" = ( "an" = (
_maps/RandomZLevels/away_mission/caves.dmm
+1 -1
View File
@@ -516,7 +516,7 @@
}, },
/area/awaymission/caves/BMP_asteroid/level_three) /area/awaymission/caves/BMP_asteroid/level_three)
"by" = ( "by" = (
/obj/item/twohanded/mjollnir, /obj/item/mjollnir,
/mob/living/simple_animal/hostile/poison/giant_spider/nurse, /mob/living/simple_animal/hostile/poison/giant_spider/nurse,
/turf/open/floor/plating/asteroid/basalt{ /turf/open/floor/plating/asteroid/basalt{
initial_gas_mix = "n2=23;o2=14" initial_gas_mix = "n2=23;o2=14"
_maps/RandomZLevels/away_mission/moonoutpost19.dmm
+2 -2
View File
@@ -4911,7 +4911,7 @@
}, },
/area/awaymission/moonoutpost19/research) /area/awaymission/moonoutpost19/research)
"jq" = ( "jq" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
desc = "A plastic potted plant."; desc = "A plastic potted plant.";
pixel_y = 3 pixel_y = 3
}, },
@@ -7144,7 +7144,7 @@
}, },
/area/awaymission/moonoutpost19/arrivals) /area/awaymission/moonoutpost19/arrivals)
"ob" = ( "ob" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
desc = "A plastic potted plant."; desc = "A plastic potted plant.";
pixel_y = 3 pixel_y = 3
}, },
_maps/RandomZLevels/away_mission/research.dmm
+9 -9
View File
@@ -117,7 +117,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/awaymission/research/interior/engineering) /area/awaymission/research/interior/engineering)
"ax" = ( "ax" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-20"; icon_state = "plant-20";
pixel_y = 3 pixel_y = 3
}, },
@@ -1800,7 +1800,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/secure) /area/awaymission/research/interior/secure)
"dN" = ( "dN" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
@@ -4173,7 +4173,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/awaymission/research/interior/genetics) /area/awaymission/research/interior/genetics)
"hV" = ( "hV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
@@ -4268,7 +4268,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/awaymission/research/interior/security) /area/awaymission/research/interior/security)
"ii" = ( "ii" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
desc = "A potted plant, it doesn't look very healthy..."; desc = "A potted plant, it doesn't look very healthy...";
name = "dead potted plant" name = "dead potted plant"
}, },
@@ -4746,7 +4746,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/awaymission/research/interior/dorm) /area/awaymission/research/interior/dorm)
"jm" = ( "jm" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/turf/open/floor/plasteel/yellowsiding{ /turf/open/floor/plasteel/yellowsiding{
@@ -5350,7 +5350,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/awaymission/research/interior/medbay) /area/awaymission/research/interior/medbay)
"kC" = ( "kC" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel/yellowsiding{ /turf/open/floor/plasteel/yellowsiding{
@@ -5707,7 +5707,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/awaymission/research/interior/medbay) /area/awaymission/research/interior/medbay)
"ly" = ( "ly" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel/yellowsiding{ /turf/open/floor/plasteel/yellowsiding{
@@ -6185,7 +6185,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/awaymission/research/interior/escapepods) /area/awaymission/research/interior/escapepods)
"mJ" = ( "mJ" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
dir = 1 dir = 1
}, },
@@ -6222,7 +6222,7 @@
/turf/open/floor/grass, /turf/open/floor/grass,
/area/awaymission/research/interior/escapepods) /area/awaymission/research/interior/escapepods)
"mN" = ( "mN" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
+7 -7
View File
@@ -1444,7 +1444,7 @@
}, },
/area/awaymission/undergroundoutpost45/central) /area/awaymission/undergroundoutpost45/central)
"do" = ( "do" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
layer = 5 layer = 5
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -2972,7 +2972,7 @@
}, },
/area/awaymission/undergroundoutpost45/central) /area/awaymission/undergroundoutpost45/central)
"fT" = ( "fT" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
layer = 5 layer = 5
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -5207,7 +5207,7 @@
}, },
/area/awaymission/undergroundoutpost45/gateway) /area/awaymission/undergroundoutpost45/gateway)
"kh" = ( "kh" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
layer = 5 layer = 5
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -6867,7 +6867,7 @@
/area/awaymission/undergroundoutpost45/research) /area/awaymission/undergroundoutpost45/research)
"mQ" = ( "mQ" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
layer = 5 layer = 5
}, },
/turf/open/floor/plasteel/cafeteria{ /turf/open/floor/plasteel/cafeteria{
@@ -8471,7 +8471,7 @@
}, },
/area/awaymission/undergroundoutpost45/research) /area/awaymission/undergroundoutpost45/research)
"pl" = ( "pl" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
layer = 5 layer = 5
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -9544,7 +9544,7 @@
}, },
/area/awaymission/undergroundoutpost45/engineering) /area/awaymission/undergroundoutpost45/engineering)
"rk" = ( "rk" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
layer = 5 layer = 5
}, },
/obj/effect/turf_decal/tile/yellow{ /obj/effect/turf_decal/tile/yellow{
@@ -12486,7 +12486,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
layer = 5 layer = 5
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
_maps/RandomZLevels/away_mission/wildwest.dmm
+1 -1
View File
@@ -755,7 +755,7 @@
/area/awaymission/wildwest/mines) /area/awaymission/wildwest/mines)
"cL" = ( "cL" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/dualsaber, /obj/item/dualsaber,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/awaymission/wildwest/gov) /area/awaymission/wildwest/gov)
"cM" = ( "cM" = (
_maps/map_files/BoxStation/BoxStation.dmm
+17 -17
View File
@@ -17791,7 +17791,7 @@
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 9 dir = 9
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-20" icon_state = "plant-20"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -21146,7 +21146,7 @@
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -21707,7 +21707,7 @@
dir = 1; dir = 1;
pixel_y = -24 pixel_y = -24
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-08" icon_state = "plant-08"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -24277,7 +24277,7 @@
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-13" icon_state = "plant-13"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -24326,7 +24326,7 @@
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -29889,7 +29889,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
@@ -33978,7 +33978,7 @@
/obj/machinery/light_switch{ /obj/machinery/light_switch{
pixel_y = -23 pixel_y = -23
}, },
/obj/item/twohanded/required/kirbyplants/dead, /obj/item/kirbyplants/dead,
/turf/open/floor/plasteel/cafeteria, /turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/hor) /area/crew_quarters/heads/hor)
"bCg" = ( "bCg" = (
@@ -39123,7 +39123,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/floor/plasteel/white/side{ /turf/open/floor/plasteel/white/side{
dir = 1 dir = 1
}, },
@@ -48394,8 +48394,8 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/engineering) /area/engine/engineering)
"cnB" = ( "cnB" = (
@@ -52134,7 +52134,7 @@
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/machinery/cell_charger, /obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus, /obj/item/stock_parts/cell/high/plus,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/heads/chief) /area/crew_quarters/heads/chief)
"cBN" = ( "cBN" = (
@@ -53845,7 +53845,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-04" icon_state = "plant-04"
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
@@ -53986,7 +53986,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/crew_quarters/fitness) /area/crew_quarters/fitness)
"exP" = ( "exP" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -54327,7 +54327,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-06" icon_state = "plant-06"
}, },
/turf/open/floor/plasteel/white/corner{ /turf/open/floor/plasteel/white/corner{
@@ -54525,7 +54525,7 @@
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 10 dir = 10
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18" icon_state = "plant-18"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -56509,7 +56509,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/processing) /area/security/processing)
"lPr" = ( "lPr" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -58083,7 +58083,7 @@
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/crew_quarters/theatre) /area/crew_quarters/theatre)
"qTV" = ( "qTV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
_maps/map_files/CogStation/CogStation.dmm
+40 -40
View File
@@ -1181,7 +1181,7 @@
/obj/effect/turf_decal/tile/yellow{ /obj/effect/turf_decal/tile/yellow{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel/checker, /turf/open/floor/plasteel/checker,
@@ -1383,7 +1383,7 @@
/obj/effect/turf_decal/tile/yellow{ /obj/effect/turf_decal/tile/yellow{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel/dark/corner{ /turf/open/floor/plasteel/dark/corner{
@@ -3602,7 +3602,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/fitness) /area/crew_quarters/fitness)
"aiS" = ( "aiS" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-06" icon_state = "plant-06"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -9522,7 +9522,7 @@
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/atmospherics/components/unary/vent_scrubber/on,
@@ -12132,7 +12132,7 @@
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/obj/machinery/camera{ /obj/machinery/camera{
@@ -13718,7 +13718,7 @@
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/chapel/main) /area/chapel/main)
"aEJ" = ( "aEJ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-08" icon_state = "plant-08"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -13756,7 +13756,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/barbershop) /area/crew_quarters/barbershop)
"aEP" = ( "aEP" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/barbershop) /area/crew_quarters/barbershop)
"aEQ" = ( "aEQ" = (
@@ -17200,7 +17200,7 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-06" icon_state = "plant-06"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -18608,7 +18608,7 @@
/obj/structure/sign/warning/securearea{ /obj/structure/sign/warning/securearea{
pixel_x = -32 pixel_x = -32
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_y = 3 pixel_y = 3
}, },
@@ -18624,7 +18624,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/floor/plasteel/dark/side{ /turf/open/floor/plasteel/dark/side{
dir = 1 dir = 1
}, },
@@ -19727,7 +19727,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02" icon_state = "plant-02"
}, },
/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{
@@ -20283,7 +20283,7 @@
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/machinery/atmospherics/pipe/simple/orange/hidden{ /obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -21141,7 +21141,7 @@
name = "Station Intercom (Common)"; name = "Station Intercom (Common)";
pixel_x = -26 pixel_x = -26
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -21684,7 +21684,7 @@
dir = 1 dir = 1
}, },
/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -22810,7 +22810,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-08" icon_state = "plant-08"
}, },
/turf/open/floor/plasteel/dark/side, /turf/open/floor/plasteel/dark/side,
@@ -23281,7 +23281,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/machinery/atmospherics/pipe/simple/orange/hidden,
@@ -24993,7 +24993,7 @@
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/space/nearstation) /area/space/nearstation)
"bcd" = ( "bcd" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
@@ -27463,7 +27463,7 @@
dir = 1 dir = 1
}, },
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/item/twohanded/required/kirbyplants/dead, /obj/item/kirbyplants/dead,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/main) /area/security/main)
"bhO" = ( "bhO" = (
@@ -27498,7 +27498,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_y = 3 pixel_y = 3
}, },
@@ -27918,7 +27918,7 @@
dir = 4; dir = 4;
light_color = "#c1caff" light_color = "#c1caff"
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-20"; icon_state = "plant-20";
pixel_y = 3 pixel_y = 3
}, },
@@ -28857,7 +28857,7 @@
dir = 4; dir = 4;
light_color = "#c1caff" light_color = "#c1caff"
}, },
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/stock_parts/cell/high/plus, /obj/item/stock_parts/cell/high/plus,
/obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson,
/obj/item/cartridge/atmos, /obj/item/cartridge/atmos,
@@ -32521,7 +32521,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/maintenance/disposal) /area/maintenance/disposal)
"brZ" = ( "brZ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02" icon_state = "plant-02"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -32845,7 +32845,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
@@ -33824,7 +33824,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/construction) /area/construction)
"bvf" = ( "bvf" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/carpet{ /turf/open/floor/carpet{
@@ -38755,7 +38755,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/fitness) /area/crew_quarters/fitness)
"bFR" = ( "bFR" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-08" icon_state = "plant-08"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -39221,7 +39221,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-20"; icon_state = "plant-20";
pixel_y = 3 pixel_y = 3
}, },
@@ -39566,7 +39566,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -41791,7 +41791,7 @@
/turf/open/floor/plasteel/cafeteria, /turf/open/floor/plasteel/cafeteria,
/area/medical/medbay/central) /area/medical/medbay/central)
"bLX" = ( "bLX" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02" icon_state = "plant-02"
}, },
/obj/machinery/atmospherics/pipe/simple/orange/hidden{ /obj/machinery/atmospherics/pipe/simple/orange/hidden{
@@ -45502,7 +45502,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/quartermaster/warehouse) /area/quartermaster/warehouse)
"bTy" = ( "bTy" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/machinery/atmospherics/pipe/simple/orange/hidden{ /obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 9 dir = 9
}, },
@@ -47414,7 +47414,7 @@
pixel_x = 24; pixel_x = 24;
pixel_y = 6 pixel_y = 6
}, },
/obj/item/twohanded/required/kirbyplants/photosynthetic, /obj/item/kirbyplants/photosynthetic,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/heads/chief) /area/crew_quarters/heads/chief)
"bXg" = ( "bXg" = (
@@ -47616,7 +47616,7 @@
}, },
/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple,
/obj/machinery/light, /obj/machinery/light,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -49227,7 +49227,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-06" icon_state = "plant-06"
}, },
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -53466,7 +53466,7 @@
/obj/effect/turf_decal/tile/yellow{ /obj/effect/turf_decal/tile/yellow{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants/photosynthetic, /obj/item/kirbyplants/photosynthetic,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/aft) /area/hallway/primary/aft)
"cjA" = ( "cjA" = (
@@ -53478,7 +53478,7 @@
dir = 4; dir = 4;
pixel_x = -28 pixel_x = -28
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/quartermaster/office) /area/quartermaster/office)
"cjB" = ( "cjB" = (
@@ -54028,8 +54028,8 @@
/obj/machinery/light_switch{ /obj/machinery/light_switch{
pixel_x = -24 pixel_x = -24
}, },
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/stack/cable_coil/red, /obj/item/stack/cable_coil/red,
/obj/item/stack/cable_coil/red, /obj/item/stack/cable_coil/red,
/obj/item/stock_parts/cell/high/plus, /obj/item/stock_parts/cell/high/plus,
@@ -59179,7 +59179,7 @@
/obj/effect/turf_decal/tile/yellow{ /obj/effect/turf_decal/tile/yellow{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants/photosynthetic, /obj/item/kirbyplants/photosynthetic,
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
dir = 1 dir = 1
}, },
@@ -64181,7 +64181,7 @@
/obj/structure/sign/warning/securearea{ /obj/structure/sign/warning/securearea{
pixel_x = -32 pixel_x = -32
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -67337,7 +67337,7 @@
/obj/effect/turf_decal/tile/yellow{ /obj/effect/turf_decal/tile/yellow{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants/photosynthetic, /obj/item/kirbyplants/photosynthetic,
/obj/machinery/airalarm{ /obj/machinery/airalarm{
pixel_y = 24 pixel_y = 24
}, },
@@ -71518,7 +71518,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/bridge) /area/bridge)
"cQV" = ( "cQV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02" icon_state = "plant-02"
}, },
/obj/structure/cable{ /obj/structure/cable{
_maps/map_files/Deltastation/DeltaStation2.dmm
+356 -356
View File
File diff suppressed because it is too large Load Diff
_maps/map_files/IceBoxStation/IceBoxStation.dmm
+17 -17
View File
@@ -17954,7 +17954,7 @@
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 9 dir = 9
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-20" icon_state = "plant-20"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -21310,7 +21310,7 @@
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -21871,7 +21871,7 @@
dir = 1; dir = 1;
pixel_y = -24 pixel_y = -24
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-08" icon_state = "plant-08"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -24440,7 +24440,7 @@
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-13" icon_state = "plant-13"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -24489,7 +24489,7 @@
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -30040,7 +30040,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
@@ -34129,7 +34129,7 @@
/obj/machinery/light_switch{ /obj/machinery/light_switch{
pixel_y = -23 pixel_y = -23
}, },
/obj/item/twohanded/required/kirbyplants/dead, /obj/item/kirbyplants/dead,
/turf/open/floor/plasteel/cafeteria, /turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/hor) /area/crew_quarters/heads/hor)
"bCg" = ( "bCg" = (
@@ -39291,7 +39291,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/floor/plasteel/white/side{ /turf/open/floor/plasteel/white/side{
dir = 1 dir = 1
}, },
@@ -48747,8 +48747,8 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/engineering) /area/engine/engineering)
"cnB" = ( "cnB" = (
@@ -52280,7 +52280,7 @@
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/machinery/cell_charger, /obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus, /obj/item/stock_parts/cell/high/plus,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/heads/chief) /area/crew_quarters/heads/chief)
"cBN" = ( "cBN" = (
@@ -53998,7 +53998,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-04" icon_state = "plant-04"
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
@@ -54135,7 +54135,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/crew_quarters/fitness) /area/crew_quarters/fitness)
"exP" = ( "exP" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -54518,7 +54518,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-06" icon_state = "plant-06"
}, },
/turf/open/floor/plasteel/white/corner{ /turf/open/floor/plasteel/white/corner{
@@ -54776,7 +54776,7 @@
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
dir = 10 dir = 10
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18" icon_state = "plant-18"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -57083,7 +57083,7 @@
/turf/open/floor/plating/snowed/smoothed/icemoon, /turf/open/floor/plating/snowed/smoothed/icemoon,
/area/quartermaster/miningdock) /area/quartermaster/miningdock)
"lPr" = ( "lPr" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -58881,7 +58881,7 @@
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/crew_quarters/theatre) /area/crew_quarters/theatre)
"qTV" = ( "qTV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
_maps/map_files/IceBoxStation/IcemoonUnderground_Above.dmm
+2 -2
View File
@@ -2321,7 +2321,7 @@
/area/mine/laborcamp) /area/mine/laborcamp)
"mL" = ( "mL" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/mine/laborcamp) /area/mine/laborcamp)
"mS" = ( "mS" = (
@@ -2493,7 +2493,7 @@
dir = 4; dir = 4;
network = list("labor") network = list("labor")
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/mine/laborcamp) /area/mine/laborcamp)
"pu" = ( "pu" = (
_maps/map_files/KiloStation/KiloStation.dmm
+99 -99
View File
@@ -3429,7 +3429,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "0-8" icon_state = "0-8"
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel/showroomfloor, /turf/open/floor/plasteel/showroomfloor,
@@ -8802,7 +8802,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/medical/virology) /area/medical/virology)
"aoR" = ( "aoR" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
@@ -8959,7 +8959,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/security/courtroom) /area/security/courtroom)
"apj" = ( "apj" = (
@@ -9122,7 +9122,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/teleporter) /area/teleporter)
"apw" = ( "apw" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
}, },
@@ -10947,7 +10947,7 @@
/turf/open/floor/engine, /turf/open/floor/engine,
/area/space) /area/space)
"asg" = ( "asg" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -11992,7 +11992,7 @@
/turf/open/floor/circuit/green/telecomms/mainframe, /turf/open/floor/circuit/green/telecomms/mainframe,
/area/tcommsat/server) /area/tcommsat/server)
"atV" = ( "atV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
@@ -14194,7 +14194,7 @@
/obj/machinery/cell_charger, /obj/machinery/cell_charger,
/obj/item/stock_parts/cell/hyper, /obj/item/stock_parts/cell/hyper,
/obj/item/stack/cable_coil, /obj/item/stack/cable_coil,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
}, },
@@ -14307,8 +14307,8 @@
/obj/item/stack/cable_coil, /obj/item/stack/cable_coil,
/obj/item/electronics/apc, /obj/item/electronics/apc,
/obj/item/electronics/apc, /obj/item/electronics/apc,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/engine/engineering) /area/engine/engineering)
"axR" = ( "axR" = (
@@ -17393,7 +17393,7 @@
dir = 4 dir = 4
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
@@ -19751,7 +19751,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -19770,7 +19770,7 @@
dir = 8 dir = 8
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
desc = "After his promotion, he was transferred to Kilo Station to serve as the gateway's protector."; desc = "After his promotion, he was transferred to Kilo Station to serve as the gateway's protector.";
icon_state = "plant-21"; icon_state = "plant-21";
name = "rodger" name = "rodger"
@@ -20601,7 +20601,7 @@
dir = 8 dir = 8
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel/showroomfloor, /turf/open/floor/plasteel/showroomfloor,
@@ -20638,7 +20638,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -21015,7 +21015,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/light{ /obj/machinery/light{
@@ -22183,7 +22183,7 @@
/area/hallway/primary/aft) /area/hallway/primary/aft)
"aKO" = ( "aKO" = (
/obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/cobweb,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/old,
@@ -22217,7 +22217,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/atmos) /area/engine/atmos)
"aKR" = ( "aKR" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -22678,7 +22678,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -24453,7 +24453,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel/showroomfloor, /turf/open/floor/plasteel/showroomfloor,
@@ -24742,7 +24742,7 @@
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -24875,7 +24875,7 @@
dir = 1 dir = 1
}, },
/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/machinery/button/door{ /obj/machinery/button/door{
@@ -28508,7 +28508,7 @@
dir = 1 dir = 1
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18" icon_state = "plant-18"
}, },
/obj/machinery/camera{ /obj/machinery/camera{
@@ -28850,7 +28850,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "2-8" icon_state = "2-8"
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
@@ -28949,7 +28949,7 @@
dir = 1 dir = 1
}, },
/obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/cobweb,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -30057,7 +30057,7 @@
dir = 1 dir = 1
}, },
/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18" icon_state = "plant-18"
}, },
/turf/open/floor/plasteel/showroomfloor, /turf/open/floor/plasteel/showroomfloor,
@@ -33871,7 +33871,7 @@
}, },
/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow,
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -38995,7 +38995,7 @@
dir = 4 dir = 4
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -39329,7 +39329,7 @@
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -39570,7 +39570,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
@@ -39609,7 +39609,7 @@
/area/quartermaster/sorting) /area/quartermaster/sorting)
"blR" = ( "blR" = (
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/structure/cable{ /obj/structure/cable{
icon_state = "4-8" icon_state = "4-8"
}, },
@@ -39926,7 +39926,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/quartermaster/storage) /area/quartermaster/storage)
"bmo" = ( "bmo" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/machinery/firealarm{ /obj/machinery/firealarm{
@@ -40112,7 +40112,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -40963,7 +40963,7 @@
dir = 4 dir = 4
}, },
/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -40995,7 +40995,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/quartermaster/office) /area/quartermaster/office)
"bnZ" = ( "bnZ" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
}, },
@@ -42304,7 +42304,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/machinery/power/apc/highcap/ten_k{ /obj/machinery/power/apc/highcap/ten_k{
areastring = "/area/bridge"; areastring = "/area/bridge";
dir = 8; dir = 8;
@@ -42955,7 +42955,7 @@
/obj/effect/turf_decal/tile/yellow{ /obj/effect/turf_decal/tile/yellow{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/obj/machinery/light{ /obj/machinery/light{
@@ -43021,7 +43021,7 @@
dir = 1 dir = 1
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -43219,7 +43219,7 @@
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/structure/spider/stickyweb, /obj/structure/spider/stickyweb,
@@ -43859,7 +43859,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/quartermaster/office) /area/quartermaster/office)
"bsA" = ( "bsA" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -44010,7 +44010,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hydroponics) /area/hydroponics)
"bsM" = ( "bsM" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/light_switch{ /obj/machinery/light_switch{
@@ -44139,7 +44139,7 @@
dir = 1 dir = 1
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -44747,7 +44747,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/bar) /area/crew_quarters/bar)
"btZ" = ( "btZ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -45149,7 +45149,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -45875,7 +45875,7 @@
/turf/open/floor/plasteel/showroomfloor, /turf/open/floor/plasteel/showroomfloor,
/area/crew_quarters/toilet/restrooms) /area/crew_quarters/toilet/restrooms)
"bvP" = ( "bvP" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/turf/open/floor/plasteel/showroomfloor, /turf/open/floor/plasteel/showroomfloor,
@@ -45929,7 +45929,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/library) /area/library)
"bvV" = ( "bvV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -45972,7 +45972,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -46003,7 +46003,7 @@
/obj/structure/noticeboard{ /obj/structure/noticeboard{
pixel_y = 30 pixel_y = 30
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-17"; icon_state = "plant-17";
pixel_x = -8; pixel_x = -8;
pixel_y = 3 pixel_y = 3
@@ -46127,7 +46127,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_x = 24 pixel_x = 24
}, },
@@ -46867,7 +46867,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation) /area/crew_quarters/fitness/recreation)
"bxF" = ( "bxF" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -46973,14 +46973,14 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation) /area/crew_quarters/fitness/recreation)
"bxO" = ( "bxO" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel/showroomfloor, /turf/open/floor/plasteel/showroomfloor,
@@ -47268,7 +47268,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -48699,7 +48699,7 @@
dir = 4 dir = 4
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
@@ -49045,7 +49045,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -49726,7 +49726,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 6 dir = 6
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -51812,7 +51812,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -51940,7 +51940,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 9 dir = 9
}, },
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-8" icon_state = "1-8"
}, },
@@ -52037,7 +52037,7 @@
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -53284,7 +53284,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 10 dir = 10
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -53308,7 +53308,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 6 dir = 6
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel/dark/corner{ /turf/open/floor/plasteel/dark/corner{
@@ -54408,7 +54408,7 @@
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
@@ -54431,7 +54431,7 @@
dir = 4 dir = 4
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
@@ -54783,7 +54783,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/item/radio/intercom{ /obj/item/radio/intercom{
@@ -55595,7 +55595,7 @@
dir = 8 dir = 8
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/obj/structure/cable{ /obj/structure/cable{
@@ -55785,7 +55785,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/machinery/firealarm{ /obj/machinery/firealarm{
@@ -56182,7 +56182,7 @@
/obj/item/radio/intercom{ /obj/item/radio/intercom{
pixel_x = -28 pixel_x = -28
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02"; icon_state = "plant-02";
pixel_y = 3 pixel_y = 3
}, },
@@ -57853,7 +57853,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/machinery/power/apc/highcap/five_k{ /obj/machinery/power/apc/highcap/five_k{
@@ -58151,7 +58151,7 @@
dir = 1 dir = 1
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02"; icon_state = "plant-02";
pixel_y = 3 pixel_y = 3
}, },
@@ -58245,7 +58245,7 @@
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-11" icon_state = "plant-11"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -58404,7 +58404,7 @@
/obj/machinery/status_display/ai{ /obj/machinery/status_display/ai{
pixel_x = 32 pixel_x = 32
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -58487,7 +58487,7 @@
/area/hallway/primary/central) /area/hallway/primary/central)
"bPT" = ( "bPT" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02"; icon_state = "plant-02";
pixel_y = 3 pixel_y = 3
}, },
@@ -58628,7 +58628,7 @@
dir = 4 dir = 4
}, },
/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -59285,7 +59285,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -60375,7 +60375,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -60730,7 +60730,7 @@
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -60978,7 +60978,7 @@
dir = 1 dir = 1
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02"; icon_state = "plant-02";
pixel_y = 3 pixel_y = 3
}, },
@@ -62455,7 +62455,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -63056,7 +63056,7 @@
dir = 8 dir = 8
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -63297,7 +63297,7 @@
dir = 8 dir = 8
}, },
/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/machinery/light, /obj/machinery/light,
@@ -63578,7 +63578,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02"; icon_state = "plant-02";
pixel_y = 3 pixel_y = 3
}, },
@@ -64074,7 +64074,7 @@
dir = 1 dir = 1
}, },
/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/structure/noticeboard{ /obj/structure/noticeboard{
@@ -64688,7 +64688,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge) /area/hallway/secondary/exit/departure_lounge)
"bZx" = ( "bZx" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
@@ -64971,7 +64971,7 @@
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/light_switch{ /obj/machinery/light_switch{
@@ -65993,7 +65993,7 @@
dir = 8 dir = 8
}, },
/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt,
@@ -66543,7 +66543,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/structure/cable{ /obj/structure/cable{
@@ -67263,7 +67263,7 @@
dir = 8 dir = 8
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/showroomfloor, /turf/open/floor/plasteel/showroomfloor,
@@ -67361,7 +67361,7 @@
dir = 8 dir = 8
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02"; icon_state = "plant-02";
pixel_y = 3 pixel_y = 3
}, },
@@ -67612,7 +67612,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{ /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
@@ -68131,7 +68131,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/showroomfloor, /turf/open/floor/plasteel/showroomfloor,
@@ -68160,7 +68160,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 9 dir = 9
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02"; icon_state = "plant-02";
pixel_y = 3 pixel_y = 3
}, },
@@ -68229,7 +68229,7 @@
dir = 4 dir = 4
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -68253,7 +68253,7 @@
/obj/machinery/light{ /obj/machinery/light{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -71553,7 +71553,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/processing) /area/security/processing)
"cld" = ( "cld" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02"; icon_state = "plant-02";
pixel_y = 3 pixel_y = 3
}, },
@@ -72405,7 +72405,7 @@
/obj/structure/noticeboard{ /obj/structure/noticeboard{
pixel_y = 28 pixel_y = 28
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -72425,7 +72425,7 @@
/obj/machinery/atmospherics/pipe/simple/cyan/visible{ /obj/machinery/atmospherics/pipe/simple/cyan/visible{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -80546,7 +80546,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/maintenance/fore) /area/maintenance/fore)
"cDr" = ( "cDr" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02"; icon_state = "plant-02";
pixel_y = 3 pixel_y = 3
}, },
@@ -80828,7 +80828,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/ai_monitored/security/armory) /area/ai_monitored/security/armory)
"cDT" = ( "cDT" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
@@ -84619,7 +84619,7 @@
icon_state = "1-4" icon_state = "1-4"
}, },
/obj/machinery/airalarm/directional/west, /obj/machinery/airalarm/directional/west,
/obj/item/twohanded/required/kirbyplants/dead, /obj/item/kirbyplants/dead,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/security/vacantoffice) /area/security/vacantoffice)
"esR" = ( "esR" = (
@@ -85474,7 +85474,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
_maps/map_files/LambdaStation/lambda.dmm
+40 -40
View File
@@ -15609,7 +15609,7 @@
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/machinery/newscaster{ /obj/machinery/newscaster{
pixel_x = -30 pixel_x = -30
}, },
@@ -15985,7 +15985,7 @@
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/crew_quarters/heads/hor/private) /area/crew_quarters/heads/hor/private)
"aDh" = ( "aDh" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/heads/hor/private) /area/crew_quarters/heads/hor/private)
"aDi" = ( "aDi" = (
@@ -16008,7 +16008,7 @@
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/explab) /area/science/explab)
"aDl" = ( "aDl" = (
@@ -21689,7 +21689,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/brig) /area/security/brig)
"aNv" = ( "aNv" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/trimline/neutral/filled/corner, /obj/effect/turf_decal/trimline/neutral/filled/corner,
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/security/brig) /area/security/brig)
@@ -21757,7 +21757,7 @@
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/lawoffice) /area/lawoffice)
"aNA" = ( "aNA" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-08" icon_state = "plant-08"
}, },
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
@@ -23806,7 +23806,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/range) /area/security/range)
"aRr" = ( "aRr" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/heads/captain/private) /area/crew_quarters/heads/captain/private)
"aRs" = ( "aRs" = (
@@ -23836,7 +23836,7 @@
dir = 8; dir = 8;
light_color = "#e8eaff" light_color = "#e8eaff"
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/heads/hop/private) /area/crew_quarters/heads/hop/private)
"aRw" = ( "aRw" = (
@@ -25007,7 +25007,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/command) /area/hallway/secondary/command)
"aTI" = ( "aTI" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/command) /area/hallway/secondary/command)
"aTJ" = ( "aTJ" = (
@@ -25232,7 +25232,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/fore/secondary) /area/maintenance/fore/secondary)
"aUi" = ( "aUi" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/machinery/camera/autoname{ /obj/machinery/camera/autoname{
dir = 1 dir = 1
}, },
@@ -27583,7 +27583,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/crew_quarters/heads/captain) /area/crew_quarters/heads/captain)
"aYV" = ( "aYV" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/heads/captain) /area/crew_quarters/heads/captain)
"aYX" = ( "aYX" = (
@@ -34832,7 +34832,7 @@
/obj/effect/turf_decal/tile{ /obj/effect/turf_decal/tile{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge) /area/hallway/secondary/exit/departure_lounge)
"bmX" = ( "bmX" = (
@@ -36562,7 +36562,7 @@
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/cafeteria) /area/crew_quarters/cafeteria)
"bqv" = ( "bqv" = (
@@ -38503,7 +38503,7 @@
dir = 8 dir = 8
}, },
/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red,
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge) /area/hallway/secondary/exit/departure_lounge)
"buh" = ( "buh" = (
@@ -42119,7 +42119,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/cryo) /area/medical/cryo)
"bBv" = ( "bBv" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{ /obj/effect/turf_decal/tile/bar{
dir = 1 dir = 1
@@ -45631,7 +45631,7 @@
/turf/open/floor/carpet/blue, /turf/open/floor/carpet/blue,
/area/crew_quarters/heads/cmo/private) /area/crew_quarters/heads/cmo/private)
"bHP" = ( "bHP" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/heads/cmo/private) /area/crew_quarters/heads/cmo/private)
"bHQ" = ( "bHQ" = (
@@ -48281,7 +48281,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-4" icon_state = "1-4"
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/trimline/blue/filled/line, /obj/effect/turf_decal/trimline/blue/filled/line,
/obj/structure/cable{ /obj/structure/cable{
icon_state = "0-4" icon_state = "0-4"
@@ -50303,7 +50303,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/maintenance/bar) /area/maintenance/bar)
"bPX" = ( "bPX" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/cafeteria) /area/crew_quarters/cafeteria)
"bPY" = ( "bPY" = (
@@ -50980,7 +50980,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/bridge/showroom/corporate) /area/bridge/showroom/corporate)
"bRs" = ( "bRs" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation) /area/crew_quarters/fitness/recreation)
"bRu" = ( "bRu" = (
@@ -51420,7 +51420,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation) /area/crew_quarters/fitness/recreation)
"bSx" = ( "bSx" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/trimline/neutral/filled/line{ /obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 8 dir = 8
}, },
@@ -52114,7 +52114,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/starboard) /area/hallway/primary/starboard)
"bTR" = ( "bTR" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
@@ -55495,7 +55495,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
}, },
@@ -56283,7 +56283,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/chief) /area/crew_quarters/heads/chief)
"cbt" = ( "cbt" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/machinery/light_switch{ /obj/machinery/light_switch{
pixel_x = 26; pixel_x = 26;
pixel_y = -26 pixel_y = -26
@@ -60353,8 +60353,8 @@
}, },
/obj/item/stack/cable_coil, /obj/item/stack/cable_coil,
/obj/item/stack/cable_coil, /obj/item/stack/cable_coil,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/break_room) /area/engine/break_room)
"ckz" = ( "ckz" = (
@@ -61193,7 +61193,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/storage/tcom) /area/storage/tcom)
"cml" = ( "cml" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-8" icon_state = "1-8"
}, },
@@ -63314,7 +63314,7 @@
/area/engine/break_room) /area/engine/break_room)
"cqz" = ( "cqz" = (
/obj/machinery/light, /obj/machinery/light,
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-4" icon_state = "1-4"
}, },
@@ -64541,7 +64541,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/atmos) /area/engine/atmos)
"ctc" = ( "ctc" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile{ /obj/effect/turf_decal/tile{
dir = 1 dir = 1
}, },
@@ -64551,7 +64551,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"ctd" = ( "ctd" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile{ /obj/effect/turf_decal/tile{
dir = 4 dir = 4
}, },
@@ -64812,7 +64812,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-8" icon_state = "1-8"
}, },
/obj/item/twohanded/required/kirbyplants/photosynthetic, /obj/item/kirbyplants/photosynthetic,
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
dir = 9 dir = 9
}, },
@@ -66743,7 +66743,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"cyc" = ( "cyc" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/trimline/yellow/filled/line{ /obj/effect/turf_decal/trimline/yellow/filled/line{
dir = 6 dir = 6
}, },
@@ -66846,8 +66846,8 @@
}, },
/obj/item/electronics/airlock, /obj/item/electronics/airlock,
/obj/item/electronics/airlock, /obj/item/electronics/airlock,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/storage_shared) /area/engine/storage_shared)
"cyq" = ( "cyq" = (
@@ -67738,7 +67738,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/bridge) /area/bridge)
"cAd" = ( "cAd" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/trimline/neutral/filled/corner{ /obj/effect/turf_decal/trimline/neutral/filled/corner{
dir = 4 dir = 4
}, },
@@ -70418,7 +70418,7 @@
/area/crew_quarters/locker) /area/crew_quarters/locker)
"cFb" = ( "cFb" = (
/obj/machinery/light, /obj/machinery/light,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18" icon_state = "plant-18"
}, },
/obj/item/radio/intercom{ /obj/item/radio/intercom{
@@ -75054,7 +75054,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/atmos) /area/engine/atmos)
"cNx" = ( "cNx" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/machinery/camera{ /obj/machinery/camera{
c_tag = "Atmospherics - Control Room"; c_tag = "Atmospherics - Control Room";
dir = 4 dir = 4
@@ -78132,7 +78132,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation) /area/crew_quarters/fitness/recreation)
"cUc" = ( "cUc" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/trimline/neutral/filled/line{ /obj/effect/turf_decal/trimline/neutral/filled/line{
dir = 4 dir = 4
}, },
@@ -78142,7 +78142,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation) /area/crew_quarters/fitness/recreation)
"cUd" = ( "cUd" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/structure/sign/departments/holy{ /obj/structure/sign/departments/holy{
pixel_x = -32 pixel_x = -32
}, },
@@ -78409,7 +78409,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/starboard/aft) /area/maintenance/starboard/aft)
"cUN" = ( "cUN" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/heads/chief/private) /area/crew_quarters/heads/chief/private)
"cUO" = ( "cUO" = (
@@ -80608,7 +80608,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/science/circuit) /area/science/circuit)
"gIA" = ( "gIA" = (
@@ -80949,7 +80949,7 @@
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge) /area/hallway/secondary/exit/departure_lounge)
"kNb" = ( "kNb" = (
_maps/map_files/MetaStation/MetaStation.dmm
+37 -37
View File
@@ -226,7 +226,7 @@
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -245,7 +245,7 @@
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/prison) /area/security/prison)
"aaE" = ( "aaE" = (
@@ -1224,7 +1224,7 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-13" icon_state = "plant-13"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -2668,7 +2668,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9 dir = 9
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/obj/structure/sign/warning/securearea{ /obj/structure/sign/warning/securearea{
@@ -2992,7 +2992,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/solars/port/fore) /area/maintenance/solars/port/fore)
"afF" = ( "afF" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -13095,7 +13095,7 @@
/turf/open/space, /turf/open/space,
/area/space/nearstation) /area/space/nearstation)
"aze" = ( "aze" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -14390,7 +14390,7 @@
/area/maintenance/starboard/fore) /area/maintenance/starboard/fore)
"aBD" = ( "aBD" = (
/obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/cobweb,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-20"; icon_state = "plant-20";
pixel_y = 3 pixel_y = 3
}, },
@@ -17086,8 +17086,8 @@
/obj/effect/turf_decal/bot{ /obj/effect/turf_decal/bot{
dir = 1 dir = 1
}, },
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel{ /turf/open/floor/plasteel{
dir = 1 dir = 1
}, },
@@ -18151,7 +18151,7 @@
name = "Law Office APC"; name = "Law Office APC";
pixel_y = 24 pixel_y = 24
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -19167,7 +19167,7 @@
c_tag = "AI Upload Chamber - Fore"; c_tag = "AI Upload Chamber - Fore";
network = list("aiupload") network = list("aiupload")
}, },
/obj/item/twohanded/required/kirbyplants/photosynthetic{ /obj/item/kirbyplants/photosynthetic{
pixel_y = 10 pixel_y = 10
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -21676,7 +21676,7 @@
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_x = -27 pixel_x = -27
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -23959,7 +23959,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"aVt" = ( "aVt" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-13" icon_state = "plant-13"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -24307,7 +24307,7 @@
/obj/machinery/airalarm{ /obj/machinery/airalarm{
pixel_y = 23 pixel_y = 23
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -24418,7 +24418,7 @@
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_x = 27 pixel_x = 27
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/obj/item/radio/intercom{ /obj/item/radio/intercom{
@@ -25667,7 +25667,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"aYF" = ( "aYF" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -26197,7 +26197,7 @@
charge = 100; charge = 100;
maxcharge = 15000 maxcharge = 15000
}, },
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
}, },
@@ -36993,7 +36993,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"btR" = ( "btR" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18" icon_state = "plant-18"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -37777,7 +37777,7 @@
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/tcommsat/computer) /area/tcommsat/computer)
"bvB" = ( "bvB" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-20" icon_state = "plant-20"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -40423,7 +40423,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/library) /area/library)
"bBx" = ( "bBx" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
@@ -43959,7 +43959,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow,
@@ -44131,7 +44131,7 @@
/turf/open/floor/circuit/telecomms/mainframe, /turf/open/floor/circuit/telecomms/mainframe,
/area/tcommsat/server) /area/tcommsat/server)
"bJh" = ( "bJh" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
@@ -44939,7 +44939,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/aisat) /area/aisat)
"bKS" = ( "bKS" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-06" icon_state = "plant-06"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -45769,7 +45769,7 @@
icon_state = "map-right-MS"; icon_state = "map-right-MS";
pixel_y = -32 pixel_y = -32
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
@@ -51025,7 +51025,7 @@
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_x = -27 pixel_x = -27
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
@@ -51121,7 +51121,7 @@
dir = 8; dir = 8;
pixel_x = 24 pixel_x = 24
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple,
@@ -54627,7 +54627,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/medbay/central) /area/medical/medbay/central)
"ceI" = ( "ceI" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-11" icon_state = "plant-11"
}, },
/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow,
@@ -54722,7 +54722,7 @@
name = "Station Intercom (General)"; name = "Station Intercom (General)";
pixel_y = -30 pixel_y = -30
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-08" icon_state = "plant-08"
}, },
/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple,
@@ -59534,7 +59534,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/research) /area/science/research)
"coj" = ( "coj" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple,
@@ -64240,7 +64240,7 @@
/obj/machinery/light_switch{ /obj/machinery/light_switch{
pixel_x = -23 pixel_x = -23
}, },
/obj/item/twohanded/required/kirbyplants/dead, /obj/item/kirbyplants/dead,
/turf/open/floor/plasteel/cafeteria{ /turf/open/floor/plasteel/cafeteria{
dir = 5 dir = 5
}, },
@@ -68833,7 +68833,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/medbay/aft) /area/medical/medbay/aft)
"cFQ" = ( "cFQ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -71165,7 +71165,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/research) /area/science/research)
"cJQ" = ( "cJQ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
@@ -72345,7 +72345,7 @@
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_x = 27 pixel_x = 27
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -74186,7 +74186,7 @@
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_x = -27 pixel_x = -27
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-04" icon_state = "plant-04"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -74252,7 +74252,7 @@
name = "Station Intercom (General)"; name = "Station Intercom (General)";
pixel_x = 29 pixel_x = 29
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -79803,7 +79803,7 @@
c_tag = "Departure Lounge - Port Fore"; c_tag = "Departure Lounge - Port Fore";
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-24" icon_state = "plant-24"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -82837,7 +82837,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
_maps/map_files/Mining/Lavaland.dmm
+9 -9
View File
@@ -192,14 +192,14 @@
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
"ft" = ( "ft" = (
/obj/structure/stone_tile/block, /obj/structure/stone_tile/block,
/obj/item/twohanded/bonespear, /obj/item/spear/bonespear,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
"fN" = ( "fN" = (
/obj/structure/stone_tile{ /obj/structure/stone_tile{
dir = 4 dir = 4
}, },
/obj/item/twohanded/bonespear, /obj/item/spear/bonespear,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors) /area/lavaland/surface/outdoors)
"fQ" = ( "fQ" = (
@@ -529,7 +529,7 @@
}, },
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/clothing/head/helmet/roman/legionnaire, /obj/item/clothing/head/helmet/roman/legionnaire,
/obj/item/twohanded/bonespear, /obj/item/spear/bonespear,
/turf/open/indestructible/boss, /turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
"iK" = ( "iK" = (
@@ -1831,8 +1831,8 @@
"An" = ( "An" = (
/obj/structure/stone_tile/slab, /obj/structure/stone_tile/slab,
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/bonespear, /obj/item/spear/bonespear,
/obj/item/twohanded/bonespear, /obj/item/spear/bonespear,
/turf/open/indestructible/boss, /turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
"AH" = ( "AH" = (
@@ -1842,7 +1842,7 @@
/obj/structure/stone_tile/cracked{ /obj/structure/stone_tile/cracked{
dir = 8 dir = 8
}, },
/obj/item/twohanded/bonespear, /obj/item/spear/bonespear,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
"AU" = ( "AU" = (
@@ -2071,7 +2071,7 @@
}, },
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/scythe, /obj/item/scythe,
/obj/item/twohanded/bonespear, /obj/item/spear/bonespear,
/turf/open/indestructible/boss, /turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
"HX" = ( "HX" = (
@@ -2200,7 +2200,7 @@
}, },
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/storage/belt, /obj/item/storage/belt,
/obj/item/twohanded/bonespear, /obj/item/spear/bonespear,
/turf/open/indestructible/boss, /turf/open/indestructible/boss,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
"Qk" = ( "Qk" = (
@@ -2429,7 +2429,7 @@
/obj/structure/stone_tile/cracked{ /obj/structure/stone_tile/cracked{
dir = 1 dir = 1
}, },
/obj/item/twohanded/bonespear, /obj/item/spear/bonespear,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface, /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/ash_walkers) /area/ruin/unpowered/ash_walkers)
"WT" = ( "WT" = (
_maps/map_files/OmegaStation/OmegaStation.dmm
+48 -48
View File
@@ -545,7 +545,7 @@
dir = 4 dir = 4
}, },
/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -601,7 +601,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -2299,7 +2299,7 @@
/obj/structure/cable/white{ /obj/structure/cable/white{
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/atmospherics/components/unary/vent_pump/on{ /obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -3040,7 +3040,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/captain/private) /area/crew_quarters/heads/captain/private)
"afl" = ( "afl" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/heads/captain/private) /area/crew_quarters/heads/captain/private)
"afm" = ( "afm" = (
@@ -3077,7 +3077,7 @@
/obj/machinery/recharger{ /obj/machinery/recharger{
pixel_x = 5 pixel_x = 5
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-15"; icon_state = "plant-15";
pixel_x = -6; pixel_x = -6;
pixel_y = 12 pixel_y = 12
@@ -5358,7 +5358,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/security/brig) /area/security/brig)
"ajd" = ( "ajd" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -5702,7 +5702,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10 dir = 10
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/camera{ /obj/machinery/camera{
@@ -6727,7 +6727,7 @@
/turf/closed/wall, /turf/closed/wall,
/area/hallway/primary/central) /area/hallway/primary/central)
"alm" = ( "alm" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/light{ /obj/machinery/light{
@@ -6783,7 +6783,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/fore) /area/hallway/primary/fore)
"als" = ( "als" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/light{ /obj/machinery/light{
@@ -7498,7 +7498,7 @@
pixel_y = -24 pixel_y = -24
}, },
/obj/machinery/light, /obj/machinery/light,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown,
@@ -8121,7 +8121,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/brig) /area/security/brig)
"anF" = ( "anF" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/door_timer{ /obj/machinery/door_timer{
@@ -9927,7 +9927,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/brig) /area/security/brig)
"aqP" = ( "aqP" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/firealarm{ /obj/machinery/firealarm{
@@ -10775,7 +10775,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/bar/atrium) /area/crew_quarters/bar/atrium)
"ase" = ( "ase" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
@@ -10835,7 +10835,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/bar/atrium) /area/crew_quarters/bar/atrium)
"asi" = ( "asi" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
@@ -11784,7 +11784,7 @@
/obj/structure/window/reinforced{ /obj/structure/window/reinforced{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -12334,7 +12334,7 @@
/obj/structure/window/reinforced{ /obj/structure/window/reinforced{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -12840,7 +12840,7 @@
dir = 8; dir = 8;
pixel_x = 24 pixel_x = 24
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
@@ -13579,7 +13579,7 @@
/obj/machinery/status_display/ai{ /obj/machinery/status_display/ai{
pixel_y = 32 pixel_y = 32
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/bot, /obj/effect/turf_decal/bot,
@@ -15982,7 +15982,7 @@
/obj/machinery/light{ /obj/machinery/light{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
@@ -16712,7 +16712,7 @@
}, },
/area/engine/break_room) /area/engine/break_room)
"aDB" = ( "aDB" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/yellow{ /obj/effect/turf_decal/tile/yellow{
@@ -17399,7 +17399,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/dorms) /area/crew_quarters/dorms)
"aEL" = ( "aEL" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/status_display{ /obj/machinery/status_display{
@@ -18152,7 +18152,7 @@
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_x = -26 pixel_x = -26
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/camera{ /obj/machinery/camera{
@@ -18491,7 +18491,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/break_room) /area/engine/break_room)
"aGu" = ( "aGu" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow,
@@ -18917,7 +18917,7 @@
pixel_y = 24; pixel_y = 24;
req_access_txt = "10" req_access_txt = "10"
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -19080,7 +19080,7 @@
/obj/structure/cable/white{ /obj/structure/cable/white{
icon_state = "2-8" icon_state = "2-8"
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
@@ -19388,7 +19388,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/bar/atrium) /area/crew_quarters/bar/atrium)
"aHU" = ( "aHU" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/structure/sign/poster/random{ /obj/structure/sign/poster/random{
@@ -19441,7 +19441,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/hallway/primary/starboard) /area/hallway/primary/starboard)
"aHZ" = ( "aHZ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/bot, /obj/effect/turf_decal/bot,
@@ -21004,8 +21004,8 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
@@ -21895,7 +21895,7 @@
/turf/open/floor/grass, /turf/open/floor/grass,
/area/hydroponics) /area/hydroponics)
"aMt" = ( "aMt" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/light{ /obj/machinery/light{
@@ -21943,7 +21943,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/starboard/central) /area/maintenance/starboard/central)
"aMy" = ( "aMy" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/bot, /obj/effect/turf_decal/bot,
@@ -21956,7 +21956,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/hallway/primary/starboard) /area/hallway/primary/starboard)
"aMz" = ( "aMz" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/brown{ /obj/effect/turf_decal/tile/brown{
@@ -22667,7 +22667,7 @@
/turf/closed/wall, /turf/closed/wall,
/area/hydroponics) /area/hydroponics)
"aOm" = ( "aOm" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
@@ -22714,7 +22714,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"aOq" = ( "aOq" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
@@ -23659,7 +23659,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/hallway/primary/port/aft) /area/hallway/primary/port/aft)
"aPX" = ( "aPX" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -23949,7 +23949,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/starboard) /area/hallway/primary/starboard)
"aQA" = ( "aQA" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/newscaster{ /obj/machinery/newscaster{
@@ -24705,7 +24705,7 @@
/obj/structure/cable/white{ /obj/structure/cable/white{
icon_state = "0-2" icon_state = "0-2"
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/camera{ /obj/machinery/camera{
@@ -25303,7 +25303,7 @@
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/crew_quarters/lounge) /area/crew_quarters/lounge)
"aTA" = ( "aTA" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18" icon_state = "plant-18"
}, },
/obj/machinery/camera{ /obj/machinery/camera{
@@ -27128,7 +27128,7 @@
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/crew_quarters/lounge) /area/crew_quarters/lounge)
"aWR" = ( "aWR" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -27391,7 +27391,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/medbay/zone3) /area/medical/medbay/zone3)
"aXu" = ( "aXu" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/button/door{ /obj/machinery/button/door{
@@ -29834,7 +29834,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/medbay/zone3) /area/medical/medbay/zone3)
"bbr" = ( "bbr" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
@@ -32733,7 +32733,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft) /area/maintenance/starboard/aft)
"bgw" = ( "bgw" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -32756,7 +32756,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft) /area/maintenance/starboard/aft)
"bgy" = ( "bgy" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -33452,7 +33452,7 @@
/turf/open/floor/plasteel/white/corner, /turf/open/floor/plasteel/white/corner,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"bhL" = ( "bhL" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -33563,7 +33563,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft) /area/maintenance/starboard/aft)
"bhU" = ( "bhU" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -34859,7 +34859,7 @@
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/engine/atmos) /area/engine/atmos)
"bkt" = ( "bkt" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/light{ /obj/machinery/light{
@@ -34902,7 +34902,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"bkE" = ( "bkE" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -40652,7 +40652,7 @@
/turf/closed/wall/rust, /turf/closed/wall/rust,
/area/chapel/main) /area/chapel/main)
"sLg" = ( "sLg" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery,
_maps/map_files/PubbyStation/PubbyStation.dmm
+70 -70
View File
@@ -1537,7 +1537,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior) /area/ai_monitored/turret_protected/aisat_interior)
"afe" = ( "afe" = (
/obj/item/twohanded/required/kirbyplants/photosynthetic{ /obj/item/kirbyplants/photosynthetic{
pixel_y = 10 pixel_y = 10
}, },
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
@@ -1567,7 +1567,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/aisat_interior) /area/ai_monitored/turret_protected/aisat_interior)
"afg" = ( "afg" = (
/obj/item/twohanded/required/kirbyplants/photosynthetic{ /obj/item/kirbyplants/photosynthetic{
pixel_y = 10 pixel_y = 10
}, },
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
@@ -5479,7 +5479,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -9400,7 +9400,7 @@
/area/hallway/primary/central) /area/hallway/primary/central)
"awe" = ( "awe" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"awf" = ( "awf" = (
@@ -9481,7 +9481,7 @@
/obj/machinery/light{ /obj/machinery/light{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/stripes/corner{ /obj/effect/turf_decal/stripes/corner{
dir = 4 dir = 4
}, },
@@ -9625,7 +9625,7 @@
}, },
/area/crew_quarters/fitness/recreation) /area/crew_quarters/fitness/recreation)
"awC" = ( "awC" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/machinery/power/apc{ /obj/machinery/power/apc{
@@ -10071,7 +10071,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/fore) /area/hallway/primary/fore)
"axF" = ( "axF" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -10163,7 +10163,7 @@
/obj/structure/cable{ /obj/structure/cable{
icon_state = "0-2" icon_state = "0-2"
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/crew_quarters/heads/captain) /area/crew_quarters/heads/captain)
"axT" = ( "axT" = (
@@ -11161,7 +11161,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/fore) /area/hallway/primary/fore)
"aAo" = ( "aAo" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red,
@@ -11857,7 +11857,7 @@
/turf/open/floor/plasteel/white/corner, /turf/open/floor/plasteel/white/corner,
/area/crew_quarters/fitness/recreation) /area/crew_quarters/fitness/recreation)
"aBY" = ( "aBY" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -11924,7 +11924,7 @@
/area/maintenance/department/security/brig) /area/maintenance/department/security/brig)
"aCi" = ( "aCi" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18"; icon_state = "plant-18";
pixel_y = 12 pixel_y = 12
}, },
@@ -12011,7 +12011,7 @@
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_y = 30 pixel_y = 30
}, },
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
@@ -13234,7 +13234,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/crew_quarters/heads/hop) /area/crew_quarters/heads/hop)
"aEM" = ( "aEM" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-24" icon_state = "plant-24"
}, },
/obj/structure/cable{ /obj/structure/cable{
@@ -13916,7 +13916,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/captain) /area/crew_quarters/heads/captain)
"aGn" = ( "aGn" = (
/obj/item/twohanded/required/kirbyplants/photosynthetic{ /obj/item/kirbyplants/photosynthetic{
layer = 3.1 layer = 3.1
}, },
/obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/fulltile,
@@ -15468,7 +15468,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"aKg" = ( "aKg" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-04" icon_state = "plant-04"
}, },
/turf/open/floor/plasteel/white/corner{ /turf/open/floor/plasteel/white/corner{
@@ -16031,7 +16031,7 @@
/obj/machinery/airalarm{ /obj/machinery/airalarm{
pixel_y = 22 pixel_y = 22
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -17480,13 +17480,13 @@
/obj/machinery/light/small{ /obj/machinery/light/small{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/department/crew_quarters/bar) /area/maintenance/department/crew_quarters/bar)
"aPy" = ( "aPy" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plating{ /turf/open/floor/plating{
@@ -21277,7 +21277,7 @@
/area/crew_quarters/bar) /area/crew_quarters/bar)
"aYe" = ( "aYe" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18"; icon_state = "plant-18";
pixel_y = 10 pixel_y = 10
}, },
@@ -21326,7 +21326,7 @@
"aYi" = ( "aYi" = (
/obj/structure/table/reinforced, /obj/structure/table/reinforced,
/obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18"; icon_state = "plant-18";
pixel_y = 10 pixel_y = 10
}, },
@@ -21777,7 +21777,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/kitchen) /area/crew_quarters/kitchen)
"aYY" = ( "aYY" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -22808,7 +22808,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hydroponics) /area/hydroponics)
"bbd" = ( "bbd" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
@@ -24508,7 +24508,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"bfp" = ( "bfp" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/button/door{ /obj/machinery/button/door{
@@ -24949,7 +24949,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/crew_quarters/bar) /area/crew_quarters/bar)
"bgv" = ( "bgv" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-14" icon_state = "plant-14"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -25911,7 +25911,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"biP" = ( "biP" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
@@ -26030,7 +26030,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/medical/medbay/central) /area/medical/medbay/central)
"bji" = ( "bji" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
@@ -26083,7 +26083,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"bjn" = ( "bjn" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple,
@@ -27332,7 +27332,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/security/checkpoint/medical) /area/security/checkpoint/medical)
"bmw" = ( "bmw" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05" icon_state = "plant-05"
}, },
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
@@ -27711,7 +27711,7 @@
dir = 8; dir = 8;
pixel_x = 28 pixel_x = 28
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-11" icon_state = "plant-11"
}, },
/obj/machinery/light/small{ /obj/machinery/light/small{
@@ -27962,7 +27962,7 @@
/turf/open/floor/engine, /turf/open/floor/engine,
/area/science/explab) /area/science/explab)
"bnZ" = ( "bnZ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -28330,7 +28330,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/hallway/primary/aft) /area/hallway/primary/aft)
"boT" = ( "boT" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/bot, /obj/effect/turf_decal/bot,
@@ -28357,7 +28357,7 @@
dir = 1 dir = 1
}, },
/obj/machinery/light, /obj/machinery/light,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -30326,7 +30326,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/aft) /area/hallway/primary/aft)
"bsW" = ( "bsW" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
@@ -30715,7 +30715,7 @@
/turf/open/floor/grass, /turf/open/floor/grass,
/area/medical/genetics) /area/medical/genetics)
"btU" = ( "btU" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
@@ -30980,7 +30980,7 @@
/area/science/robotics/lab) /area/science/robotics/lab)
"buw" = ( "buw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/twohanded/required/kirbyplants/photosynthetic{ /obj/item/kirbyplants/photosynthetic{
pixel_y = 10 pixel_y = 10
}, },
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
@@ -30999,7 +30999,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/science/explab) /area/science/explab)
"buy" = ( "buy" = (
/obj/item/twohanded/required/kirbyplants/photosynthetic{ /obj/item/kirbyplants/photosynthetic{
pixel_y = 10 pixel_y = 10
}, },
/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple,
@@ -31038,7 +31038,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/science/explab) /area/science/explab)
"buD" = ( "buD" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-11" icon_state = "plant-11"
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden{ /obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -33011,7 +33011,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants/photosynthetic{ /obj/item/kirbyplants/photosynthetic{
pixel_y = 4 pixel_y = 4
}, },
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -33403,7 +33403,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/genetics) /area/medical/genetics)
"bzM" = ( "bzM" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
@@ -34198,7 +34198,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/hor) /area/crew_quarters/heads/hor)
"bBu" = ( "bBu" = (
/obj/item/twohanded/required/kirbyplants/dead, /obj/item/kirbyplants/dead,
/obj/structure/disposalpipe/segment{ /obj/structure/disposalpipe/segment{
dir = 10 dir = 10
}, },
@@ -34295,7 +34295,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/aft) /area/hallway/primary/aft)
"bBB" = ( "bBB" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-20"; icon_state = "plant-20";
pixel_y = 3 pixel_y = 3
}, },
@@ -35995,7 +35995,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/crew_quarters/heads/cmo) /area/crew_quarters/heads/cmo)
"bEH" = ( "bEH" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-16" icon_state = "plant-16"
}, },
/obj/machinery/light_switch{ /obj/machinery/light_switch{
@@ -38239,7 +38239,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/maintenance/department/engine) /area/maintenance/department/engine)
"bJi" = ( "bJi" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -39421,7 +39421,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/aft) /area/hallway/primary/aft)
"bLT" = ( "bLT" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "applebush" icon_state = "applebush"
}, },
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -40327,7 +40327,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/medical/virology) /area/medical/virology)
"bNR" = ( "bNR" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
@@ -42444,7 +42444,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/aft) /area/hallway/primary/aft)
"bSP" = ( "bSP" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-02" icon_state = "plant-02"
}, },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -44961,7 +44961,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/department/engine) /area/maintenance/department/engine)
"bYI" = ( "bYI" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_y = 3 pixel_y = 3
}, },
@@ -45728,7 +45728,7 @@
/area/engine/engineering) /area/engine/engineering)
"caw" = ( "caw" = (
/obj/structure/table, /obj/structure/table,
/obj/item/twohanded/rcl/pre_loaded, /obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/engine/engineering) /area/engine/engineering)
"cax" = ( "cax" = (
@@ -46861,7 +46861,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/chapel/main/monastery) /area/chapel/main/monastery)
"ceK" = ( "ceK" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-08" icon_state = "plant-08"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -48018,7 +48018,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/department/chapel/monastery) /area/maintenance/department/chapel/monastery)
"cjP" = ( "cjP" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/item/radio/intercom{ /obj/item/radio/intercom{
@@ -49774,7 +49774,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"cpT" = ( "cpT" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{ /obj/effect/turf_decal/tile/blue{
dir = 8 dir = 8
@@ -49782,7 +49782,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/central) /area/hallway/primary/central)
"cpU" = ( "cpU" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 8 dir = 8
@@ -49979,7 +49979,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/primary/aft) /area/hallway/primary/aft)
"cqE" = ( "cqE" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-18"; icon_state = "plant-18";
layer = 3 layer = 3
}, },
@@ -50631,7 +50631,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -50723,7 +50723,7 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -51274,7 +51274,7 @@
icon_state = "1-4" icon_state = "1-4"
}, },
/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -51533,7 +51533,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/department/chapel/monastery) /area/maintenance/department/chapel/monastery)
"cwr" = ( "cwr" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/structure/cable{ /obj/structure/cable{
@@ -51978,7 +51978,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/library) /area/library)
"cyQ" = ( "cyQ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/camera{ /obj/machinery/camera{
@@ -51991,7 +51991,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/library) /area/library)
"cyR" = ( "cyR" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -52243,7 +52243,7 @@
/area/library) /area/library)
"cAs" = ( "cAs" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05"; icon_state = "plant-05";
pixel_y = 10 pixel_y = 10
}, },
@@ -53006,7 +53006,7 @@
}, },
/area/hallway/secondary/exit/departure_lounge) /area/hallway/secondary/exit/departure_lounge)
"dpb" = ( "dpb" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_y = 3 pixel_y = 3
}, },
@@ -54227,7 +54227,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/department/security/brig) /area/maintenance/department/security/brig)
"gkR" = ( "gkR" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_y = 30 pixel_y = 30
}, },
@@ -54526,7 +54526,7 @@
/area/science/xenobiology) /area/science/xenobiology)
"gKz" = ( "gKz" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22"; icon_state = "plant-22";
pixel_y = 8 pixel_y = 8
}, },
@@ -55664,7 +55664,7 @@
/obj/structure/sign/plaques/deempisi{ /obj/structure/sign/plaques/deempisi{
pixel_y = 28 pixel_y = 28
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_y = 3 pixel_y = 3
}, },
@@ -56122,7 +56122,7 @@
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/lawoffice) /area/lawoffice)
"kxs" = ( "kxs" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -56433,7 +56433,7 @@
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -57428,7 +57428,7 @@
/turf/open/floor/plasteel/white/corner, /turf/open/floor/plasteel/white/corner,
/area/hallway/primary/central) /area/hallway/primary/central)
"nyO" = ( "nyO" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/light/small{ /obj/machinery/light/small{
@@ -57668,7 +57668,7 @@
/turf/open/floor/engine, /turf/open/floor/engine,
/area/engine/supermatter) /area/engine/supermatter)
"nVU" = ( "nVU" = (
/obj/item/twohanded/spear, /obj/item/spear,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/department/engine) /area/maintenance/department/engine)
"nWP" = ( "nWP" = (
@@ -58653,7 +58653,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/science/xenobiology) /area/science/xenobiology)
"pXT" = ( "pXT" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/obj/machinery/power/apc{ /obj/machinery/power/apc{
areastring = "/area/lawoffice"; areastring = "/area/lawoffice";
dir = 8; dir = 8;
@@ -58668,7 +58668,7 @@
/turf/closed/wall/r_wall, /turf/closed/wall/r_wall,
/area/engine/engineering) /area/engine/engineering)
"pYw" = ( "pYw" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-03" icon_state = "plant-03"
}, },
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
_maps/map_files/debug/multiz.dmm
+1 -1
View File
@@ -1300,7 +1300,7 @@
"dO" = ( "dO" = (
/obj/structure/table, /obj/structure/table,
/obj/machinery/light, /obj/machinery/light,
/obj/item/twohanded/fireaxe, /obj/item/fireaxe,
/obj/item/extinguisher, /obj/item/extinguisher,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/storage/primary) /area/storage/primary)
_maps/map_files/generic/CentCom.dmm
+62 -62
View File
@@ -58,7 +58,7 @@
/obj/structure/table/wood{ /obj/structure/table/wood{
layer = 3.3 layer = 3.3
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05"; icon_state = "plant-05";
pixel_y = 4 pixel_y = 4
}, },
@@ -294,7 +294,7 @@
/area/holodeck/rec_center/winterwonderland) /area/holodeck/rec_center/winterwonderland)
"aT" = ( "aT" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-05"; icon_state = "plant-05";
pixel_y = 10 pixel_y = 10
}, },
@@ -1686,19 +1686,19 @@
/obj/item/melee/chainofcommand{ /obj/item/melee/chainofcommand{
name = "chain whip" name = "chain whip"
}, },
/obj/item/twohanded/spear, /obj/item/spear,
/turf/open/floor/holofloor/asteroid, /turf/open/floor/holofloor/asteroid,
/area/holodeck/rec_center/thunderdome1218) /area/holodeck/rec_center/thunderdome1218)
"ez" = ( "ez" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/scythe, /obj/item/scythe,
/obj/item/twohanded/spear, /obj/item/spear,
/turf/open/floor/holofloor/asteroid, /turf/open/floor/holofloor/asteroid,
/area/holodeck/rec_center/thunderdome1218) /area/holodeck/rec_center/thunderdome1218)
"eA" = ( "eA" = (
/obj/structure/table/wood, /obj/structure/table/wood,
/obj/item/tailclub, /obj/item/tailclub,
/obj/item/twohanded/spear, /obj/item/spear,
/turf/open/floor/holofloor/asteroid, /turf/open/floor/holofloor/asteroid,
/area/holodeck/rec_center/thunderdome1218) /area/holodeck/rec_center/thunderdome1218)
"eB" = ( "eB" = (
@@ -2916,11 +2916,11 @@
/turf/open/floor/circuit/green/anim, /turf/open/floor/circuit/green/anim,
/area/ctf) /area/ctf)
"hE" = ( "hE" = (
/obj/item/twohanded/ctf/blue, /obj/item/ctf/blue,
/turf/open/floor/circuit/green/anim, /turf/open/floor/circuit/green/anim,
/area/ctf) /area/ctf)
"hF" = ( "hF" = (
/obj/item/twohanded/ctf/red, /obj/item/ctf/red,
/turf/open/floor/circuit/green/anim, /turf/open/floor/circuit/green/anim,
/area/ctf) /area/ctf)
"hG" = ( "hG" = (
@@ -4002,7 +4002,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/control) /area/centcom/control)
"ke" = ( "ke" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -4106,7 +4106,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/supply) /area/centcom/supply)
"kk" = ( "kk" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -4211,7 +4211,7 @@
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/centcom/control) /area/centcom/control)
"kB" = ( "kB" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/firealarm{ /obj/machinery/firealarm{
@@ -4234,7 +4234,7 @@
/obj/structure/window/reinforced{ /obj/structure/window/reinforced{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
@@ -4243,7 +4243,7 @@
/obj/structure/window/reinforced{ /obj/structure/window/reinforced{
dir = 1 dir = 1
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
@@ -4284,13 +4284,13 @@
/obj/structure/window/reinforced{ /obj/structure/window/reinforced{
dir = 8 dir = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/centcom/control) /area/centcom/control)
"kJ" = ( "kJ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/airalarm{ /obj/machinery/airalarm{
@@ -4733,7 +4733,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"lQ" = ( "lQ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/firealarm{ /obj/machinery/firealarm{
@@ -5168,7 +5168,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"mL" = ( "mL" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -5180,7 +5180,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"mM" = ( "mM" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -5957,7 +5957,7 @@
/obj/machinery/status_display/ai{ /obj/machinery/status_display/ai{
pixel_y = 32 pixel_y = 32
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-15"; icon_state = "plant-15";
pixel_x = -6; pixel_x = -6;
pixel_y = 12 pixel_y = 12
@@ -6171,7 +6171,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"oy" = ( "oy" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -6517,7 +6517,7 @@
/turf/open/floor/plasteel/grimy, /turf/open/floor/plasteel/grimy,
/area/centcom/ferry) /area/centcom/ferry)
"ph" = ( "ph" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/light{ /obj/machinery/light{
@@ -6751,7 +6751,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/control) /area/centcom/control)
"pw" = ( "pw" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
@@ -6998,13 +6998,13 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/ferry) /area/centcom/ferry)
"qd" = ( "qd" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/wood, /turf/open/floor/wood,
/area/centcom/ferry) /area/centcom/ferry)
"qe" = ( "qe" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/light_switch{ /obj/machinery/light_switch{
@@ -7525,7 +7525,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/ferry) /area/centcom/ferry)
"rt" = ( "rt" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/newscaster{ /obj/machinery/newscaster{
@@ -7550,7 +7550,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/centcom/ferry) /area/centcom/ferry)
"rv" = ( "rv" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/light{ /obj/machinery/light{
@@ -7732,7 +7732,7 @@
/turf/open/floor/grass, /turf/open/floor/grass,
/area/centcom/control) /area/centcom/control)
"rL" = ( "rL" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
@@ -8611,7 +8611,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/ferry) /area/centcom/ferry)
"tJ" = ( "tJ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -8650,7 +8650,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"tO" = ( "tO" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -8667,7 +8667,7 @@
/turf/closed/indestructible/riveted, /turf/closed/indestructible/riveted,
/area/centcom/evac) /area/centcom/evac)
"tS" = ( "tS" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -9109,7 +9109,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/ferry) /area/centcom/ferry)
"uT" = ( "uT" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -9139,7 +9139,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/ferry) /area/centcom/ferry)
"uV" = ( "uV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -10077,7 +10077,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/centcom/ferry) /area/centcom/ferry)
"xi" = ( "xi" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/delivery, /obj/effect/turf_decal/delivery,
@@ -10147,7 +10147,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"xp" = ( "xp" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -10159,7 +10159,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"xq" = ( "xq" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
@@ -10178,7 +10178,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/centcom/evac) /area/centcom/evac)
"xs" = ( "xs" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/stripes/line{ /obj/effect/turf_decal/stripes/line{
@@ -10741,7 +10741,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/ferry) /area/centcom/ferry)
"zd" = ( "zd" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/light{ /obj/machinery/light{
@@ -11247,7 +11247,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/ferry) /area/centcom/ferry)
"Am" = ( "Am" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
@@ -11268,7 +11268,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"Ap" = ( "Ap" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue,
@@ -11541,7 +11541,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/evac) /area/centcom/evac)
"Ba" = ( "Ba" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line,
@@ -12161,7 +12161,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/ferry) /area/centcom/ferry)
"Cw" = ( "Cw" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/power/apc{ /obj/machinery/power/apc{
@@ -12198,7 +12198,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/ferry) /area/centcom/ferry)
"Cy" = ( "Cy" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/machinery/light, /obj/machinery/light,
@@ -12219,7 +12219,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/ferry) /area/centcom/ferry)
"Cz" = ( "Cz" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
@@ -12616,7 +12616,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/evac) /area/centcom/evac)
"Df" = ( "Df" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
@@ -13008,7 +13008,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/centcom/control) /area/centcom/control)
"DV" = ( "DV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -13017,7 +13017,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/centcom/control) /area/centcom/control)
"DW" = ( "DW" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
@@ -13571,7 +13571,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Fs" = ( "Fs" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -13585,7 +13585,7 @@
}, },
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Fu" = ( "Fu" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
@@ -13670,7 +13670,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"FG" = ( "FG" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red,
@@ -13750,7 +13750,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"FQ" = ( "FQ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -13848,7 +13848,7 @@
}, },
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Gg" = ( "Gg" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -13862,7 +13862,7 @@
}, },
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Gh" = ( "Gh" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
@@ -13871,7 +13871,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Gi" = ( "Gi" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/red{ /obj/effect/turf_decal/tile/red{
@@ -13884,7 +13884,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Gj" = ( "Gj" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red,
@@ -13913,7 +13913,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Gn" = ( "Gn" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
@@ -13923,7 +13923,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Go" = ( "Go" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
@@ -13936,7 +13936,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Gp" = ( "Gp" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -14876,7 +14876,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"HZ" = ( "HZ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
@@ -14966,7 +14966,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeobserve) /area/tdome/tdomeobserve)
"Ig" = ( "Ig" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -15790,7 +15790,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/tdome/tdomeadmin) /area/tdome/tdomeadmin)
"JZ" = ( "JZ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/firealarm{ /obj/machinery/firealarm{
@@ -15822,7 +15822,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/tdome/tdomeadmin) /area/tdome/tdomeadmin)
"Kc" = ( "Kc" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -17577,7 +17577,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/centcom/holding) /area/centcom/holding)
"RQ" = ( "RQ" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -18850,7 +18850,7 @@
/turf/open/indestructible/binary, /turf/open/indestructible/binary,
/area/space) /area/space)
"Zh" = ( "Zh" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/indestructible/hotelwood, /turf/open/indestructible/hotelwood,
_maps/shuttles/arrival_delta.dmm
+4 -4
View File
@@ -203,7 +203,7 @@
/obj/machinery/status_display/evac{ /obj/machinery/status_display/evac{
pixel_x = -32 pixel_x = -32
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -226,7 +226,7 @@
/obj/machinery/status_display/ai{ /obj/machinery/status_display/ai{
pixel_x = 32 pixel_x = 32
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
@@ -277,7 +277,7 @@
/turf/closed/wall/mineral/titanium, /turf/closed/wall/mineral/titanium,
/area/shuttle/arrival) /area/shuttle/arrival)
"A" = ( "A" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -312,7 +312,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/arrival) /area/shuttle/arrival)
"E" = ( "E" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
_maps/shuttles/arrival_omega.dmm
+1 -1
View File
@@ -138,7 +138,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/arrival) /area/shuttle/arrival)
"o" = ( "o" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
dir = 1 dir = 1
}, },
_maps/shuttles/emergency_bar.dmm
+4 -4
View File
@@ -175,7 +175,7 @@
pixel_x = 6; pixel_x = 6;
pixel_y = 24 pixel_y = 24
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -385,7 +385,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/escape) /area/shuttle/escape)
"bc" = ( "bc" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -424,7 +424,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/escape) /area/shuttle/escape)
"bg" = ( "bg" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar,
@@ -557,7 +557,7 @@
/turf/open/floor/plating/airless, /turf/open/floor/plating/airless,
/area/shuttle/escape) /area/shuttle/escape)
"bG" = ( "bG" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
_maps/shuttles/emergency_birdboat.dmm
+2 -2
View File
@@ -47,7 +47,7 @@
/turf/open/floor/mineral/titanium/blue, /turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape) /area/shuttle/escape)
"k" = ( "k" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/mineral/titanium/blue, /turf/open/floor/mineral/titanium/blue,
@@ -144,7 +144,7 @@
/turf/open/floor/mineral/titanium/white, /turf/open/floor/mineral/titanium/white,
/area/shuttle/escape) /area/shuttle/escape)
"B" = ( "B" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/mineral/titanium, /turf/open/floor/mineral/titanium,
_maps/shuttles/emergency_cere.dmm
+4 -4
View File
@@ -420,7 +420,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/shuttle/escape) /area/shuttle/escape)
"aM" = ( "aM" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/item/radio/intercom{ /obj/item/radio/intercom{
@@ -446,7 +446,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/shuttle/escape) /area/shuttle/escape)
"aP" = ( "aP" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/item/radio/intercom{ /obj/item/radio/intercom{
@@ -968,7 +968,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/escape) /area/shuttle/escape)
"ca" = ( "ca" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -994,7 +994,7 @@
/obj/machinery/light{ /obj/machinery/light{
dir = 4 dir = 4
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
_maps/shuttles/emergency_delta.dmm
+6 -6
View File
@@ -167,7 +167,7 @@
/turf/open/floor/plasteel/white, /turf/open/floor/plasteel/white,
/area/shuttle/escape) /area/shuttle/escape)
"an" = ( "an" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -196,7 +196,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/escape) /area/shuttle/escape)
"ap" = ( "ap" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -800,7 +800,7 @@
/turf/open/floor/mineral/plastitanium/red/brig, /turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape) /area/shuttle/escape)
"bz" = ( "bz" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/machinery/button/flasher{ /obj/machinery/button/flasher{
@@ -814,7 +814,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/escape) /area/shuttle/escape)
"bA" = ( "bA" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21" icon_state = "plant-21"
}, },
/obj/effect/turf_decal/tile/neutral{ /obj/effect/turf_decal/tile/neutral{
@@ -1018,7 +1018,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/shuttle/escape) /area/shuttle/escape)
"cb" = ( "cb" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -1338,7 +1338,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/escape) /area/shuttle/escape)
"cA" = ( "cA" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
_maps/shuttles/emergency_imfedupwiththisworld.dmm
+1 -1
View File
@@ -155,7 +155,7 @@
/turf/open/floor/carpet, /turf/open/floor/carpet,
/area/shuttle/escape) /area/shuttle/escape)
"y" = ( "y" = (
/obj/item/twohanded/required/kirbyplants, /obj/item/kirbyplants,
/turf/open/floor/wood, /turf/open/floor/wood,
/area/shuttle/escape) /area/shuttle/escape)
"z" = ( "z" = (
_maps/shuttles/emergency_luxury.dmm
+5 -5
View File
@@ -305,7 +305,7 @@
/turf/open/floor/carpet/royalblue, /turf/open/floor/carpet/royalblue,
/area/shuttle/escape/luxury) /area/shuttle/escape/luxury)
"bg" = ( "bg" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/carpet/red, /turf/open/floor/carpet/red,
@@ -320,7 +320,7 @@
/turf/open/floor/carpet/royalblue, /turf/open/floor/carpet/royalblue,
/area/shuttle/escape/luxury) /area/shuttle/escape/luxury)
"bj" = ( "bj" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -328,13 +328,13 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/shuttle/escape/luxury) /area/shuttle/escape/luxury)
"bk" = ( "bk" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/carpet/royalblue, /turf/open/floor/carpet/royalblue,
/area/shuttle/escape/luxury) /area/shuttle/escape/luxury)
"bl" = ( "bl" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -437,7 +437,7 @@
dir = 4; dir = 4;
light_range = 8 light_range = 8
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-10" icon_state = "plant-10"
}, },
/turf/open/floor/carpet/red, /turf/open/floor/carpet/red,
_maps/shuttles/emergency_omega.dmm
+3 -3
View File
@@ -194,7 +194,7 @@
/turf/open/floor/mineral/plastitanium/red/brig, /turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape) /area/shuttle/escape)
"as" = ( "as" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -317,7 +317,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/escape) /area/shuttle/escape)
"aC" = ( "aC" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -530,7 +530,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/shuttle/escape) /area/shuttle/escape)
"aS" = ( "aS" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
_maps/shuttles/emergency_pubby.dmm
+3 -3
View File
@@ -110,7 +110,7 @@
/obj/machinery/computer/security/telescreen/entertainment{ /obj/machinery/computer/security/telescreen/entertainment{
pixel_y = 32 pixel_y = 32
}, },
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-21"; icon_state = "plant-21";
pixel_x = -3; pixel_x = -3;
pixel_y = 3 pixel_y = 3
@@ -183,7 +183,7 @@
/area/shuttle/escape) /area/shuttle/escape)
"aB" = ( "aB" = (
/obj/structure/window/reinforced, /obj/structure/window/reinforced,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-11" icon_state = "plant-11"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
@@ -589,7 +589,7 @@
/turf/open/floor/mineral/titanium/blue, /turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape) /area/shuttle/escape)
"bu" = ( "bu" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/mineral/plastitanium/red/brig, /turf/open/floor/mineral/plastitanium/red/brig,
_maps/shuttles/emergency_raven.dmm
+4 -4
View File
@@ -1014,7 +1014,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/shuttle/escape) /area/shuttle/escape)
"bV" = ( "bV" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -1029,7 +1029,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/shuttle/escape) /area/shuttle/escape)
"bW" = ( "bW" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -1094,7 +1094,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/shuttle/escape) /area/shuttle/escape)
"cd" = ( "cd" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/green{ /obj/effect/turf_decal/tile/green{
@@ -1107,7 +1107,7 @@
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/shuttle/escape) /area/shuttle/escape)
"ce" = ( "ce" = (
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/obj/effect/turf_decal/tile/green, /obj/effect/turf_decal/tile/green,
_maps/shuttles/emergency_scrapheap.dmm
+1 -1
View File
@@ -194,7 +194,7 @@
/turf/open/floor/mineral/plastitanium/red/brig, /turf/open/floor/mineral/plastitanium/red/brig,
/area/shuttle/escape) /area/shuttle/escape)
"aF" = ( "aF" = (
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/mineral/titanium/blue, /turf/open/floor/mineral/titanium/blue,
/area/shuttle/escape) /area/shuttle/escape)
"aG" = ( "aG" = (
_maps/shuttles/emergency_syndicate.dmm
+2 -2
View File
@@ -1351,7 +1351,7 @@
dir = 1 dir = 1
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
@@ -1842,7 +1842,7 @@
dir = 1 dir = 1
}, },
/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral,
/obj/item/twohanded/required/kirbyplants{ /obj/item/kirbyplants{
icon_state = "plant-22" icon_state = "plant-22"
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
_maps/shuttles/ferry_lighthouse.dmm
+1 -1
View File
@@ -236,7 +236,7 @@
/turf/open/floor/wood, /turf/open/floor/wood,
/area/shuttle/transport) /area/shuttle/transport)
"bd" = ( "bd" = (
/obj/item/twohanded/required/kirbyplants/dead{ /obj/item/kirbyplants/dead{
desc = "It doesn't look very healthy..."; desc = "It doesn't look very healthy...";
name = "potted plant" name = "potted plant"
}, },
_maps/templates/shelter_2.dmm
+1 -1
View File
@@ -93,7 +93,7 @@
/area/survivalpod) /area/survivalpod)
"q" = ( "q" = (
/obj/structure/tubes, /obj/structure/tubes,
/obj/item/twohanded/required/kirbyplants/random, /obj/item/kirbyplants/random,
/turf/open/floor/pod, /turf/open/floor/pod,
/area/survivalpod) /area/survivalpod)
"r" = ( "r" = (
code/__DEFINES/dcs/signals.dm
+16 -3
View File
@@ -191,8 +191,8 @@
#define COMSIG_MOB_ANTAG_ON_GAIN "mob_antag_on_gain" //from base of /datum/antagonist/on_gain(): (antag_datum) #define COMSIG_MOB_ANTAG_ON_GAIN "mob_antag_on_gain" //from base of /datum/antagonist/on_gain(): (antag_datum)
#define COMSIG_MOB_SPELL_CAN_CAST "mob_spell_can_cast" //from base of /obj/effect/proc_holder/spell/can_cast(): (spell) #define COMSIG_MOB_SPELL_CAN_CAST "mob_spell_can_cast" //from base of /obj/effect/proc_holder/spell/can_cast(): (spell)
#define COMSIG_MOB_SWAP_HANDS "mob_swap_hands" //from base of mob/swap_hand(): (obj/item)
#define COMSIG_ROBOT_UPDATE_ICONS "robot_update_icons" //from base of robot/update_icons(): () #define COMPONENT_BLOCK_SWAP 1
// /mob/living signals // /mob/living signals
#define COMSIG_LIVING_REGENERATE_LIMBS "living_regenerate_limbs" //from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs) #define COMSIG_LIVING_REGENERATE_LIMBS "living_regenerate_limbs" //from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs)
@@ -235,6 +235,9 @@
#define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget" #define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget"
#define COMPONENT_HOSTILE_NO_ATTACK 1 #define COMPONENT_HOSTILE_NO_ATTACK 1
// /mob/living/silicon signals
#define COMSIG_ROBOT_UPDATE_ICONS "robot_update_icons" //from base of robot/update_icons(): ()
// /obj signals // /obj signals
#define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct" //from base of obj/deconstruct(): (disassembled) #define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct" //from base of obj/deconstruct(): (disassembled)
#define COMSIG_OBJ_BREAK "obj_break" //from base of /obj/obj_break(): (damage_flag) #define COMSIG_OBJ_BREAK "obj_break" //from base of /obj/obj_break(): (damage_flag)
@@ -264,7 +267,12 @@
#define COMSIG_ITEM_ATTACK_ZONE "item_attack_zone" //from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone) #define COMSIG_ITEM_ATTACK_ZONE "item_attack_zone" //from base of mob/living/carbon/attacked_by(): (mob/living/carbon/target, mob/living/user, hit_zone)
#define COMSIG_ITEM_IMBUE_SOUL "item_imbue_soul" //return a truthy value to prevent ensouling, checked in /obj/effect/proc_holder/spell/targeted/lichdom/cast(): (mob/user) #define COMSIG_ITEM_IMBUE_SOUL "item_imbue_soul" //return a truthy value to prevent ensouling, checked in /obj/effect/proc_holder/spell/targeted/lichdom/cast(): (mob/user)
#define COMSIG_ITEM_HIT_REACT "item_hit_react" //from base of obj/item/hit_reaction(): (list/args) #define COMSIG_ITEM_HIT_REACT "item_hit_react" //from base of obj/item/hit_reaction(): (list/args)
#define COMSIG_ITEM_WEARERCROSSED "wearer_crossed" //called on item when crossed by something (): (/atom/movable) #define COMSIG_ITEM_WEARERCROSSED "wearer_crossed" //called on item when crossed by something (): (/atom/movable)
#define COMSIG_ITEM_SHARPEN_ACT "sharpen_act" //from base of item/sharpener/attackby(): (amount, max)
#define COMPONENT_BLOCK_SHARPEN_APPLIED 1
#define COMPONENT_BLOCK_SHARPEN_BLOCKED 2
#define COMPONENT_BLOCK_SHARPEN_ALREADY 4
#define COMPONENT_BLOCK_SHARPEN_MAXED 8
#define COMSIG_ITEM_WORN_OVERLAYS "item_worn_overlays" //from base of obj/item/worn_overlays(): (isinhands, icon_file, used_state, style_flags, list/overlays) #define COMSIG_ITEM_WORN_OVERLAYS "item_worn_overlays" //from base of obj/item/worn_overlays(): (isinhands, icon_file, used_state, style_flags, list/overlays)
// THE FOLLOWING TWO BLOCKS SHOULD RETURN BLOCK FLAGS AS DEFINED IN __DEFINES/combat.dm! // THE FOLLOWING TWO BLOCKS SHOULD RETURN BLOCK FLAGS AS DEFINED IN __DEFINES/combat.dm!
#define COMSIG_ITEM_CHECK_BLOCK "check_block" //from base of obj/item/check_block(): (mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) #define COMSIG_ITEM_CHECK_BLOCK "check_block" //from base of obj/item/check_block(): (mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
@@ -375,6 +383,11 @@
#define COMSIG_TRY_STORAGE_RETURN_INVENTORY "storage_return_inventory" //(list/list_to_inject_results_into, recursively_search_inside_storages = TRUE) #define COMSIG_TRY_STORAGE_RETURN_INVENTORY "storage_return_inventory" //(list/list_to_inject_results_into, recursively_search_inside_storages = TRUE)
#define COMSIG_TRY_STORAGE_CAN_INSERT "storage_can_equip" //(obj/item/insertion_candidate, mob/user, silent) - returns bool #define COMSIG_TRY_STORAGE_CAN_INSERT "storage_can_equip" //(obj/item/insertion_candidate, mob/user, silent) - returns bool
// /datum/component/two_handed signals
#define COMSIG_TWOHANDED_WIELD "twohanded_wield" //from base of datum/component/two_handed/proc/wield(mob/living/carbon/user): (/mob/user)
#define COMPONENT_TWOHANDED_BLOCK_WIELD 1
#define COMSIG_TWOHANDED_UNWIELD "twohanded_unwield" //from base of datum/component/two_handed/proc/unwield(mob/living/carbon/user): (/mob/user)
// /datum/action signals // /datum/action signals
#define COMSIG_ACTION_TRIGGER "action_trigger" //from base of datum/action/proc/Trigger(): (datum/action) #define COMSIG_ACTION_TRIGGER "action_trigger" //from base of datum/action/proc/Trigger(): (datum/action)
#define COMPONENT_ACTION_BLOCK_TRIGGER 1 #define COMPONENT_ACTION_BLOCK_TRIGGER 1
code/__DEFINES/misc.dm
+1 -1
View File
@@ -457,7 +457,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
#define EGG_LAYING_MESSAGES list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.") #define EGG_LAYING_MESSAGES list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")
// list of all null rod weapons // list of all null rod weapons
#define HOLY_WEAPONS /obj/item/nullrod, /obj/item/twohanded/dualsaber/hypereutactic/chaplain, /obj/item/gun/energy/laser/redtag/hitscan/chaplain, /obj/item/multitool/chaplain, /obj/item/clothing/gloves/fingerless/pugilist/chaplain, /obj/item/melee/baseball_bat/chaplain #define HOLY_WEAPONS /obj/item/nullrod, /obj/item/dualsaber/hypereutactic/chaplain, /obj/item/gun/energy/laser/redtag/hitscan/chaplain, /obj/item/multitool/chaplain, /obj/item/clothing/gloves/fingerless/pugilist/chaplain, /obj/item/melee/baseball_bat/chaplain
// Used by PDA and cartridge code to reduce repetitiveness of spritesheets // Used by PDA and cartridge code to reduce repetitiveness of spritesheets
#define PDAIMG(what) {"<span class="pda16x16 [#what]"></span>"} #define PDAIMG(what) {"<span class="pda16x16 [#what]"></span>"}
code/controllers/subsystem/traumas.dm
+5 -5
View File
@@ -79,7 +79,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/pda/clown, /obj/item/grown/bananapeel)), /obj/item/pda/clown, /obj/item/grown/bananapeel)),
"greytide" = typecacheof(list(/obj/item/clothing/under/color/grey, /obj/item/melee/baton/cattleprod, "greytide" = typecacheof(list(/obj/item/clothing/under/color/grey, /obj/item/melee/baton/cattleprod,
/obj/item/twohanded/spear, /obj/item/clothing/mask/gas)), /obj/item/spear, /obj/item/clothing/mask/gas)),
"lizards" = typecacheof(list(/obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail, "lizards" = typecacheof(list(/obj/item/toy/plush/lizardplushie, /obj/item/reagent_containers/food/snacks/kebab/tail,
/obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)), /obj/item/organ/tail/lizard, /obj/item/reagent_containers/food/drinks/bottle/lizardwine)),
@@ -120,7 +120,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)), /obj/item/card/id/captains_spare, /obj/item/card/id/centcom, /obj/machinery/door/airlock/command)),
"the supernatural" = typecacheof(list(/obj/structure/destructible/cult, /obj/item/tome, "the supernatural" = typecacheof(list(/obj/structure/destructible/cult, /obj/item/tome,
/obj/item/melee/cultblade, /obj/item/twohanded/required/cult_bastard, /obj/item/restraints/legcuffs/bola/cult, /obj/item/melee/cultblade, /obj/item/cult_bastard, /obj/item/restraints/legcuffs/bola/cult,
/obj/item/clothing/suit/cultrobes, /obj/item/clothing/suit/space/hardsuit/cult, /obj/item/clothing/suit/cultrobes, /obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune, /obj/item/clothing/suit/hooded/cultrobes, /obj/item/clothing/head/hooded/cult_hoodie, /obj/effect/rune,
/obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie, /obj/item/stack/sheet/runed_metal, /obj/machinery/door/airlock/cult, /obj/singularity/narsie,
@@ -151,7 +151,7 @@ SUBSYSTEM_DEF(traumas)
"anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi, "anime" = typecacheof(list(/obj/item/clothing/under/costume/schoolgirl, /obj/item/katana, /obj/item/reagent_containers/food/snacks/sashimi, /obj/item/reagent_containers/food/snacks/chawanmushi,
/obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja, /obj/item/reagent_containers/food/drinks/bottle/sake, /obj/item/throwing_star, /obj/item/clothing/head/kitty/genuine, /obj/item/clothing/suit/space/space_ninja,
/obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/twohanded/vibro_weapon, /obj/item/clothing/mask/gas/space_ninja, /obj/item/clothing/shoes/space_ninja, /obj/item/clothing/gloves/space_ninja, /obj/item/vibro_weapon,
/obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe)), /obj/item/nullrod/scythe/vibro, /obj/item/energy_katana, /obj/item/toy/katana, /obj/item/nullrod/claymore/katana, /obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe)),
"mimes" = typecacheof(list(/obj/item/pda/mime, /obj/item/clothing/under/rank/civilian/mime, /obj/item/clothing/mask/gas/mime, "mimes" = typecacheof(list(/obj/item/pda/mime, /obj/item/clothing/under/rank/civilian/mime, /obj/item/clothing/mask/gas/mime,
@@ -168,7 +168,7 @@ SUBSYSTEM_DEF(traumas)
/obj/machinery/porta_turret/syndicate, /obj/structure/closet/syndicate, /obj/machinery/suit_storage_unit/syndicate, /obj/item/clothing/under/syndicate, /obj/item/folder/syndicate, /obj/item/documents/syndicate, /obj/item/clothing/glasses/phantomthief/syndicate, /obj/item/antag_spawner/nuke_ops, /obj/item/storage/box/syndicate, /obj/machinery/porta_turret/syndicate, /obj/structure/closet/syndicate, /obj/machinery/suit_storage_unit/syndicate, /obj/item/clothing/under/syndicate, /obj/item/folder/syndicate, /obj/item/documents/syndicate, /obj/item/clothing/glasses/phantomthief/syndicate, /obj/item/antag_spawner/nuke_ops, /obj/item/storage/box/syndicate,
/obj/structure/fluff/empty_sleeper/syndicate, /obj/item/implant/radio/syndicate, /obj/item/clothing/head/helmet/space/syndicate, /obj/machinery/nuclearbomb/syndicate, /obj/item/grenade/syndieminibomb, /obj/item/storage/backpack/duffelbag/syndie, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/structure/fluff/empty_sleeper/syndicate, /obj/item/implant/radio/syndicate, /obj/item/clothing/head/helmet/space/syndicate, /obj/machinery/nuclearbomb/syndicate, /obj/item/grenade/syndieminibomb, /obj/item/storage/backpack/duffelbag/syndie, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver,
/obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow, /obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow,
/obj/item/melee/transforming/energy/sword/saber, /obj/item/twohanded/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm, /obj/item/melee/transforming/energy/sword/saber, /obj/item/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm195x129, /obj/item/antag_spawner/nuke_ops, /obj/mecha/combat/gygax/dark, /obj/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate, /obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm195x129, /obj/item/antag_spawner/nuke_ops, /obj/mecha/combat/gygax/dark, /obj/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate,
/obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/aiModule/syndicate, /obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/aiModule/syndicate,
/obj/item/clothing/shoes/magboots/syndie, /obj/item/powersink, /obj/item/sbeacondrop, /obj/item/sbeacondrop/bomb, /obj/item/syndicatedetonator, /obj/item/shield/energy, /obj/item/assault_pod, /obj/item/slimepotion/slime/sentience/nuclear, /obj/item/stack/telecrystal, /obj/item/jammer, /obj/item/codespeak_manual/unlimited, /obj/item/clothing/shoes/magboots/syndie, /obj/item/powersink, /obj/item/sbeacondrop, /obj/item/sbeacondrop/bomb, /obj/item/syndicatedetonator, /obj/item/shield/energy, /obj/item/assault_pod, /obj/item/slimepotion/slime/sentience/nuclear, /obj/item/stack/telecrystal, /obj/item/jammer, /obj/item/codespeak_manual/unlimited,
@@ -176,7 +176,7 @@ SUBSYSTEM_DEF(traumas)
/obj/machinery/computer/pod/old/syndicate, /obj/machinery/vending/medical/syndicate_access, /obj/item/mmi/syndie, /obj/item/target/syndicate, /obj/machinery/vending/cigarette/syndicate, /obj/item/robot_module/syndicate, /obj/item/clothing/mask/gas/syndicate, /obj/machinery/power/singularity_beacon/syndicate, /obj/item/clothing/head/syndicatefake, /obj/machinery/computer/pod/old/syndicate, /obj/machinery/vending/medical/syndicate_access, /obj/item/mmi/syndie, /obj/item/target/syndicate, /obj/machinery/vending/cigarette/syndicate, /obj/item/robot_module/syndicate, /obj/item/clothing/mask/gas/syndicate, /obj/machinery/power/singularity_beacon/syndicate, /obj/item/clothing/head/syndicatefake,
/obj/item/radio/headset/syndicate, /obj/item/gun/ballistic/automatic/pistol/antitank/syndicate, /obj/item/pda/syndicate, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/gun/ballistic/automatic/flechette, /obj/item/ammo_box/magazine/flechette, /obj/item/clothing/suit/toggle/lawyer/black/syndie, /obj/item/melee/transforming/energy/sword/cx/traitor, /obj/item/radio/headset/syndicate, /obj/item/gun/ballistic/automatic/pistol/antitank/syndicate, /obj/item/pda/syndicate, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/gun/ballistic/automatic/flechette, /obj/item/ammo_box/magazine/flechette, /obj/item/clothing/suit/toggle/lawyer/black/syndie, /obj/item/melee/transforming/energy/sword/cx/traitor,
/obj/structure/sign/poster/contraband/syndicate_pistol, /obj/structure/sign/poster/contraband/syndicate_recruitment, /obj/item/bedsheet/syndie, /obj/item/borg/upgrade/syndicate, /obj/item/tank/jetpack/oxygen/harness, /obj/item/firing_pin/implant/pindicate, /obj/item/reagent_containers/glass/bottle/traitor, /obj/item/storage/belt/military, /obj/structure/sign/poster/contraband/syndicate_pistol, /obj/structure/sign/poster/contraband/syndicate_recruitment, /obj/item/bedsheet/syndie, /obj/item/borg/upgrade/syndicate, /obj/item/tank/jetpack/oxygen/harness, /obj/item/firing_pin/implant/pindicate, /obj/item/reagent_containers/glass/bottle/traitor, /obj/item/storage/belt/military,
/obj/item/twohanded/shockpaddles/syndicate, /obj/item/clothing/mask/cigarette/syndicate, /obj/item/toy/plush/nukeplushie)), /obj/item/shockpaddles/syndicate, /obj/item/clothing/mask/cigarette/syndicate, /obj/item/toy/plush/nukeplushie)),
"eye" = typecacheof(list(/obj/item/organ/eyes, /obj/item/reagent_containers/syringe)) "eye" = typecacheof(list(/obj/item/organ/eyes, /obj/item/reagent_containers/syringe))
) )
code/datums/components/crafting/recipes/recipes_misc.dm
+1 -1
View File
@@ -244,7 +244,7 @@
/datum/crafting_recipe/rcl /datum/crafting_recipe/rcl
name = "Makeshift Rapid Cable Layer" name = "Makeshift Rapid Cable Layer"
result = /obj/item/twohanded/rcl/ghetto result = /obj/item/rcl/ghetto
time = 40 time = 40
tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH) tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH)
reqs = list(/obj/item/stack/sheet/metal = 15) reqs = list(/obj/item/stack/sheet/metal = 15)
code/datums/components/crafting/recipes/recipes_primal.dm
+6 -6
View File
@@ -50,7 +50,7 @@
/datum/crafting_recipe/bonespear /datum/crafting_recipe/bonespear
name = "Bone Spear" name = "Bone Spear"
result = /obj/item/twohanded/bonespear result = /obj/item/spear/bonespear
time = 30 time = 30
reqs = list(/obj/item/stack/sheet/bone = 4, reqs = list(/obj/item/stack/sheet/bone = 4,
/obj/item/stack/sheet/sinew = 1) /obj/item/stack/sheet/sinew = 1)
@@ -58,7 +58,7 @@
/datum/crafting_recipe/boneaxe /datum/crafting_recipe/boneaxe
name = "Bone Axe" name = "Bone Axe"
result = /obj/item/twohanded/fireaxe/boneaxe result = /obj/item/fireaxe/boneaxe
time = 50 time = 50
reqs = list(/obj/item/stack/sheet/bone = 6, reqs = list(/obj/item/stack/sheet/bone = 6,
/obj/item/stack/sheet/sinew = 3) /obj/item/stack/sheet/sinew = 3)
@@ -74,20 +74,20 @@
/datum/crafting_recipe/headpike /datum/crafting_recipe/headpike
name = "Spike Head (Glass Spear)" name = "Spike Head (Glass Spear)"
time = 65 time = 65
reqs = list(/obj/item/twohanded/spear = 1, reqs = list(/obj/item/spear = 1,
/obj/item/bodypart/head = 1) /obj/item/bodypart/head = 1)
parts = list(/obj/item/bodypart/head = 1, parts = list(/obj/item/bodypart/head = 1,
/obj/item/twohanded/spear = 1) /obj/item/spear = 1)
result = /obj/structure/headpike result = /obj/structure/headpike
category = CAT_PRIMAL category = CAT_PRIMAL
/datum/crafting_recipe/headpikebone /datum/crafting_recipe/headpikebone
name = "Spike Head (Bone Spear)" name = "Spike Head (Bone Spear)"
time = 65 time = 65
reqs = list(/obj/item/twohanded/bonespear = 1, reqs = list(/obj/item/spear/bonespear = 1,
/obj/item/bodypart/head = 1) /obj/item/bodypart/head = 1)
parts = list(/obj/item/bodypart/head = 1, parts = list(/obj/item/bodypart/head = 1,
/obj/item/twohanded/bonespear = 1) /obj/item/spear/bonespear = 1)
result = /obj/structure/headpike/bone result = /obj/structure/headpike/bone
category = CAT_PRIMAL category = CAT_PRIMAL
code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
+6 -6
View File
@@ -42,7 +42,7 @@
/datum/crafting_recipe/spear /datum/crafting_recipe/spear
name = "Spear" name = "Spear"
result = /obj/item/twohanded/spear result = /obj/item/spear
reqs = list(/obj/item/restraints/handcuffs/cable = 1, reqs = list(/obj/item/restraints/handcuffs/cable = 1,
/obj/item/shard = 1, /obj/item/shard = 1,
/obj/item/stack/rods = 1) /obj/item/stack/rods = 1)
@@ -110,7 +110,7 @@
/datum/crafting_recipe/chainsaw /datum/crafting_recipe/chainsaw
name = "Chainsaw" name = "Chainsaw"
result = /obj/item/twohanded/required/chainsaw result = /obj/item/chainsaw
reqs = list(/obj/item/circular_saw = 1, reqs = list(/obj/item/circular_saw = 1,
/obj/item/stack/cable_coil = 3, /obj/item/stack/cable_coil = 3,
/obj/item/stack/sheet/plasteel = 5) /obj/item/stack/sheet/plasteel = 5)
@@ -141,7 +141,7 @@
result = /obj/item/bombcore/chemical result = /obj/item/bombcore/chemical
reqs = list( reqs = list(
/obj/item/stock_parts/matter_bin = 1, /obj/item/stock_parts/matter_bin = 1,
/obj/item/twohanded/required/gibtonite = 1, /obj/item/gibtonite = 1,
/obj/item/grenade/chem_grenade = 2 /obj/item/grenade/chem_grenade = 2
) )
parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2) parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2)
@@ -173,10 +173,10 @@
/datum/crafting_recipe/lance /datum/crafting_recipe/lance
name = "Explosive Lance (Grenade)" name = "Explosive Lance (Grenade)"
result = /obj/item/twohanded/spear result = /obj/item/spear
reqs = list(/obj/item/twohanded/spear = 1, reqs = list(/obj/item/spear = 1,
/obj/item/grenade = 1) /obj/item/grenade = 1)
parts = list(/obj/item/twohanded/spear = 1, parts = list(/obj/item/spear = 1,
/obj/item/grenade = 1) /obj/item/grenade = 1)
time = 15 time = 15
category = CAT_WEAPONRY category = CAT_WEAPONRY
code/datums/components/twohanded.dm
+311
View File
@@ -0,0 +1,311 @@
/**
* Two Handed Component
*
* When applied to an item it will make it two handed
*
*/
/datum/component/two_handed
dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS // Only one of the component can exist on an item
var/wielded = FALSE /// Are we holding the two handed item properly
var/force_multiplier = 0 /// The multiplier applied to force when wielded, does not work with force_wielded, and force_unwielded
var/force_wielded = 0 /// The force of the item when weilded
var/force_unwielded = 0 /// The force of the item when unweilded
var/wieldsound = FALSE /// Play sound when wielded
var/unwieldsound = FALSE /// Play sound when unwielded
var/attacksound = FALSE /// Play sound on attack when wielded
var/require_twohands = FALSE /// Does it have to be held in both hands
var/icon_wielded = FALSE /// The icon that will be used when wielded
var/obj/item/offhand/offhand_item = null /// Reference to the offhand created for the item
var/sharpened_increase = 0 /// The amount of increase recived from sharpening the item
/**
* Two Handed component
*
* vars:
* * require_twohands (optional) Does the item need both hands to be carried
* * wieldsound (optional) The sound to play when wielded
* * unwieldsound (optional) The sound to play when unwielded
* * attacksound (optional) The sound to play when wielded and attacking
* * force_multiplier (optional) The force multiplier when wielded, do not use with force_wielded, and force_unwielded
* * force_wielded (optional) The force setting when the item is wielded, do not use with force_multiplier
* * force_unwielded (optional) The force setting when the item is unwielded, do not use with force_multiplier
* * icon_wielded (optional) The icon to be used when wielded
*/
/datum/component/two_handed/Initialize(require_twohands=FALSE, wieldsound=FALSE, unwieldsound=FALSE, attacksound=FALSE, \
force_multiplier=0, force_wielded=0, force_unwielded=0, icon_wielded=FALSE)
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
src.require_twohands = require_twohands
src.wieldsound = wieldsound
src.unwieldsound = unwieldsound
src.attacksound = attacksound
src.force_multiplier = force_multiplier
src.force_wielded = force_wielded
src.force_unwielded = force_unwielded
src.icon_wielded = icon_wielded
// Inherit the new values passed to the component
/datum/component/two_handed/InheritComponent(datum/component/two_handed/new_comp, original, require_twohands, wieldsound, unwieldsound, \
force_multiplier, force_wielded, force_unwielded, icon_wielded)
if(!original)
return
if(require_twohands)
src.require_twohands = require_twohands
if(wieldsound)
src.wieldsound = wieldsound
if(unwieldsound)
src.unwieldsound = unwieldsound
if(attacksound)
src.attacksound = attacksound
if(force_multiplier)
src.force_multiplier = force_multiplier
if(force_wielded)
src.force_wielded = force_wielded
if(force_unwielded)
src.force_unwielded = force_unwielded
if(icon_wielded)
src.icon_wielded = icon_wielded
// register signals withthe parent item
/datum/component/two_handed/RegisterWithParent()
RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self)
RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack)
RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, .proc/on_update_icon)
RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved)
RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, .proc/on_sharpen)
// Remove all siginals registered to the parent item
/datum/component/two_handed/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED,
COMSIG_ITEM_DROPPED,
COMSIG_ITEM_ATTACK_SELF,
COMSIG_ITEM_ATTACK,
COMSIG_ATOM_UPDATE_ICON,
COMSIG_MOVABLE_MOVED,
COMSIG_ITEM_SHARPEN_ACT))
/// Triggered on equip of the item containing the component
/datum/component/two_handed/proc/on_equip(datum/source, mob/user, slot)
if(require_twohands && slot == ITEM_SLOT_HANDS) // force equip the item
wield(user)
if(!user.is_holding(parent) && wielded && !require_twohands)
unwield(user)
/// Triggered on drop of item containing the component
/datum/component/two_handed/proc/on_drop(datum/source, mob/user)
if(require_twohands)
unwield(user, show_message=TRUE)
if(wielded)
unwield(user)
if(source == offhand_item && !QDELETED(src))
qdel(src)
/// Triggered on attack self of the item containing the component
/datum/component/two_handed/proc/on_attack_self(datum/source, mob/user)
if(wielded)
unwield(user)
else
wield(user)
/**
* Wield the two handed item in both hands
*
* vars:
* * user The mob/living/carbon that is wielding the item
*/
/datum/component/two_handed/proc/wield(mob/living/carbon/user)
if(wielded)
return
if(ismonkey(user))
to_chat(user, "<span class='warning'>It's too heavy for you to wield fully.</span>")
return
if(user.get_inactive_held_item())
if(require_twohands)
to_chat(user, "<span class='notice'>[parent] is too cumbersome to carry in one hand!</span>")
user.dropItemToGround(parent, force=TRUE)
else
to_chat(user, "<span class='warning'>You need your other hand to be empty!</span>")
return
if(user.get_num_arms() < 2)
if(require_twohands)
user.dropItemToGround(parent, force=TRUE)
to_chat(user, "<span class='warning'>You don't have enough intact hands.</span>")
return
// wield update status
if(SEND_SIGNAL(parent, COMSIG_TWOHANDED_WIELD, user) & COMPONENT_TWOHANDED_BLOCK_WIELD)
return // blocked wield from item
wielded = TRUE
RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands)
// update item stats and name
var/obj/item/parent_item = parent
if(force_multiplier)
parent_item.force *= force_multiplier
else if(force_wielded)
parent_item.force = force_wielded
if(sharpened_increase)
parent_item.force += sharpened_increase
parent_item.name = "[parent_item.name] (Wielded)"
parent_item.update_icon()
if(iscyborg(user))
to_chat(user, "<span class='notice'>You dedicate your module to [parent].</span>")
else
to_chat(user, "<span class='notice'>You grab [parent] with both hands.</span>")
// Play sound if one is set
if(wieldsound)
playsound(parent_item.loc, wieldsound, 50, TRUE)
// Let's reserve the other hand
offhand_item = new(user)
offhand_item.name = "[parent_item.name] - offhand"
offhand_item.desc = "Your second grip on [parent_item]."
offhand_item.wielded = TRUE
RegisterSignal(offhand_item, COMSIG_ITEM_DROPPED, .proc/on_drop)
user.put_in_inactive_hand(offhand_item)
/**
* Unwield the two handed item
*
* vars:
* * user The mob/living/carbon that is unwielding the item
* * show_message (option) show a message to chat on unwield
*/
/datum/component/two_handed/proc/unwield(mob/living/carbon/user, show_message=TRUE)
if(!wielded || !user)
return
// wield update status
wielded = FALSE
UnregisterSignal(user, COMSIG_MOB_SWAP_HANDS)
SEND_SIGNAL(parent, COMSIG_TWOHANDED_UNWIELD, user)
// update item stats
var/obj/item/parent_item = parent
if(sharpened_increase)
parent_item.force -= sharpened_increase
if(force_multiplier)
parent_item.force /= force_multiplier
else if(force_unwielded)
parent_item.force = force_unwielded
// update the items name to remove the wielded status
var/sf = findtext(parent_item.name, " (Wielded)", -10) // 10 == length(" (Wielded)")
if(sf)
parent_item.name = copytext(parent_item.name, 1, sf)
else
parent_item.name = "[initial(parent_item.name)]"
// Update icons
parent_item.update_icon()
if(user.get_item_by_slot(ITEM_SLOT_BACK) == parent)
user.update_inv_back()
else
user.update_inv_hands()
// if the item requires two handed drop the item on unwield
if(require_twohands)
user.dropItemToGround(parent, force=TRUE)
// Show message if requested
if(show_message)
if(iscyborg(user))
to_chat(user, "<span class='notice'>You free up your module.</span>")
else if(require_twohands)
to_chat(user, "<span class='notice'>You drop [parent].</span>")
else
to_chat(user, "<span class='notice'>You are now carrying [parent] with one hand.</span>")
// Play sound if set
if(unwieldsound)
playsound(parent_item.loc, unwieldsound, 50, TRUE)
// Remove the object in the offhand
if(offhand_item)
UnregisterSignal(offhand_item, COMSIG_ITEM_DROPPED)
qdel(offhand_item)
// Clear any old refrence to an item that should be gone now
offhand_item = null
/**
* on_attack triggers on attack with the parent item
*/
/datum/component/two_handed/proc/on_attack(obj/item/source, mob/living/target, mob/living/user)
if(wielded && attacksound)
var/obj/item/parent_item = parent
playsound(parent_item.loc, attacksound, 50, TRUE)
/**
* on_update_icon triggers on call to update parent items icon
*
* Updates the icon using icon_wielded if set
*/
/datum/component/two_handed/proc/on_update_icon(datum/source)
if(icon_wielded && wielded)
var/obj/item/parent_item = parent
if(parent_item)
parent_item.icon_state = icon_wielded
return COMSIG_ATOM_NO_UPDATE_ICON_STATE
/**
* on_moved Triggers on item moved
*/
/datum/component/two_handed/proc/on_moved(datum/source, mob/user, dir)
unwield(user)
/**
* on_swap_hands Triggers on swapping hands, blocks swap if the other hand is busy
*/
/datum/component/two_handed/proc/on_swap_hands(mob/user, obj/item/held_item)
if(!held_item)
return
if(held_item == parent)
return COMPONENT_BLOCK_SWAP
/**
* on_sharpen Triggers on usage of a sharpening stone on the item
*/
/datum/component/two_handed/proc/on_sharpen(obj/item/item, amount, max_amount)
if(!item)
return COMPONENT_BLOCK_SHARPEN_BLOCKED
if(sharpened_increase)
return COMPONENT_BLOCK_SHARPEN_ALREADY
var/wielded_val = 0
if(force_multiplier)
var/obj/item/parent_item = parent
if(wielded)
wielded_val = parent_item.force
else
wielded_val = parent_item.force * force_multiplier
else
wielded_val = force_wielded
if(wielded_val > max_amount)
return COMPONENT_BLOCK_SHARPEN_MAXED
sharpened_increase = min(amount, (max_amount - wielded_val))
return COMPONENT_BLOCK_SHARPEN_APPLIED
/**
* The offhand dummy item for two handed items
*
*/
/obj/item/offhand
name = "offhand"
icon_state = "offhand"
w_class = WEIGHT_CLASS_HUGE
item_flags = ABSTRACT
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/wielded = FALSE // Off Hand tracking of wielded status
/obj/item/offhand/Destroy()
wielded = FALSE
return ..()
/obj/item/offhand/equipped(mob/user, slot)
. = ..()
if(wielded && !user.is_holding(src) && !QDELETED(src))
qdel(src)
code/datums/martial/sleeping_carp.dm
+23 -7
View File
@@ -180,14 +180,12 @@
to_chat(usr, "<span class='notice'>Keelhaul</span>: Harm Grab. Kick opponents to the floor. Against prone targets, deal additional stamina damage and disarm them.") to_chat(usr, "<span class='notice'>Keelhaul</span>: Harm Grab. Kick opponents to the floor. Against prone targets, deal additional stamina damage and disarm them.")
to_chat(usr, "<span class='notice'>In addition, your body has become incredibly resilient to most forms of attack. Weapons cannot readily pierce your hardened skin, and you are highly resistant to stuns and knockdowns, and can block all projectiles in Throw Mode. However, you are not invincible, and sustained damage will take it's toll. Avoid heat at all costs!</span>") to_chat(usr, "<span class='notice'>In addition, your body has become incredibly resilient to most forms of attack. Weapons cannot readily pierce your hardened skin, and you are highly resistant to stuns and knockdowns, and can block all projectiles in Throw Mode. However, you are not invincible, and sustained damage will take it's toll. Avoid heat at all costs!</span>")
/obj/item/twohanded/bostaff /obj/item/staff/bostaff
name = "bo staff" name = "bo staff"
desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate." desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate."
force = 10 force = 10
w_class = WEIGHT_CLASS_BULKY w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK slot_flags = ITEM_SLOT_BACK
force_unwielded = 10
force_wielded = 24
throwforce = 20 throwforce = 20
throw_speed = 2 throw_speed = 2
attack_verb = list("smashed", "slammed", "whacked", "thwacked") attack_verb = list("smashed", "slammed", "whacked", "thwacked")
@@ -196,11 +194,29 @@
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
block_chance = 50 block_chance = 50
var/wielded = FALSE // track wielded status on item
/obj/item/twohanded/bostaff/update_icon_state() /obj/item/staff/bostaff/Initialize()
icon_state = "bostaff[wielded]" . = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/twohanded/bostaff/attack(mob/target, mob/living/user) /obj/item/staff/bostaff/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=24, icon_wielded="bostaff1")
/// triggered on wield of two handed item
/obj/item/staff/bostaff/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/staff/bostaff/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/staff/bostaff/update_icon_state()
icon_state = "bostaff0"
/obj/item/staff/bostaff/attack(mob/target, mob/living/user)
add_fingerprint(user) add_fingerprint(user)
if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
to_chat(user, "<span class ='warning'>You club yourself over the head with [src].</span>") to_chat(user, "<span class ='warning'>You club yourself over the head with [src].</span>")
@@ -249,7 +265,7 @@
else else
return ..() return ..()
/obj/item/twohanded/bostaff/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) /obj/item/staff/bostaff/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(!wielded) if(!wielded)
return BLOCK_NONE return BLOCK_NONE
return ..() return ..()
code/datums/status_effects/debuffs.dm
+2 -2
View File
@@ -363,9 +363,9 @@
status_type = STATUS_EFFECT_REPLACE status_type = STATUS_EFFECT_REPLACE
alert_type = null alert_type = null
var/mutable_appearance/marked_underlay var/mutable_appearance/marked_underlay
var/obj/item/twohanded/kinetic_crusher/hammer_synced var/obj/item/kinetic_crusher/hammer_synced
/datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, obj/item/twohanded/kinetic_crusher/new_hammer_synced) /datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, obj/item/kinetic_crusher/new_hammer_synced)
. = ..() . = ..()
if(.) if(.)
hammer_synced = new_hammer_synced hammer_synced = new_hammer_synced
code/datums/wires/explosive.dm
+2 -2
View File
@@ -75,8 +75,8 @@
/datum/wires/explosive/gibtonite /datum/wires/explosive/gibtonite
holder_type = /obj/item/twohanded/required/gibtonite holder_type = /obj/item/gibtonite
/datum/wires/explosive/gibtonite/explode() /datum/wires/explosive/gibtonite/explode()
var/obj/item/twohanded/required/gibtonite/P = holder var/obj/item/gibtonite/P = holder
P.GibtoniteReaction(null, 2) P.GibtoniteReaction(null, 2)
code/game/machinery/computer/arcade.dm
+3 -3
View File
@@ -42,9 +42,9 @@
/obj/item/clothing/mask/facehugger/toy = ARCADE_WEIGHT_RARE, /obj/item/clothing/mask/facehugger/toy = ARCADE_WEIGHT_RARE,
/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = ARCADE_WEIGHT_TRICK, /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = ARCADE_WEIGHT_TRICK,
/obj/item/hot_potato/harmless/toy = ARCADE_WEIGHT_RARE, /obj/item/hot_potato/harmless/toy = ARCADE_WEIGHT_RARE,
/obj/item/twohanded/dualsaber/toy = ARCADE_WEIGHT_RARE, /obj/item/dualsaber/toy = ARCADE_WEIGHT_RARE,
/obj/item/twohanded/dualsaber/hypereutactic/toy = ARCADE_WEIGHT_RARE, /obj/item/dualsaber/hypereutactic/toy = ARCADE_WEIGHT_RARE,
/obj/item/twohanded/dualsaber/hypereutactic/toy/rainbow = ARCADE_WEIGHT_RARE, /obj/item/dualsaber/hypereutactic/toy/rainbow = ARCADE_WEIGHT_RARE,
/obj/item/storage/box/snappops = ARCADE_WEIGHT_TRICK, /obj/item/storage/box/snappops = ARCADE_WEIGHT_TRICK,
/obj/item/clothing/under/syndicate/tacticool = ARCADE_WEIGHT_TRICK, /obj/item/clothing/under/syndicate/tacticool = ARCADE_WEIGHT_TRICK,
code/game/machinery/doors/airlock.dm
+5 -5
View File
@@ -1052,11 +1052,11 @@
to_chat(user, "<span class='warning'>The airlock's bolts prevent it from being forced!</span>") to_chat(user, "<span class='warning'>The airlock's bolts prevent it from being forced!</span>")
else if( !welded && !operating) else if( !welded && !operating)
if(!beingcrowbarred) //being fireaxe'd if(!beingcrowbarred) //being fireaxe'd
var/obj/item/twohanded/fireaxe/F = I var/obj/item/fireaxe/axe = I
if(F.wielded) if(!axe.wielded)
INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2) to_chat(user, "<span class='warning'>You need to be wielding \the [axe] to do that!</span>")
else return
to_chat(user, "<span class='warning'>You need to be wielding the fire axe to do that!</span>") INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2)
else else
INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2) INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2)
code/game/machinery/doors/door.dm
+1 -1
View File
@@ -181,7 +181,7 @@
return return
/obj/machinery/door/attackby(obj/item/I, mob/user, params) /obj/machinery/door/attackby(obj/item/I, mob/user, params)
if(user.a_intent != INTENT_HARM && (istype(I, /obj/item/crowbar) || istype(I, /obj/item/twohanded/fireaxe))) if(user.a_intent != INTENT_HARM && (istype(I, /obj/item/crowbar) || istype(I, /obj/item/fireaxe)))
try_to_crowbar(I, user) try_to_crowbar(I, user)
return 1 return 1
else if(istype(I, /obj/item/weldingtool)) else if(istype(I, /obj/item/weldingtool))
code/game/machinery/recharger.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/obj/item/melee/baton, /obj/item/melee/baton,
/obj/item/ammo_box/magazine/recharge, /obj/item/ammo_box/magazine/recharge,
/obj/item/modular_computer, /obj/item/modular_computer,
/obj/item/twohanded/electrostaff, /obj/item/electrostaff,
/obj/item/gun/ballistic/automatic/magrifle)) /obj/item/gun/ballistic/automatic/magrifle))
/obj/machinery/recharger/RefreshParts() /obj/machinery/recharger/RefreshParts()
code/game/objects/effects/mines.dm
+1 -2
View File
@@ -128,14 +128,13 @@
spawn(0) spawn(0)
new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0) new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0)
var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc) var/obj/item/chainsaw/doomslayer/chainsaw = new(victim.loc)
victim.log_message("entered a blood frenzy", LOG_ATTACK) victim.log_message("entered a blood frenzy", LOG_ATTACK)
ADD_TRAIT(chainsaw, TRAIT_NODROP, CHAINSAW_FRENZY_TRAIT) ADD_TRAIT(chainsaw, TRAIT_NODROP, CHAINSAW_FRENZY_TRAIT)
victim.drop_all_held_items() victim.drop_all_held_items()
victim.put_in_hands(chainsaw, forced = TRUE) victim.put_in_hands(chainsaw, forced = TRUE)
chainsaw.attack_self(victim) chainsaw.attack_self(victim)
chainsaw.wield(victim)
victim.reagents.add_reagent(/datum/reagent/medicine/adminordrazine,25) victim.reagents.add_reagent(/datum/reagent/medicine/adminordrazine,25)
to_chat(victim, "<span class='warning'>KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!</span>") to_chat(victim, "<span class='warning'>KILL, KILL, KILL! YOU HAVE NO ALLIES ANYMORE, KILL THEM ALL!</span>")
code/game/objects/items/RCL.dm
+34 -29
View File
@@ -1,4 +1,4 @@
/obj/item/twohanded/rcl /obj/item/rcl
name = "rapid cable layer" name = "rapid cable layer"
desc = "A device used to rapidly deploy cables. It has screws on the side which can be removed to slide off the cables. Do not use without insulation!" desc = "A device used to rapidly deploy cables. It has screws on the side which can be removed to slide off the cables. Do not use without insulation!"
icon = 'icons/obj/tools.dmi' icon = 'icons/obj/tools.dmi'
@@ -23,15 +23,25 @@
var/datum/radial_menu/persistent/wiring_gui_menu var/datum/radial_menu/persistent/wiring_gui_menu
var/mob/listeningTo var/mob/listeningTo
/obj/item/twohanded/rcl/Initialize() /obj/item/rcl/Initialize()
. = ..() . = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
update_icon() update_icon()
/obj/item/twohanded/rcl/ComponentInitialize() /// triggered on wield of two handed item
/obj/item/rcl/proc/on_wield(obj/item/source, mob/user)
active = TRUE
/// triggered on unwield of two handed item
/obj/item/rcl/proc/on_unwield(obj/item/source, mob/user)
active = FALSE
/obj/item/rcl/ComponentInitialize()
. = ..() . = ..()
AddElement(/datum/element/update_icon_updates_onmob) AddElement(/datum/element/update_icon_updates_onmob)
/obj/item/twohanded/rcl/attackby(obj/item/W, mob/user) /obj/item/rcl/attackby(obj/item/W, mob/user)
if(istype(W, /obj/item/stack/cable_coil)) if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W var/obj/item/stack/cable_coil/C = W
@@ -86,26 +96,26 @@
else else
..() ..()
/obj/item/twohanded/rcl/examine(mob/user) /obj/item/rcl/examine(mob/user)
. = ..() . = ..()
if(loaded) if(loaded)
. += "<span class='info'>It contains [loaded.amount]/[max_amount] cables.</span>" . += "<span class='info'>It contains [loaded.amount]/[max_amount] cables.</span>"
/obj/item/twohanded/rcl/Destroy() /obj/item/rcl/Destroy()
QDEL_NULL(loaded) QDEL_NULL(loaded)
last = null last = null
listeningTo = null listeningTo = null
QDEL_NULL(wiring_gui_menu) QDEL_NULL(wiring_gui_menu)
return ..() return ..()
/obj/item/twohanded/rcl/update_icon_state() /obj/item/rcl/update_icon_state()
icon_state = initial(icon_state) icon_state = initial(icon_state)
item_state = initial(item_state) item_state = initial(item_state)
if(!loaded || !loaded.amount) if(!loaded || !loaded.amount)
icon_state += "-empty" icon_state += "-empty"
item_state += "-0" item_state += "-0"
/obj/item/twohanded/rcl/update_overlays() /obj/item/rcl/update_overlays()
. = ..() . = ..()
if(!loaded || !loaded.amount) if(!loaded || !loaded.amount)
return return
@@ -113,7 +123,7 @@
cable_overlay.color = GLOB.cable_colors[colors[current_color_index]] cable_overlay.color = GLOB.cable_colors[colors[current_color_index]]
. += cable_overlay . += cable_overlay
/obj/item/twohanded/rcl/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE) /obj/item/rcl/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
. = ..() . = ..()
if(!isinhands || !(loaded?.amount)) if(!isinhands || !(loaded?.amount))
return return
@@ -121,7 +131,7 @@
cable_overlay.color = GLOB.cable_colors[colors[current_color_index]] cable_overlay.color = GLOB.cable_colors[colors[current_color_index]]
. += cable_overlay . += cable_overlay
/obj/item/twohanded/rcl/proc/is_empty(mob/user, loud = 1) /obj/item/rcl/proc/is_empty(mob/user, loud = 1)
update_icon() update_icon()
if(!loaded || !loaded.amount) if(!loaded || !loaded.amount)
if(loud) if(loud)
@@ -130,26 +140,23 @@
QDEL_NULL(loaded) QDEL_NULL(loaded)
loaded = null loaded = null
QDEL_NULL(wiring_gui_menu) QDEL_NULL(wiring_gui_menu)
unwield(user)
active = wielded
return TRUE return TRUE
return FALSE return FALSE
/obj/item/twohanded/rcl/pickup(mob/user) /obj/item/rcl/pickup(mob/user)
..() ..()
getMobhook(user) getMobhook(user)
/obj/item/twohanded/rcl/dropped(mob/wearer) /obj/item/rcl/dropped(mob/wearer)
..() ..()
UnregisterSignal(wearer, COMSIG_MOVABLE_MOVED) UnregisterSignal(wearer, COMSIG_MOVABLE_MOVED)
listeningTo = null listeningTo = null
last = null last = null
/obj/item/twohanded/rcl/attack_self(mob/user) /obj/item/rcl/attack_self(mob/user)
..() ..()
active = wielded
if(!active) if(!active)
last = null last = null
else if(!last) else if(!last)
@@ -158,7 +165,7 @@
last = C last = C
break break
obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook) obj/item/rcl/proc/getMobhook(mob/to_hook)
if(listeningTo == to_hook) if(listeningTo == to_hook)
return return
if(listeningTo) if(listeningTo)
@@ -166,7 +173,7 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
RegisterSignal(to_hook, COMSIG_MOVABLE_MOVED, .proc/trigger) RegisterSignal(to_hook, COMSIG_MOVABLE_MOVED, .proc/trigger)
listeningTo = to_hook listeningTo = to_hook
/obj/item/twohanded/rcl/proc/trigger(mob/user) /obj/item/rcl/proc/trigger(mob/user)
if(active) if(active)
layCable(user) layCable(user)
if(wiring_gui_menu) //update the wire options as you move if(wiring_gui_menu) //update the wire options as you move
@@ -174,7 +181,7 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
//previous contents of trigger(), lays cable each time the player moves //previous contents of trigger(), lays cable each time the player moves
/obj/item/twohanded/rcl/proc/layCable(mob/user) /obj/item/rcl/proc/layCable(mob/user)
if(!isturf(user.loc)) if(!isturf(user.loc))
return return
if(is_empty(user, 0)) if(is_empty(user, 0))
@@ -207,7 +214,7 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
update_icon() update_icon()
//searches the current tile for a stub cable of the same colour //searches the current tile for a stub cable of the same colour
/obj/item/twohanded/rcl/proc/findLinkingCable(mob/user) /obj/item/rcl/proc/findLinkingCable(mob/user)
var/turf/T var/turf/T
if(!isturf(user.loc)) if(!isturf(user.loc))
return return
@@ -223,10 +230,8 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
continue continue
if(C.d1 == 0) if(C.d1 == 0)
return C return C
return
/obj/item/rcl/proc/wiringGuiGenerateChoices(mob/user)
/obj/item/twohanded/rcl/proc/wiringGuiGenerateChoices(mob/user)
var/fromdir = 0 var/fromdir = 0
var/obj/structure/cable/linkingCable = findLinkingCable(user) var/obj/structure/cable/linkingCable = findLinkingCable(user)
if(linkingCable) if(linkingCable)
@@ -243,12 +248,12 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
wiredirs[icondir] = img wiredirs[icondir] = img
return wiredirs return wiredirs
/obj/item/twohanded/rcl/proc/showWiringGui(mob/user) /obj/item/rcl/proc/showWiringGui(mob/user)
var/list/choices = wiringGuiGenerateChoices(user) var/list/choices = wiringGuiGenerateChoices(user)
wiring_gui_menu = show_radial_menu_persistent(user, src , choices, select_proc = CALLBACK(src, .proc/wiringGuiReact, user), radius = 42) wiring_gui_menu = show_radial_menu_persistent(user, src , choices, select_proc = CALLBACK(src, .proc/wiringGuiReact, user), radius = 42)
/obj/item/twohanded/rcl/proc/wiringGuiUpdate(mob/user) /obj/item/rcl/proc/wiringGuiUpdate(mob/user)
if(!wiring_gui_menu) if(!wiring_gui_menu)
return return
@@ -259,7 +264,7 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
//Callback used to respond to interactions with the wiring menu //Callback used to respond to interactions with the wiring menu
/obj/item/twohanded/rcl/proc/wiringGuiReact(mob/living/user,choice) /obj/item/rcl/proc/wiringGuiReact(mob/living/user,choice)
if(!choice) //close on a null choice (the center button) if(!choice) //close on a null choice (the center button)
QDEL_NULL(wiring_gui_menu) QDEL_NULL(wiring_gui_menu)
return return
@@ -290,7 +295,7 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
wiringGuiUpdate(user) wiringGuiUpdate(user)
/obj/item/twohanded/rcl/ui_action_click(mob/user, action) /obj/item/rcl/ui_action_click(mob/user, action)
if(istype(action, /datum/action/item_action/rcl_col)) if(istype(action, /datum/action/item_action/rcl_col))
current_color_index++; current_color_index++;
if (current_color_index > colors.len) if (current_color_index > colors.len)
@@ -308,13 +313,13 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
else //open the menu else //open the menu
showWiringGui(user) showWiringGui(user)
/obj/item/twohanded/rcl/pre_loaded/Initialize() //Comes preloaded with cable, for testing stuff /obj/item/rcl/pre_loaded/Initialize() //Comes preloaded with cable, for testing stuff
loaded = new() loaded = new()
loaded.max_amount = max_amount loaded.max_amount = max_amount
loaded.amount = max_amount loaded.amount = max_amount
return ..() return ..()
/obj/item/twohanded/rcl/ghetto /obj/item/rcl/ghetto
actions_types = list() actions_types = list()
max_amount = 30 max_amount = 30
name = "makeshift rapid cable layer" name = "makeshift rapid cable layer"
code/game/objects/items/binoculars.dm
+65
View File
@@ -0,0 +1,65 @@
/obj/item/binoculars
name = "binoculars"
desc = "Used for long-distance surveillance."
item_state = "binoculars"
icon_state = "binoculars"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
var/mob/listeningTo
var/zoom_out_amt = 6
var/zoom_amt = 10
/obj/item/binoculars/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/binoculars/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12)
/obj/item/binoculars/Destroy()
listeningTo = null
return ..()
/obj/item/binoculars/proc/on_wield(obj/item/source, mob/user)
RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/unwield)
listeningTo = user
user.visible_message("<span class='notice'>[user] holds [src] up to [user.p_their()] eyes.</span>", "<span class='notice'>You hold [src] up to your eyes.</span>")
item_state = "binoculars_wielded"
user.regenerate_icons()
if(!user?.client)
return
var/client/C = user.client
var/_x = 0
var/_y = 0
switch(user.dir)
if(NORTH)
_y = zoom_amt
if(EAST)
_x = zoom_amt
if(SOUTH)
_y = -zoom_amt
if(WEST)
_x = -zoom_amt
C.change_view(world.view + zoom_out_amt)
C.pixel_x = world.icon_size*_x
C.pixel_y = world.icon_size*_y
/obj/item/binoculars/proc/on_unwield(obj/item/source, mob/user)
unwield(user)
/obj/item/binoculars/proc/unwield(mob/user)
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
listeningTo = null
user.visible_message("<span class='notice'>[user] lowers [src].</span>", "<span class='notice'>You lower [src].</span>")
item_state = "binoculars"
user.regenerate_icons()
if(user && user.client)
user.regenerate_icons()
var/client/C = user.client
C.change_view(CONFIG_GET(string/default_view))
user.client.pixel_x = 0
user.client.pixel_y = 0
code/game/objects/items/broom.dm
+69
View File
@@ -0,0 +1,69 @@
/obj/item/broom
name = "broom"
desc = "This is my BROOMSTICK! It can be used manually or braced with two hands to sweep items as you move. It has a telescopic handle for compact storage."
icon = 'icons/obj/janitor.dmi'
icon_state = "broom0"
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
force = 8
throwforce = 10
throw_speed = 3
throw_range = 7
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("swept", "brushed off", "bludgeoned", "whacked")
resistance_flags = FLAMMABLE
/obj/item/broom/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/broom/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12, icon_wielded="broom1")
/obj/item/broom/update_icon_state()
icon_state = "broom0"
/// triggered on wield of two handed item
/obj/item/broom/proc/on_wield(obj/item/source, mob/user)
to_chat(user, "<span class='notice'>You brace the [src] against the ground in a firm sweeping stance.</span>")
RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/sweep)
/// triggered on unwield of two handed item
/obj/item/broom/proc/on_unwield(obj/item/source, mob/user)
UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
/obj/item/broom/afterattack(atom/A, mob/user, proximity)
. = ..()
if(!proximity)
return
sweep(user, A, FALSE)
/obj/item/broom/proc/sweep(mob/user, atom/A, moving = TRUE)
var/turf/target
if (!moving)
if (isturf(A))
target = A
else
target = A.loc
else
target = user.loc
if (!isturf(target))
return
if (locate(/obj/structure/table) in target.contents)
return
var/i = 0
for(var/obj/item/garbage in target.contents)
if(!garbage.anchored)
garbage.Move(get_step(target, user.dir), user.dir)
i++
if(i >= 20)
break
if(i >= 1)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 30, TRUE, -1)
/obj/item/broom/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) //bless you whoever fixes this copypasta
J.put_in_cart(src, user)
J.mybroom=src
J.update_icon()
code/game/objects/items/chainsaw.dm
+93
View File
@@ -0,0 +1,93 @@
// CHAINSAW
/obj/item/chainsaw
name = "chainsaw"
desc = "A versatile power tool. Useful for limbing trees and delimbing humans."
icon_state = "chainsaw_off"
lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi'
flags_1 = CONDUCT_1
force = 13
var/force_on = 24
w_class = WEIGHT_CLASS_HUGE
throwforce = 13
throw_speed = 2
throw_range = 4
custom_materials = list(/datum/material/iron=13000)
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
hitsound = "swing_hit"
sharpness = IS_SHARP
actions_types = list(/datum/action/item_action/startchainsaw)
tool_behaviour = TOOL_SAW
toolspeed = 0.5
var/on = FALSE
var/wielded = FALSE // track wielded status on item
/obj/item/chainsaw/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/chainsaw/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 30, 100, 0, 'sound/weapons/chainsawhit.ogg', TRUE)
AddComponent(/datum/component/two_handed, require_twohands=TRUE)
AddElement(/datum/element/update_icon_updates_onmob)
/// triggered on wield of two handed item
/obj/item/chainsaw/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/chainsaw/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/chainsaw/suicide_act(mob/living/carbon/user)
if(on)
user.visible_message("<span class='suicide'>[user] begins to tear [user.p_their()] head off with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(src, 'sound/weapons/chainsawhit.ogg', 100, 1)
var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD)
if(myhead)
myhead.dismember()
else
user.visible_message("<span class='suicide'>[user] smashes [src] into [user.p_their()] neck, destroying [user.p_their()] esophagus! It looks like [user.p_theyre()] trying to commit suicide!</span>")
playsound(src, 'sound/weapons/genhit1.ogg', 100, 1)
return(BRUTELOSS)
/obj/item/chainsaw/attack_self(mob/user)
on = !on
to_chat(user, "As you pull the starting cord dangling from [src], [on ? "it begins to whirr." : "the chain stops moving."]")
force = on ? force_on : initial(force)
throwforce = on ? force_on : force
update_icon()
var/datum/component/butchering/butchering = src.GetComponent(/datum/component/butchering)
butchering.butchering_enabled = on
if(on)
hitsound = 'sound/weapons/chainsawhit.ogg'
else
hitsound = "swing_hit"
/obj/item/chainsaw/update_icon_state()
icon_state = "chainsaw_[on ? "on" : "off"]"
/obj/item/chainsaw/get_dismemberment_chance()
if(wielded)
. = ..()
/obj/item/chainsaw/doomslayer
name = "THE GREAT COMMUNICATOR"
desc = "<span class='warning'>VRRRRRRR!!!</span>"
armour_penetration = 100
force_on = 30
/obj/item/chainsaw/doomslayer/check_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
block_return[BLOCK_RETURN_REFLECT_PROJECTILE_CHANCE] = 100
return ..()
/obj/item/chainsaw/doomslayer/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(attack_type & ATTACK_TYPE_PROJECTILE)
owner.visible_message("<span class='danger'>Ranged attacks just make [owner] angrier!</span>")
playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1)
return BLOCK_SUCCESS | BLOCK_PHYSICAL_EXTERNAL
return ..()
code/game/objects/items/defib.dm
+50 -50
View File
@@ -19,7 +19,7 @@
var/on = FALSE //if the paddles are equipped (1) or on the defib (0) var/on = FALSE //if the paddles are equipped (1) or on the defib (0)
var/safety = TRUE //if you can zap people with the defibs on harm mode var/safety = TRUE //if you can zap people with the defibs on harm mode
var/powered = FALSE //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise var/powered = FALSE //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise
var/obj/item/twohanded/shockpaddles/paddles var/obj/item/shockpaddles/paddles
var/obj/item/stock_parts/cell/cell var/obj/item/stock_parts/cell/cell
var/combat = FALSE //can we revive through space suits? var/combat = FALSE //can we revive through space suits?
var/grab_ghost = FALSE // Do we pull the ghost back into their body? var/grab_ghost = FALSE // Do we pull the ghost back into their body?
@@ -106,7 +106,6 @@
/obj/item/defibrillator/attackby(obj/item/W, mob/user, params) /obj/item/defibrillator/attackby(obj/item/W, mob/user, params)
if(W == paddles) if(W == paddles)
paddles.unwield()
toggle_paddles() toggle_paddles()
else if(istype(W, /obj/item/stock_parts/cell)) else if(istype(W, /obj/item/stock_parts/cell))
var/obj/item/stock_parts/cell/C = W var/obj/item/stock_parts/cell/C = W
@@ -170,7 +169,6 @@
return return
else else
//Remove from their hands and back onto the defib unit //Remove from their hands and back onto the defib unit
paddles.unwield()
remove_paddles(user) remove_paddles(user)
update_power() update_power()
@@ -179,7 +177,7 @@
A.UpdateButtonIcon() A.UpdateButtonIcon()
/obj/item/defibrillator/proc/make_paddles() /obj/item/defibrillator/proc/make_paddles()
return new /obj/item/twohanded/shockpaddles(src) return new /obj/item/shockpaddles(src)
/obj/item/defibrillator/equipped(mob/user, slot) /obj/item/defibrillator/equipped(mob/user, slot)
..() ..()
@@ -256,13 +254,12 @@
/obj/item/defibrillator/compact/combat/loaded/attackby(obj/item/W, mob/user, params) /obj/item/defibrillator/compact/combat/loaded/attackby(obj/item/W, mob/user, params)
if(W == paddles) if(W == paddles)
paddles.unwield()
toggle_paddles() toggle_paddles()
return return
//paddles //paddles
/obj/item/twohanded/shockpaddles /obj/item/shockpaddles
name = "defibrillator paddles" name = "defibrillator paddles"
desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks." desc = "A pair of plastic-gripped paddles with flat metal surfaces that are used to deliver powerful electric shocks."
icon = 'icons/obj/items_and_weapons.dmi' icon = 'icons/obj/items_and_weapons.dmi'
@@ -284,24 +281,48 @@
var/grab_ghost = FALSE var/grab_ghost = FALSE
var/tlimit = DEFIB_TIME_LIMIT * 10 var/tlimit = DEFIB_TIME_LIMIT * 10
var/disarm_shock_time = 10 var/disarm_shock_time = 10
var/wielded = FALSE // track wielded status on item
var/mob/listeningTo /obj/item/shockpaddles/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
if(!req_defib)
return //If it doesn't need a defib, just say it exists
if (!loc || !istype(loc, /obj/item/defibrillator)) //To avoid weird issues from admin spawns
return INITIALIZE_HINT_QDEL
defib = loc
busy = FALSE
update_icon()
/obj/item/twohanded/shockpaddles/ComponentInitialize() /obj/item/shockpaddles/ComponentInitialize()
. = ..() . = ..()
AddElement(/datum/element/update_icon_updates_onmob) AddElement(/datum/element/update_icon_updates_onmob)
AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12)
/obj/item/twohanded/shockpaddles/equipped(mob/user, slot) /// triggered on wield of two handed item
/obj/item/shockpaddles/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/shockpaddles/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/shockpaddles/Destroy()
defib = null
return ..()
/obj/item/shockpaddles/equipped(mob/user, slot)
. = ..() . = ..()
if(!req_defib) if(!req_defib)
return return
RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/check_range) RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/check_range)
/obj/item/twohanded/shockpaddles/Moved() /obj/item/shockpaddles/Moved()
. = ..() . = ..()
check_range() check_range()
/obj/item/twohanded/shockpaddles/proc/check_range() /obj/item/shockpaddles/proc/check_range()
if(!req_defib || !defib) if(!req_defib || !defib)
return return
if(!in_range(src,defib)) if(!in_range(src,defib))
@@ -312,7 +333,7 @@
visible_message("<span class='notice'>[src] snap back into [defib].</span>") visible_message("<span class='notice'>[src] snap back into [defib].</span>")
snap_back() snap_back()
/obj/item/twohanded/shockpaddles/proc/recharge(var/time) /obj/item/shockpaddles/proc/recharge(var/time)
if(req_defib || !time) if(req_defib || !time)
return return
cooldown = TRUE cooldown = TRUE
@@ -324,57 +345,36 @@
cooldown = FALSE cooldown = FALSE
update_icon() update_icon()
/obj/item/twohanded/shockpaddles/New(mainunit) /obj/item/shockpaddles/suicide_act(mob/user)
..()
if(check_defib_exists(mainunit, src) && req_defib)
defib = mainunit
forceMove(defib)
busy = FALSE
update_icon()
/obj/item/twohanded/shockpaddles/update_icon_state()
icon_state = "defibpaddles[wielded]"
item_state = "defibpaddles[wielded]"
if(cooldown)
icon_state = "defibpaddles[wielded]_cooldown"
/obj/item/twohanded/shockpaddles/suicide_act(mob/user)
user.visible_message("<span class='danger'>[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!</span>") user.visible_message("<span class='danger'>[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!</span>")
if(req_defib) if(req_defib)
defib.deductcharge(revivecost) defib.deductcharge(revivecost)
playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1) playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1)
return (OXYLOSS) return (OXYLOSS)
/obj/item/twohanded/shockpaddles/dropped(mob/user) /obj/item/shockpaddles/update_icon_state()
icon_state = "defibpaddles[wielded]"
item_state = "defibpaddles[wielded]"
if(cooldown)
icon_state = "defibpaddles[wielded]_cooldown"
/obj/item/shockpaddles/dropped(mob/user)
if(!req_defib) if(!req_defib)
return ..() return ..()
if(user) if(user)
UnregisterSignal(user, COMSIG_MOVABLE_MOVED) UnregisterSignal(user, COMSIG_MOVABLE_MOVED)
var/obj/item/twohanded/offhand/O = user.get_inactive_held_item()
if(istype(O))
O.unwield()
if(user != loc) if(user != loc)
to_chat(user, "<span class='notice'>The paddles snap back into the main unit.</span>") to_chat(user, "<span class='notice'>The paddles snap back into the main unit.</span>")
snap_back() snap_back()
return unwield(user)
/obj/item/twohanded/shockpaddles/proc/snap_back() /obj/item/shockpaddles/proc/snap_back()
if(!defib) if(!defib)
return return
defib.on = FALSE defib.on = FALSE
forceMove(defib) forceMove(defib)
defib.update_power() defib.update_power()
/obj/item/twohanded/shockpaddles/proc/check_defib_exists(mainunit, mob/living/carbon/M, obj/O) /obj/item/shockpaddles/attack(mob/M, mob/user)
if(!req_defib)
return TRUE //If it doesn't need a defib, just say it exists
if (!mainunit || !istype(mainunit, /obj/item/defibrillator)) //To avoid weird issues from admin spawns
qdel(O)
return FALSE
else
return TRUE
/obj/item/twohanded/shockpaddles/attack(mob/M, mob/user)
if(busy) if(busy)
return return
@@ -426,7 +426,7 @@
do_help(H, user) do_help(H, user)
/obj/item/twohanded/shockpaddles/proc/shock_touching(dmg, mob/H) /obj/item/shockpaddles/proc/shock_touching(dmg, mob/H)
if(!H.pulledby || !isliving(H.pulledby)) if(!H.pulledby || !isliving(H.pulledby))
return return
if(req_defib && defib.pullshocksafely) if(req_defib && defib.pullshocksafely)
@@ -437,7 +437,7 @@
M.visible_message("<span class='danger'>[M] is electrocuted by [M.p_their()] contact with [H]!</span>") M.visible_message("<span class='danger'>[M] is electrocuted by [M.p_their()] contact with [H]!</span>")
M.emote("scream") M.emote("scream")
/obj/item/twohanded/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user) /obj/item/shockpaddles/proc/do_disarm(mob/living/M, mob/living/user)
if(req_defib && defib.safety) if(req_defib && defib.safety)
return return
if(!req_defib && !combat) if(!req_defib && !combat)
@@ -465,7 +465,7 @@
else else
recharge(60) recharge(60)
/obj/item/twohanded/shockpaddles/proc/do_harm(mob/living/carbon/H, mob/living/user) /obj/item/shockpaddles/proc/do_harm(mob/living/carbon/H, mob/living/user)
if(req_defib && defib.safety) if(req_defib && defib.safety)
return return
if(!req_defib && !combat) if(!req_defib && !combat)
@@ -520,7 +520,7 @@
busy = FALSE busy = FALSE
update_icon() update_icon()
/obj/item/twohanded/shockpaddles/proc/do_help(mob/living/carbon/H, mob/living/user) /obj/item/shockpaddles/proc/do_help(mob/living/carbon/H, mob/living/user)
user.visible_message("<span class='warning'>[user] begins to place [src] on [H]'s chest.</span>", "<span class='warning'>You begin to place [src] on [H]'s chest...</span>") user.visible_message("<span class='warning'>[user] begins to place [src] on [H]'s chest.</span>", "<span class='warning'>You begin to place [src] on [H]'s chest...</span>")
busy = TRUE busy = TRUE
update_icon() update_icon()
@@ -677,14 +677,14 @@
return TRUE return TRUE
return ..() return ..()
/obj/item/twohanded/shockpaddles/cyborg /obj/item/shockpaddles/cyborg
name = "cyborg defibrillator paddles" name = "cyborg defibrillator paddles"
icon = 'icons/obj/items_and_weapons.dmi' icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "defibpaddles0" icon_state = "defibpaddles0"
item_state = "defibpaddles0" item_state = "defibpaddles0"
req_defib = FALSE req_defib = FALSE
/obj/item/twohanded/shockpaddles/cyborg/attack(mob/M, mob/user) /obj/item/shockpaddles/cyborg/attack(mob/M, mob/user)
if(iscyborg(user)) if(iscyborg(user))
var/mob/living/silicon/robot/R = user var/mob/living/silicon/robot/R = user
if(R.emagged) if(R.emagged)
@@ -696,7 +696,7 @@
. = ..() . = ..()
/obj/item/twohanded/shockpaddles/syndicate /obj/item/shockpaddles/syndicate
name = "syndicate defibrillator paddles" name = "syndicate defibrillator paddles"
desc = "A pair of paddles used to revive deceased operatives. It possesses both the ability to penetrate armor and to deliver powerful shocks offensively." desc = "A pair of paddles used to revive deceased operatives. It possesses both the ability to penetrate armor and to deliver powerful shocks offensively."
combat = TRUE combat = TRUE
code/game/objects/items/dualsaber.dm
+310
View File
@@ -0,0 +1,310 @@
/*
* Double-Bladed Energy Swords - Cheridan
*/
/obj/item/dualsaber
icon_state = "dualsaber0"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
name = "double-bladed energy sword"
desc = "Handle with care."
force = 3
throwforce = 5
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
item_flags = SLOWS_WHILE_IN_HAND
var/w_class_on = WEIGHT_CLASS_BULKY
hitsound = "swing_hit"
var/hitsound_on = 'sound/weapons/blade1.ogg'
armour_penetration = 35
var/saber_color = "green"
light_color = "#00ff00"//green
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 75
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
var/hacked = FALSE
/// Can this reflect all energy projectiles?
var/can_reflect = TRUE
var/brightness_on = 6 //TWICE AS BRIGHT AS A REGULAR ESWORD
var/list/possible_colors = list("red", "blue", "green", "purple")
var/list/rainbow_colors = list(LIGHT_COLOR_RED, LIGHT_COLOR_GREEN, LIGHT_COLOR_LIGHT_CYAN, LIGHT_COLOR_LAVENDER)
var/spinnable = TRUE
total_mass = 0.4 //Survival flashlights typically weigh around 5 ounces.
var/total_mass_on = 3.4
var/wielded = FALSE // track wielded status on item
var/slowdown_wielded = 0
/obj/item/dualsaber/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=3, force_wielded=34, \
wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
/obj/item/dualsaber/Initialize()
. = ..()
if(LAZYLEN(possible_colors))
saber_color = pick(possible_colors)
switch(saber_color)
if("red")
light_color = LIGHT_COLOR_RED
if("green")
light_color = LIGHT_COLOR_GREEN
if("blue")
light_color = LIGHT_COLOR_LIGHT_CYAN
if("purple")
light_color = LIGHT_COLOR_LAVENDER
/// Triggered on wield of two handed item
/// Specific hulk checks due to reflection chance for balance issues and switches hitsounds.
/obj/item/dualsaber/proc/on_wield(obj/item/source, mob/living/carbon/user)
if(user.has_dna() && user.dna.check_mutation(HULK))
to_chat(user, "<span class='warning'>You lack the grace to wield this!</span>")
return COMPONENT_TWOHANDED_BLOCK_WIELD
wielded = TRUE
sharpness = IS_SHARP
w_class = w_class_on
total_mass = total_mass_on
hitsound = 'sound/weapons/blade1.ogg'
slowdown += slowdown_wielded
START_PROCESSING(SSobj, src)
set_light(brightness_on)
AddElement(/datum/element/sword_point)
/// Triggered on unwield of two handed item
/// switch hitsounds
/obj/item/dualsaber/proc/on_unwield(obj/item/source, mob/living/carbon/user)
sharpness = initial(sharpness)
w_class = initial(w_class)
total_mass = initial(total_mass)
wielded = FALSE
hitsound = "swing_hit"
slowdown_wielded -= slowdown_wielded
STOP_PROCESSING(SSobj, src)
set_light(0)
RemoveElement(/datum/element/sword_point)
/obj/item/dualsaber/Destroy()
STOP_PROCESSING(SSobj, src)
. = ..()
/obj/item/dualsaber/update_icon_state()
if(wielded)
icon_state = "dualsaber[saber_color][wielded]"
else
icon_state = "dualsaber0"
clean_blood()
/obj/item/dualsaber/suicide_act(mob/living/carbon/user)
if(wielded)
user.visible_message("<span class='suicide'>[user] begins spinning way too fast! It looks like [user.p_theyre()] trying to commit suicide!</span>")
var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD)//stole from chainsaw code
var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN)
B.organ_flags &= ~ORGAN_VITAL //this cant possibly be a good idea
var/randdir
for(var/i in 1 to 24)//like a headless chicken!
if(user.is_holding(src))
randdir = pick(GLOB.alldirs)
user.Move(get_step(user, randdir),randdir)
user.emote("spin")
if (i == 3 && myhead)
myhead.drop_limb()
sleep(3)
else
user.visible_message("<span class='suicide'>[user] panics and starts choking to death!</span>")
return OXYLOSS
else
user.visible_message("<span class='suicide'>[user] begins beating [user.p_them()]self to death with \the [src]'s handle! It probably would've been cooler if [user.p_they()] turned it on first!</span>")
return BRUTELOSS
/obj/item/dualsaber/attack(mob/target, mob/living/carbon/human/user)
if(user.has_dna() && user.dna.check_mutation(HULK))
to_chat(user, "<span class='warning'>You grip the blade too hard and accidentally drop it!</span>")
user.dropItemToGround(src)
return
..()
if(HAS_TRAIT(user, TRAIT_CLUMSY) && (wielded) && prob(40))
impale(user)
return
if(spinnable && (wielded) && prob(50))
INVOKE_ASYNC(src, .proc/jedi_spin, user)
/obj/item/dualsaber/proc/jedi_spin(mob/living/user)
for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
user.setDir(i)
if(i == WEST)
user.emote("flip")
sleep(1)
/obj/item/dualsaber/proc/impale(mob/living/user)
to_chat(user, "<span class='warning'>You twirl around a bit before losing your balance and impaling yourself on [src].</span>")
if (force)
user.take_bodypart_damage(20,25)
else
user.adjustStaminaLoss(25)
/obj/item/dualsaber/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(!wielded)
return NONE
if(can_reflect && is_energy_reflectable_projectile(object) && (attack_type & ATTACK_TYPE_PROJECTILE))
block_return[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_RETURN_TO_SENDER //no you
return BLOCK_SHOULD_REDIRECT | BLOCK_SUCCESS | BLOCK_REDIRECTED
return ..()
/obj/item/dualsaber/attack_hulk(mob/living/carbon/human/user, does_attack_animation = 0) //In case thats just so happens that it is still activated on the groud, prevents hulk from picking it up
if(wielded)
to_chat(user, "<span class='warning'>You can't pick up such dangerous item with your meaty hands without losing fingers, better not to!</span>")
return 1
/obj/item/dualsaber/process()
if(wielded)
if(hacked)
rainbow_process()
open_flame()
else
STOP_PROCESSING(SSobj, src)
/obj/item/dualsaber/proc/rainbow_process()
light_color = pick(rainbow_colors)
/obj/item/dualsaber/ignition_effect(atom/A, mob/user)
// same as /obj/item/melee/transforming/energy, mostly
if(!wielded)
return ""
var/in_mouth = ""
if(iscarbon(user))
var/mob/living/carbon/C = user
if(C.wear_mask)
in_mouth = ", barely missing [user.p_their()] nose"
. = "<span class='warning'>[user] swings [user.p_their()] [name][in_mouth]. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [A.name] in the process.</span>"
playsound(loc, hitsound, get_clamped_volume(), 1, -1)
add_fingerprint(user)
// Light your candles while spinning around the room
if(spinnable)
INVOKE_ASYNC(src, .proc/jedi_spin, user)
/obj/item/dualsaber/green
possible_colors = list("green")
/obj/item/dualsaber/red
possible_colors = list("red")
/obj/item/dualsaber/blue
possible_colors = list("blue")
/obj/item/dualsaber/purple
possible_colors = list("purple")
/obj/item/dualsaber/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/multitool))
if(!hacked)
hacked = TRUE
to_chat(user, "<span class='warning'>2XRNBW_ENGAGE</span>")
saber_color = "rainbow"
update_icon()
else
to_chat(user, "<span class='warning'>It's starting to look like a triple rainbow - no, nevermind.</span>")
else
return ..()
/////////////////////////////////////////////////////
// HYPEREUTACTIC Blades /////////////////////////
/////////////////////////////////////////////////////
/obj/item/dualsaber/hypereutactic
icon = 'icons/obj/1x2.dmi'
icon_state = "hypereutactic"
lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
item_state = "hypereutactic"
inhand_x_dimension = 64
inhand_y_dimension = 64
name = "hypereutactic blade"
desc = "A supermassive weapon envisioned to cleave the very fabric of space and time itself in twain, the hypereutactic blade dynamically flash-forges a hypereutactic crystaline nanostructure capable of passing through most known forms of matter like a hot knife through butter."
force = 7
hitsound_on = 'sound/weapons/nebhit.ogg'
armour_penetration = 60
light_color = "#37FFF7"
rainbow_colors = list("#FF0000", "#FFFF00", "#00FF00", "#00FFFF", "#0000FF","#FF00FF", "#3399ff", "#ff9900", "#fb008b", "#9800ff", "#00ffa3", "#ccff00")
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "destroyed", "ripped", "devastated", "shredded")
spinnable = FALSE
total_mass_on = 4
slowdown_wielded = 1
/obj/item/dualsaber/hypereutactic/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=7, force_wielded=40, \
wieldsound='sound/weapons/nebon.ogg', unwieldsound='sound/weapons/nebhit.ogg')
AddElement(/datum/element/update_icon_updates_onmob)
/obj/item/dualsaber/hypereutactic/update_icon_state()
return
/obj/item/dualsaber/hypereutactic/update_overlays()
. = ..()
var/mutable_appearance/blade_overlay = mutable_appearance(icon, "hypereutactic_blade")
var/mutable_appearance/gem_overlay = mutable_appearance(icon, "hypereutactic_gem")
if(light_color)
blade_overlay.color = light_color
gem_overlay.color = light_color
. += gem_overlay
if(wielded)
. += blade_overlay
clean_blood()
/obj/item/dualsaber/hypereutactic/AltClick(mob/living/user)
. = ..()
if(!user.canUseTopic(src, BE_CLOSE, FALSE) || hacked)
return
if(user.incapacitated() || !istype(user))
to_chat(user, "<span class='warning'>You can't do that right now!</span>")
return
if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes")
var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null
if(!energy_color_input || !user.canUseTopic(src, BE_CLOSE, FALSE) || hacked)
return
light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1)
update_icon()
update_light()
return TRUE
/obj/item/dualsaber/hypereutactic/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
. = ..()
if(isinhands)
var/mutable_appearance/gem_inhand = mutable_appearance(icon_file, "hypereutactic_gem")
gem_inhand.color = light_color
. += gem_inhand
if(wielded)
var/mutable_appearance/blade_inhand = mutable_appearance(icon_file, "hypereutactic_blade")
blade_inhand.color = light_color
. += blade_inhand
/obj/item/dualsaber/hypereutactic/examine(mob/user)
. = ..()
if(!hacked)
. += "<span class='notice'>Alt-click to recolor it.</span>"
/obj/item/dualsaber/hypereutactic/rainbow_process()
. = ..()
update_icon()
update_light()
/obj/item/dualsaber/hypereutactic/chaplain
name = "divine lightblade"
desc = "A giant blade of bright and holy light, said to cut down the wicked with ease."
force = 5
block_chance = 50
armour_penetration = 0
var/chaplain_spawnable = TRUE
can_reflect = FALSE
obj_flags = UNIQUE_RENAME
/obj/item/dualsaber/hypereutactic/chaplain/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=20, \
wieldsound='sound/weapons/nebon.ogg', unwieldsound='sound/weapons/nebhit.ogg')
AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE)
code/game/objects/items/electrostaff.dm
+229
View File
@@ -0,0 +1,229 @@
/obj/item/electrostaff
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "electrostaff"
item_state = "electrostaff"
lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
name = "riot suppression electrostaff"
desc = "A large quarterstaff, with massive silver electrodes mounted at the end."
w_class = WEIGHT_CLASS_HUGE
slot_flags = ITEM_SLOT_BACK | ITEM_SLOT_OCLOTHING
throwforce = 15 //if you are a madman and finish someone off with this, power to you.
throw_speed = 1
item_flags = NO_MAT_REDEMPTION
block_chance = 30
attack_verb = list("struck", "beaten", "thwacked", "pulped")
total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors. (to curb stun-kill rampaging without it being on)
var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
var/on = FALSE
var/can_block_projectiles = FALSE //can't block guns
var/lethal_cost = 400 //10000/400*20 = 500. decent enough?
var/lethal_damage = 20
var/lethal_stam_cost = 4
var/stun_cost = 333 //10000/333*25 = 750. stunbatons are at time of writing 10000/1000*49 = 490.
var/stun_status_effect = STATUS_EFFECT_ELECTROSTAFF //a small slowdown effect
var/stun_stamdmg = 40
var/stun_status_duration = 25
var/stun_stam_cost = 3.5
var/wielded = FALSE // track wielded status on item
/obj/item/electrostaff/Initialize(mapload)
. = ..()
if(ispath(cell))
cell = new cell
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/turn_on)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/turn_off)
/obj/item/electrostaff/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_multiplier=2, wieldsound="sparks", unwieldsound="sparks")
/obj/item/electrostaff/Destroy()
STOP_PROCESSING(SSobj, src)
QDEL_NULL(cell)
return ..()
/obj/item/electrostaff/get_cell()
. = cell
if(iscyborg(loc))
var/mob/living/silicon/robot/R = loc
. = R.get_cell()
/obj/item/electrostaff/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(!on || (!can_block_projectiles && (attack_type & ATTACK_TYPE_PROJECTILE)))
return BLOCK_NONE
return ..()
/obj/item/electrostaff/proc/min_hitcost()
return min(stun_cost, lethal_cost)
/obj/item/electrostaff/proc/turn_on(obj/item/source, mob/user)
wielded = TRUE
if(!cell)
if(user)
to_chat(user, "<span class='warning'>[src] has no cell.</span>")
return
if(cell.charge < min_hitcost())
if(user)
to_chat(user, "<span class='warning'>[src] is out of charge.</span>")
return
on = TRUE
START_PROCESSING(SSobj, src)
if(user)
to_chat(user, "<span class='warning'>You turn [src] on.</span>")
/obj/item/electrostaff/proc/turn_off(obj/item/source, mob/user)
wielded = FALSE
if(user)
to_chat(user, "<span class='warning'>You turn [src] off.</span>")
on = FALSE
STOP_PROCESSING(SSobj, src)
/obj/item/electrostaff/update_icon_state()
if(!wielded)
icon_state = item_state = "electrostaff"
else
icon_state = item_state = (on? "electrostaff_1" : "electrostaff_0")
set_light(7, on? 1 : 0, LIGHT_COLOR_CYAN)
/obj/item/electrostaff/examine(mob/living/user)
. = ..()
if(cell)
. += "<span class='notice'>The cell charge is [round(cell.percent())]%.</span>"
else
. += "<span class='warning'>There is no cell installed!</span>"
/obj/item/electrostaff/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stock_parts/cell))
var/obj/item/stock_parts/cell/C = W
if(cell)
to_chat(user, "<span class='warning'>[src] already has a cell!</span>")
else
if(C.maxcharge < min_hit_cost())
to_chat(user, "<span class='notice'>[src] requires a higher capacity cell.</span>")
return
if(!user.transferItemToLoc(W, src))
return
cell = C
to_chat(user, "<span class='notice'>You install a cell in [src].</span>")
else if(W.tool_behaviour == TOOL_SCREWDRIVER)
if(cell)
cell.update_icon()
cell.forceMove(get_turf(src))
cell = null
to_chat(user, "<span class='notice'>You remove the cell from [src].</span>")
turn_off(user, TRUE)
else
return ..()
/obj/item/electrostaff/process()
deductcharge(50) //Wasteful!
/obj/item/electrostaff/proc/min_hit_cost()
return min(lethal_cost, stun_cost)
/obj/item/electrostaff/proc/deductcharge(amount)
var/obj/item/stock_parts/cell/C = get_cell()
if(!C)
turn_off()
return FALSE
C.use(min(amount, C.charge))
if(QDELETED(src))
return FALSE
if(C.charge < min_hit_cost())
turn_off()
/obj/item/electrostaff/attack(mob/living/target, mob/living/user)
if(IS_STAMCRIT(user))//CIT CHANGE - makes it impossible to baton in stamina softcrit
to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")//CIT CHANGE - ditto
return //CIT CHANGE - ditto
if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
clowning_around(user) //ouch!
return
if(iscyborg(target))
..()
return
if(target.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, null) & BLOCK_SUCCESS) //No message; run_block() handles that
playsound(target, 'sound/weapons/genhit.ogg', 50, 1)
return FALSE
if(user.a_intent != INTENT_HARM)
if(stun_act(target, user))
user.do_attack_animation(target)
user.adjustStaminaLossBuffered(stun_stam_cost)
return
else if(!harm_act(target, user))
return ..() //if you can't fry them just beat them with it
else //we did harm act them
user.do_attack_animation(target)
user.adjustStaminaLossBuffered(lethal_stam_cost)
/obj/item/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
var/stunforce = stun_stamdmg
if(!no_charge_and_force)
if(!on)
target.visible_message("<span class='warning'>[user] has bapped [target] with [src]. Luckily it was off.</span>", \
"<span class='warning'>[user] has bapped you with [src]. Luckily it was off</span>")
turn_off() //if it wasn't already off
return FALSE
var/obj/item/stock_parts/cell/C = get_cell()
var/chargeleft = C.charge
deductcharge(stun_cost)
if(QDELETED(src) || QDELETED(C)) //boom
return FALSE
if(chargeleft < stun_cost)
stunforce *= round(chargeleft/stun_cost, 0.1)
target.adjustStaminaLoss(stunforce)
target.apply_effect(EFFECT_STUTTER, stunforce)
SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK)
if(user)
target.lastattacker = user.real_name
target.lastattackerckey = user.ckey
target.visible_message("<span class='danger'>[user] has shocked [target] with [src]!</span>", \
"<span class='userdanger'>[user] has shocked you with [src]!</span>")
log_combat(user, target, "stunned with an electrostaff")
playsound(src, 'sound/weapons/staff.ogg', 50, 1, -1)
target.apply_status_effect(stun_status_effect, stun_status_duration)
if(ishuman(user))
var/mob/living/carbon/human/H = user
H.forcesay(GLOB.hit_appends)
return TRUE
/obj/item/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
var/lethal_force = lethal_damage
if(!no_charge_and_force)
if(!on)
return FALSE //standard item attack
var/obj/item/stock_parts/cell/C = get_cell()
var/chargeleft = C.charge
deductcharge(lethal_cost)
if(QDELETED(src) || QDELETED(C)) //boom
return FALSE
if(chargeleft < stun_cost)
lethal_force *= round(chargeleft/lethal_cost, 0.1)
target.adjustFireLoss(lethal_force) //good against ointment spam
SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK)
if(user)
target.lastattacker = user.real_name
target.lastattackerckey = user.ckey
target.visible_message("<span class='danger'>[user] has seared [target] with [src]!</span>", \
"<span class='userdanger'>[user] has seared you with [src]!</span>")
log_combat(user, target, "burned with an electrostaff")
playsound(src, 'sound/weapons/sear.ogg', 50, 1, -1)
return TRUE
/obj/item/electrostaff/proc/clowning_around(mob/living/user)
user.visible_message("<span class='danger'>[user] accidentally hits [user.p_them()]self with [src]!</span>", \
"<span class='userdanger'>You accidentally hit yourself with [src]!</span>")
SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
harm_act(user, user, TRUE)
stun_act(user, user, TRUE)
deductcharge(lethal_cost)
/obj/item/electrostaff/emp_act(severity)
. = ..()
if (!(. & EMP_PROTECT_SELF))
turn_off()
if(!iscyborg(loc))
deductcharge(1000 / severity, TRUE, FALSE)
code/game/objects/items/fireaxe.dm
+71
View File
@@ -0,0 +1,71 @@
/*
* Fireaxe
*/
/obj/item/fireaxe // DEM AXES MAN, marker -Agouri
icon_state = "fireaxe0"
lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/axes_righthand.dmi'
name = "fire axe"
desc = "Truly, the weapon of a madman. Who would think to fight fire with an axe?"
force = 5
throwforce = 15
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
var/wielded = FALSE // track wielded status on item
/obj/item/fireaxe/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/fireaxe/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 100, 80, 0 , hitsound) //axes are not known for being precision butchering tools
AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=24, icon_wielded="fireaxe1")
/// triggered on wield of two handed item
/obj/item/fireaxe/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/fireaxe/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/fireaxe/update_icon_state()
icon_state = "fireaxe0"
/obj/item/fireaxe/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] axes [user.p_them()]self from head to toe! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return (BRUTELOSS)
/obj/item/fireaxe/afterattack(atom/A, mob/living/user, proximity)
. = ..()
if(!proximity || !wielded || IS_STAMCRIT(user))
return
if(istype(A, /obj/structure/window)) //destroys windows and grilles in one hit (or more if it has a ton of health like plasmaglass)
var/obj/structure/window/W = A
W.take_damage(200, BRUTE, "melee", 0)
else if(istype(A, /obj/structure/grille))
var/obj/structure/grille/G = A
G.take_damage(40, BRUTE, "melee", 0)
/*
* Bone Axe
*/
/obj/item/fireaxe/boneaxe // Blatant imitation of the fireaxe, but made out of bone.
icon_state = "bone_axe0"
name = "bone axe"
desc = "A large, vicious axe crafted out of several sharpened bone plates and crudely tied together. Made of monsters, by killing monsters, for killing monsters."
/obj/item/fireaxe/boneaxe/update_icon_state()
icon_state = "bone_axe0"
/obj/item/fireaxe/boneaxe/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=5, force_wielded=23, icon_wielded="bone_axe1")
code/game/objects/items/melee/energy.dm
+1 -1
View File
@@ -345,7 +345,7 @@
return return
else else
to_chat(user, "<span class='notice'>You combine the two light swords, making a single supermassive blade! You're cool.</span>") to_chat(user, "<span class='notice'>You combine the two light swords, making a single supermassive blade! You're cool.</span>")
new /obj/item/twohanded/dualsaber/hypereutactic(user.drop_location()) new /obj/item/dualsaber/hypereutactic(user.drop_location())
qdel(W) qdel(W)
qdel(src) qdel(src)
else else
code/game/objects/items/pitchfork.dm
+101
View File
@@ -0,0 +1,101 @@
/obj/item/pitchfork
icon_state = "pitchfork0"
lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
name = "pitchfork"
desc = "A simple tool used for moving hay."
force = 7
throwforce = 15
w_class = WEIGHT_CLASS_BULKY
attack_verb = list("attacked", "impaled", "pierced")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 30)
resistance_flags = FIRE_PROOF
var/wielded = FALSE // track wielded status on item
/obj/item/pitchfork/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/pitchfork/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=7, force_wielded=15, icon_wielded="pitchfork1")
AddElement(/datum/element/sword_point)
/// triggered on wield of two handed item
/obj/item/pitchfork/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/pitchfork/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/pitchfork/update_icon_state()
icon_state = "pitchfork0"
/obj/item/pitchfork/demonic
name = "demonic pitchfork"
desc = "A red pitchfork, it looks like the work of the devil."
force = 19
throwforce = 24
/obj/item/pitchfork/demonic/Initialize()
. = ..()
set_light(3,6,LIGHT_COLOR_RED)
/obj/item/pitchfork/demonic/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=19, force_wielded=25)
/obj/item/pitchfork/demonic/greater
force = 24
throwforce = 50
/obj/item/pitchfork/demonic/greater/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=24, force_wielded=34)
/obj/item/pitchfork/demonic/ascended
force = 100
throwforce = 100
/obj/item/pitchfork/demonic/ascended/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=100, force_wielded=500000) // Kills you DEAD
/obj/item/pitchfork/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] impales [user.p_them()]self in [user.p_their()] abdomen with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return (BRUTELOSS)
/obj/item/pitchfork/demonic/pickup(mob/living/user)
. = ..()
if(isliving(user) && user.mind && user.owns_soul() && !is_devil(user))
var/mob/living/U = user
U.visible_message("<span class='warning'>As [U] picks [src] up, [U]'s arms briefly catch fire.</span>", \
"<span class='warning'>\"As you pick up [src] your arms ignite, reminding you of all your past sins.\"</span>")
if(ishuman(U))
var/mob/living/carbon/human/H = U
H.apply_damage(rand(force/2, force), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
else
U.adjustFireLoss(rand(force/2,force))
/obj/item/pitchfork/demonic/attack(mob/target, mob/living/carbon/human/user)
if(user.mind && user.owns_soul() && !is_devil(user))
to_chat(user, "<span class='warning'>[src] burns in your hands.</span>")
user.apply_damage(rand(force/2, force), BURN, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
..()
/obj/item/pitchfork/demonic/ascended/afterattack(atom/target, mob/user, proximity)
. = ..()
if(!proximity || !wielded)
return
if(iswallturf(target))
var/turf/closed/wall/W = target
user.visible_message("<span class='danger'>[user] blasts \the [target] with \the [src]!</span>")
playsound(target, 'sound/magic/disintegrate.ogg', 100, TRUE)
W.break_wall()
W.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
return
code/game/objects/items/robot/robot_upgrades.dm
+1 -1
View File
@@ -459,7 +459,7 @@
/obj/item/borg/upgrade/defib/deactivate(mob/living/silicon/robot/R, user = usr) /obj/item/borg/upgrade/defib/deactivate(mob/living/silicon/robot/R, user = usr)
. = ..() . = ..()
if (.) if (.)
var/obj/item/twohanded/shockpaddles/cyborg/S = locate() in R.module var/obj/item/shockpaddles/cyborg/S = locate() in R.module
R.module.remove_module(S, TRUE) R.module.remove_module(S, TRUE)
/obj/item/borg/upgrade/processor /obj/item/borg/upgrade/processor
code/game/objects/items/sharpener.dm
+12 -14
View File
@@ -24,24 +24,22 @@
if(istype(I, /obj/item/melee/transforming/energy)) if(istype(I, /obj/item/melee/transforming/energy))
to_chat(user, "<span class='warning'>You don't think \the [I] will be the thing getting modified if you use it on \the [src]!</span>") to_chat(user, "<span class='warning'>You don't think \the [I] will be the thing getting modified if you use it on \the [src]!</span>")
return return
if(istype(I, /obj/item/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff
var/obj/item/twohanded/TH = I var/signal_out = SEND_SIGNAL(I, COMSIG_ITEM_SHARPEN_ACT, increment, max)
if(TH.force_wielded >= max) if(signal_out & COMPONENT_BLOCK_SHARPEN_MAXED)
to_chat(user, "<span class='warning'>[TH] is much too powerful to sharpen further!</span>") to_chat(user, "<span class='warning'>[I] is much too powerful to sharpen further!</span>")
return return
if(TH.wielded) if(signal_out & COMPONENT_BLOCK_SHARPEN_BLOCKED)
to_chat(user, "<span class='warning'>[TH] must be unwielded before it can be sharpened!</span>") to_chat(user, "<span class='warning'>[I] is not able to be sharpened right now!</span>")
return return
if(TH.force_wielded > initial(TH.force_wielded)) if((signal_out & COMPONENT_BLOCK_SHARPEN_ALREADY) || (I.force > initial(I.force) && !signal_out))
to_chat(user, "<span class='warning'>[TH] has already been refined before. It cannot be sharpened further!</span>")
return
TH.force_wielded = clamp(TH.force_wielded + increment, 0, max)//wieldforce is increased since normal force wont stay
if(I.force > initial(I.force))
to_chat(user, "<span class='warning'>[I] has already been refined before. It cannot be sharpened further!</span>") to_chat(user, "<span class='warning'>[I] has already been refined before. It cannot be sharpened further!</span>")
return return
if(!(signal_out & COMPONENT_BLOCK_SHARPEN_APPLIED))
I.force = clamp(I.force + increment, 0, max)
user.visible_message("<span class='notice'>[user] sharpens [I] with [src]!</span>", "<span class='notice'>You sharpen [I], making it much more deadly than before.</span>") user.visible_message("<span class='notice'>[user] sharpens [I] with [src]!</span>", "<span class='notice'>You sharpen [I], making it much more deadly than before.</span>")
I.sharpness = IS_SHARP_ACCURATE I.sharpness = IS_SHARP_ACCURATE
I.force = clamp(I.force + increment, 0, max)
I.throwforce = clamp(I.throwforce + increment, 0, max) I.throwforce = clamp(I.throwforce + increment, 0, max)
I.name = "[prefix] [I.name]" I.name = "[prefix] [I.name]"
name = "worn out [name]" name = "worn out [name]"
code/game/objects/items/singularityhammer.dm
+50 -25
View File
@@ -1,4 +1,4 @@
/obj/item/twohanded/singularityhammer /obj/item/singularityhammer
name = "singularity hammer" name = "singularity hammer"
desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows." desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows."
icon_state = "mjollnir0" icon_state = "mjollnir0"
@@ -7,35 +7,47 @@
flags_1 = CONDUCT_1 flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK slot_flags = ITEM_SLOT_BACK
force = 5 force = 5
force_unwielded = 5
force_wielded = 20
throwforce = 15 throwforce = 15
throw_range = 1 throw_range = 1
w_class = WEIGHT_CLASS_HUGE w_class = WEIGHT_CLASS_HUGE
var/charged = 5
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF resistance_flags = FIRE_PROOF | ACID_PROOF
force_string = "LORD SINGULOTH HIMSELF" force_string = "LORD SINGULOTH HIMSELF"
total_mass = TOTAL_MASS_MEDIEVAL_WEAPON total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
var/charged = 5
var/wielded = FALSE // track wielded status on item
/obj/item/twohanded/singularityhammer/New() /obj/item/singularityhammer/New()
..() ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
START_PROCESSING(SSobj, src) START_PROCESSING(SSobj, src)
/obj/item/twohanded/singularityhammer/Destroy() /obj/item/singularityhammer/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_multiplier=4, icon_wielded="mjollnir1")
/// triggered on wield of two handed item
/obj/item/singularityhammer/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/singularityhammer/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/singularityhammer/update_icon_state()
icon_state = "mjollnir0"
/obj/item/singularityhammer/Destroy()
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
return ..() return ..()
/obj/item/twohanded/singularityhammer/process() /obj/item/singularityhammer/process()
if(charged < 5) if(charged < 5)
charged++ charged++
return return
/obj/item/twohanded/singularityhammer/update_icon_state() //Currently only here to fuck with the on-mob icons. /obj/item/singularityhammer/proc/vortex(turf/pull, mob/wielder)
icon_state = "mjollnir[wielded]"
return
/obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder)
for(var/atom/X in orange(5,pull)) for(var/atom/X in orange(5,pull))
if(ismovable(X)) if(ismovable(X))
var/atom/movable/A = X var/atom/movable/A = X
@@ -55,9 +67,8 @@
step_towards(H,pull) step_towards(H,pull)
step_towards(H,pull) step_towards(H,pull)
step_towards(H,pull) step_towards(H,pull)
return
/obj/item/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) /obj/item/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
. = ..() . = ..()
if(!proximity) if(!proximity)
return return
@@ -71,7 +82,7 @@
var/turf/target = get_turf(A) var/turf/target = get_turf(A)
vortex(target,user) vortex(target,user)
/obj/item/twohanded/mjollnir /obj/item/mjollnir
name = "Mjolnir" name = "Mjolnir"
desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy." desc = "A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy."
icon_state = "mjollnir0" icon_state = "mjollnir0"
@@ -80,14 +91,33 @@
flags_1 = CONDUCT_1 flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK slot_flags = ITEM_SLOT_BACK
force = 5 force = 5
force_unwielded = 5
force_wielded = 25
throwforce = 30 throwforce = 30
throw_range = 7 throw_range = 7
w_class = WEIGHT_CLASS_HUGE w_class = WEIGHT_CLASS_HUGE
total_mass = TOTAL_MASS_MEDIEVAL_WEAPON total_mass = TOTAL_MASS_MEDIEVAL_WEAPON
var/wielded = FALSE // track wielded status on item
/obj/item/twohanded/mjollnir/proc/shock(mob/living/target) /obj/item/mjollnir/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/mjollnir/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_multiplier=5, icon_wielded="mjollnir1", attacksound="sparks")
/// triggered on wield of two handed item
/obj/item/mjollnir/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/mjollnir/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/mjollnir/update_icon_state()
icon_state = "mjollnir0"
/obj/item/mjollnir/proc/shock(mob/living/target)
target.Stun(60) target.Stun(60)
var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread
s.set_up(5, 1, target.loc) s.set_up(5, 1, target.loc)
@@ -99,17 +129,12 @@
target.throw_at(throw_target, 200, 4) target.throw_at(throw_target, 200, 4)
return return
/obj/item/twohanded/mjollnir/attack(mob/living/M, mob/user) /obj/item/mjollnir/attack(mob/living/M, mob/user)
..() ..()
if(wielded) if(wielded)
playsound(src.loc, "sparks", 50, 1)
shock(M) shock(M)
/obj/item/twohanded/mjollnir/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) /obj/item/mjollnir/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..() . = ..()
if(isliving(hit_atom)) if(isliving(hit_atom))
shock(hit_atom) shock(hit_atom)
/obj/item/twohanded/mjollnir/update_icon_state() //Currently only here to fuck with the on-mob icons.
icon_state = "mjollnir[wielded]"
return
code/game/objects/items/spear.dm
+181
View File
@@ -0,0 +1,181 @@
//spears
/obj/item/spear
icon_state = "spearglass0"
lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
name = "spear"
desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
force = 10
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
throwforce = 20
throw_speed = 4
embedding = list("embedded_impact_pain_multiplier" = 3, "embed_chance" = 90)
armour_penetration = 10
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
sharpness = IS_SHARP
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 30)
var/obj/item/grenade/explosive = null
var/war_cry = "AAAAARGH!!!"
var/icon_prefix = "spearglass"
var/wielded = FALSE // track wielded status on item
/obj/item/spear/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/spear/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 100, 70) //decent in a pinch, but pretty bad.
AddComponent(/datum/component/jousting)
AddElement(/datum/element/sword_point)
AddComponent(/datum/component/two_handed, force_unwielded=10, force_wielded=18, icon_wielded="[icon_prefix]1")
/// triggered on wield of two handed item
/obj/item/spear/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/spear/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/spear/rightclick_attack_self(mob/user)
if(explosive)
explosive.attack_self(user)
return
. = ..()
/obj/item/spear/update_icon_state()
icon_state = "[icon_prefix]0"
/obj/item/spear/update_overlays()
. = ..()
if(explosive)
. += "spearbomb_overlay"
/obj/item/spear/suicide_act(mob/living/carbon/user)
user.visible_message("<span class='suicide'>[user] begins to sword-swallow \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
if(explosive) //Citadel Edit removes qdel and explosive.forcemove(AM)
user.say("[war_cry]", forced="spear warcry")
explosive.prime()
user.gib()
return BRUTELOSS
return BRUTELOSS
/obj/item/spear/examine(mob/user)
. = ..()
if(explosive)
. += "<span class='notice'>Alt-click to set your war cry.</span>"
. += "<span class='notice'>Right-click in combat mode to activate the attached explosive.</span>"
/obj/item/spear/afterattack(atom/movable/AM, mob/user, proximity)
. = ..()
if(!proximity)
return
if(isopenturf(AM)) //So you can actually melee with it
return
if(explosive && wielded) //Citadel edit removes qdel and explosive.forcemove(AM)
user.say("[war_cry]", forced="spear warcry")
explosive.prime()
/obj/item/spear/grenade_prime_react(obj/item/grenade/nade) //Citadel edit, removes throw_impact because memes
nade.forceMove(get_turf(src))
qdel(src)
/obj/item/spear/AltClick(mob/user)
. = ..()
if(user.canUseTopic(src, BE_CLOSE))
..()
if(!explosive)
return
if(istype(user) && loc == user)
var/input = stripped_input(user,"What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50)
if(input)
src.war_cry = input
return TRUE
/obj/item/spear/CheckParts(list/parts_list)
var/obj/item/shard/tip = locate() in parts_list
if (istype(tip, /obj/item/shard/plasma))
throwforce = 21
icon_prefix = "spearplasma"
AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]1")
qdel(tip)
var/obj/item/spear/S = locate() in parts_list
if(S)
if(S.explosive)
S.explosive.forceMove(get_turf(src))
S.explosive = null
parts_list -= S
qdel(S)
..()
var/obj/item/grenade/G = locate() in contents
if(G)
explosive = G
name = "explosive lance"
desc = "A makeshift spear with \a [G] attached to it."
update_icon()
//GREY TIDE
/obj/item/spear/grey_tide
icon_state = "spearglass0"
name = "\improper Grey Tide"
desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualities among Nanotrasen military forces."
throwforce = 20
throw_speed = 4
attack_verb = list("gored")
var/clonechance = 50
var/clonedamage = 12
var/clonespeed = 0
var/clone_replication_chance = 30
var/clone_lifespan = 100
/obj/item/spear/grey_tide/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=15, force_wielded=25, icon_wielded="[icon_prefix]1")
/obj/item/spear/grey_tide/afterattack(atom/movable/AM, mob/living/user, proximity)
. = ..()
if(!proximity)
return
user.faction |= "greytide([REF(user)])"
if(isliving(AM))
var/mob/living/L = AM
if(istype (L, /mob/living/simple_animal/hostile/illusion))
return
if(!L.stat && prob(clonechance))
var/mob/living/simple_animal/hostile/illusion/M = new(user.loc)
M.faction = user.faction.Copy()
M.set_varspeed(clonespeed)
M.Copy_Parent(user, clone_lifespan, user.health/2.5, clonedamage, clone_replication_chance)
M.GiveTarget(L)
/*
* Bone Spear
*/
/obj/item/spear/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification.
icon_state = "bone_spear0"
lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
name = "bone spear"
desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology."
force = 11
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
reach = 2
throwforce = 22
embedding = list("embedded_impact_pain_multiplier" = 3)
armour_penetration = 15 //Enhanced armor piercing
custom_materials = null
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
sharpness = IS_SHARP
icon_prefix = "bone_spear"
/obj/item/spear/bonespear/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=20, icon_wielded="[icon_prefix]1")
code/game/objects/items/storage/belt.dm
+1 -1
View File
@@ -585,7 +585,7 @@
/obj/item/key/janitor, /obj/item/key/janitor,
/obj/item/clothing/gloves, /obj/item/clothing/gloves,
/obj/item/melee/flyswatter, /obj/item/melee/flyswatter,
/obj/item/twohanded/broom, /obj/item/broom,
/obj/item/paint/paint_remover, /obj/item/paint/paint_remover,
/obj/item/assembly/mousetrap, /obj/item/assembly/mousetrap,
/obj/item/screwdriver, /obj/item/screwdriver,
code/game/objects/items/storage/book.dm
+2 -2
View File
@@ -173,12 +173,12 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
var/unholy2clean = A.reagents.get_reagent_amount(/datum/reagent/fuel/unholywater) var/unholy2clean = A.reagents.get_reagent_amount(/datum/reagent/fuel/unholywater)
A.reagents.del_reagent(/datum/reagent/fuel/unholywater) A.reagents.del_reagent(/datum/reagent/fuel/unholywater)
A.reagents.add_reagent(/datum/reagent/water/holywater,unholy2clean) A.reagents.add_reagent(/datum/reagent/water/holywater,unholy2clean)
if(istype(A, /obj/item/twohanded/required/cult_bastard) || istype(A, /obj/item/melee/cultblade) && !iscultist(user)) if(istype(A, /obj/item/cult_bastard) || istype(A, /obj/item/melee/cultblade) && !iscultist(user))
to_chat(user, "<span class='notice'>You begin to exorcise [A].</span>") to_chat(user, "<span class='notice'>You begin to exorcise [A].</span>")
playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1) playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,1)
if(do_after(user, 40, target = A)) if(do_after(user, 40, target = A))
playsound(src,'sound/effects/pray_chaplain.ogg',60,1) playsound(src,'sound/effects/pray_chaplain.ogg',60,1)
if(istype(A, /obj/item/twohanded/required/cult_bastard)) if(istype(A, /obj/item/cult_bastard))
for(var/obj/item/soulstone/SS in A.contents) for(var/obj/item/soulstone/SS in A.contents)
SS.usability = TRUE SS.usability = TRUE
for(var/mob/living/simple_animal/shade/EX in SS) for(var/mob/living/simple_animal/shade/EX in SS)
code/game/objects/items/storage/uplink_kits.dm
+1 -1
View File
@@ -117,7 +117,7 @@
new /obj/item/pizzabox/bomb new /obj/item/pizzabox/bomb
if("darklord") //20 tc + tk + summon item close enough for now if("darklord") //20 tc + tk + summon item close enough for now
new /obj/item/twohanded/dualsaber(src) new /obj/item/dualsaber(src)
new /obj/item/dnainjector/telemut/darkbundle(src) new /obj/item/dnainjector/telemut/darkbundle(src)
new /obj/item/clothing/suit/hooded/chaplain_hoodie(src) new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
new /obj/item/card/id/syndicate(src) new /obj/item/card/id/syndicate(src)
code/game/objects/items/toys.dm
+16 -11
View File
@@ -272,7 +272,7 @@
return return
else else
to_chat(user, "<span class='notice'>You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.</span>") to_chat(user, "<span class='notice'>You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.</span>")
var/obj/item/twohanded/dualsaber/toy/newSaber = new /obj/item/twohanded/dualsaber/toy(user.loc) var/obj/item/dualsaber/toy/newSaber = new /obj/item/dualsaber/toy(user.loc)
if(hacked) // That's right, we'll only check the "original" "sword". if(hacked) // That's right, we'll only check the "original" "sword".
newSaber.hacked = TRUE newSaber.hacked = TRUE
qdel(W) qdel(W)
@@ -363,7 +363,7 @@
return return
else else
to_chat(user, "<span class='notice'>You combine the two plastic swords, making a single supermassive toy! You're fake-cool.</span>") to_chat(user, "<span class='notice'>You combine the two plastic swords, making a single supermassive toy! You're fake-cool.</span>")
new /obj/item/twohanded/dualsaber/hypereutactic/toy(user.loc) new /obj/item/dualsaber/hypereutactic/toy(user.loc)
qdel(W) qdel(W)
qdel(src) qdel(src)
else else
@@ -437,40 +437,45 @@
/* /*
* Subtype of Double-Bladed Energy Swords * Subtype of Double-Bladed Energy Swords
*/ */
/obj/item/twohanded/dualsaber/toy /obj/item/dualsaber/toy
name = "double-bladed toy sword" name = "double-bladed toy sword"
desc = "A cheap, plastic replica of TWO energy swords. Double the fun!" desc = "A cheap, plastic replica of TWO energy swords. Double the fun!"
force = 0 force = 0
throwforce = 0 throwforce = 0
throw_speed = 3 throw_speed = 3
throw_range = 5 throw_range = 5
force_unwielded = 0
force_wielded = 0
attack_verb = list("attacked", "struck", "hit") attack_verb = list("attacked", "struck", "hit")
total_mass_on = TOTAL_MASS_TOY_SWORD total_mass_on = TOTAL_MASS_TOY_SWORD
sharpness = IS_BLUNT sharpness = IS_BLUNT
/obj/item/twohanded/dualsaber/toy/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) /obj/item/dualsaber/toy/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
/obj/item/dualsaber/toy/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
return BLOCK_NONE return BLOCK_NONE
/obj/item/twohanded/dualsaber/hypereutactic/toy /obj/item/dualsaber/hypereutactic/toy
name = "\improper DX Hyper-Euplastic LightSword" name = "\improper DX Hyper-Euplastic LightSword"
desc = "A supermassive toy envisioned to cleave the very fabric of space and time itself in twain. Realistic visuals and sounds! Ages 8 and up." desc = "A supermassive toy envisioned to cleave the very fabric of space and time itself in twain. Realistic visuals and sounds! Ages 8 and up."
force = 0 force = 0
throwforce = 0 throwforce = 0
throw_speed = 3 throw_speed = 3
throw_range = 5 throw_range = 5
force_unwielded = 0
force_wielded = 0
attack_verb = list("attacked", "struck", "hit") attack_verb = list("attacked", "struck", "hit")
total_mass_on = TOTAL_MASS_TOY_SWORD total_mass_on = TOTAL_MASS_TOY_SWORD
slowdown_wielded = 0 slowdown_wielded = 0
sharpness = IS_BLUNT sharpness = IS_BLUNT
/obj/item/twohanded/dualsaber/hypereutactic/toy/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) /obj/item/dualsaber/toy/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, wieldsound='sound/weapons/saberon.ogg', unwieldsound='sound/weapons/saberoff.ogg')
/obj/item/dualsaber/hypereutactic/toy/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
return BLOCK_NONE return BLOCK_NONE
/obj/item/twohanded/dualsaber/hypereutactic/toy/rainbow /obj/item/dualsaber/hypereutactic/toy/rainbow
name = "\improper Hyper-Euclidean Reciprocating Trigonometric Zweihander" name = "\improper Hyper-Euclidean Reciprocating Trigonometric Zweihander"
desc = "A custom-built toy with fancy rainbow lights built-in." desc = "A custom-built toy with fancy rainbow lights built-in."
hacked = TRUE hacked = TRUE
code/game/objects/items/twohanded.dm
-1331
View File
File diff suppressed because it is too large Load Diff
code/game/objects/items/weaponry.dm
+58 -2
View File
@@ -261,7 +261,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/wirerod/attackby(obj/item/I, mob/user, params) /obj/item/wirerod/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/shard)) if(istype(I, /obj/item/shard))
var/obj/item/twohanded/spear/S = new /obj/item/twohanded/spear var/obj/item/spear/S = new /obj/item/spear
remove_item_from_storage(user) remove_item_from_storage(user)
if (!user.transferItemToLoc(I, S)) if (!user.transferItemToLoc(I, S))
@@ -457,7 +457,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/mounted_chainsaw/Destroy() /obj/item/mounted_chainsaw/Destroy()
var/obj/item/bodypart/part var/obj/item/bodypart/part
new /obj/item/twohanded/required/chainsaw(get_turf(src)) new /obj/item/chainsaw(get_turf(src))
if(iscarbon(loc)) if(iscarbon(loc))
var/mob/living/carbon/holder = loc var/mob/living/carbon/holder = loc
var/index = holder.get_held_index_of_item(src) var/index = holder.get_held_index_of_item(src)
@@ -734,3 +734,59 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
to_chat(user, "<span class='warning'>[M] is too close to use [src] on.</span>") to_chat(user, "<span class='warning'>[M] is too close to use [src] on.</span>")
return return
M.attack_hand(user) M.attack_hand(user)
//HF blade
/obj/item/vibro_weapon
icon_state = "hfrequency0"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
name = "vibro sword"
desc = "A potent weapon capable of cutting through nearly anything. Wielding it in two hands will allow you to deflect gunfire."
armour_penetration = 100
block_chance = 40
throwforce = 20
throw_speed = 4
sharpness = IS_SHARP
attack_verb = list("cut", "sliced", "diced")
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
hitsound = 'sound/weapons/bladeslice.ogg'
var/wielded = FALSE // track wielded status on item
/obj/item/vibro_weapon/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/vibro_weapon/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 20, 105)
AddComponent(/datum/component/two_handed, force_multiplier=2, icon_wielded="hfrequency1")
AddElement(/datum/element/sword_point)
/// triggered on wield of two handed item
/obj/item/vibro_weapon/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/vibro_weapon/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/vibro_weapon/update_icon_state()
icon_state = "hfrequency0"
/obj/item/vibro_weapon/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(wielded)
final_block_chance *= 2
if(wielded || !(attack_type & ATTACK_TYPE_PROJECTILE))
if(prob(final_block_chance))
if(attack_type & ATTACK_TYPE_PROJECTILE)
owner.visible_message("<span class='danger'>[owner] deflects [attack_text] with [src]!</span>")
playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, 1)
block_return[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT
return BLOCK_SUCCESS | BLOCK_REDIRECTED | BLOCK_SHOULD_REDIRECT | BLOCK_PHYSICAL_EXTERNAL
else
owner.visible_message("<span class='danger'>[owner] parries [attack_text] with [src]!</span>")
return BLOCK_SUCCESS | BLOCK_PHYSICAL_EXTERNAL
return NONE
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+2 -2
View File
@@ -272,8 +272,8 @@
icon_state = "tac" icon_state = "tac"
/obj/structure/closet/secure_closet/lethalshots/PopulateContents() /obj/structure/closet/secure_closet/lethalshots/PopulateContents()
..() ..()
new /obj/item/twohanded/electrostaff(src) new /obj/item/electrostaff(src)
new /obj/item/twohanded/electrostaff(src) new /obj/item/electrostaff(src)
for(var/i in 1 to 3) for(var/i in 1 to 3)
new /obj/item/storage/box/lethalshot(src) new /obj/item/storage/box/lethalshot(src)
code/game/objects/structures/fireaxe.dm
+3 -3
View File
@@ -11,7 +11,7 @@
integrity_failure = 0.33 integrity_failure = 0.33
var/locked = TRUE var/locked = TRUE
var/open = FALSE var/open = FALSE
var/obj/item/twohanded/fireaxe/fireaxe var/obj/item/fireaxe/fireaxe
/obj/structure/fireaxecabinet/Initialize() /obj/structure/fireaxecabinet/Initialize()
. = ..() . = ..()
@@ -50,8 +50,8 @@
obj_integrity = max_integrity obj_integrity = max_integrity
update_icon() update_icon()
else if(open || broken) else if(open || broken)
if(istype(I, /obj/item/twohanded/fireaxe) && !fireaxe) if(istype(I, /obj/item/fireaxe) && !fireaxe)
var/obj/item/twohanded/fireaxe/F = I var/obj/item/fireaxe/F = I
if(F.wielded) if(F.wielded)
to_chat(user, "<span class='warning'>Unwield the [F.name] first.</span>") to_chat(user, "<span class='warning'>Unwield the [F.name] first.</span>")
return return
code/game/objects/structures/flora.dm
+8 -7
View File
@@ -288,7 +288,7 @@
icon_state = "fullgrass_[rand(1, 3)]" icon_state = "fullgrass_[rand(1, 3)]"
. = ..() . = ..()
/obj/item/twohanded/required/kirbyplants /obj/item/kirbyplants
name = "potted plant" name = "potted plant"
icon = 'icons/obj/flora/plants.dmi' icon = 'icons/obj/flora/plants.dmi'
icon_state = "plant-01" icon_state = "plant-01"
@@ -300,23 +300,24 @@
throw_speed = 2 throw_speed = 2
throw_range = 4 throw_range = 4
/obj/item/twohanded/required/kirbyplants/Initialize() /obj/item/kirbyplants/ComponentInitialize()
. = ..() . = ..()
AddComponent(/datum/component/tactical) AddComponent(/datum/component/tactical)
AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_unwielded=10, force_wielded=10)
/obj/item/twohanded/required/kirbyplants/random /obj/item/kirbyplants/random
icon = 'icons/obj/flora/_flora.dmi' icon = 'icons/obj/flora/_flora.dmi'
icon_state = "random_plant" icon_state = "random_plant"
var/list/static/states var/list/static/states
/obj/item/twohanded/required/kirbyplants/random/Initialize() /obj/item/kirbyplants/random/Initialize()
. = ..() . = ..()
icon = 'icons/obj/flora/plants.dmi' icon = 'icons/obj/flora/plants.dmi'
if(!states) if(!states)
generate_states() generate_states()
icon_state = pick(states) icon_state = pick(states)
/obj/item/twohanded/required/kirbyplants/random/proc/generate_states() /obj/item/kirbyplants/random/proc/generate_states()
states = list() states = list()
for(var/i in 1 to 25) for(var/i in 1 to 25)
var/number var/number
@@ -328,12 +329,12 @@
states += "applebush" states += "applebush"
/obj/item/twohanded/required/kirbyplants/dead /obj/item/kirbyplants/dead
name = "RD's potted plant" name = "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..." 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..."
icon_state = "plant-25" icon_state = "plant-25"
/obj/item/twohanded/required/kirbyplants/photosynthetic /obj/item/kirbyplants/photosynthetic
name = "photosynthetic potted plant" name = "photosynthetic potted plant"
desc = "A bioluminescent plant." desc = "A bioluminescent plant."
icon_state = "plant-09" icon_state = "plant-09"
code/game/objects/structures/headpike.dm
+3 -3
View File
@@ -6,7 +6,7 @@
density = FALSE density = FALSE
anchored = TRUE anchored = TRUE
var/bonespear = FALSE var/bonespear = FALSE
var/obj/item/twohanded/spear/spear var/obj/item/spear/spear
var/obj/item/bodypart/head/victim var/obj/item/bodypart/head/victim
/obj/structure/headpike/bone //for bone spears /obj/structure/headpike/bone //for bone spears
@@ -20,9 +20,9 @@
name = "[victim.name] on a spear" name = "[victim.name] on a spear"
update_icon() update_icon()
if(bonespear) if(bonespear)
spear = locate(/obj/item/twohanded/bonespear) in parts_list spear = locate(/obj/item/spear/bonespear) in parts_list
else else
spear = locate(/obj/item/twohanded/spear) in parts_list spear = locate(/obj/item/spear) in parts_list
/obj/structure/headpike/Initialize() /obj/structure/headpike/Initialize()
. = ..() . = ..()
code/game/objects/structures/janicart.dm
+3 -3
View File
@@ -8,7 +8,7 @@
//copypaste sorry //copypaste sorry
var/obj/item/storage/bag/trash/mybag var/obj/item/storage/bag/trash/mybag
var/obj/item/mop/mymop var/obj/item/mop/mymop
var/obj/item/twohanded/broom/mybroom var/obj/item/broom/mybroom
var/obj/item/reagent_containers/spray/cleaner/myspray var/obj/item/reagent_containers/spray/cleaner/myspray
var/obj/item/lightreplacer/myreplacer var/obj/item/lightreplacer/myreplacer
var/signs = 0 var/signs = 0
@@ -48,9 +48,9 @@
m.janicart_insert(user, src) m.janicart_insert(user, src)
else else
to_chat(user, fail_msg) to_chat(user, fail_msg)
else if(istype(I, /obj/item/twohanded/broom)) else if(istype(I, /obj/item/broom))
if(!mybroom) if(!mybroom)
var/obj/item/twohanded/broom/b=I var/obj/item/broom/b=I
b.janicart_insert(user,src) b.janicart_insert(user,src)
else else
to_chat(user, fail_msg) to_chat(user, fail_msg)
code/game/turfs/simulated/minerals.dm
+1 -1
View File
@@ -803,7 +803,7 @@
stage = GIBTONITE_DETONATE stage = GIBTONITE_DETONATE
explosion(bombturf,1,2,5, adminlog = 0) explosion(bombturf,1,2,5, adminlog = 0)
if(stage == GIBTONITE_STABLE) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore. if(stage == GIBTONITE_STABLE) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
var/obj/item/twohanded/required/gibtonite/G = new (src) var/obj/item/gibtonite/G = new (src)
if(det_time <= 0) if(det_time <= 0)
G.quality = 3 G.quality = 3
G.icon_state = "Gibtonite ore 3" G.icon_state = "Gibtonite ore 3"
code/game/turfs/simulated/wall/mineral_walls.dm
+1 -1
View File
@@ -136,7 +136,7 @@
/turf/closed/wall/mineral/wood/attackby(obj/item/W, mob/user) /turf/closed/wall/mineral/wood/attackby(obj/item/W, mob/user)
if(W.sharpness && W.force) if(W.sharpness && W.force)
var/duration = (48/W.force) * 2 //In seconds, for now. var/duration = (48/W.force) * 2 //In seconds, for now.
if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/twohanded/fireaxe)) if(istype(W, /obj/item/hatchet) || istype(W, /obj/item/fireaxe))
duration /= 4 //Much better with hatchets and axes. duration /= 4 //Much better with hatchets and axes.
var/src_type = type var/src_type = type
if(do_after(user, duration*10, target=src) && type == src_type) //Into deciseconds. if(do_after(user, duration*10, target=src) && type == src_type) //Into deciseconds.
code/game/turfs/turf.dm
+2 -2
View File
@@ -179,7 +179,7 @@
target.zImpact(A, levels, src) target.zImpact(A, levels, src)
return TRUE return TRUE
/turf/proc/handleRCL(obj/item/twohanded/rcl/C, mob/user) /turf/proc/handleRCL(obj/item/rcl/C, mob/user)
if(C.loaded) if(C.loaded)
for(var/obj/structure/cable/LC in src) for(var/obj/structure/cable/LC in src)
if(!LC.d1 || !LC.d2) if(!LC.d1 || !LC.d2)
@@ -202,7 +202,7 @@
coil.place_turf(src, user) coil.place_turf(src, user)
return TRUE return TRUE
else if(istype(C, /obj/item/twohanded/rcl)) else if(istype(C, /obj/item/rcl))
handleRCL(C, user) handleRCL(C, user)
return FALSE return FALSE
code/modules/admin/fun_balloon.dm
+1 -1
View File
@@ -126,7 +126,7 @@
L.forceMove(LA) L.forceMove(LA)
L.hallucination = 0 L.hallucination = 0
to_chat(L, "<span class='reallybig redtext'>The battle is won. Your bloodlust subsides.</span>") to_chat(L, "<span class='reallybig redtext'>The battle is won. Your bloodlust subsides.</span>")
for(var/obj/item/twohanded/required/chainsaw/doomslayer/chainsaw in L) for(var/obj/item/chainsaw/doomslayer/chainsaw in L)
qdel(chainsaw) qdel(chainsaw)
else else
to_chat(L, "You are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.") to_chat(L, "You are not yet worthy of passing. Drag a severed head to the barrier to be allowed entry to the hall of champions.")
code/modules/antagonists/cult/blood_magic.dm
+1 -1
View File
@@ -801,7 +801,7 @@
var/turf/T = get_turf(user) var/turf/T = get_turf(user)
qdel(src) qdel(src)
var/datum/action/innate/cult/spear/S = new(user) var/datum/action/innate/cult/spear/S = new(user)
var/obj/item/twohanded/cult_spear/rite = new(T) var/obj/item/cult_spear/rite = new(T)
S.Grant(user, rite) S.Grant(user, rite)
rite.spear_act = S rite.spear_act = S
if(user.put_in_hands(rite)) if(user.put_in_hands(rite))
code/modules/antagonists/cult/cult_items.dm
+41 -23
View File
@@ -100,7 +100,7 @@
user.apply_damage(30, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) user.apply_damage(30, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
user.dropItemToGround(src) user.dropItemToGround(src)
/obj/item/twohanded/required/cult_bastard /obj/item/cult_bastard
name = "bloody bastard sword" name = "bloody bastard sword"
desc = "An enormous sword used by Nar'Sien cultists to rapidly harvest the souls of non-believers." desc = "An enormous sword used by Nar'Sien cultists to rapidly harvest the souls of non-believers."
w_class = WEIGHT_CLASS_HUGE w_class = WEIGHT_CLASS_HUGE
@@ -127,31 +127,35 @@
var/spin_cooldown = 250 var/spin_cooldown = 250
var/dash_toggled = TRUE var/dash_toggled = TRUE
/obj/item/twohanded/required/cult_bastard/Initialize() /obj/item/cult_bastard/Initialize()
. = ..() . = ..()
set_light(4) set_light(4)
jaunt = new(src) jaunt = new(src)
linked_action = new(src) linked_action = new(src)
AddComponent(/datum/component/butchering, 50, 80)
/obj/item/twohanded/required/cult_bastard/examine(mob/user) /obj/item/cult_bastard/ComponentInitialize()
. = ..()
AddComponent(/datum/component/butchering, 50, 80)
AddComponent(/datum/component/two_handed, require_twohands=TRUE)
/obj/item/cult_bastard/examine(mob/user)
. = ..() . = ..()
if(contents.len) if(contents.len)
. += "<br><b>There are [contents.len] souls trapped within the sword's core.</b>" . += "<br><b>There are [contents.len] souls trapped within the sword's core.</b>"
else else
. += "<br>The sword appears to be quite lifeless." . += "<br>The sword appears to be quite lifeless."
/obj/item/twohanded/required/cult_bastard/can_be_pulled(user) /obj/item/cult_bastard/can_be_pulled(user)
return FALSE return FALSE
/obj/item/twohanded/required/cult_bastard/attack_self(mob/user) /obj/item/cult_bastard/attack_self(mob/user)
dash_toggled = !dash_toggled dash_toggled = !dash_toggled
if(dash_toggled) if(dash_toggled)
to_chat(loc, "<span class='notice'>You raise [src] and prepare to jaunt with it.</span>") to_chat(loc, "<span class='notice'>You raise [src] and prepare to jaunt with it.</span>")
else else
to_chat(loc, "<span class='notice'>You lower [src] and prepare to swing it normally.</span>") to_chat(loc, "<span class='notice'>You lower [src] and prepare to swing it normally.</span>")
/obj/item/twohanded/required/cult_bastard/pickup(mob/living/user) /obj/item/cult_bastard/pickup(mob/living/user)
. = ..() . = ..()
if(!iscultist(user)) if(!iscultist(user))
if(!is_servant_of_ratvar(user)) if(!is_servant_of_ratvar(user))
@@ -171,13 +175,13 @@
linked_action.Grant(user, src) linked_action.Grant(user, src)
user.update_icons() user.update_icons()
/obj/item/twohanded/required/cult_bastard/dropped(mob/user) /obj/item/cult_bastard/dropped(mob/user)
. = ..() . = ..()
linked_action.Remove(user) linked_action.Remove(user)
jaunt.Remove(user) jaunt.Remove(user)
user.update_icons() user.update_icons()
/obj/item/twohanded/required/cult_bastard/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) /obj/item/cult_bastard/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(spinning && is_energy_reflectable_projectile(object) && (attack_type & ATTACK_TYPE_PROJECTILE)) if(spinning && is_energy_reflectable_projectile(object) && (attack_type & ATTACK_TYPE_PROJECTILE))
playsound(src, pick('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg'), 100, 1) playsound(src, pick('sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg', 'sound/weapons/effects/ric3.ogg', 'sound/weapons/effects/ric4.ogg', 'sound/weapons/effects/ric5.ogg'), 100, 1)
return BLOCK_SUCCESS | BLOCK_PHYSICAL_EXTERNAL | BLOCK_REDIRECTED | BLOCK_SHOULD_REDIRECT return BLOCK_SUCCESS | BLOCK_PHYSICAL_EXTERNAL | BLOCK_REDIRECTED | BLOCK_SHOULD_REDIRECT
@@ -192,7 +196,7 @@
return BLOCK_SUCCESS | BLOCK_PHYSICAL_EXTERNAL return BLOCK_SUCCESS | BLOCK_PHYSICAL_EXTERNAL
return BLOCK_NONE return BLOCK_NONE
/obj/item/twohanded/required/cult_bastard/afterattack(atom/target, mob/user, proximity, click_parameters) /obj/item/cult_bastard/afterattack(atom/target, mob/user, proximity, click_parameters)
. = ..() . = ..()
if(dash_toggled && !proximity) if(dash_toggled && !proximity)
jaunt.Teleport(user, target) jaunt.Teleport(user, target)
@@ -235,7 +239,7 @@
button_icon_state = "sintouch" button_icon_state = "sintouch"
var/cooldown = 0 var/cooldown = 0
var/mob/living/carbon/human/holder var/mob/living/carbon/human/holder
var/obj/item/twohanded/required/cult_bastard/sword var/obj/item/cult_bastard/sword
/datum/action/innate/cult/spin2win/Grant(mob/user, obj/bastard) /datum/action/innate/cult/spin2win/Grant(mob/user, obj/bastard)
. = ..() . = ..()
@@ -686,7 +690,7 @@
to_chat(user, "<span class='warning'>\The [src] can only transport items!</span>") to_chat(user, "<span class='warning'>\The [src] can only transport items!</span>")
/obj/item/twohanded/cult_spear /obj/item/cult_spear
name = "blood halberd" name = "blood halberd"
desc = "A sickening spear composed entirely of crystallized blood." desc = "A sickening spear composed entirely of crystallized blood."
icon_state = "bloodspear0" icon_state = "bloodspear0"
@@ -694,8 +698,6 @@
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi' righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
slot_flags = 0 slot_flags = 0
force = 17 force = 17
force_unwielded = 17
force_wielded = 24
throwforce = 40 throwforce = 40
throw_speed = 2 throw_speed = 2
armour_penetration = 30 armour_penetration = 30
@@ -704,20 +706,36 @@
sharpness = IS_SHARP sharpness = IS_SHARP
hitsound = 'sound/weapons/bladeslice.ogg' hitsound = 'sound/weapons/bladeslice.ogg'
var/datum/action/innate/cult/spear/spear_act var/datum/action/innate/cult/spear/spear_act
var/wielded = FALSE // track wielded status on item
/obj/item/twohanded/cult_spear/Initialize()
/obj/item/cult_spear/Initialize()
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)
/obj/item/cult_spear/ComponentInitialize()
. = ..() . = ..()
AddComponent(/datum/component/butchering, 100, 90) AddComponent(/datum/component/butchering, 100, 90)
AddComponent(/datum/component/two_handed, force_unwielded=17, force_wielded=24, icon_wielded="bloodspear1")
/obj/item/twohanded/cult_spear/Destroy() /// triggered on wield of two handed item
/obj/item/cult_spear/proc/on_wield(obj/item/source, mob/user)
wielded = TRUE
/// triggered on unwield of two handed item
/obj/item/cult_spear/proc/on_unwield(obj/item/source, mob/user)
wielded = FALSE
/obj/item/cult_spear/update_icon_state()
icon_state = "bloodspear0"
/obj/item/cult_spear/Destroy()
if(spear_act) if(spear_act)
qdel(spear_act) qdel(spear_act)
..() ..()
/obj/item/twohanded/cult_spear/update_icon_state() /obj/item/cult_spear/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
icon_state = "bloodspear[wielded]"
/obj/item/twohanded/cult_spear/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
var/turf/T = get_turf(hit_atom) var/turf/T = get_turf(hit_atom)
if(isliving(hit_atom)) if(isliving(hit_atom))
var/mob/living/L = hit_atom var/mob/living/L = hit_atom
@@ -740,7 +758,7 @@
else else
..() ..()
/obj/item/twohanded/cult_spear/proc/break_spear(turf/T) /obj/item/cult_spear/proc/break_spear(turf/T)
if(src) if(src)
if(!T) if(!T)
T = get_turf(src) T = get_turf(src)
@@ -751,7 +769,7 @@
playsound(T, 'sound/effects/glassbr3.ogg', 100) playsound(T, 'sound/effects/glassbr3.ogg', 100)
qdel(src) qdel(src)
/obj/item/twohanded/cult_spear/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) /obj/item/cult_spear/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(wielded) if(wielded)
final_block_chance *= 2 final_block_chance *= 2
if(prob(final_block_chance)) if(prob(final_block_chance))
@@ -770,7 +788,7 @@
desc = "Call the blood spear back to your hand!" desc = "Call the blood spear back to your hand!"
background_icon_state = "bg_demon" background_icon_state = "bg_demon"
button_icon_state = "bloodspear" button_icon_state = "bloodspear"
var/obj/item/twohanded/cult_spear/spear var/obj/item/cult_spear/spear
var/cooldown = 0 var/cooldown = 0
/datum/action/innate/cult/spear/Grant(mob/user, obj/blood_spear) /datum/action/innate/cult/spear/Grant(mob/user, obj/blood_spear)
code/modules/antagonists/wizard/equipment/artefact.dm
+1 -1
View File
@@ -234,7 +234,7 @@
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_SHOES) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), SLOT_SHOES)
H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE) H.put_in_hands(new /obj/item/shield/riot/roman(H), TRUE)
H.put_in_hands(new /obj/item/claymore(H), TRUE) H.put_in_hands(new /obj/item/claymore(H), TRUE)
H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), SLOT_BACK) H.equip_to_slot_or_del(new /obj/item/spear(H), SLOT_BACK)
/obj/item/voodoo /obj/item/voodoo
code/modules/antagonists/wizard/equipment/spellbook.dm
+2 -2
View File
@@ -426,12 +426,12 @@
/datum/spellbook_entry/item/mjolnir /datum/spellbook_entry/item/mjolnir
name = "Mjolnir" name = "Mjolnir"
desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power." desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power."
item_path = /obj/item/twohanded/mjollnir item_path = /obj/item/mjollnir
/datum/spellbook_entry/item/singularity_hammer /datum/spellbook_entry/item/singularity_hammer
name = "Singularity Hammer" name = "Singularity Hammer"
desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everything nearby to the point of impact." desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everything nearby to the point of impact."
item_path = /obj/item/twohanded/singularityhammer item_path = /obj/item/singularityhammer
/datum/spellbook_entry/item/battlemage /datum/spellbook_entry/item/battlemage
name = "Battlemage Armour" name = "Battlemage Armour"
code/modules/awaymissions/capture_the_flag.dm
+17 -12
View File
@@ -7,7 +7,7 @@
#define AMMO_DROP_LIFETIME 300 #define AMMO_DROP_LIFETIME 300
#define CTF_REQUIRED_PLAYERS 4 #define CTF_REQUIRED_PLAYERS 4
/obj/item/twohanded/ctf /obj/item/ctf
name = "banner" name = "banner"
icon = 'icons/obj/items_and_weapons.dmi' icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "banner" icon_state = "banner"
@@ -16,6 +16,7 @@
righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi' righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi'
desc = "A banner with Nanotrasen's logo on it." desc = "A banner with Nanotrasen's logo on it."
slowdown = 2 slowdown = 2
item_flags = SLOWS_WHILE_IN_HAND
throw_speed = 0 throw_speed = 0
throw_range = 1 throw_range = 1
force = 200 force = 200
@@ -28,16 +29,20 @@
var/obj/effect/ctf/flag_reset/reset var/obj/effect/ctf/flag_reset/reset
var/reset_path = /obj/effect/ctf/flag_reset var/reset_path = /obj/effect/ctf/flag_reset
/obj/item/twohanded/ctf/Destroy() /obj/item/ctf/Destroy()
QDEL_NULL(reset) QDEL_NULL(reset)
return ..() return ..()
/obj/item/twohanded/ctf/Initialize() /obj/item/ctf/Initialize()
. = ..() . = ..()
if(!reset) if(!reset)
reset = new reset_path(get_turf(src)) reset = new reset_path(get_turf(src))
/obj/item/twohanded/ctf/process() /obj/item/ctf/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed)
/obj/item/ctf/process()
if(is_ctf_target(loc)) //don't reset from someone's hands. if(is_ctf_target(loc)) //don't reset from someone's hands.
return PROCESS_KILL return PROCESS_KILL
if(world.time > reset_cooldown) if(world.time > reset_cooldown)
@@ -49,7 +54,7 @@
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
//ATTACK HAND IGNORING PARENT RETURN VALUE //ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/twohanded/ctf/attack_hand(mob/living/user) /obj/item/ctf/attack_hand(mob/living/user)
if(!is_ctf_target(user) && !anyonecanpickup) if(!is_ctf_target(user) && !anyonecanpickup)
to_chat(user, "Non players shouldn't be moving the flag!") to_chat(user, "Non players shouldn't be moving the flag!")
return return
@@ -73,7 +78,7 @@
STOP_PROCESSING(SSobj, src) STOP_PROCESSING(SSobj, src)
..() ..()
/obj/item/twohanded/ctf/dropped(mob/user) /obj/item/ctf/dropped(mob/user)
..() ..()
user.anchored = FALSE user.anchored = FALSE
user.status_flags |= CANPUSH user.status_flags |= CANPUSH
@@ -86,7 +91,7 @@
anchored = TRUE anchored = TRUE
/obj/item/twohanded/ctf/red /obj/item/ctf/red
name = "red flag" name = "red flag"
icon_state = "banner-red" icon_state = "banner-red"
item_state = "banner-red" item_state = "banner-red"
@@ -95,7 +100,7 @@
reset_path = /obj/effect/ctf/flag_reset/red reset_path = /obj/effect/ctf/flag_reset/red
/obj/item/twohanded/ctf/blue /obj/item/ctf/blue
name = "blue flag" name = "blue flag"
icon_state = "banner-blue" icon_state = "banner-blue"
item_state = "banner-blue" item_state = "banner-blue"
@@ -276,8 +281,8 @@
attack_ghost(ghost) attack_ghost(ghost)
/obj/machinery/capture_the_flag/attackby(obj/item/I, mob/user, params) /obj/machinery/capture_the_flag/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/twohanded/ctf)) if(istype(I, /obj/item/ctf))
var/obj/item/twohanded/ctf/flag = I var/obj/item/ctf/flag = I
if(flag.team != src.team) if(flag.team != src.team)
user.transferItemToLoc(flag, get_turf(flag.reset), TRUE) user.transferItemToLoc(flag, get_turf(flag.reset), TRUE)
points++ points++
@@ -294,7 +299,7 @@
if(istype(mob_area, /area/ctf)) if(istype(mob_area, /area/ctf))
to_chat(M, "<span class='narsie [team_span]'>[team] team wins!</span>") to_chat(M, "<span class='narsie [team_span]'>[team] team wins!</span>")
to_chat(M, "<span class='userdanger'>Teams have been cleared. Click on the machines to vote to begin another round.</span>") to_chat(M, "<span class='userdanger'>Teams have been cleared. Click on the machines to vote to begin another round.</span>")
for(var/obj/item/twohanded/ctf/W in M) for(var/obj/item/ctf/W in M)
M.dropItemToGround(W) M.dropItemToGround(W)
M.dust() M.dust()
for(var/obj/machinery/control_point/control in GLOB.machines) for(var/obj/machinery/control_point/control in GLOB.machines)
@@ -335,7 +340,7 @@
var/list/ctf_object_typecache = typecacheof(list( var/list/ctf_object_typecache = typecacheof(list(
/obj/machinery, /obj/machinery,
/obj/effect/ctf, /obj/effect/ctf,
/obj/item/twohanded/ctf /obj/item/ctf
)) ))
for(var/atm in A) for(var/atm in A)
if (isturf(A) || ismob(A) || isarea(A)) if (isturf(A) || ismob(A) || isarea(A))
code/modules/awaymissions/corpse.dm
+1 -1
View File
@@ -661,5 +661,5 @@
/datum/outfit/lavaknight/captain /datum/outfit/lavaknight/captain
name ="Cydonian Knight Captain" name ="Cydonian Knight Captain"
l_pocket = /obj/item/twohanded/dualsaber/hypereutactic l_pocket = /obj/item/dualsaber/hypereutactic
id = /obj/item/card/id/knight/captain id = /obj/item/card/id/knight/captain
code/modules/awaymissions/mission_code/snowdin.dm
+5 -5
View File
@@ -519,11 +519,11 @@
/obj/effect/spawner/lootdrop/snowdin/dungeonheavy /obj/effect/spawner/lootdrop/snowdin/dungeonheavy
name = "dungeon heavy" name = "dungeon heavy"
loot = list(/obj/item/twohanded/singularityhammer = 25, loot = list(/obj/item/singularityhammer = 25,
/obj/item/twohanded/mjollnir = 10, /obj/item/mjollnir = 10,
/obj/item/twohanded/fireaxe = 25, /obj/item/fireaxe = 25,
/obj/item/organ/brain/alien = 17, /obj/item/organ/brain/alien = 17,
/obj/item/twohanded/dualsaber = 15, /obj/item/dualsaber = 15,
/obj/item/organ/heart/demon = 7, /obj/item/organ/heart/demon = 7,
/obj/item/gun/ballistic/automatic/c20r/unrestricted = 16, /obj/item/gun/ballistic/automatic/c20r/unrestricted = 16,
/obj/item/gun/magic/wand/resurrection/inert = 15, /obj/item/gun/magic/wand/resurrection/inert = 15,
@@ -544,7 +544,7 @@
loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10, loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10,
/obj/item/toy/snowball = 15, /obj/item/toy/snowball = 15,
/obj/item/shovel = 10, /obj/item/shovel = 10,
/obj/item/twohanded/spear = 8, /obj/item/spear = 8,
) )
//special items//-- //special items//--

Some files were not shown because too many files have changed in this diff Show More