mistakes + removes tec 9

shiptest-ss13 · Sep 6, 2024 · ee774f7 · ee774f7
1 parent c7b5f99
commit ee774f7
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 68 deletions.
diff --git a/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm b/_maps/RandomRuins/RockRuins/rockplanet_shippingdock.dmm
@@ -2002,7 +2002,7 @@
 	},
 /obj/item/ammo_box/magazine/tec9,
 /obj/item/ammo_box/magazine/tec9,
-/obj/item/gun/ballistic/automatic/pistol/tec9,
+/obj/item/storage/pistolcase/ringneck,
 /turf/open/floor/plasteel/mono/dark,
 /area/ruin/rockplanet/shippingdocksecure)
 "rK" = (

diff --git a/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm b/code/modules/cargo/blackmarket/blackmarket_items/ammo.dm
@@ -121,17 +121,6 @@
 	stock_max = 5
 	availability_prob = 0
 
-/datum/blackmarket_item/ammo/tec_mag
-	name = "TEC-9 AP Magazine"
-	desc = "A 20 round magazine of AP ammo for the TEC-9 machine pistol."
-	item = /obj/item/ammo_box/magazine/tec9
-
-	price_min = 500
-	price_max = 1000
-	stock_min = 3
-	stock_max = 5
-	availability_prob = 0
-
 /datum/blackmarket_item/ammo/polymer_clip
 	name = "7.62 Stripper Clip"
 	desc = "A 5 round stripper clip of 7.62x40mm CLIP."

diff --git a/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm b/code/modules/cargo/blackmarket/blackmarket_items/weapons.dm
@@ -283,17 +283,6 @@
 	stock = 2
 	availability_prob = 25
 
-/datum/blackmarket_item/weapon/tec
-	name = "TEC-9 Machine Pistol"
-	desc = "Hallelujah! It's raining lead! This 9mm machine pistol is capable of spitting out bullets at rapid pace."
-	item = /obj/item/gun/ballistic/automatic/pistol/tec9
-	pair_item = list(/datum/blackmarket_item/ammo/tec_mag)
-
-	price_min = 1500
-	price_max = 2750
-	stock = 2
-	availability_prob = 35
-
 /datum/blackmarket_item/weapon/syringe_gun
 	name = "Dart Pistol"
 	desc = "A compact dart pistol, for clandestine poisoining from a distance."

diff --git a/code/modules/projectiles/boxes_magazines/external/smg.dm b/code/modules/projectiles/boxes_magazines/external/smg.dm
@@ -114,11 +114,3 @@
 /obj/item/ammo_box/magazine/c45_firestorm_mag/pan/update_icon_state() //Causes the mag to NOT inherit the parent's update_icon oooh the misery
 	. = ..()
 	icon_state = "firestorm_pan"
-
-/obj/item/ammo_box/magazine/tec9
-	name = "machine pistol magazine (9mm AP)"
-	desc = "A sizable 20-round magazine for the TEC-9 machine pistol. These armor-piercing rounds are okay at piercing protective equipment, but lose some stopping power.."
-	icon_state = "tec_mag"
-	ammo_type = /obj/item/ammo_casing/c9mm/ap
-	caliber = "9mm"
-	max_ammo = 20
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -224,28 +224,6 @@ EMPTY_GUN_HELPER(automatic/pistol/commander/inteq)
 /obj/item/gun/ballistic/automatic/pistol/solgov/old
 	icon_state = "pistole-c-old"
 
-/obj/item/gun/ballistic/automatic/pistol/tec9 //fucking kill this gun already my god
-	name = "\improper TEC-9 machine pistol"
-	desc = "A crude machine pistol designed to vomit 9mm ammunition at a truly eye-watering rate of fire."
-	icon_state = "tec9"
-	icon = 'icons/obj/guns/manufacturer/scarborough/48x32.dmi'
-	lefthand_file = 'icons/obj/guns/manufacturer/scarborough/lefthand.dmi'
-	righthand_file = 'icons/obj/guns/manufacturer/scarborough/righthand.dmi'
-	mob_overlay_icon = 'icons/obj/guns/manufacturer/scarborough/onmob.dmi'
-
-	fire_delay = 0.15 SECONDS
-	weapon_weight = WEAPON_LIGHT
-	w_class = WEIGHT_CLASS_NORMAL
-	mag_type = /obj/item/ammo_box/magazine/tec9
-	show_magazine_on_sprite = TRUE
-	load_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
-	load_empty_sound = 'sound/weapons/gun/pistol/mag_insert.ogg'
-	eject_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
-	eject_empty_sound = 'sound/weapons/gun/pistol/mag_release.ogg'
-
-	gun_firemodes = list(FIREMODE_SEMIAUTO, FIREMODE_FULLAUTO)
-	default_firemode = FIREMODE_SEMIAUTO
-
 /obj/item/gun/ballistic/automatic/pistol/disposable
 	name = "disposable gun"
 	desc = "An exceedingly flimsy plastic gun that is extremely cheap to produce. You get what you pay for."

diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
@@ -565,21 +565,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
 	surplus = 5
 	limited_stock = 1
 
-/datum/uplink_item/dangerous/tec9
-	name = "TEC9 Machine Pistol"
-	desc = "A powerful machine pistol sporting a high rate of fire and armor-piercing rounds."
-	item = /obj/item/gun/ballistic/automatic/pistol/tec9
-	cost = 12
-	surplus = 20
-
-/datum/uplink_item/dangerous/ebr
-	name = "M514 EBR"
-	desc = "A cheap rifle with high stopping power and low capacity."
-	item = /obj/item/gun/ballistic/automatic/assault/hydra/dmr
-	cost = 8
-	surplus = 20
-	include_modes = list(/datum/game_mode/nuclear)
-
 // Stealthy Weapons
 /datum/uplink_item/stealthy_weapons
 	category = "Stealthy Weapons"