From 4e4db212b9d474d682ff95c62f369b4c1489a5e3 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 19 Jul 2023 01:23:36 +0200 Subject: [PATCH] [MIRROR] Fixes birdshots cannonballs not spawning by replacing the cannonballs with a stack [MDB IGNORE] (#22546) * Fixes birdshots cannonballs not spawning by replacing the cannonballs with a stack (#76839) ## About The Pull Request pretty much just as the Title says, birdshot used the obj/projectile/bullet/cannonball path instead of having its own stack of 4 cannonballs, this made it so that it couldn't load the cannonballs as bullet types don't load as actual items to use. i have added a 4 stack of cannonballs to the obj/item/stack/cannonball tree so that way they can get slotted in birdshot to replace 'em, also for use later by whomever else wants a smaller amount of cannonballs as the only other amount for regular cannonballs is 14 as used by the skeletal pirate ship. ## Why It's Good For The Game with birdshots intention to have originally been overrun by pirates i assume it was meant to actually spawn because the cannon and gunpowder barrels also spawn for usage, but the cannonballs themselves didn't. allows players to find 'em in the area in maints they're supposed to be found in so you can get up to some hijinks as i assume the creator intended for all you maint dwellers. ## Changelog :cl: fix: replaces the unspawnable cannonballs in birdshot maintenance with a stack so that the 4 cannonballs properly spawn, make sure to point them away from medical! /:cl: * Fixes birdshots cannonballs not spawning by replacing the cannonballs with a stack * Update birdshot.dmm --------- Co-authored-by: Donglesplonge <120208006+Donglesplonge@users.noreply.github.com> Co-authored-by: Giz --- _maps/map_files/Birdshot/birdshot.dmm | 542 +++++++++--------- .../objects/structures/cannons/cannonballs.dm | 3 + 2 files changed, 274 insertions(+), 271 deletions(-) diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 586597326a0..22ee8f98692 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -67,6 +67,19 @@ /obj/machinery/camera/directional/north, /turf/open/floor/plating, /area/station/engineering/atmos/project) +"acE" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/closet/crate{ + name = "Outdated Weaponry" + }, +/obj/effect/spawner/random/armory/barrier_grenades, +/obj/effect/spawner/random/armory/shotgun, +/turf/open/floor/plating, +/area/station/ai_monitored/security/armory) "acF" = ( /turf/closed/wall/rust, /area/station/engineering/atmos/project) @@ -2589,12 +2602,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/tcommsat/server) -"bgX" = ( -/obj/structure/bed/dogbed/renault, -/mob/living/basic/pet/fox/renault, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/carpet/executive, -/area/station/command/heads_quarters/captain/private) "bhc" = ( /obj/structure/reflector/box{ dir = 1 @@ -12567,6 +12574,17 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/circuit/red, /area/station/ai_monitored/turret_protected/ai) +"eZT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/light/cold/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/structure/filingcabinet, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/server) "faj" = ( /obj/machinery/door/airlock/public, /turf/open/floor/plating, @@ -12870,6 +12888,16 @@ }, /turf/open/floor/iron/small, /area/station/security/office) +"fhD" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/chair/office{ + dir = 4 + }, +/turf/open/floor/wood/tile, +/area/station/tcommsat/server) "fhS" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 5 @@ -14481,6 +14509,15 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/atmos/pumproom) +"fIm" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 4 + }, +/obj/structure/rack, +/obj/machinery/airalarm/directional/west, +/obj/effect/spawner/random/armory/laser_gun, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "fIr" = ( /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/small, @@ -16007,6 +16044,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"glt" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/announcement_system, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/server) "glv" = ( /obj/structure/reagent_dispensers/beerkeg, /obj/structure/sign/picture_frame/portrait/bar{ @@ -20745,16 +20793,6 @@ /obj/item/kirbyplants/organic/applebush, /turf/open/floor/wood/tile, /area/station/command/corporate_showroom) -"hQL" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/chair/office{ - dir = 4 - }, -/turf/open/floor/wood/tile, -/area/station/tcommsat/server) "hRd" = ( /obj/structure/table/reinforced, /obj/item/binoculars, @@ -20849,12 +20887,6 @@ /obj/machinery/meter, /turf/open/floor/iron, /area/station/engineering/atmos) -"hSR" = ( -/obj/effect/turf_decal/bot_red, -/obj/structure/sign/poster/official/random/directional/north, -/obj/structure/reagent_dispensers/cooking_oil, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) "hTr" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance{ @@ -20914,17 +20946,6 @@ }, /turf/open/floor/iron/dark/side, /area/station/security/execution/transfer) -"hUc" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/announcement_system, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/server) "hUk" = ( /obj/structure/disposalpipe/segment, /obj/structure/broken_flooring/plating/directional/south, @@ -22555,6 +22576,13 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"iwv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/turf/open/floor/iron/diagonal, +/area/station/command/heads_quarters/hop) "iwM" = ( /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ dir = 1 @@ -22697,15 +22725,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/engineering/break_room) -"iAt" = ( -/obj/effect/turf_decal/siding/dark_red{ - dir = 4 - }, -/obj/structure/rack, -/obj/machinery/airalarm/directional/west, -/obj/effect/spawner/random/armory/laser_gun, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "iAy" = ( /obj/structure/table, /obj/item/clothing/shoes/sneakers/orange{ @@ -23410,19 +23429,6 @@ /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"iNK" = ( -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/closet/crate{ - name = "Outdated Weaponry" - }, -/obj/effect/spawner/random/armory/barrier_grenades, -/obj/effect/spawner/random/armory/shotgun, -/turf/open/floor/plating, -/area/station/ai_monitored/security/armory) "iNL" = ( /obj/machinery/door/airlock/wood{ desc = "Sessions held every Friday."; @@ -24607,16 +24613,6 @@ /obj/structure/sign/poster/official/random/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/dock) -"jiA" = ( -/obj/structure/cable, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, -/obj/structure/table, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) "jiB" = ( /obj/effect/spawner/random/structure/crate_loot, /turf/open/floor/plating, @@ -26646,13 +26642,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/cargo/storage) -"jWb" = ( -/obj/machinery/light/cold/directional/west, -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/pdapainter/medbay, -/turf/open/floor/wood/parquet, -/area/station/command/heads_quarters/cmo) "jWd" = ( /obj/structure/cable, /obj/item/kirbyplants/random/fullysynthetic, @@ -27726,6 +27715,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"kow" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ + dir = 8 + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/station/tcommsat/server) "koz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral{ @@ -28136,13 +28133,6 @@ /obj/effect/turf_decal/trimline/neutral/line, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"kvo" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/diagonal, -/area/station/command/heads_quarters/hop) "kvI" = ( /obj/docking_port/stationary/random{ dir = 8; @@ -28387,19 +28377,6 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"kAF" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/rack{ - icon = 'icons/obj/fluff/general.dmi'; - icon_state = "minibar"; - name = "skeletal minibar" - }, -/obj/item/storage/fancy/candle_box, -/obj/machinery/light_switch/directional/west, -/turf/open/floor/iron/grimy, -/area/station/service/library) "kAR" = ( /obj/structure/fireplace, /obj/effect/turf_decal/siding/wood, @@ -29222,17 +29199,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured_half, /area/station/cargo/miningoffice) -"kOz" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/structure/table/glass, -/obj/item/folder/red, -/obj/item/pen, -/obj/machinery/airalarm/directional/west, -/obj/item/paper/monitorkey, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/server) "kOA" = ( /obj/effect/spawner/random/structure/closet_maintenance, /turf/open/floor/plating, @@ -31961,6 +31927,19 @@ "lLX" = ( /turf/open/floor/iron/showroomfloor, /area/station/medical/surgery/theatre) +"lMo" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/structure/rack{ + icon = 'icons/obj/fluff/general.dmi'; + icon_state = "minibar"; + name = "skeletal minibar" + }, +/obj/item/storage/fancy/candle_box, +/obj/machinery/light_switch/directional/west, +/turf/open/floor/iron/grimy, +/area/station/service/library) "lMp" = ( /obj/structure/disposalpipe/segment, /obj/structure/plasticflaps/opaque, @@ -32807,6 +32786,19 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/department/bridge) +"lZu" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/machinery/light/cold/directional/north, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/item/kirbyplants/random{ + pixel_y = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/server) "lZD" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -33812,17 +33804,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"muy" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/computer/telecomms/server{ - dir = 8; - network = "tcommsat" - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/server) "muz" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -33924,6 +33905,17 @@ dir = 1 }, /area/station/hallway/primary/central/fore) +"mwm" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/structure/table/glass, +/obj/item/folder/red, +/obj/item/pen, +/obj/machinery/airalarm/directional/west, +/obj/item/paper/monitorkey, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/server) "mwn" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -35821,19 +35813,6 @@ /obj/structure/sign/departments/custodian/directional/north, /turf/open/floor/iron, /area/station/commons/dorms) -"nge" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/machinery/light/cold/directional/north, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/item/kirbyplants/random{ - pixel_y = 8 - }, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/server) "ngo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36343,6 +36322,15 @@ /obj/effect/spawner/random/trash, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"npQ" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/radio/intercom/directional/west, +/obj/effect/spawner/random/armory/disablers, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "npS" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -36945,32 +36933,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/white, /area/station/commons/dorms) -"nBb" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/structure/table/wood, -/obj/machinery/recharger{ - pixel_x = 5; - pixel_y = 3 - }, -/obj/item/storage/wallet/random{ - pixel_x = -7; - pixel_y = 1 - }, -/obj/item/assembly/flash/handheld{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/machinery/requests_console/directional/north{ - department = "Head of Personnel's Desk"; - name = "Head of Personnel's Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/turf/open/floor/plating, -/area/station/command/heads_quarters/hop) "nBq" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -37031,16 +36993,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/commons) -"nCD" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/machinery/light_switch/directional/east, -/obj/machinery/computer/message_monitor{ - dir = 8 - }, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/server) "nCH" = ( /turf/closed/wall/r_wall, /area/station/security) @@ -38969,6 +38921,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/commons) +"ooG" = ( +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 8 + }, +/obj/machinery/light/cold/directional/north, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "ooK" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -41695,15 +41656,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/science/xenobiology) -"pon" = ( -/obj/effect/turf_decal/siding/dark_red{ - dir = 4 - }, -/obj/structure/rack, -/obj/item/radio/intercom/directional/west, -/obj/effect/spawner/random/armory/disablers, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "pox" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42101,10 +42053,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/iron/grimy, /area/station/service/library) -"puP" = ( -/obj/machinery/computer/order_console/cook, -/turf/open/floor/iron/freezer, -/area/station/service/kitchen/coldroom) "pvg" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -46293,6 +46241,19 @@ }, /turf/open/floor/iron, /area/station/commons) +"qJJ" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ + dir = 8 + }, +/obj/machinery/computer/telecomms/monitor{ + network = "tcommsat"; + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/server) "qJS" = ( /obj/effect/mapping_helpers/broken_floor, /obj/item/kirbyplants/random, @@ -46642,6 +46603,16 @@ "qPN" = ( /turf/closed/wall/r_wall, /area/station/security/prison/safe) +"qPY" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/light_switch/directional/east, +/obj/machinery/computer/message_monitor{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/server) "qQg" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -49070,6 +49041,16 @@ /obj/effect/landmark/start/botanist, /turf/open/floor/iron/white/small, /area/station/service/hydroponics) +"rBP" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 4 + }, +/obj/structure/rack, +/obj/effect/spawner/random/armory/bulletproof_armor, +/obj/effect/spawner/random/armory/riot_armor, +/obj/effect/spawner/random/armory/riot_shield, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "rBQ" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white/small, @@ -51145,18 +51126,6 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron/kitchen/small, /area/station/maintenance/aft) -"skO" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark_red/corner{ - dir = 1 - }, -/obj/structure/rack, -/obj/machinery/light/cold/directional/south, -/obj/effect/spawner/random/armory/riot_helmet, -/obj/effect/spawner/random/armory/bulletproof_helmet, -/obj/item/gun/energy/e_gun/dragnet, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "skP" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -51875,6 +51844,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/small, /area/station/maintenance/starboard/central) +"swF" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/structure/table, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) "swI" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -54427,6 +54406,32 @@ dir = 1 }, /area/station/engineering/atmos) +"toP" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/table/wood, +/obj/machinery/recharger{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/storage/wallet/random{ + pixel_x = -7; + pixel_y = 1 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/machinery/requests_console/directional/north{ + department = "Head of Personnel's Desk"; + name = "Head of Personnel's Requests Console" + }, +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/plating, +/area/station/command/heads_quarters/hop) "toT" = ( /obj/structure/flora/rock/pile/jungle/style_random, /obj/structure/window/reinforced/spawner/directional/west, @@ -54630,14 +54635,6 @@ /obj/structure/sign/warning/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"trK" = ( -/obj/effect/turf_decal/siding/dark_red{ - dir = 4 - }, -/obj/structure/rack, -/obj/effect/spawner/random/armory/e_gun, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "trS" = ( /obj/effect/decal/cleanable/glass, /obj/structure/grille, @@ -55540,6 +55537,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"tGe" = ( +/obj/machinery/computer/order_console/cook, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) "tGp" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/engine, @@ -58761,6 +58762,18 @@ /obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"uJr" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 1 + }, +/obj/structure/rack, +/obj/machinery/light/cold/directional/south, +/obj/effect/spawner/random/armory/riot_helmet, +/obj/effect/spawner/random/armory/bulletproof_helmet, +/obj/item/gun/energy/e_gun/dragnet, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "uJD" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -58871,15 +58884,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/station/hallway/secondary/spacebridge) -"uLE" = ( -/obj/effect/turf_decal/siding/dark_red/corner{ - dir = 8 - }, -/obj/machinery/light/cold/directional/north, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "uLO" = ( /obj/item/stack/sheet/cardboard{ amount = 14 @@ -60666,16 +60670,6 @@ }, /turf/open/space/basic, /area/space/nearstation) -"voX" = ( -/obj/effect/turf_decal/siding/dark_red{ - dir = 4 - }, -/obj/structure/rack, -/obj/effect/spawner/random/armory/bulletproof_armor, -/obj/effect/spawner/random/armory/riot_armor, -/obj/effect/spawner/random/armory/riot_shield, -/turf/open/floor/iron/dark/small, -/area/station/ai_monitored/security/armory) "vpb" = ( /obj/machinery/door/airlock/hatch{ name = "Tool Supply Corridor" @@ -61386,17 +61380,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) -"vAm" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/machinery/light/cold/directional/north, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/structure/filingcabinet, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/server) "vAo" = ( /obj/item/radio/intercom/directional/north{ broadcasting = 1; @@ -63828,14 +63811,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/glass, /area/station/hallway/secondary/spacebridge) -"wli" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 8 - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/tcommsat/server) "wlk" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 4 @@ -65454,6 +65429,17 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/service/library) +"wMi" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/computer/telecomms/server{ + dir = 8; + network = "tcommsat" + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/server) "wMm" = ( /turf/closed/wall/rust, /area/station/engineering/break_room) @@ -66353,6 +66339,12 @@ }, /turf/open/floor/iron/dark, /area/station/medical/cryo) +"wYy" = ( +/obj/effect/turf_decal/bot_red, +/obj/structure/sign/poster/official/random/directional/north, +/obj/structure/reagent_dispensers/cooking_oil, +/turf/open/floor/iron/freezer, +/area/station/service/kitchen/coldroom) "wYA" = ( /turf/closed/wall/r_wall, /area/station/medical/chemistry) @@ -67522,6 +67514,12 @@ "xnE" = ( /turf/closed/wall/r_wall, /area/station/hallway/secondary/entry) +"xnG" = ( +/obj/structure/bed/dogbed/renault, +/mob/living/basic/pet/fox/renault, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/carpet/executive, +/area/station/command/heads_quarters/captain/private) "xnQ" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68136,6 +68134,13 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"xvt" = ( +/obj/machinery/light/cold/directional/west, +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/pdapainter/medbay, +/turf/open/floor/wood/parquet, +/area/station/command/heads_quarters/cmo) "xvv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68220,19 +68225,6 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/burnchamber) -"xxb" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/hidden{ - dir = 8 - }, -/obj/machinery/computer/telecomms/monitor{ - network = "tcommsat"; - dir = 8 - }, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/server) "xxn" = ( /obj/machinery/atmospherics/components/binary/tank_compressor, /obj/effect/mapping_helpers/broken_floor, @@ -70350,6 +70342,14 @@ /obj/machinery/light/cold/directional/east, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"xYe" = ( +/obj/effect/turf_decal/siding/dark_red{ + dir = 4 + }, +/obj/structure/rack, +/obj/effect/spawner/random/armory/e_gun, +/turf/open/floor/iron/dark/small, +/area/station/ai_monitored/security/armory) "xYj" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -84391,10 +84391,10 @@ qVP blb xkt bCr -trK -iAt -pon -voX +xYe +fIm +npQ +rBP fQo syk bKE @@ -85161,12 +85161,12 @@ rui qVP blb xkt -uLE +ooG mVt gJa huN jBr -skO +uJr syk nDx iLc @@ -85419,7 +85419,7 @@ qVP blb xkt kJp -iNK +acE xkt ntf uMT @@ -93337,8 +93337,8 @@ qoD pLr qoD uVT -nBb -kvo +toP +iwv iLC iLC jts @@ -93615,8 +93615,8 @@ jVM ygb ipt jVM -jiA -puP +swF +tGe tGq tGq qnA @@ -94900,7 +94900,7 @@ qtb jVM vXW jVM -hSR +wYy pww pRU tGq @@ -96176,7 +96176,7 @@ oGJ wQB wsE xeO -kAF +lMo mbK mqz jVM @@ -99073,7 +99073,7 @@ xqg pKS bkY lVP -jWb +xvt wgL hgF pVK @@ -101567,7 +101567,7 @@ xRH gcz lHW jOU -bgX +xnG wSZ lFg xqC @@ -117562,7 +117562,7 @@ eXo srH vqX gCo -wli +kow eXo eXo eXo @@ -117816,12 +117816,12 @@ vbQ iVE ksg wos -vAm +eZT iIN eQX -hUc +glt iOF -kOz +mwm wos jrU qlz @@ -118334,7 +118334,7 @@ nFp hfI woD qCY -hQL +fhD tAT pJu ldx @@ -118587,12 +118587,12 @@ bFw ulK cdn wos -nge +lZu ujZ moe -xxb -muy -nCD +qJJ +wMi +qPY wos oGk eFV diff --git a/code/game/objects/structures/cannons/cannonballs.dm b/code/game/objects/structures/cannons/cannonballs.dm index 9e2b38a3420..718fd2b1ebb 100644 --- a/code/game/objects/structures/cannons/cannonballs.dm +++ b/code/game/objects/structures/cannons/cannonballs.dm @@ -22,6 +22,9 @@ /obj/item/stack/cannonball/fourteen amount = 14 +/obj/item/stack/cannonball/four + amount = 4 + /obj/item/stack/cannonball/shellball name = "explosive shellballs" singular_name = "explosive shellball"