Новые турели #17 (#97)

* Resprites 571, adds 2 new sentry types. (#15183) * Sentry fix and code improvements (#15404) * Подтягивем код * Солянка + переводы * meh * Update code/modules/projectiles/guns/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/projectiles/guns/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/reqs/supplypacks.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/reqs/supplypacks.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/projectiles/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/projectiles/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * fid moment * doc * Update code/modules/projectiles/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/reqs/supplypacks.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/reqs/supplypacks.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/projectiles/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/projectiles/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/projectiles/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/projectiles/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/projectiles/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * Update code/modules/projectiles/sentries.dm Co-authored-by: Helg2 <[email protected]> Signed-off-by: homexp13 <[email protected]> * set_on <-- * icons * cannot fit into --------- Signed-off-by: homexp13 <[email protected]> Co-authored-by: Pariah919 <[email protected]> Co-authored-by: Lumipharon <[email protected]> Co-authored-by: Feedod <[email protected]> Co-authored-by: Helg2 <[email protected]>
PMC-Unga-Marines · Aug 22, 2024 · 7979b15 · 7979b15
1 parent 62454d3
commit 7979b15
Show file tree

Hide file tree

Showing 35 changed files with 410 additions and 138 deletions.
diff --git a/_maps/map_files/Campaign maps/orion_2/orionoutpost_2.dmm b/_maps/map_files/Campaign maps/orion_2/orionoutpost_2.dmm
@@ -20,7 +20,7 @@
 /area/orion_outpost/ground/underground/caveN)
 "ao" = (
 /obj/structure/flora/tree/joshua,
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostcent)
 "ap" = (
@@ -2187,7 +2187,7 @@
 	},
 /area/orion_outpost/surface/building/administration)
 "kD" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -2620,7 +2620,7 @@
 /obj/machinery/light{
 	dir = 4
 	},
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /turf/open/floor/mainship/mono,
 /area/orion_outpost/surface/building/vehicledepot)
 "mH" = (
@@ -4234,7 +4234,7 @@
 	},
 /area/orion_outpost/surface/building/prep)
 "tZ" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 1
 	},
@@ -4404,7 +4404,7 @@
 /turf/open/floor/mainship/mono,
 /area/orion_outpost/surface/building/atc)
 "uU" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 1
 	},
@@ -4567,15 +4567,15 @@
 /turf/open/floor/mainship/mono,
 /area/orion_outpost/surface/building/engineering)
 "vE" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostsw)
 "vF" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -4805,7 +4805,7 @@
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostse)
 "wQ" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete,
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostse)
@@ -5213,7 +5213,7 @@
 	},
 /area/orion_outpost/surface/building/engineering)
 "yK" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -5499,7 +5499,7 @@
 /area/orion_outpost/ground/underground/caveN/garbledradio)
 "Am" = (
 /obj/effect/turf_decal/riverdecal,
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -6550,7 +6550,7 @@
 /area/orion_outpost/surface/building/administration)
 "Fs" = (
 /obj/structure/flora/ausbushes/sparsegrass,
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete,
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outposte)
@@ -7207,7 +7207,7 @@
 	},
 /area/orion_outpost/surface/building/vehicledepot)
 "IB" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 4
 	},
@@ -7400,7 +7400,7 @@
 /turf/open/floor/mainship/blue,
 /area/orion_outpost/surface/building/command)
 "JF" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /turf/open/floor/plating/ground/concrete,
 /area/orion_outpost/ground/outpostcent)
 "JG" = (
@@ -9172,7 +9172,7 @@
 /turf/closed/mineral/smooth/indestructible,
 /area/orion_outpost/ground/outpostw)
 "RR" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 8
 	},
@@ -9843,7 +9843,7 @@
 /turf/open/floor/plating/ground/concrete,
 /area/orion_outpost/surface/train_yard)
 "UY" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete,
 /turf/open/floor/plating/ground/mars/random/cave/darker,
 /area/orion_outpost/ground/outpostsw)
@@ -10448,7 +10448,7 @@
 /turf/open/floor/mainship/mono,
 /area/orion_outpost/surface/building/command)
 "XR" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade/radial,
+/obj/item/weapon/gun/sentry/basic/premade/radial,
 /obj/structure/barricade/concrete{
 	dir = 1
 	},

