Ports TGMC Pistol + Pistol Magazine + Attachment Sprites (#29768)

* let's fuckin go

* aps cleanup

* one word

* attachments file

* license nonsense

* almost forgor

* error fix

* second fix

* please free me from this hell

* AHHHHHHHHHHHHHHH

* please just end already

* please

* for fuck's sake

* just work already you little shit

* FUCK

* the suffering does not end

* there can't be many more

* license

* rollback 1

* rollback 2

* license move

* Update code/modules/projectiles/ammunition/magazines.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* contra change

* rollback

* contra change 2.0

* Update README.md

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/automatic.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/projectiles/guns/syringe_gun.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* more contra changes

* whoops

* daedalus

* few more

* Update code/modules/projectiles/guns/projectile/automatic.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* more contra edits

* Update code/modules/projectiles/guns/projectile/sniper.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* that was annoying

* Update code/modules/projectiles/ammunition/magazines.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
PopeDaveThe3th
2025-07-29 22:30:45 +00:00
committed by GitHub
co-authored by Contrabang
parent d06d5fe83d
commit 6dff434902
29 changed files with 138 additions and 63 deletions
+2 -2
View File
@@ -612,7 +612,7 @@
suit = /obj/item/clothing/suit/sovietcoat
glasses = /obj/item/clothing/glasses/sunglasses
r_pocket = /obj/item/flashlight/seclite
belt = /obj/item/gun/projectile/automatic/pistol/aps
belt = /obj/item/gun/projectile/automatic/pistol/type_230
backpack_contents = list(
/obj/item/storage/box/soviet = 1,
@@ -655,7 +655,7 @@
backpack_contents = list(
/obj/item/storage/box/soviet = 1,
/obj/item/gun/projectile/automatic/pistol/aps = 1,
/obj/item/gun/projectile/automatic/pistol/type_230 = 1,
/obj/item/ammo_box/magazine/apsm10mm = 2,
/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1,
/obj/item/lighter/zippo/engraved = 1
+11 -11
View File
@@ -5,10 +5,10 @@
////////////////////////////////////////
/datum/uplink_item/dangerous/aps
name = "Stechkin APS Pistol"
name = "Type 230 Machine Pistol"
reference = "APS"
desc = "The automatic machine pistol version of the FK-69 'Stechkin' chambered in 10mm Auto with a detachable 20-round box magazine. Perfect for dual wielding or as backup."
item = /obj/item/gun/projectile/automatic/pistol/aps
desc = "A compact machine pistol, chambered in 10mm Auto with a detachable 20-round box magazine. Perfect for dual wielding or as backup."
item = /obj/item/gun/projectile/automatic/pistol/type_230
cost = 40
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
@@ -165,32 +165,32 @@
////////////////////////////////////////
/datum/uplink_item/ammo/aps
name = "Stechkin APS - 10mm Magazine"
desc = "An additional 20-round 10mm magazine for use in the Stechkin APS machine pistol, loaded with rounds that are cheap but around half as effective as .357"
name = "Type 230 - 10mm Magazine"
desc = "An additional 20-round 10mm magazine for use in the Type 230 machine pistol, loaded with rounds that are cheap but around half as effective as .357"
reference = "10MMAPS"
item = /obj/item/ammo_box/magazine/apsm10mm
cost = 10
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/ammo/apsap
name = "Stechkin APS - 10mm Armour Piercing Magazine"
desc = "An additional 20-round 10mm magazine for use in the Stechkin APS machine pistol, loaded with rounds that are less effective at injuring the target but penetrate protective gear."
name = "Type 230 - 10mm Armour Piercing Magazine"
desc = "An additional 20-round 10mm magazine for use in the Type 230 machine pistol, loaded with rounds that are less effective at injuring the target but penetrate protective gear."
reference = "10MMAPSAP"
item = /obj/item/ammo_box/magazine/apsm10mm/ap
cost = 15
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/ammo/apsfire
name = "Stechkin APS - 10mm Incendiary Magazine"
desc = "An additional 20-round 10mm magazine for use in the Stechkin APS machine pistol, loaded with incendiary rounds which ignite the target."
name = "Type 230 - 10mm Incendiary Magazine"
desc = "An additional 20-round 10mm magazine for use in the Type 230 machine pistol, loaded with incendiary rounds which ignite the target."
reference = "10MMAPSFIRE"
item = /obj/item/ammo_box/magazine/apsm10mm/fire
cost = 15
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
/datum/uplink_item/ammo/apshp
name = "Stechkin APS - 10mm Hollow Point Magazine"
desc = "An additional 20-round 10mm magazine for use in the Stechkin APS machine pistol, loaded with rounds which are more damaging but ineffective against armour."
name = "Type 230 - 10mm Hollow Point Magazine"
desc = "An additional 20-round 10mm magazine for use in the Type 230 machine pistol, loaded with rounds which are more damaging but ineffective against armour."
reference = "10MMAPSHP"
item = /obj/item/ammo_box/magazine/apsm10mm/hp
cost = 20