From cdd94e121a42a873aa3b62f1af93e35ba41ae5be Mon Sep 17 00:00:00 2001 From: bearrrrrrrr <54826962+bearrrrrrrr@users.noreply.github.com> Date: Mon, 15 Jan 2024 12:41:55 -0500 Subject: [PATCH] adds prop AT gun, moves the tables in squad 1 prep a tile up (#86) --- .../effects/spawners/prop_gun_spawner.dm | 5 ++ maps/map_files/golden_arrow/golden_arrow.dmm | 89 ++++++++++--------- 2 files changed, 50 insertions(+), 44 deletions(-) diff --git a/code/game/objects/effects/spawners/prop_gun_spawner.dm b/code/game/objects/effects/spawners/prop_gun_spawner.dm index 5e620994e7..bdfb083ffe 100644 --- a/code/game/objects/effects/spawners/prop_gun_spawner.dm +++ b/code/game/objects/effects/spawners/prop_gun_spawner.dm @@ -90,3 +90,8 @@ prop_gun_type = /obj/item/weapon/gun/rifle/m41aMK1 custom_gun_name = "\improper Broken M41A pulse rifle" custom_gun_desc = "An older design of the Pulse Rifle commonly used by Colonial Marines. This one has seen better days. The trigger is missing, the barrel is bent, and it no longer appropriately feeds magazines." + +/obj/effect/spawner/prop_gun/anti_tank + prop_gun_type = /obj/item/weapon/gun/launcher/rocket/anti_tank + custom_gun_name = "\improper Spent M83A2 SADAR" + custom_gun_desc = "A spent M83A2 tube. It's been kept as a trophy after a lucky tank kill nearly a thousand meters out. Someone has engraved a single tally-mark on the side to begin recording a kill-count." diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index ed6306db1f..c00c87e116 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -173,17 +173,17 @@ "aT" = ( /obj/structure/machinery/computer/cameras/almayer/vehicle{ dir = 4; - pixel_x = -17; - network = list("Golden Arrow","Vehicle","Midway") + network = list("Golden Arrow","Vehicle","Midway"); + pixel_x = -17 }, /obj/structure/machinery/prop/almayer/CICmap{ + density = 0; dir = 4; icon_state = "shuttle"; layer = 2.97; name = "Tactical Map Display"; pixel_x = -17; - pixel_y = 14; - density = 0 + pixel_y = 14 }, /turf/open/floor/almayer, /area/golden_arrow/platoon_commander_rooms) @@ -482,11 +482,13 @@ /area/golden_arrow/hangar) "cD" = ( /obj/structure/surface/table/almayer, -/obj/item/reagent_container/food/drinks/coffeecup/wy{ - desc = "A matte gray coffee mug bearing the Weyland-Yutani logo on its front. Looks like someone spat in it."; - name = "dip cup"; - pixel_x = -4; - pixel_y = 8 +/obj/item/spacecash/c10{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/storage/box/co2_knife{ + pixel_x = 3; + pixel_y = 13 }, /turf/open/floor/almayer, /area/golden_arrow/squad_one) @@ -527,6 +529,13 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, +/obj/structure/surface/table/almayer, +/obj/item/reagent_container/food/drinks/coffeecup/wy{ + desc = "A matte gray coffee mug bearing the Weyland-Yutani logo on its front. Looks like someone spat in it."; + name = "dip cup"; + pixel_x = -4; + pixel_y = 8 + }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) "cS" = ( @@ -783,8 +792,8 @@ /obj/structure/machinery/door/airlock/almayer/maint/reinforced{ access_modified = 1; dir = 8; - req_one_access = list(36); - name = "\improper Synthetic Preperations" + name = "\improper Synthetic Preperations"; + req_one_access = list(36) }, /obj/structure/machinery/door/poddoor/almayer/closed{ dir = 4; @@ -1501,16 +1510,7 @@ }, /area/golden_arrow/prep_hallway) "iE" = ( -/obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply, -/obj/item/spacecash/c10{ - pixel_x = 5; - pixel_y = 7 - }, -/obj/item/storage/box/co2_knife{ - pixel_x = 3; - pixel_y = 13 - }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) "iF" = ( @@ -3703,8 +3703,8 @@ dir = 8 }, /obj/item/device/walkman{ - pixel_y = -6; - pixel_x = 4 + pixel_x = 4; + pixel_y = -6 }, /turf/open/floor/almayer{ dir = 5; @@ -5716,9 +5716,9 @@ /area/golden_arrow/firingrange) "It" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/autoname{ + autoname = 0; dir = 1; - req_one_access = list(); - autoname = 0 + req_one_access = list() }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -6431,8 +6431,8 @@ /area/golden_arrow/cryo_cells) "Mu" = ( /obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ - req_one_access = list(); - name = "\improper Engineering Airlock" + name = "\improper Engineering Airlock"; + req_one_access = list() }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -6567,6 +6567,7 @@ /area/golden_arrow/briefing) "Nr" = ( /obj/structure/surface/table/almayer, +/obj/effect/spawner/prop_gun/anti_tank, /turf/open/floor/almayer, /area/golden_arrow/squad_two) "Nx" = ( @@ -6643,8 +6644,8 @@ /area/golden_arrow/platoon_commander_rooms) "NI" = ( /obj/structure/machinery/cm_vending/clothing/synth/snowflake{ - pixel_x = -30; - density = 0 + density = 0; + pixel_x = -30 }, /turf/open/floor/almayer{ icon_state = "test_floor5" @@ -6670,9 +6671,9 @@ /area/golden_arrow/canteen) "NU" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/autoname{ + autoname = 0; dir = 1; - req_one_access = list(); - autoname = 0 + req_one_access = list() }, /turf/open/floor/almayer{ icon_state = "test_floor4" @@ -7082,6 +7083,12 @@ /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 }, +/obj/structure/surface/table/almayer, +/obj/item/device/cassette_tape/nam{ + layer = 2.9; + pixel_x = -6; + pixel_y = 7 + }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) "Qc" = ( @@ -7144,8 +7151,8 @@ /area/golden_arrow/prep_hallway) "Qq" = ( /obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ - req_one_access = list(); - name = "\improper Engineering Airlock" + name = "\improper Engineering Airlock"; + req_one_access = list() }, /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 @@ -8046,8 +8053,8 @@ "Um" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/cm_vending/clothing/synth{ - pixel_x = -30; - density = 0 + density = 0; + pixel_x = -30 }, /turf/open/floor/almayer{ icon_state = "test_floor5" @@ -8061,12 +8068,6 @@ }, /area/golden_arrow/canteen) "UI" = ( -/obj/structure/surface/table/almayer, -/obj/item/device/cassette_tape/nam{ - layer = 2.9; - pixel_x = -6; - pixel_y = 7 - }, /turf/open/floor/plating/plating_catwalk, /area/golden_arrow/squad_one) "UK" = ( @@ -8692,8 +8693,8 @@ /area/golden_arrow/firingrange) "Yl" = ( /obj/structure/machinery/cm_vending/gear/synth{ - pixel_x = -30; - density = 0 + density = 0; + pixel_x = -30 }, /turf/open/floor/almayer{ icon_state = "test_floor5" @@ -18480,7 +18481,7 @@ wp ZC Fe cT -cT +cD aJ iE xx @@ -18786,7 +18787,7 @@ qa cT cR Uk -cD +cT cT zk Ty