From 854591a4ab9df3381d635521556b3776a919d7f3 Mon Sep 17 00:00:00 2001 From: Leopold <62264115+TheLeopold@users.noreply.github.com> Date: Tue, 24 Sep 2024 09:05:54 +0000 Subject: [PATCH] Disposable gun: ... Svalinn! (#8139) * disposable svalinn --- code/datums/autolathe/guns.dm | 1 + .../objects/items/weapons/design_disks/NeoTheology.dm | 3 +-- code/modules/projectiles/guns/energy/nt_svalinn.dm | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/code/datums/autolathe/guns.dm b/code/datums/autolathe/guns.dm index bf2fcfb0cac..d3b9051f5cd 100644 --- a/code/datums/autolathe/guns.dm +++ b/code/datums/autolathe/guns.dm @@ -250,6 +250,7 @@ /datum/design/autolathe/gun/nt_svalinn name = "NT LP \"Svalinn\"" build_path = /obj/item/gun/energy/nt_svalinn + materials = list(MATERIAL_BIOMATTER = 5) factions = list(FACTION_NEOTHEOLOGY) // Energy general diff --git a/code/game/objects/items/weapons/design_disks/NeoTheology.dm b/code/game/objects/items/weapons/design_disks/NeoTheology.dm index 9670f725577..aa375c415d4 100644 --- a/code/game/objects/items/weapons/design_disks/NeoTheology.dm +++ b/code/game/objects/items/weapons/design_disks/NeoTheology.dm @@ -45,8 +45,7 @@ disk_name = "NeoTheology Armory - NT LP \"Svalinn\"" license = -1 designs = list( - /datum/design/autolathe/gun/nt_svalinn, - /datum/design/bioprinter/nt_cells/small + /datum/design/autolathe/gun/nt_svalinn ) // Javelins & bucklers, speed upgrade TODO: light armor diff --git a/code/modules/projectiles/guns/energy/nt_svalinn.dm b/code/modules/projectiles/guns/energy/nt_svalinn.dm index e0aa3d9c4ce..ae04923e964 100644 --- a/code/modules/projectiles/guns/energy/nt_svalinn.dm +++ b/code/modules/projectiles/guns/energy/nt_svalinn.dm @@ -1,6 +1,6 @@ /obj/item/gun/energy/nt_svalinn name = "NT LP \"Svalinn\"" - desc = "\"NeoTheology\" brand laser pistol. Small and easily concealable, it's still a reasonable punch for a laser weapon." + desc = "\"NeoTheology\" brand disposable laser pistol. Small and easily concealable, it's still a reasonable punch for a laser weapon." icon = 'icons/obj/guns/energy/nt_svalinn.dmi' icon_state = "nt_svalinn" item_state = "nt_svalinn" @@ -14,15 +14,16 @@ can_dual = TRUE zoom_factors = list() damage_multiplier = 1 - matter = list(MATERIAL_PLASTEEL = 8, MATERIAL_WOOD = 4, MATERIAL_SILVER = 2) - price_tag = 1000 + matter = list(MATERIAL_STEEL = 8, MATERIAL_BIOMATTER = 8) //Cost of the cell is added automatically + disposable = TRUE + price_tag = 200 init_firemodes = list( WEAPON_NORMAL, WEAPON_CHARGE ) twohanded = FALSE - suitable_cell = /obj/item/cell/small - cell_type = /obj/item/cell/small + suitable_cell = /obj/item/cell/small/neotheology + cell_type = /obj/item/cell/small/neotheology init_recoil = HANDGUN_RECOIL(1) serial_type = "NT"