From ecd09f81442236f1bb642a09595a9ffccc053d8f Mon Sep 17 00:00:00 2001 From: DexterDude Date: Sun, 18 Aug 2024 05:21:48 -0400 Subject: [PATCH] chane --- code/modules/cm_phone/phone_base.dm | 4 ++++ code/modules/cm_tech/implements/railgun.dm | 13 ++++++++++-- maps/shuttles/dropship_cyclone.dmm | 9 ++++++++ maps/shuttles/dropship_midway.dmm | 9 ++++++++ maps/shuttles/dropship_tornado.dmm | 9 ++++++++ maps/shuttles/dropship_tripoli.dmm | 9 ++++++++ maps/shuttles/dropship_typhoon.dmm | 24 ++++++++++++++++++++++ 7 files changed, 75 insertions(+), 2 deletions(-) diff --git a/code/modules/cm_phone/phone_base.dm b/code/modules/cm_phone/phone_base.dm index 7c64fd7ee32..fb05b578a06 100644 --- a/code/modules/cm_phone/phone_base.dm +++ b/code/modules/cm_phone/phone_base.dm @@ -99,3 +99,7 @@ name = "rotary telephone" icon_state = "rotary_phone" desc = "The finger plate is a little stiff." + +/obj/structure/phone_base/toc + name = "telephone receiver" + icon = 'icons/obj/vehicles/interiors/movie.dmi' diff --git a/code/modules/cm_tech/implements/railgun.dm b/code/modules/cm_tech/implements/railgun.dm index f627894bcfd..f6dadc2c789 100644 --- a/code/modules/cm_tech/implements/railgun.dm +++ b/code/modules/cm_tech/implements/railgun.dm @@ -280,7 +280,7 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords) desc = "The younger sister to the railgun, this one is way weaker, however, it fires significantly faster. The higher your altitude, the faster your reload, and slower the shots hit." max_ammo = 100 ammo = 100 - ammo_recharge_time = 1 SECONDS + ammo_recharge_time = 5 SECONDS fire_cooldown = 0.1 SECONDS ammo_delay = 3 SECONDS power = 50 @@ -293,13 +293,14 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords) desc = "An Orbital cannon with a very long recharge time. The higher your altitude, the faster your reload, and slower the shots hit." max_ammo = 1 ammo = 1 - ammo_recharge_time = 1 SECONDS + ammo_recharge_time = 5 SECONDS fire_cooldown = 10 MINUTES //So you know how long it takes betweenS ammo_delay = 30 SECONDS power = 1500 range = 15 warning_color = "#ff0000" + /obj/structure/machinery/computer/railgun/napalm name = "orbital napalm computer" desc = "An Orbital cannon with a very long recharge time. The higher your altitude, the faster your reload, and slower the shots hit." @@ -317,3 +318,11 @@ GLOBAL_DATUM(railgun_eye_location, /datum/coords) firer.images -= to_remove playsound(T, 'sound/machines/railgun/railgun_impact.ogg', sound_range = 75) INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flame_radius), create_cause_data("railgun", firer.mob), 5, T, BURN_TIME_TIER_5 + 5, BURN_LEVEL_TIER_2, FLAMESHAPE_DEFAULT, FIRE_VARIANT_TYPE_B) + +/obj/structure/machinery/computer/railgun/toc + name = "railgun computer screen" + icon_state = "toc_railgun" + +/obj/structure/machinery/computer/railgun/gatling/toc + name = "gatling-gun computer screen" + icon_state = "toc_railcannon" diff --git a/maps/shuttles/dropship_cyclone.dmm b/maps/shuttles/dropship_cyclone.dmm index 83cb61e8293..8b3393d4a3d 100644 --- a/maps/shuttles/dropship_cyclone.dmm +++ b/maps/shuttles/dropship_cyclone.dmm @@ -554,6 +554,15 @@ pixel_y = 8; pixel_x = 7 }, +/obj/structure/phone_base{ + dir = 4; + pixel_x = -19; + pixel_y = 12; + layer = 3.1; + phone_category = "Dropship"; + name = "Cyclone telephone receiver"; + phone_id = "Cyclone" + }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, diff --git a/maps/shuttles/dropship_midway.dmm b/maps/shuttles/dropship_midway.dmm index fdb5cb1b620..1daebf7d842 100644 --- a/maps/shuttles/dropship_midway.dmm +++ b/maps/shuttles/dropship_midway.dmm @@ -464,6 +464,15 @@ pixel_y = 8; pixel_x = 7 }, +/obj/structure/phone_base{ + dir = 4; + pixel_x = -19; + pixel_y = 12; + layer = 3.1; + phone_category = "Dropship"; + name = "Midway telephone receiver"; + phone_id = "Midway" + }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, diff --git a/maps/shuttles/dropship_tornado.dmm b/maps/shuttles/dropship_tornado.dmm index d7ccb13255f..ab191e748fa 100644 --- a/maps/shuttles/dropship_tornado.dmm +++ b/maps/shuttles/dropship_tornado.dmm @@ -248,6 +248,15 @@ pixel_y = 8; pixel_x = 7 }, +/obj/structure/phone_base{ + dir = 4; + pixel_x = -19; + pixel_y = 12; + layer = 3.1; + phone_category = "Dropship"; + name = "Tornado telephone receiver"; + phone_id = "Tornado" + }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, diff --git a/maps/shuttles/dropship_tripoli.dmm b/maps/shuttles/dropship_tripoli.dmm index 560122ed56f..f0bde94d8e6 100644 --- a/maps/shuttles/dropship_tripoli.dmm +++ b/maps/shuttles/dropship_tripoli.dmm @@ -9,6 +9,15 @@ pixel_y = 8; pixel_x = 7 }, +/obj/structure/phone_base{ + dir = 4; + pixel_x = -19; + pixel_y = 12; + layer = 3.1; + phone_category = "Dropship"; + name = "Tripoli telephone receiver"; + phone_id = "Tripoli" + }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, diff --git a/maps/shuttles/dropship_typhoon.dmm b/maps/shuttles/dropship_typhoon.dmm index 6a8787701eb..bbc0e0c4acf 100644 --- a/maps/shuttles/dropship_typhoon.dmm +++ b/maps/shuttles/dropship_typhoon.dmm @@ -612,6 +612,17 @@ /obj/structure/surface/table/reinforced/toc/east{ pixel_y = -7 }, +/obj/structure/machinery/computer/railgun/gatling/toc{ + pixel_y = 13; + pixel_x = -7 + }, +/obj/structure/phone_base/toc{ + pixel_y = 13; + pixel_x = 11; + phone_id = "Typhoon Overwatch"; + phone_category = "Overwatch"; + name = "Typhoon overwatch telephone receiver" + }, /turf/open/shuttle/dropship{ icon_state = "rasputin6" }, @@ -638,6 +649,15 @@ pixel_x = 8; dir = 1 }, +/obj/structure/phone_base{ + dir = 4; + pixel_x = -19; + pixel_y = 12; + layer = 3.1; + phone_category = "Dropship"; + name = "Typhoon telephone receiver"; + phone_id = "Typhoon" + }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" }, @@ -677,6 +697,10 @@ pixel_y = 9; pixel_x = -9 }, +/obj/structure/machinery/computer/railgun/toc{ + pixel_y = 14; + pixel_x = 7 + }, /turf/open/shuttle/dropship{ icon_state = "rasputin15" },