fixes syringe guns, stripper guns, size guns (#7235)

Author: silicons

citadel.dme

@@ -4695,6 +4695,7 @@
 #include "code\modules\projectiles\ammunition\calibers\special\musket.dm"
 #include "code\modules\projectiles\ammunition\calibers\special\pellet.dm"
 #include "code\modules\projectiles\ammunition\calibers\special\rocket.dm"
+#include "code\modules\projectiles\ammunition\calibers\special\syringe.dm"
 #include "code\modules\projectiles\guns\firemode-energy.dm"
 #include "code\modules\projectiles\guns\firemode.dm"
 #include "code\modules\projectiles\guns\firing_pin.dm"
@@ -4715,7 +4716,6 @@
 #include "code\modules\projectiles\guns\gun\launcher\crossbow.dm"
 #include "code\modules\projectiles\guns\gun\launcher\grenade_launcher.dm"
 #include "code\modules\projectiles\guns\gun\launcher\pneumatic.dm"
-#include "code\modules\projectiles\guns\gun\launcher\syringe_gun.dm"
 #include "code\modules\projectiles\guns\gun\launcher\vox.dm"
 #include "code\modules\projectiles\guns\gun\projectile\ballistic-interaction.dm"
 #include "code\modules\projectiles\guns\gun\projectile\ballistic-legacy.dm"
@@ -4743,6 +4743,7 @@
 #include "code\modules\projectiles\guns\gun\projectile\ballistic\semiauto.dm"
 #include "code\modules\projectiles\guns\gun\projectile\ballistic\shotgun.dm"
 #include "code\modules\projectiles\guns\gun\projectile\ballistic\sniper.dm"
+#include "code\modules\projectiles\guns\gun\projectile\ballistic\syringe.dm"
 #include "code\modules\projectiles\guns\gun\projectile\ballistic\caseless\pellet.dm"
 #include "code\modules\projectiles\guns\gun\projectile\energy\frontier.dm"
 #include "code\modules\projectiles\guns\gun\projectile\energy\hardlight_bow.dm"
@@ -4752,8 +4753,9 @@
 #include "code\modules\projectiles\guns\gun\projectile\energy\nuclear.dm"
 #include "code\modules\projectiles\guns\gun\projectile\energy\particle.dm"
 #include "code\modules\projectiles\guns\gun\projectile\energy\phase.dm"
-#include "code\modules\projectiles\guns\gun\projectile\energy\sizegun_vr.dm"
+#include "code\modules\projectiles\guns\gun\projectile\energy\sizegun.dm"
 #include "code\modules\projectiles\guns\gun\projectile\energy\special.dm"
+#include "code\modules\projectiles\guns\gun\projectile\energy\stripper.dm"
 #include "code\modules\projectiles\guns\gun\projectile\energy\stun.dm"
 #include "code\modules\projectiles\guns\gun\projectile\energy\temperature.dm"
 #include "code\modules\projectiles\guns\gun\projectile\magic\staff.dm"
@@ -4939,7 +4941,8 @@
 #include "code\modules\reagents\reagent_containers\patch.dm"
 #include "code\modules\reagents\reagent_containers\pill.dm"
 #include "code\modules\reagents\reagent_containers\pill_vr.dm"
-#include "code\modules\reagents\reagent_containers\syringes.dm"
+#include "code\modules\reagents\reagent_containers\syringe-misc.dm"
+#include "code\modules\reagents\reagent_containers\syringe.dm"
 #include "code\modules\reagents\reagent_containers\syringes_vr.dm"
 #include "code\modules\reagents\reagent_containers\unidentified_hypospray.dm"
 #include "code\modules\reagents\reagent_containers\glass\bottle_vr.dm"

code/datums/design/designs/medical/misc.dm

@@ -2,7 +2,7 @@
 	id = "AmmoSyringeCartridge"
 	lathe_type = LATHE_TYPE_AUTOLATHE
 	design_unlock = DESIGN_UNLOCK_INTRINSIC
-	build_path = /obj/item/syringe_cartridge
+	build_path = /obj/item/ammo_casing/syringe
 
 /datum/prototype/design/medical/implanter
 	id = "MedicalImplanter"

code/game/atoms/movable/movable.dm

@@ -81,6 +81,7 @@
 	var/tmp/movement_type = MOVEMENT_GROUND
 
 	//? Spacedrift
+	//  todo: rework spacedrift, proper bucket subsystem.
 	/// Which direction we're drifting
 	var/inertia_dir = NONE
 	/// Only set while drifting, last location we were while drifting

code/game/content/factions/corporations/nanotrasen/guns/nt_hydra-legacy.dm

@@ -89,24 +89,4 @@
 	microbattery_group_key = "stripper"
 	microbattery_mode_color = "#fc8d0f"
 	microbattery_mode_name = "<span style='color:#fc8d0f;font-weight:bold;'>STRIPPER</span>"
-	projectile_type = /obj/projectile/bullet/stripper
-
-/obj/projectile/bullet/stripper
-	icon_state = "magicm"
-	nodamage = 1
-	damage_inflict_agony = 5
-	embed_chance = 0
-	damage_mode = NONE
-	damage_flag = ARMOR_MELEE
-
-/obj/projectile/bullet/stripper/on_impact(atom/target, impact_flags, def_zone, efficiency)
-	. = ..()
-	if(. & PROJECTILE_IMPACT_FLAGS_UNCONDITIONAL_ABORT)
-		return
-
-	if(ishuman(target))
-		var/mob/living/carbon/human/H = target
-		if(!H.permit_stripped)
-			return
-		H.drop_slots_to_ground(list(SLOT_ID_SUIT, SLOT_ID_UNIFORM, SLOT_ID_BACK, SLOT_ID_SHOES, SLOT_ID_GLOVES))
-		//Hats can stay! Most other things fall off with removing these.
+	projectile_type = /obj/projectile/energy/stripper

code/game/objects/items/storage/boxes.dm

@@ -108,7 +108,7 @@
 	name = "box of syringe gun cartridges"
 	desc = "A box full of compressed gas cartridges."
 	icon_state = "syringe"
-	starts_with = list(/obj/item/syringe_cartridge = 7)
+	starts_with = list(/obj/item/ammo_casing/syringe = 7)
 
 /obj/item/storage/box/beakers
 	name = "box of beakers"

code/modules/mob/_modifiers/traits_phobias.dm

@@ -522,7 +522,7 @@
 		if(istype(thing, /obj/item/implanter))
 			fear_amount += 8 //Very big needle.
 
-		if(istype(thing, /obj/item/gun/launcher/syringe))
+		if(istype(thing, /obj/item/gun/projectile/ballistic/syringe))
 			fear_amount += 6
 
 		if(istype(thing, /mob/living/carbon/human))

code/modules/projectiles/ammunition/calibers/special/syringe.dm

@@ -0,0 +1,91 @@
+/datum/ammo_caliber/syringe
+	id = "syringe"
+	caliber = "syringe"
+
+/obj/item/ammo_casing/syringe
+	name = "syringe gun cartridge"
+	desc = "An impact-triggered compressed gas cartridge that can be fitted to a syringe for rapid injection."
+	icon = 'icons/modules/projectiles/casings/syringe.dmi'
+	icon_state = "syringe-cartridge"
+	materials_base = list(MAT_STEEL = 125, MAT_GLASS = 375)
+	slot_flags = SLOT_BELT | SLOT_EARS
+	throw_force = 3
+	damage_force = 3
+	casing_flags = CASING_DELETE
+	w_class = WEIGHT_CLASS_TINY
+
+	projectile_type = /obj/projectile/syringe
+
+	var/obj/item/reagent_containers/syringe/syringe
+
+
+/obj/item/ammo_casing/syringe/expend()
+	var/obj/projectile/syringe/maybe_syringe = ..()
+	if(!istype(maybe_syringe))
+		return maybe_syringe
+	if(syringe)
+		syringe.forceMove(maybe_syringe)
+		maybe_syringe.syringe = syringe
+		syringe = null
+	return maybe_syringe
+
+/obj/item/ammo_casing/syringe/update_icon()
+	underlays.Cut()
+	. = ..()
+	if(syringe)
+		underlays += image(syringe.icon, src, syringe.icon_state)
+		underlays += syringe.filling
+
+/obj/item/ammo_casing/syringe/using_item_on(obj/item/using, datum/event_args/actor/clickchain/clickchain, clickchain_flags)
+	. = ..()
+	if(.)
+		return
+	if(istype(using, /obj/item/reagent_containers/syringe))
+		if(!clickchain.performer.attempt_insert_item_for_installation(using, src))
+			return TRUE
+		syringe = using
+		clickchain.chat_feedback(SPAN_NOTICE("You carefully insert [using] into [src]"), target = src)
+		damage_mode |= DAMAGE_MODE_SHARP
+		update_icon()
+		return TRUE
+
+/obj/item/ammo_casing/syringe/on_attack_hand(datum/event_args/actor/clickchain/clickchain, clickchain_flags)
+	. = ..()
+	if(.)
+		return
+	if(!clickchain.performer.is_holding_inactive(src))
+		return
+	if(!syringe)
+		return
+	clickchain.chat_feedback(SPAN_NOTICE("You remove [syringe] from [src]."))
+	clickchain.performer.grab_item_from_interacted_with(syringe, src)
+	syringe = null
+	playsound(src, 'sound/weapons/empty.ogg', 50, TRUE)
+	damage_mode &= ~DAMAGE_MODE_SHARP
+	update_icon()
+
+/obj/projectile/syringe
+	name = "syringe"
+	icon = 'icons/modules/projectiles/projectile-misc.dmi'
+	icon_state = "syringe"
+	impact_sound = PROJECTILE_IMPACT_SOUNDS_KINETIC
+	var/obj/item/reagent_containers/syringe/syringe
+
+/obj/projectile/syringe/proc/set_syringe(obj/item/reagent_containers/syringe/syringe)
+	src.syringe = syringe
+	src.name = syringe.name
+	src.desc = syringe.desc
+
+/obj/projectile/syringe/expire(impacting)
+	syringe?.forceMove(drop_location())
+	syringe = null
+	return ..()
+
+/obj/projectile/syringe/on_impact(atom/target, impact_flags, def_zone, efficiency)
+	if(!syringe)
+		return ..()
+	var/units_injected = 0
+	impact_flags = syringe.handle_impact_as_projectile(target, impact_flags, def_zone, efficiency, &units_injected)
+	if(units_injected)
+		add_attack_logs(firer, target, "Shot with [src.name] transferring [units_injected] units")
+	return ..()

code/modules/projectiles/guns/gun-firing.dm

@@ -252,7 +252,7 @@
 	// todo: do we really need to newtonian move always? some guns shouldn't?
 	if(ismovable(cycle.firing_atom))
 		var/atom/movable/movable_firer = cycle.firing_atom
-		movable_firer.newtonian_move(angle2dir(cycle.original_angle))
+		movable_firer.newtonian_move(turn(angle2dir(cycle.original_angle), 180))
 
 	// todo: muzzle flash implementation
 

code/modules/projectiles/guns/gun/launcher/syringe_gun.dm

@@ -0,0 +1,25 @@
+/obj/item/gun/projectile/ballistic/syringe
+	name = "syringe gun"
+	desc = "A spring loaded rifle designed to fit syringes, designed to incapacitate unruly patients from a distance."
+	icon = 'icons/modules/projectiles/guns/ballistic/syringe.dmi'
+	icon_state = "syringe"
+	w_class = WEIGHT_CLASS_NORMAL
+	materials_base = list(MAT_STEEL = 2000)
+	damage_force = 7
+	slot_flags = SLOT_BELT
+
+	fire_sound = 'sound/weapons/empty.ogg'
+	fire_sound_text = "a metallic thunk"
+	recoil = 0
+
+	internal_magazine_size = 1
+	bolt_simulation = TRUE
+	chamber_simulation = TRUE
+
+/obj/item/gun/projectile/ballistic/syringe/rapid
+	name = "syringe gun revolver"
+	desc = "A modification of the syringe gun design, using a rotating cylinder to store up to five syringes. The spring still needs to be drawn between shots."
+	icon_state = "syringe-rapid"
+	internal_magazine_size = 5
+	bolt_simulation = FALSE
+	chamber_simulation = FALSE