diff --git a/code/modules/cargo/markets/market_items/weapons.dm b/code/modules/cargo/markets/market_items/weapons.dm index 010dd131799f..f40e4fa1447c 100644 --- a/code/modules/cargo/markets/market_items/weapons.dm +++ b/code/modules/cargo/markets/market_items/weapons.dm @@ -63,44 +63,3 @@ price_max = CARGO_CRATE_VALUE * 2 stock_max = 2 availability_prob = 50 - -//monke edits -/datum/market_item/weapon/smoothbore_disabler_prime - name = "Elite Smoothbore Disabler" - desc = "A rare and sought after disabler often used by Nanotrasen's high command, and historical LARPers." - item = /obj/item/gun/energy/disabler/smoothbore/prime - - price_min = CARGO_CRATE_VALUE * 3 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 2 - availability_prob = 40 - -/datum/market_item/weapon/pipegun_recipe - name = "Diary of a Dead Assistant" - desc = "Found this book in my Archives, had some barely legible scrabblings about making 'The perfect pipegun'. Figured someone here would buy this." - item = /obj/item/book/granter/crafting_recipe/maint_gun/pipegun_prime - - price_min = CARGO_CRATE_VALUE * 4 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 1 - availability_prob = 40 - -/datum/market_item/weapon/musket_recipe - name = "Journal of a Space Ranger" - desc = "An old banned book written by an eccentric space ranger, notable for its detailed description of how to make powerful improvised lasers." - item = /obj/item/book/granter/crafting_recipe/maint_gun/laser_musket_prime - - price_min = CARGO_CRATE_VALUE * 4 - price_max = CARGO_CRATE_VALUE * 5 - stock_max = 2 - availability_prob = 40 - -/datum/market_item/weapon/smoothbore_recipe - name = "Old Tome" - desc = "Ahoy Maties, I, Captain Whitebeard, have plundered the ol' Nanotrasen station, among the booty retreived was this here tome about smoothbores. Alas, I have no use for its knowlege, so I am droppin it off here." - item = /obj/item/book/granter/crafting_recipe/maint_gun/smoothbore_disabler_prime - - price_min = CARGO_CRATE_VALUE * 6 - price_max = CARGO_CRATE_VALUE * 8 - stock_max = 1 - availability_prob = 20 diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index b56576099580..005afe473eb9 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -27,16 +27,10 @@ /obj/item/ammo_casing/energy/laser/musket projectile_type = /obj/projectile/beam/laser/musket e_cost = 1000 - fire_sound = 'sound/weapons/lasercannonfire.ogg' //monke edit: sounds cooler /obj/item/ammo_casing/energy/laser/musket/prime projectile_type = /obj/projectile/beam/laser/musket/prime -/obj/item/ammo_casing/energy/laser/musket/syndicate//monke edit: syndicate laser musket - projectile_type = /obj/projectile/beam/laser/musket/syndicate - e_cost = 125 - fire_sound = 'sound/weapons/laser2.ogg' - /obj/item/ammo_casing/energy/laser/practice projectile_type = /obj/projectile/beam/practice select_name = "practice" diff --git a/code/modules/projectiles/guns/energy/crank_guns.dm b/code/modules/projectiles/guns/energy/crank_guns.dm index a455358dde65..70a726d81d2b 100644 --- a/code/modules/projectiles/guns/energy/crank_guns.dm +++ b/code/modules/projectiles/guns/energy/crank_guns.dm @@ -10,8 +10,9 @@ can_bayonet = TRUE knife_x_offset = 22 knife_y_offset = 11 - //monke edit:fully charges per crank because it was really confusing and unintuitive + //monke edit: fully charges per crank because it was really confusing and unintuitive //monke edit: increased cooldown time to compensate for increased charge + /obj/item/gun/energy/laser/musket/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, require_twohands = TRUE, force_wielded = 10) @@ -43,26 +44,6 @@ charge_sound_cooldown_time = 1.8 SECONDS, \ ) -/obj/item/gun/energy/laser/musket/syndicate - name = "syndicate laser musket" - desc = "A powerful laser(?) weapon, its 4 tetradimensional capacitors can hold 2 shots each, totaling to 8 shots. \ - Putting your hand on the control panel gives you a strange tingling feeling, this is probably how you charge it." - icon_state = "musket_syndie" - inhand_icon_state = "musket_syndie" - worn_icon_state = "las_musket_syndie" - ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/syndicate) - w_class = WEIGHT_CLASS_NORMAL -/obj/item/gun/energy/laser/musket/syndicate/Initialize(mapload) //it takes two hand slots and costs 12 tc, they deserve fast recharging - . = ..() - AddComponent( \ - /datum/component/gun_crank, \ - charging_cell = get_cell(), \ - charge_amount = 250, \ - cooldown_time = 1.5 SECONDS, \ - charge_sound = 'sound/weapons/laser_crank.ogg', \ - charge_sound_cooldown_time = 1.3 SECONDS, \ - ) - /obj/item/gun/energy/disabler/smoothbore name = "smoothbore disabler" desc = "A hand-crafted disabler, using a hard knock on an energy cell to fire the stunner laser. A lack of proper focusing means it has little accuracy." diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 0e79dfb0ba0f..a161c295f1d9 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -58,24 +58,16 @@ name = "low-power laser" icon_state = "laser_musket" impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser - damage = 30 //monke edit: damage changed from 25 to 30 - stamina = 45 //monke edit: brought to disabler level as is on tg + damage = 25 + stamina = 40 light_color = COLOR_STRONG_VIOLET weak_against_armour = TRUE /obj/projectile/beam/laser/musket/prime name = "mid-power laser" - damage = 35 //monke edit: damage changed from 30 to 35 - stamina = 60 //monke edit: damage changed from 45 to 60 - weak_against_armour = FALSE - -/obj/projectile/beam/laser/musket/syndicate //monke edit: syndicate laser musket - name = "resonant laser" damage = 30 - stamina = 65 + stamina = 45 weak_against_armour = FALSE - armour_penetration = 25 //less powerful than armor piercing rounds - wound_bonus = 10 /obj/projectile/beam/weak damage = 15 @@ -132,7 +124,7 @@ /obj/projectile/beam/disabler/smoothbore/prime name = "focused disabler beam" weak_against_armour = FALSE - stamina = 65 //monkie edit: changed from 35 to 65(Black market/ERT item only, even rarer is the book to make it) + stamina = 35 /obj/projectile/beam/pulse name = "pulse" diff --git a/code/modules/uplink/uplink_items/dangerous.dm b/code/modules/uplink/uplink_items/dangerous.dm index b9f9bdd08f63..0c14c302b5ef 100644 --- a/code/modules/uplink/uplink_items/dangerous.dm +++ b/code/modules/uplink/uplink_items/dangerous.dm @@ -98,14 +98,3 @@ cost = 13 surplus = 50 purchasable_from = ~UPLINK_CLOWN_OPS - -/datum/uplink_item/dangerous/laser_musket - name = "Syndicate Laser Musket" - desc = "An exprimental 'rifle' designed by Aethrofusion. This laser(probably) uses alien technology to fit 4 high energy capacitors \ - into a small rifle which can be stored safely(?) in any backpack. To charge, simply press down on the main control panel. \ - Rumors of this 'siphoning power off your lifeforce' are greatly exaggerated, and Aethrofusion assures safety for up to 2 years of use." - item = /obj/item/gun/energy/laser/musket/syndicate - progression_minimum = 30 MINUTES - cost = 12 - surplus = 40 - purchasable_from = ~UPLINK_CLOWN_OPS diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi index 7d753efe421b..4284c4b92f99 100644 Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi index 4fdf61b03eb9..fe336a4d5964 100644 Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/icons/obj/weapons/guns/energy.dmi b/icons/obj/weapons/guns/energy.dmi index bdd5290eb0ae..2cdbc55ea122 100644 Binary files a/icons/obj/weapons/guns/energy.dmi and b/icons/obj/weapons/guns/energy.dmi differ diff --git a/monkestation/code/game/objects/items/guns/crank_guns.dm b/monkestation/code/game/objects/items/guns/crank_guns.dm new file mode 100644 index 000000000000..5c96a49462cd --- /dev/null +++ b/monkestation/code/game/objects/items/guns/crank_guns.dm @@ -0,0 +1,49 @@ +/obj/item/gun/energy/laser/musket/syndicate + name = "syndicate laser musket" + desc = "A powerful laser(?) weapon, its 4 tetradimensional capacitors can hold 2 shots each, totaling to 8 shots. \ + Putting your hand on the control panel gives you a strange tingling feeling, this is probably how you charge it." + icon = 'monkestation/icons/obj/guns/guns.dmi' + icon_state = "musket_syndie" + inhand_icon_state = "musket_syndie" + lefthand_file = 'monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi' + righthand_file = 'monkestation/icons/mob/inhands/weapons/guns_righthand.dmi' + worn_icon_state = "las_musket_syndie" + ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/syndicate) + w_class = WEIGHT_CLASS_NORMAL +/obj/item/gun/energy/laser/musket/syndicate/Initialize(mapload) //it takes two hand slots and costs 12 tc, they deserve fast recharging + . = ..() + AddComponent( \ + /datum/component/gun_crank, \ + charging_cell = get_cell(), \ + charge_amount = 250, \ + cooldown_time = 1.5 SECONDS, \ + charge_sound = 'sound/weapons/laser_crank.ogg', \ + charge_sound_cooldown_time = 1.3 SECONDS, \ + ) + +/obj/projectile/beam/laser/musket + damage = 30 + stamina = 45 + +/obj/projectile/beam/laser/musket/prime + damage = 35 + stamina = 60 + +/obj/projectile/beam/disabler/smoothbore/prime + stamina = 65 + +/obj/item/ammo_casing/energy/laser/musket + fire_sound = 'sound/weapons/lasercannonfire.ogg' + +/obj/item/ammo_casing/energy/laser/musket/syndicate + projectile_type = /obj/projectile/beam/laser/musket/syndicate + e_cost = 125 + fire_sound = 'sound/weapons/laser2.ogg' + +/obj/projectile/beam/laser/musket/syndicate + name = "resonant laser" + damage = 30 + stamina = 65 + weak_against_armour = FALSE + armour_penetration = 25 //less powerful than armor piercing rounds + wound_bonus = 10 diff --git a/monkestation/code/modules/antagonists/uplink_items/weapons.dm b/monkestation/code/modules/antagonists/uplink_items/weapons.dm index 9a597b7d4b75..c55ee090e9e0 100644 --- a/monkestation/code/modules/antagonists/uplink_items/weapons.dm +++ b/monkestation/code/modules/antagonists/uplink_items/weapons.dm @@ -4,3 +4,14 @@ made out of hardlight that the user can use to wreak havoc." item = /obj/item/storage/box/syndie_kit/imp_hard_spear cost = 10 + +/datum/uplink_item/dangerous/laser_musket + name = "Syndicate Laser Musket" + desc = "An exprimental 'rifle' designed by Aetherofusion. This laser(probably) uses alien technology to fit 4 high energy capacitors \ + into a small rifle which can be stored safely(?) in any backpack. To charge, simply press down on the main control panel. \ + Rumors of this 'siphoning power off your lifeforce' are greatly exaggerated, and Aetherofusion assures safety for up to 2 years of use." + item = /obj/item/gun/energy/laser/musket/syndicate + progression_minimum = 30 MINUTES + cost = 12 + surplus = 40 + purchasable_from = ~UPLINK_CLOWN_OPS diff --git a/monkestation/code/modules/cargo/markets/market_items.dm b/monkestation/code/modules/cargo/markets/market_items.dm new file mode 100644 index 000000000000..d744ef932ae1 --- /dev/null +++ b/monkestation/code/modules/cargo/markets/market_items.dm @@ -0,0 +1,39 @@ +/datum/market_item/weapon/smoothbore_disabler_prime + name = "Elite Smoothbore Disabler" + desc = "A rare and sought after disabler often used by Nanotrasen's high command, and historical LARPers." + item = /obj/item/gun/energy/disabler/smoothbore/prime + + price_min = CARGO_CRATE_VALUE * 3 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 2 + availability_prob = 40 + +/datum/market_item/weapon/pipegun_recipe + name = "Diary of a Dead Assistant" + desc = "Found this book in my Archives, had some barely legible scrabblings about making 'The perfect pipegun'. Figured someone here would buy this." + item = /obj/item/book/granter/crafting_recipe/maint_gun/pipegun_prime + + price_min = CARGO_CRATE_VALUE * 4 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 1 + availability_prob = 40 + +/datum/market_item/weapon/musket_recipe + name = "Journal of a Space Ranger" + desc = "An old banned book written by an eccentric space ranger, notable for its detailed description of how to make powerful improvised lasers." + item = /obj/item/book/granter/crafting_recipe/maint_gun/laser_musket_prime + + price_min = CARGO_CRATE_VALUE * 4 + price_max = CARGO_CRATE_VALUE * 5 + stock_max = 2 + availability_prob = 40 + +/datum/market_item/weapon/smoothbore_recipe + name = "Old Tome" + desc = "Ahoy Maties, I, Captain Whitebeard, have plundered the ol' Nanotrasen station, among the booty retreived was this here tome about smoothbores. Alas, I have no use for its knowlege, so I am droppin it off here." + item = /obj/item/book/granter/crafting_recipe/maint_gun/smoothbore_disabler_prime + + price_min = CARGO_CRATE_VALUE * 6 + price_max = CARGO_CRATE_VALUE * 8 + stock_max = 1 + availability_prob = 20 diff --git a/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi b/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi index 5ab121f331c8..0311809edf11 100644 Binary files a/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi and b/monkestation/icons/mob/inhands/weapons/guns_lefthand.dmi differ diff --git a/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi b/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi index 3f85082af1dc..5bf25ffe8aad 100644 Binary files a/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi and b/monkestation/icons/mob/inhands/weapons/guns_righthand.dmi differ diff --git a/monkestation/icons/obj/guns/guns.dmi b/monkestation/icons/obj/guns/guns.dmi index f44ca1a7bf83..80436df8fdd2 100644 Binary files a/monkestation/icons/obj/guns/guns.dmi and b/monkestation/icons/obj/guns/guns.dmi differ diff --git a/tgstation.dme b/tgstation.dme index ff9d8f7cc8d2..be5da408f513 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5530,6 +5530,7 @@ #include "monkestation\code\game\objects\items\effects\washing_machine.dm" #include "monkestation\code\game\objects\items\food\spaghetti.dm" #include "monkestation\code\game\objects\items\grenades\monkey_barrel.dm" +#include "monkestation\code\game\objects\items\guns\crank_guns.dm" #include "monkestation\code\game\objects\items\guns\shotguns.dm" #include "monkestation\code\game\objects\items\guns\SRN.dm" #include "monkestation\code\game\objects\items\implants\hardlight.dm" @@ -5753,6 +5754,7 @@ #include "monkestation\code\modules\cargo\crates\science.dm" #include "monkestation\code\modules\cargo\crates\security.dm" #include "monkestation\code\modules\cargo\crates\service.dm" +#include "monkestation\code\modules\cargo\markets\market_items.dm" #include "monkestation\code\modules\cargoborg\code\cargo_module.dm" #include "monkestation\code\modules\cargoborg\code\cargo_teleporter.dm" #include "monkestation\code\modules\cargoborg\code\cargoborg_items.dm"