From db046f3dbbac219b6159698f05ae35c21b6fa7a1 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Wed, 21 Apr 2021 03:12:01 -0400 Subject: [PATCH] I want to play Thermonuclear War (Initial Commit) --- code/modules/cargo/packs/armory.dm | 1 - .../projectiles/boxes_magazines/internal/derringer.dm | 6 +++--- code/modules/projectiles/guns/ballistic/derringer.dm | 4 ---- code/modules/uplink/uplink_items/uplink_stealth.dm | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index bf79a3ed15..84a159c1e4 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -239,7 +239,6 @@ desc = "Hey kid.. c'mere. Boss says we need to offload these, to any buyer, no questions asked. You pay us, we give you three of these guns, no strings attached. Locks are to ensure they get to PAYING customers." cost = 2000 contraband = TRUE - can_private_buy = TRUE contains = list(/obj/item/storage/fancy/cigarettes/derringer/smuggled, /obj/item/storage/fancy/cigarettes/derringer/smuggled, /obj/item/storage/fancy/cigarettes/derringer/smuggled, diff --git a/code/modules/projectiles/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm index cc86549793..e052e0badd 100644 --- a/code/modules/projectiles/boxes_magazines/internal/derringer.dm +++ b/code/modules/projectiles/boxes_magazines/internal/derringer.dm @@ -3,7 +3,7 @@ ammo_type = /obj/item/ammo_casing/c38 caliber = "38" max_ammo = 2 - multiload = FALSE + multiload = 0 /obj/item/ammo_box/magazine/internal/derringer/ammo_count(countempties = 1) if (!countempties) @@ -20,11 +20,11 @@ ammo_type = /obj/item/ammo_casing/a357 caliber = "357" max_ammo = 2 - multiload = FALSE + multiload = 0 /obj/item/ammo_box/magazine/internal/derringer/g4570 name = "\improper derringer muzzle" ammo_type = /obj/item/ammo_casing/g4570 caliber = "45-70g" max_ammo = 2 - multiload = FALSE + multiload = 0 diff --git a/code/modules/projectiles/guns/ballistic/derringer.dm b/code/modules/projectiles/guns/ballistic/derringer.dm index a88a11b416..4b92d1d558 100644 --- a/code/modules/projectiles/guns/ballistic/derringer.dm +++ b/code/modules/projectiles/guns/ballistic/derringer.dm @@ -9,10 +9,6 @@ casing_ejector = FALSE w_class = WEIGHT_CLASS_TINY -/obj/item/gun/ballistic/derringer/Initialize() - ..() - transform *= 0.8 //Spriter too lazy to make icons smaller than default revolvers, local coder hacks in solution. - /obj/item/gun/ballistic/derringer/get_ammo(countchambered = FALSE, countempties = TRUE) var/boolets = 0 //legacy var name maturity if (chambered && countchambered) diff --git a/code/modules/uplink/uplink_items/uplink_stealth.dm b/code/modules/uplink/uplink_items/uplink_stealth.dm index 673f2ab6ee..63d70b9141 100644 --- a/code/modules/uplink/uplink_items/uplink_stealth.dm +++ b/code/modules/uplink/uplink_items/uplink_stealth.dm @@ -49,7 +49,7 @@ name = "Compact Derringer" desc = "An easily concealable handgun capable of firing .357 rounds. Comes in an inconspicuious packet of cigarettes with additional munitions." item = /obj/item/storage/fancy/cigarettes/derringer - cost = 8 + cost = 6 surplus = 30 /datum/uplink_item/stealthy_weapons/derringerpack/purchase(mob/user, datum/component/uplink/U) @@ -57,7 +57,7 @@ item = /obj/item/storage/fancy/cigarettes/derringer/gold ..() -/datum/uplink_item/stalthy_weapons/derringerpack_nukie +/datum/uplink_item/stealthy_weapons/derringerpack_nukie name = "Antique Derringer" desc = "An easy to conceal, yet extremely deadly handgun, capable of firing .45-70 Govt rounds. Comes in a unique pack of cigarettes with additional munitions." item = /obj/item/storage/fancy/cigarettes/derringer/midworld