From 0e6e947d7668e508bcd87476a9966ef398538ab3 Mon Sep 17 00:00:00 2001 From: bearrrrrrrrr Date: Tue, 9 Jan 2024 04:13:47 -0500 Subject: [PATCH 1/4] adds prop AT gun, moves the tables in squad 1 prep a tile up --- .../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..4256786cf5 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. Partially kept as a trophy after a lucky tank kill close to a click out- and partially kept as a prop to scare the vehicle crewmen with." \ No newline at end of file diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 3558338e21..a0a88904f3 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) @@ -466,11 +466,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) @@ -511,6 +513,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" = ( @@ -744,8 +753,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; @@ -1438,16 +1447,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" = ( @@ -3575,8 +3575,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; @@ -5473,9 +5473,9 @@ /area/golden_arrow/cryo_cells) "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 @@ -6157,8 +6157,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" @@ -6284,6 +6284,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" = ( @@ -6360,8 +6361,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" @@ -6387,9 +6388,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" @@ -6767,6 +6768,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" = ( @@ -6829,8 +6836,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 @@ -7706,8 +7713,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" @@ -7721,12 +7728,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" = ( @@ -8317,8 +8318,8 @@ /area/golden_arrow/hangar) "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" @@ -18100,7 +18101,7 @@ wp ZC Fe cT -cT +cD aJ iE xx @@ -18406,7 +18407,7 @@ qa cT cR Uk -cD +cT cT zk Ty From 7b4ba3a1a3f26bc20b8b32802fb5f5a1d3a01efe Mon Sep 17 00:00:00 2001 From: bearrrrrrrr <54826962+bearrrrrrrr@users.noreply.github.com> Date: Tue, 9 Jan 2024 06:19:31 -0500 Subject: [PATCH 2/4] newline --- code/game/objects/effects/spawners/prop_gun_spawner.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/spawners/prop_gun_spawner.dm b/code/game/objects/effects/spawners/prop_gun_spawner.dm index 4256786cf5..1280e8a286 100644 --- a/code/game/objects/effects/spawners/prop_gun_spawner.dm +++ b/code/game/objects/effects/spawners/prop_gun_spawner.dm @@ -94,4 +94,4 @@ /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. Partially kept as a trophy after a lucky tank kill close to a click out- and partially kept as a prop to scare the vehicle crewmen with." \ No newline at end of file + custom_gun_desc = "A spent M83A2 tube. Partially kept as a trophy after a lucky tank kill close to a click out- and partially kept as a prop to scare the vehicle crewmen with." From 489ae05747820d47d51a58b9c2f7571a9f4caf27 Mon Sep 17 00:00:00 2001 From: bearrrrrrrr <54826962+bearrrrrrrr@users.noreply.github.com> Date: Tue, 9 Jan 2024 06:22:48 -0500 Subject: [PATCH 3/4] better joke, actually --- code/game/objects/effects/spawners/prop_gun_spawner.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/spawners/prop_gun_spawner.dm b/code/game/objects/effects/spawners/prop_gun_spawner.dm index 1280e8a286..73e569f311 100644 --- a/code/game/objects/effects/spawners/prop_gun_spawner.dm +++ b/code/game/objects/effects/spawners/prop_gun_spawner.dm @@ -94,4 +94,5 @@ /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. Partially kept as a trophy after a lucky tank kill close to a click out- and partially kept as a prop to scare the vehicle crewmen with." + custom_gun_desc = "A spent M83A2 tube. It's, partially, been kept as a trophy after a lucky tank kill nearly a thousand meters out. Someone has spray-painted a single tally-mark on the side to commemorate its kill-count." + From af7aad79ebb1adfc7d929ce8fdb9b13cc4f644e1 Mon Sep 17 00:00:00 2001 From: bearrrrrrrr <54826962+bearrrrrrrr@users.noreply.github.com> Date: Tue, 9 Jan 2024 06:34:29 -0500 Subject: [PATCH 4/4] ok. good joke --- code/game/objects/effects/spawners/prop_gun_spawner.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/effects/spawners/prop_gun_spawner.dm b/code/game/objects/effects/spawners/prop_gun_spawner.dm index 73e569f311..bdfb083ffe 100644 --- a/code/game/objects/effects/spawners/prop_gun_spawner.dm +++ b/code/game/objects/effects/spawners/prop_gun_spawner.dm @@ -94,5 +94,4 @@ /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, partially, been kept as a trophy after a lucky tank kill nearly a thousand meters out. Someone has spray-painted a single tally-mark on the side to commemorate its kill-count." - + 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."