diff --git a/_maps/map_files/Prison_Station_FOP/Prison_Station_FOP.dmm b/_maps/map_files/Prison_Station_FOP/Prison_Station_FOP.dmm
@@ -35693,7 +35693,7 @@
 	dir = 4
 	},
 /obj/structure/closet/walllocker/emerglocker/full,
-/obj/item/weapon/gun/sentry/big_sentry/premade,
+/obj/item/weapon/gun/sentry/basic/premade,
 /turf/open/floor/prison/blackfloor,
 /area/prison/pirate)
 "ckG" = (
@@ -36759,7 +36759,7 @@
 /turf/open/floor/plating,
 /area/prison/pirate)
 "cnH" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade,
+/obj/item/weapon/gun/sentry/basic/premade,
 /turf/open/floor/plating,
 /area/prison/pirate)
 "cnI" = (
@@ -37160,7 +37160,7 @@
 /turf/open/floor/plating/platebot,
 /area/prison/pirate)
 "cpb" = (
-/obj/item/weapon/gun/sentry/big_sentry/premade,
+/obj/item/weapon/gun/sentry/basic/premade,
 /turf/open/floor/plating/platebot,
 /area/prison/pirate)
 "cpc" = (

diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
@@ -93,11 +93,11 @@ GLOBAL_LIST_INIT(engineer_gear_listed_products, list(
 	/obj/item/explosive/plastique = list(CAT_ENGSUP, "Plastique explosive", 2, "orange3"),
 	/obj/item/explosive/plastique/genghis_charge = list(CAT_ENGSUP, "EX-62 Genghis incendiary charge", 6, "orange3"),
 	/obj/item/detpack = list(CAT_ENGSUP, "Detonation pack", 2, "orange3"),
-	/obj/item/storage/box/crate/minisentry = list(CAT_ENGSUP, "ST-580 point defense sentry kit", 45, "blue"),
 	/obj/structure/closet/crate/uav_crate = list(CAT_ENGSUP, "Iguana Unmanned Vehicle", 50, "blue"),
 	/obj/effect/teleporter_linker = list(CAT_ENGSUP, "Teleporters", 25, "blue"),
 	/obj/item/tool/pickaxe/plasmacutter = list(CAT_ENGSUP, "Plasma cutter", 23, "blue"),
 	/obj/item/attachable/buildasentry = list(CAT_ENGSUP, "Build-A-Sentry Attachment", 30, "blue"),
+	/obj/item/sentry_upgrade_kit = list(CAT_ENGSUP, "Upgrade kit TUR-B", 25, "blue"),
 	/obj/item/deployable_floodlight = list(CAT_ENGSUP, "Deployable floodlight", 2, "blue"),
 	/obj/item/weapon/shield/riot/marine/deployable = list(CAT_ENGSUP, "TL-182 deployable shield", 3, "yellow"),
 	/obj/item/binoculars/tactical/range = list(CAT_ENGSUP, "Range Finder", 2, "yellow"),
@@ -292,7 +292,6 @@ GLOBAL_LIST_INIT(commander_gear_listed_products, list(
 	/obj/item/tool/pickaxe/plasmacutter = list(CAT_FCSUP, "Plasma cutter", 23, "yellow"),
 	/obj/item/clothing/glasses/welding/superior = list(CAT_FCSUP, "Superior welding goggles", 2, "yellow"),
 	/obj/item/armor_module/module/welding/superior = list(CAT_FCSUP, "Superior welding module", 2, "yellow"),
-	/obj/item/storage/box/crate/minisentry = list(CAT_FCSUP, "ST-580 point defense sentry kit", 15, "yellow"),
 	/obj/item/healthanalyzer/gloves = list(CAT_FCSUP, "Health scanner gloves", 2, "yellow"),
 	/obj/item/reagent_containers/hypospray/autoinjector/dexalinplus = list(CAT_FCSUP, "Injector (Dexalin)", 1, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/synaptizine = list(CAT_FCSUP, "Injector (Synaptizine)", 2, "cyan"),
@@ -340,7 +339,6 @@ GLOBAL_LIST_INIT(synthetic_gear_listed_products, list(
 	/obj/item/tool/weldingtool/hugetank = list(CAT_SYNTH, "High-capacity industrial blowtorch", 5, "orange"),
 	/obj/item/explosive/plastique = list(CAT_SYNTH, "Plastique explosive", 2, "orange3"),
 	/obj/item/explosive/plastique/genghis_charge = list(CAT_SYNTH, "EX-62 Genghis incendiary charge", 6, "orange3"),
-	/obj/item/storage/box/crate/minisentry = list(CAT_SYNTH, "ST-580 point defense sentry kit", 30, "blue"),
 	/obj/effect/teleporter_linker = list(CAT_SYNTH, "Teleporters", 15, "blue"),
 	/obj/item/tool/pickaxe/plasmacutter = list(CAT_SYNTH, "Plasma cutter", 15, "blue"),
 	/obj/item/attachable/buildasentry = list(CAT_SYNTH, "Build-A-Sentry Attachment", 30, "blue"),

diff --git a/code/__DEFINES/progress_display.dm b/code/__DEFINES/progress_display.dm
@@ -38,3 +38,4 @@
 #define BUSY_ICON_DANGER /image/progdisplay/danger
 #define BUSY_ICON_BAR /image/progdisplay/bar
 #define BUSY_ICON_UNSKILLED /image/progdisplay/unskilled
+#define BUSY_ICON_ENERGY /image/progdisplay/energy
diff --git a/code/datums/components/deployable_item.dm b/code/datums/components/deployable_item.dm
@@ -66,7 +66,7 @@
 			return
 
 		if(LinkBlocked(get_turf(user), location))
-			location.balloon_alert(user, "No room to deploy")
+			location.balloon_alert(user, "Нет места для установки.")
 			return
 		var/newdir = get_dir(user, location)
 		if(deploy_type.flags_atom & ON_BORDER)
@@ -77,12 +77,17 @@
 					continue
 				if(object.dir != newdir)
 					continue
-				location.balloon_alert(user, "No room to deploy")
+				location.balloon_alert(user, "Нет места для установки.")
 				return
 		if(user.do_actions)
-			user.balloon_alert(user, "You are already doing something!")
+			user.balloon_alert(user, "Вы уже чем-то заняты!")
 			return
-		user.balloon_alert(user, "You start deploying...")
+		if(item_to_deploy.near_lock)
+			for(var/obj/machinery/deployable/def in urange(2, location))
+				if(def != src)
+					user.balloon_alert(user, "Слишком близко к [def]!")
+					return
+		user.balloon_alert(user, "Вы начали установку...")
 		user.setDir(newdir) //Face towards deploy location for ease of deploy.
 		if(!do_after(user, deploy_time, NONE, item_to_deploy, BUSY_ICON_BUILD))
 			return
@@ -113,7 +118,7 @@
 	deployed_machine.update_appearance()
 
 	if(user)
-		item_to_deploy.balloon_alert(user, "Deployed!")
+		item_to_deploy.balloon_alert(user, "Установлено!")
 		user.transferItemToLoc(item_to_deploy, deployed_machine, TRUE)
 		if(user.client.prefs.toggles_gameplay & AUTO_INTERACT_DEPLOYABLES)
 			deployed_machine.interact(user)

diff --git a/code/datums/looping_sounds/miscellaneous.dm b/code/datums/looping_sounds/miscellaneous.dm
@@ -7,3 +7,9 @@
 	end_volume = 30
 	end_sound = 'sound/items/weldingtool/RepairTool_Stop.ogg'
 	volume = 18
+
+/datum/looping_sound/sentry_scan
+	mid_sounds = list('sound/items/turrets/turret_scan.ogg')
+	mid_length = 3 SECONDS
+	volume = 30
+	range = 10
diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm
@@ -258,3 +258,5 @@
 /image/progdisplay/unskilled
 	icon_state = "busy_questionmark"
 
+/image/progdisplay/energy
+	icon_state = "busy_energy"
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
@@ -110,6 +110,8 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan
 	var/toolspeed = 1
 	var/usesound = null
 	var/active = FALSE
+	///If TRUE you cant deploy item next to another deployable in 5x5 tile radius.
+	var/near_lock = FALSE
 	//Coloring vars
 	///Some defines to determine if the item is allowed to be recolored.
 	var/colorable_allowed = NONE

diff --git a/code/game/objects/items/loot_box.dm b/code/game/objects/items/loot_box.dm
@@ -637,7 +637,6 @@
 	new /obj/item/storage/box/crate/sentry(src)
 	new /obj/item/storage/box/crate/sentry(src)
 	new /obj/item/storage/box/crate/sentry(src)
-	new /obj/item/storage/box/crate/minisentry(src)
 
 // Legendaries
 

diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
@@ -397,7 +397,7 @@
 	icon_state = "marinepackt"
 	item_state = "marinepackt"
 	bypass_w_limit = list(
-		/obj/item/weapon/gun/sentry/big_sentry,
+		/obj/item/weapon/gun/sentry/basic,
 		/obj/item/weapon/gun/sentry/mini,
 		/obj/item/weapon/gun/tl102,
 		/obj/item/ammo_magazine/tl102,

diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
@@ -628,6 +628,7 @@
 			/obj/structure/closet/crate/mortar_ammo/howitzer_kit = -1,
 			/obj/structure/largecrate/supply/weapons/standard_atgun = -1,
 			/obj/item/storage/box/crate/sentry = -1,
+			/obj/item/sentry_upgrade_kit = -1,
 			/obj/item/storage/box/tl102 = -1,
 			/obj/item/weapon/gun/heavymachinegun = -1,
 			/obj/item/ammo_magazine/heavymachinegun = -1,

diff --git a/code/game/objects/machinery/vending/new_marine_vendors.dm b/code/game/objects/machinery/vending/new_marine_vendors.dm
@@ -722,6 +722,7 @@
 
 /obj/effect/vendor_bundle/engi
 	gear_to_spawn = list(
+		/obj/item/weapon/gun/sentry/basic,
 		/obj/item/explosive/plastique,
 		/obj/item/explosive/grenade/chem_grenade/razorburn_smol,
 		/obj/item/clothing/gloves/marine/insulated,

diff --git a/code/game/objects/structures/dropship_equipment.dm b/code/game/objects/structures/dropship_equipment.dm
@@ -364,7 +364,7 @@
 	point_cost = 500
 	var/deployment_cooldown
 	var/obj/machinery/deployable/mounted/sentry/deployed_turret
-	var/sentry_type = /obj/item/weapon/gun/sentry/big_sentry/dropship
+	var/sentry_type = /obj/item/weapon/gun/sentry/basic/dropship
 
 /obj/structure/dropship_equipment/shuttle/sentry_holder/Initialize(mapload)
 	. = ..()

diff --git a/code/modules/projectiles/ammo_datums/misc.dm b/code/modules/projectiles/ammo_datums/misc.dm
@@ -11,7 +11,7 @@
 	hud_state_empty = "rifle_empty"
 	flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SENTRY
 	accurate_range = 10
-	damage = 25
+	damage = 20
 	penetration = 20
 	damage_falloff = 0.25
 
@@ -23,6 +23,47 @@
 	hud_state = "rifle_heavy"
 	damage = 60
 
+/datum/ammo/bullet/turret/mini
+	name = "small caliber autocannon bullet"
+	damage = 12
+	penetration = 10
+	damage_falloff = 0.5
+	flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SENTRY
+
+/datum/ammo/bullet/turret/sniper
+	name = "antimaterial bullet"
+	bullet_color = COLOR_SOFT_RED
+	accurate_range = 14
+	damage = 75
+	penetration = 50
+	damage_falloff = 0
+
+/datum/ammo/flamethrower/turret
+	max_range = 8
+	damage = 50
+
+/datum/ammo/bullet/turret/buckshot
+	name = "turret buckshot shell"
+	icon_state = "buckshot"
+	hud_state = "shotgun_buckshot"
+	bonus_projectiles_type = /datum/ammo/bullet/turret/spread
+	bonus_projectiles_amount = 6
+	bonus_projectiles_scatter = 5
+	max_range = 10
+	damage = 20
+	penetration = 20
+	damage_falloff = 1
+
+/datum/ammo/bullet/turret/buckshot/on_hit_mob(mob/M,obj/projectile/P)
+	staggerstun(M, P, knockback = 1, max_range = 4)
+
+/datum/ammo/bullet/turret/spread
+	name = "additional buckshot"
+	max_range = 10
+	damage = 20
+	penetration = 40
+	damage_falloff = 1
+
 /datum/ammo/bullet/turret/mini
 	name = "small caliber autocannon bullet"
 	damage = 20

diff --git a/code/modules/projectiles/gun_helpers.dm b/code/modules/projectiles/gun_helpers.dm
@@ -26,7 +26,7 @@
 
 /obj/item/weapon/gun/attackby(obj/item/I, mob/user, params)
 	. = ..()
-	if(user.get_inactive_held_item() != src || istype(I, /obj/item/attachable) || isgun(I))
+	if(user.get_inactive_held_item() != src || istype(I, /obj/item/attachable) || isgun(I) || istype(I, /obj/item/sentry_upgrade_kit))
 		return
 	reload(I, user)