KILL

cmss13-devs · Sep 9, 2023 · 3d4c6ef · 3d4c6ef
1 parent 6897069
commit 3d4c6ef
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/code/datums/elements/bullet_trait/penetrating/heavy.dm b/code/datums/elements/bullet_trait/penetrating/heavy.dm
@@ -18,7 +18,7 @@
 
 	src.damage_lost_per_pen = damage_lost_per_pen
 
-/datum/element/bullet_trait_penetrating/heavy/handle_passthrough_movables(obj/item/projectile/bullet, atom/movable/hit_movable, did_hit)
+/datum/element/bullet_trait_penetrating/heavy/handle_passthrough_movables(obj/projectile/bullet, atom/movable/hit_movable, did_hit)
 	if(did_hit)
 		var/slow_mult = 1
 		if(ismob(hit_movable))
@@ -35,7 +35,7 @@
 
 	return COMPONENT_BULLET_PASS_THROUGH
 
-/datum/element/bullet_trait_penetrating/heavy/handle_passthrough_turf(obj/item/projectile/bullet, turf/closed/wall/hit_wall)
+/datum/element/bullet_trait_penetrating/heavy/handle_passthrough_turf(obj/projectile/bullet, turf/closed/wall/hit_wall)
 	bullet.distance_travelled += distance_loss_per_hit
 	bullet.damage -= damage_lost_per_pen
 

diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm
@@ -1650,7 +1650,7 @@
 	sound_hit = 'sound/bullets/bullet_vulture_impact.ogg'
 	flags_ammo_behavior = AMMO_BALLISTIC|AMMO_SNIPER|AMMO_IGNORE_COVER|AMMO_ANTIVEHICLE
 
-/datum/ammo/bullet/sniper/anti_materiel/vulture/on_hit_mob(mob/hit_mob, obj/item/projectile/bullet)
+/datum/ammo/bullet/sniper/anti_materiel/vulture/on_hit_mob(mob/hit_mob, obj/projectile/bullet)
 	. = ..()
 	knockback(hit_mob, bullet, 30)
 	hit_mob.apply_effect(3, SLOW)
@@ -1811,7 +1811,7 @@
 ///Stuff for the HRP holotargetting stacks
 	var/holo_stacks = 15
 
-/datum/ammo/bullet/smartgun/holo_target/on_hit_mob(mob/M, obj/item/projectile/P)
+/datum/ammo/bullet/smartgun/holo_target/on_hit_mob(mob/M, obj/projectile/P)
 	. = ..()
 	M.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time)
 
@@ -2175,16 +2175,16 @@
 	var/datum/reagent/napalm/upp/R = new()
 	new /obj/flamer_fire(T, cause_data, R, 3)
 
-/datum/ammo/rocket/wp/upp/on_hit_mob(mob/M, obj/item/projectile/P)
+/datum/ammo/rocket/wp/upp/on_hit_mob(mob/M, obj/projectile/P)
 	drop_flame(get_turf(M), P.weapon_cause_data)
 
-/datum/ammo/rocket/wp/upp/on_hit_obj(obj/O, obj/item/projectile/P)
+/datum/ammo/rocket/wp/upp/on_hit_obj(obj/O, obj/projectile/P)
 	drop_flame(get_turf(O), P.weapon_cause_data)
 
-/datum/ammo/rocket/wp/upp/on_hit_turf(turf/T, obj/item/projectile/P)
+/datum/ammo/rocket/wp/upp/on_hit_turf(turf/T, obj/projectile/P)
 	drop_flame(T, P.weapon_cause_data)
 
-/datum/ammo/rocket/wp/upp/do_at_max_range(obj/item/projectile/P)
+/datum/ammo/rocket/wp/upp/do_at_max_range(obj/projectile/P)
 	drop_flame(get_turf(P), P.weapon_cause_data)
 
 /datum/ammo/rocket/wp/quad

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -230,7 +230,7 @@
 	/// If this gun should spawn with automatic fire. Protected due to it never needing to be edited.
 	VAR_PROTECTED/start_automatic = FALSE
 	/// The type of projectile that this gun should shoot
-	var/projectile_type = /obj/item/projectile
+	var/projectile_type = /obj/projectile
 	/// The multiplier for how much slower this should fire in automatic mode. 1 is normal, 1.2 is 20% slower, 2 is 100% slower, etc. Protected due to it never needing to be edited.
 	VAR_PROTECTED/autofire_slow_mult = 1
 

diff --git a/code/modules/projectiles/guns/boltaction.dm b/code/modules/projectiles/guns/boltaction.dm
@@ -158,7 +158,7 @@
 		/obj/item/attachable/stock/vulture,
 	)
 	civilian_usable_override = FALSE
-	projectile_type = /obj/item/projectile/vulture
+	projectile_type = /obj/projectile/vulture
 	actions_types = list(
 		/datum/action/item_action/vulture,
 	)

diff --git a/code/modules/projectiles/guns/specialist.dm b/code/modules/projectiles/guns/specialist.dm
@@ -1353,7 +1353,7 @@
 	Integrated.Attach(src)
 	update_attachable(Integrated.slot)
 
-/obj/item/weapon/gun/launcher/rocket/upp/apply_bullet_effects(obj/item/projectile/projectile_to_fire, mob/user, i = 1, reflex = 0)
+/obj/item/weapon/gun/launcher/rocket/upp/apply_bullet_effects(obj/projectile/projectile_to_fire, mob/user, i = 1, reflex = 0)
 	. = ..()
 	if(!HAS_TRAIT(user, TRAIT_EAR_PROTECTION) && ishuman(user))
 		return

diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
@@ -1194,16 +1194,16 @@
 		if(dx == -1 || dx == 1)
 			return TRUE
 
-/obj/item/projectile/vulture
+/obj/projectile/vulture
 	accuracy_range_falloff = 10
 	/// The odds of hitting a xeno in less than your gun's range. Doesn't apply to humans.
 	var/xeno_shortrange_chance = 10
 
-/obj/item/projectile/vulture/Initialize(mapload, datum/cause_data/cause_data)
+/obj/projectile/vulture/Initialize(mapload, datum/cause_data/cause_data)
 	. = ..()
 	RegisterSignal(src, COMSIG_GUN_VULTURE_FIRED_ONEHAND, PROC_REF(on_onehand))
 
-/obj/item/projectile/vulture/handle_mob(mob/living/hit_mob)
+/obj/projectile/vulture/handle_mob(mob/living/hit_mob)
 	if((ammo.accurate_range_min > distance_travelled) && isxeno(hit_mob))
 		if(prob(xeno_shortrange_chance))
 			return ..()
@@ -1214,7 +1214,7 @@
 	return ..()
 
 /// Handler for when the user one-hands the firing gun
-/obj/item/projectile/vulture/proc/on_onehand(datum/source)
+/obj/projectile/vulture/proc/on_onehand(datum/source)
 	SIGNAL_HANDLER
 
 	accuracy = HIT_ACCURACY_TIER_2 // flat 10% chance if you're desperate and try to fire this thing without a bipod