diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index 4ce24a3ba0802..3a7c3fcb59d36 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -7,14 +7,10 @@ caliber = CALIBER_STRILKA310 projectile_type = /obj/projectile/bullet/strilka310 -// MASSMETA EDIT REMOVAL BEGIN - mosin return -/* /obj/item/ammo_casing/strilka310/Initialize(mapload) . = ..() AddElement(/datum/element/caseless) -*/ -// MASSMETA EDIT REMOVAL END /obj/item/ammo_casing/strilka310/surplus name = ".310 Strilka surplus bullet casing" diff --git a/massmeta/code/game/objects/items/storage/toolbox.dm b/massmeta/code/game/objects/items/storage/toolbox.dm deleted file mode 100644 index a7c09ae0b2334..0000000000000 --- a/massmeta/code/game/objects/items/storage/toolbox.dm +++ /dev/null @@ -1,8 +0,0 @@ -/obj/item/storage/toolbox/ammobox/strilka310 - name = "7.62mm ammo box (Surplus?)" - desc = "It contains a few clips. Goddamn, this thing smells awful. \ - Has this been sitting in a warehouse for the last several centuries?" - ammo_to_spawn = /obj/item/ammo_box/strilka310 - -/obj/item/storage/toolbox/ammobox/strilka310/surplus - ammo_to_spawn = /obj/item/ammo_box/strilka310/surplus diff --git a/massmeta/code/modules/projectiles/ammunition/ballistic/rifle.dm b/massmeta/code/modules/projectiles/ammunition/ballistic/rifle.dm deleted file mode 100644 index 5d42dcfb398c4..0000000000000 --- a/massmeta/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ /dev/null @@ -1,14 +0,0 @@ -// какая нахуй стрилка - -/obj/item/ammo_casing/strilka310 - name = "7.62 bullet casing" - desc = "A 7.62 bullet casing." - icon = 'massmeta/icons/mosin/ammo.dmi' - icon_state = "762-casing" - caliber = CALIBER_STRILKA310 - projectile_type = /obj/projectile/bullet/strilka310 - -/obj/item/ammo_casing/strilka310/surplus - name = ".762 surplus bullet casing" - desc = "A surplus .762 bullet casing." - projectile_type = /obj/projectile/bullet/strilka310/surplus diff --git a/massmeta/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/massmeta/code/modules/projectiles/boxes_magazines/ammo_boxes.dm deleted file mode 100644 index ba9294d66f57d..0000000000000 --- a/massmeta/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ /dev/null @@ -1,13 +0,0 @@ -/obj/item/ammo_box/strilka310 - name = "stripper clip (7.62mm)" - desc = "A stripper clip." - icon = 'massmeta/icons/mosin/ammo.dmi' - icon_state = "762" - ammo_type = /obj/item/ammo_casing/strilka310 - max_ammo = 5 - caliber = CALIBER_STRILKA310 - multiple_sprites = AMMO_BOX_PER_BULLET - -/obj/item/ammo_box/strilka310/surplus - name = "stripper clip (7.62mm Surplus)" - ammo_type = /obj/item/ammo_casing/strilka310/surplus diff --git a/massmeta/code/modules/projectiles/guns/ballistic/rifle.dm b/massmeta/code/modules/projectiles/guns/ballistic/rifle.dm deleted file mode 100644 index a0c28554dea24..0000000000000 --- a/massmeta/code/modules/projectiles/guns/ballistic/rifle.dm +++ /dev/null @@ -1,53 +0,0 @@ -/obj/item/gun/ballistic/rifle/boltaction - name = "\improper Mosin Nagant" - desc = "A classic Mosin Nagant. They don't make them like they used to. Well, okay, in all honesty, this one is actually \ - a new refurbished version. So it works just fine! Often found in the hands of underpaid Nanotrasen interns, \ - Russian military LARPers, actual Space Russians, revolutionaries and cargo technicians. Still feels slightly moist." - sawn_desc = "A sawn-off Mosin Nagant, popularly known as an \"Obrez\". \ - There was probably a reason it wasn't manufactured this short to begin with. \ - This one is still in surprisingly good condition. Often found in the hands \ - of underpaid Nanotrasen interns without a care for company property, Russian military LARPers, \ - actual drunk Space Russians, Tiger Co-op assassins and cargo technicians. Still feels slightly moist." - icon = 'massmeta/icons/mosin/mosinnagant.dmi' - lefthand_file = 'massmeta/icons/mosin/64x_guns_left.dmi' - righthand_file = 'massmeta/icons/mosin/64x_guns_right.dmi' - icon_state = "moistnugget" - inhand_icon_state = "moistnugget" - worn_icon_state = "moistnugget" - inhand_x_dimension = 64 - inhand_y_dimension = 64 - - -/obj/item/gun/ballistic/rifle/boltaction/surplus - name = "\improper Mosin Nagant" - desc = "A classic Mosin Nagant, ruined by centuries of moisture. Some Space Russians claim that the moisture \ - is a sign of good luck. A sober user will know that this thing is going to fucking jam. Repeatedly. \ - Often found in the hands of cargo technicians, Russian military LARPers, Tiger Co-Op terrorist cells, \ - cryo-frozen Space Russians, and security personnel with a bone to pick. EXTREMELY moist." - sawn_desc = "A sawn-off Mosin Nagant, popularly known as an \"Obrez\". \ - There was probably a reason it wasn't manufactured this short to begin with. \ - This one has been ruined by centuries of moisture and WILL jam. Often found in the hands of \ - cargo technicians with a death wish, Russian military LARPers, actual drunk Space Russians, \ - Tiger Co-op assassins, cryo-frozen Space Russians, and security personnel with \ - little care for professional conduct while making 'arrests' point blank in the back of the head \ - until the gun clicks. EXTREMELY moist." - icon_state = "moistnugget" - inhand_icon_state = "moistnugget" - worn_icon_state = "moistnugget" - -/obj/item/gun/ballistic/rifle/boltaction/prime - name = "\improper Regal Nagant" - desc = "A prized hunting Mosin Nagant. Used for the most dangerous game." - icon_state = "moistprime" - inhand_icon_state = "moistprime" - worn_icon_state = "moistprime" - can_be_sawn_off = TRUE - sawn_desc = "A sawn-off Regal Nagant... Doing this was a sin, I hope you're happy. \ - You are now probably one of the few people in the universe to ever hold a \"Regal Obrez\". \ - Even thinking about that name combination makes you ill." - -/obj/item/gun/ballistic/rifle/boltaction/harpoon - lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi' - inhand_x_dimension = 32 - inhand_y_dimension = 32 diff --git a/massmeta/code/modules/projectiles/projectile/bullets/rifle.dm b/massmeta/code/modules/projectiles/projectile/bullets/rifle.dm deleted file mode 100644 index aba5789c82cfb..0000000000000 --- a/massmeta/code/modules/projectiles/projectile/bullets/rifle.dm +++ /dev/null @@ -1,18 +0,0 @@ -// 7.62 (Nagant Rifle) - -/obj/projectile/bullet/strilka310 - name = "7.62 bullet" - damage = 60 - armour_penetration = 10 - wound_bonus = -45 - wound_falloff_tile = 0 - -/obj/projectile/bullet/strilka310/surplus - name = "7.62 surplus bullet" - weak_against_armour = TRUE //this is specifically more important for fighting carbons than fighting noncarbons. Against a simple mob, this is still a full force bullet - armour_penetration = 0 - -/obj/projectile/bullet/strilka310/enchanted - name = "enchanted 7.62 bullet" - damage = 20 - stamina = 80 diff --git a/massmeta/modular_meta.dm b/massmeta/modular_meta.dm index 8b56b375b8b5a..4178aa25ce683 100644 --- a/massmeta/modular_meta.dm +++ b/massmeta/modular_meta.dm @@ -74,11 +74,6 @@ #include "code\modules\uplink\uplink_items\suits.dm" #include "code\modules\uplink\uplink_items\nukeops.dm" #include "code\game\machinery\suit_storage_unit.dm" -#include "code\modules\projectiles\guns\ballistic\rifle.dm" -#include "code\game\objects\items\storage\toolbox.dm" -#include "code\modules\projectiles\boxes_magazines\ammo_boxes.dm" -#include "code\modules\projectiles\ammunition\ballistic\rifle.dm" -#include "code\modules\projectiles\projectile\bullets\rifle.dm" #include "code\modules\map_vote.dm" #include "code\modules\hallucination\fake_chat.dm"