From 198ef5ed88f91bfd7addfd904b90cb0dec5b1802 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Tue, 29 Nov 2022 13:05:59 +0100 Subject: [PATCH] Ship Weapon Barrels Fixes (#15191) --- .../overmap/ship_weaponry/_ship_gun.dm | 15 +- .../sleepygemmy-longbow_barrel_fix.yml | 6 + .../ship_guns/ship_weapon_attachments.dmi | Bin 1518 -> 1308 bytes .../machines/ship_guns/ship_weapon_dummy.dmi | Bin 0 -> 474 bytes maps/sccv_horizon/sccv_horizon-2_deck_2.dmm | 14 +- maps/sccv_horizon/sccv_horizon-3_deck_3.dmm | 358 ++++++++++-------- 6 files changed, 221 insertions(+), 172 deletions(-) create mode 100644 html/changelogs/sleepygemmy-longbow_barrel_fix.yml create mode 100644 icons/obj/machines/ship_guns/ship_weapon_dummy.dmi diff --git a/code/modules/overmap/ship_weaponry/_ship_gun.dm b/code/modules/overmap/ship_weaponry/_ship_gun.dm index 2aae42f43de..1b9e24ab694 100644 --- a/code/modules/overmap/ship_weaponry/_ship_gun.dm +++ b/code/modules/overmap/ship_weaponry/_ship_gun.dm @@ -257,8 +257,8 @@ //The fake objects below handle things like density/opaqueness for empty tiles, since the icons for guns are larger than 32x32. //What kind of dinky ass gun is only 32x32? /obj/structure/ship_weapon_dummy - name = "ship weapon" - icon = 'icons/obj/machines/ship_guns/ship_weapon_attachments.dmi' + name = "ship weapon dummy" + icon = 'icons/obj/machines/ship_guns/ship_weapon_dummy.dmi' icon_state = "dummy" mouse_opacity = 2 layer = OBJ_LAYER+0.1 //Higher than the gun itself. @@ -270,7 +270,7 @@ var/is_barrel = FALSE //Ammo spawns in front of THIS dummy. /obj/structure/ship_weapon_dummy/Initialize(mapload) - icon_state = "dummy_inv" + icon_state = null . = ..() /obj/structure/ship_weapon_dummy/examine(mob/user) @@ -312,6 +312,15 @@ if(!SD.connected) SD.connect(SW) +// Ship Weapon Barrel Dummy +/obj/structure/ship_weapon_dummy/barrel + name = "ship weapon barrel dummy" + icon_state = "dummy_barrel" + is_barrel = TRUE + +// ^^ +// Cardinal variants of the "ship weapon barrel dummy" intentionally left out since ship guns only face south and thus only fire south. + /obj/machinery/computer/ship/targeting name = "targeting systems console" desc = "A targeting systems console using Zavodskoi software." diff --git a/html/changelogs/sleepygemmy-longbow_barrel_fix.yml b/html/changelogs/sleepygemmy-longbow_barrel_fix.yml new file mode 100644 index 00000000000..4b9d020b05f --- /dev/null +++ b/html/changelogs/sleepygemmy-longbow_barrel_fix.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - bugfix: "Fixes the Longbow's barrel not being mapped in appropiately." \ No newline at end of file diff --git a/icons/obj/machines/ship_guns/ship_weapon_attachments.dmi b/icons/obj/machines/ship_guns/ship_weapon_attachments.dmi index 2ec1f84953dfd2eba559c7f21470cec14d2749d6..d7d5005dd82f03371d3f05bbab78cf229e20aa71 100644 GIT binary patch literal 1308 zcmV+%1>^dOP)pr zz{>v4HUIzs0d!JMQvg8b*k%9#0GoPLSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1 zPbXFRA_NZJzvG8G zcs?=6z5>!Uu3&oI6T!ceX@F;*rCtDk001OxOc4;)eb5Q`${(B}Bs^LNtAas5@m~Rj zpaU=t1AywkPEjFffb4$+Kpvn1)X>HtuhZ)PFaR_FLpty&0%d{#5IubPaRr#CTR=%i z>moP+!0~$>klIxLn}E`58{oGAX`1To2EZrh89;KIhY6VOB?fnyu4}vYu3td`pn~(S z%+2@kx>V1YRPa~{2w%42S54iuLQL9 z>lCSkUs1r~aG?S%(*8mP3IXhQ6c7S)psaJNUM$nPSXF|$lZ^W2WG77ZIbv$6pmsVJ zIm2#eZQi$VdH^OMFcZa)0AbVm01GuyOn~tH4zZDj4FJuS zNSNa|;MxS_w)lyFd|L%31**kPk7Ft43Pp&-xzo zZh*_jubLoVUJ0E?^N6+yWu1s;CEd7%hLR)7JJdI7+@`ojs(MNgj< zXy~H=00fOL2m~b$YyhAx8BPRvk00m)AUM|!iUPX;uv6Y40FeA=fJ7hzKpgA>dk(sWRQbSnT5R7tTh45J1DfWIgEZvv#Jehy&T0KOaYX#>D`=MV&KH5<9uIzrYW#J2onG(&}&K79)`_zU>S->jQMXQA|`=B0A#AF8>rSZ z|57TZ>kmXA0DS$0PyG7g0Che0-0QDALZE>9yefH2Or`Zs-JQfE`sAP_T+QV-5nw`Qv* z`rKpStoC0vr;7EO3w~@?vBM5Dd#sxq4yXb+Vyx&qfNNSGfEgPrdI0x%cgvl2Mvu)l z99sx<09#7d1K{!k;M_d`NH%XEcr5J*M-w2v3qA`#Jk0`m1w>mO+CZ=s0NjQyDE0|fHE2AiAo3Xsl~McNDWtDRu$?1u-3wH0I6fL0&*%I2jDZV!vJzB?g1d%4h0Sd zp|;`~9)#`XOf&^R8>T7%O(XRSQ~;%ZCjj63Z2?#xraJ-n-p{H*sMYsVpfL=!`u|9Q z*92i(f!6?td0=h6pVfL506!onB8y%hh8Zra^*X>l<4Z2JUIkF+0-6^c%e_vkR~=}k zwm@wm36Ytb6)urNUx1pR24D|#0I>MoR+#ay!96IdJ1Y=oTt|wi;NyqiejGqBw1}~2 z@)Xw=y%q59oPYqk0soV&B+JBp36by`k0Pyq#HvIj7jbGmX z69Bp^fM=%%0005*0`DIH$nE_A(lPYJ2LI3n54@u229RHx01`opzi=rkfCzd4 zlvk!M2n1o~fS=(~>Vk6npct@E(4d$vW(9`C00RgOP7Kdjd?f&A00eOIQUzjz3qU+x z3ScRK9SDH;Y9aefsnbap`2TGTIf?G|1}KmKm;xD~w*rDabE8oVuz}fcI_B$UqB;Qx zRs8nj05}F7_JIg+3}pWga(l-Z$mx|3uv0%j(A{mvAQTDcS>?Yc0D3Ww1AGGW<1ht~ zWdci1gx`G)0+83g((m2|>n+a diff --git a/icons/obj/machines/ship_guns/ship_weapon_dummy.dmi b/icons/obj/machines/ship_guns/ship_weapon_dummy.dmi new file mode 100644 index 0000000000000000000000000000000000000000..56ec0b385a5148eab1130d75c8f346ef56e0da71 GIT binary patch literal 474 zcmV<00VV#4P)D@x2wg|Jao#U~{e6{Y6jQmm}t>gNJ>0{~T| zC)h=H1{weW0P{&iK~y-6jZ;ewgCGzcHnS!y+!GTHKnxc!a)PF7KREY4LdQghmP#ob zea_>(2hISrm&&jD4ujD`wRc$c_WEGF{>ESie{NCzXuq-Qr}5lkhKJWBmWNPFoF&dm ziK~U|RY)UI93A0$36$Xwx{yM*&>k&9mJmk-bX;3g3WSg)#E}VIdirgT4lcqWA&yMI zEyf|Ooe&NQxgLZWImJW^W&%q{WF(ew(}Oh9JppGX><6K4L5GFKTF7~Ekv>8e$DG&j z4E?@2y1yt=d`f3h@*K0?2XDC22ZEcwyV)?Umiwn^f46;maGImn9^T*U1yx5_eo$sG QhyVZp07*qoM6N<$f?RRL-~a#s literal 0 HcmV?d00001 diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index 708105646ea..9acb0b94dbd 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -35511,12 +35511,6 @@ "rFn" = ( /turf/simulated/wall/r_wall, /area/rnd/xenobiology/xenoflora) -"rFs" = ( -/obj/structure/ship_weapon_dummy{ - is_barrel = 1 - }, -/turf/template_noop, -/area/template_noop) "rFF" = ( /obj/structure/table/standard, /obj/machinery/power/apc{ @@ -41348,6 +41342,10 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/dark/full, /area/security/checkpoint2) +"uAl" = ( +/obj/structure/ship_weapon_dummy/barrel, +/turf/template_noop, +/area/template_noop) "uAt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -57369,8 +57367,8 @@ vig lnO xDC ePO -rFs jHd +uAl qgN qgN qgN @@ -84248,7 +84246,7 @@ jHd jHd jHd jHd -rFs +uAl qgN qgN qgN diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm index 2d1233b56d3..e41b04a9717 100644 --- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm +++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm @@ -517,7 +517,7 @@ /obj/effect/floor_decal/industrial/warning, /obj/structure/disposalpipe/segment, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "avY" = ( /obj/structure/railing/mapped{ dir = 8 @@ -1211,7 +1211,7 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "aVB" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -2868,6 +2868,10 @@ "cyz" = ( /turf/simulated/floor/beach/water/alt, /area/horizon/hallway/deck_three/primary/starboard) +"cyH" = ( +/obj/structure/ship_weapon_dummy/barrel, +/turf/template_noop, +/area/template_noop) "czd" = ( /obj/structure/lattice/catwalk/indoor, /turf/simulated/floor/reinforced/airless, @@ -2954,7 +2958,7 @@ pixel_x = -32 }, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "cBy" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -3135,12 +3139,11 @@ /turf/simulated/floor/tiled/dark, /area/horizon/crew_quarters/fitness/hallway) "cMi" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "cMn" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -4487,7 +4490,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "dVW" = ( /turf/simulated/open, /area/hallway/medical/upper) @@ -4842,6 +4845,15 @@ "eiF" = ( /turf/simulated/wall/shuttle/scc_space_ship/cardinal, /area/bridge/minibar) +"eiR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior) "ejB" = ( /turf/simulated/wall/r_wall, /area/horizon/crew_armoury) @@ -5428,7 +5440,7 @@ dir = 1 }, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "eGq" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/mapped, @@ -5482,7 +5494,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "eIH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -6026,6 +6038,10 @@ }, /turf/simulated/floor/tiled, /area/bridge/controlroom) +"ffO" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior) "fgs" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -6378,7 +6394,7 @@ }, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/template_noop) +/area/horizon/exterior) "frA" = ( /obj/structure/bed/stool/chair{ dir = 1 @@ -7958,7 +7974,7 @@ "gBM" = ( /obj/effect/floor_decal/industrial/hatch/red, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "gCH" = ( /obj/effect/floor_decal/spline/fancy{ dir = 1 @@ -8553,7 +8569,7 @@ /obj/effect/floor_decal/industrial/hatch/red, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "hbl" = ( /obj/structure/table/reinforced/wood, /obj/effect/floor_decal/spline/fancy/wood, @@ -13292,7 +13308,7 @@ /obj/item/hullbeacon/red, /obj/structure/railing/mapped, /turf/simulated/open/airless, -/area/template_noop) +/area/horizon/exterior) "kIy" = ( /obj/structure/railing/mapped{ dir = 8 @@ -13414,6 +13430,10 @@ }, /turf/simulated/floor/tiled, /area/horizon/hallway/deck_three/primary/starboard) +"kPd" = ( +/obj/structure/lattice/catwalk/indoor, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior) "kQp" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -13669,7 +13689,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "kZD" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -15858,9 +15878,9 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/longbow) "mKC" = ( -/obj/structure/lattice/catwalk, -/turf/simulated/open/airless, -/area/template_noop) +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior) "mKP" = ( /obj/structure/sink/kitchen{ name = "water fountain"; @@ -16067,6 +16087,13 @@ /obj/effect/shuttle_landmark/ert/dock, /turf/simulated/floor/reinforced/airless, /area/template_noop) +"mUv" = ( +/obj/structure/lattice/catwalk, +/obj/structure/railing/mapped{ + dir = 8 + }, +/turf/simulated/open/airless, +/area/horizon/exterior) "mVc" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 @@ -16660,7 +16687,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "nup" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16944,7 +16971,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "nFO" = ( /obj/machinery/light{ dir = 8 @@ -17256,7 +17283,7 @@ dir = 4 }, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "nSJ" = ( /obj/effect/floor_decal/corner/green/diagonal, /obj/item/device/radio/intercom{ @@ -17610,7 +17637,7 @@ /obj/structure/ship_weapon_dummy, /obj/effect/floor_decal/industrial/hatch/red, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "oip" = ( /obj/machinery/door/airlock{ name = "Locker Room" @@ -17932,7 +17959,7 @@ "oty" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "otG" = ( /obj/item/modular_computer/console/preset/security/investigations, /obj/effect/floor_decal/corner/beige{ @@ -18567,7 +18594,7 @@ pixel_x = 32 }, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "oRv" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -23858,6 +23885,15 @@ /obj/effect/map_effect/door_helper/unres, /turf/simulated/floor/tiled, /area/bridge/controlroom) +"teR" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/railing/mapped{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/horizon/exterior) "tfg" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25079,7 +25115,7 @@ /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/disposalpipe/segment, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "tYg" = ( /obj/structure/sign/flag/scc{ pixel_x = 32 @@ -26009,7 +26045,7 @@ dir = 8 }, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "uLo" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 10 @@ -30388,7 +30424,7 @@ }, /obj/item/hullbeacon/red, /turf/simulated/floor/reinforced/airless, -/area/template_noop) +/area/horizon/exterior) "ych" = ( /obj/structure/table/rack, /obj/item/clothing/accessory/armband/sec, @@ -54171,23 +54207,23 @@ mhs vJc qaI moN -wGH -wGH -wGH -wGH -wGH -wGH -vkb -mKC -mKC -mKC -mKC -mKC -mKC -mKC -mKC -mKC +cPq +cPq +cPq +cPq +cPq +cPq mKC +grY +grY +grY +grY +grY +grY +grY +grY +grY +grY uLF leE leE @@ -54373,13 +54409,13 @@ xqX gvC aiE rjn -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +mKC iKX nbl iKX @@ -54575,13 +54611,13 @@ xqX fum pja rjn -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +mKC slH lix slH @@ -54777,14 +54813,14 @@ xqX jxA wtr rjn -wGH -wGH -wGH -wGH -wGH -wGH -vkb -iqb +cPq +cPq +cPq +cPq +cPq +cPq +mKC +mUv kIe slH dSF @@ -54979,14 +55015,14 @@ qsd tIR oaA rjn -wGH -wGH -wGH -wGH -wGH -wGH -vkb -rcF +cPq +cPq +cPq +cPq +cPq +cPq +mKC +swU frj slH dSF @@ -55181,13 +55217,13 @@ krt jwe gcM moN -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +mKC slH dSF dSF @@ -55383,13 +55419,13 @@ viN viN moN moN -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +mKC slH dSF dSF @@ -55584,14 +55620,14 @@ tzM dhB aeV asU -wGH -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +cPq +mKC slH dSF dSF @@ -55786,14 +55822,14 @@ eHB pTx pTx gqH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +cPq +mKC slH dSF dSF @@ -55988,14 +56024,14 @@ oAS xjl feb gqH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +cPq +mKC slH slH slH @@ -56190,14 +56226,14 @@ xjl jaG pbu gqH -wGH -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +cPq +mKC slH slH slH @@ -56392,14 +56428,14 @@ hep yfg jOn asU -wGH -wGH -wGH -wGH -wGH -wGH +cPq +cPq +cPq +cPq +cPq +cPq oRi -vkb +mKC slH slH slH @@ -57010,7 +57046,7 @@ kKg kKg kKg bkv -bkv +cyH dSF dSF dSF @@ -58614,14 +58650,14 @@ tcM tcM tcM uEc -wGH -wGH -wGH -wGH -wGH -wGH +cPq +cPq +cPq +cPq +cPq +cPq cBs -vkb +mKC vtk uRs dSF @@ -58817,13 +58853,13 @@ nKD nKD mIx dUB -leE -leE -whh -cMi -wGH -wGH -vkb +fJy +fJy +teR +kCw +cPq +cPq +mKC iKX slH dSF @@ -59018,14 +59054,14 @@ nKD nKD nKD nKD -czd -czd -czd -czd +kPd +kPd +kPd +kPd eGh -wGH -wGH -vkb +cPq +cPq +mKC dSF dSF dSF @@ -59221,13 +59257,13 @@ nKD nKD mIx yce -otI -otI -uFC +mjb +mjb +eiR nFG -wGH -bEW -kMe +cPq +ffO +cMi dSF dSF dSF @@ -59422,13 +59458,13 @@ tcM tcM tcM tcM -wGH -wGH -wGH -wGH -wGH -wGH -vkb +cPq +cPq +cPq +cPq +cPq +cPq +mKC dSF dSF dSF