From db046f3dbbac219b6159698f05ae35c21b6fa7a1 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Wed, 21 Apr 2021 03:12:01 -0400 Subject: [PATCH 1/5] 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 From 146ffcd2bd9e74b89c520bf1f17d48e502488eff Mon Sep 17 00:00:00 2001 From: The0bserver Date: Wed, 21 Apr 2021 09:58:08 -0400 Subject: [PATCH 2/5] tweaks --- .../projectiles/boxes_magazines/internal/derringer.dm | 11 ----------- code/modules/projectiles/guns/ballistic/derringer.dm | 3 ++- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/internal/derringer.dm b/code/modules/projectiles/boxes_magazines/internal/derringer.dm index e052e0badd..dad8386178 100644 --- a/code/modules/projectiles/boxes_magazines/internal/derringer.dm +++ b/code/modules/projectiles/boxes_magazines/internal/derringer.dm @@ -3,17 +3,6 @@ ammo_type = /obj/item/ammo_casing/c38 caliber = "38" max_ammo = 2 - multiload = 0 - -/obj/item/ammo_box/magazine/internal/derringer/ammo_count(countempties = 1) - if (!countempties) - var/boolets = 0 - for(var/obj/item/ammo_casing/bullet in stored_ammo) - if(bullet.BB) - boolets++ - return boolets - else - return ..() /obj/item/ammo_box/magazine/internal/derringer/a357 name = "\improper derringer muzzle" diff --git a/code/modules/projectiles/guns/ballistic/derringer.dm b/code/modules/projectiles/guns/ballistic/derringer.dm index 4b92d1d558..d563e58c42 100644 --- a/code/modules/projectiles/guns/ballistic/derringer.dm +++ b/code/modules/projectiles/guns/ballistic/derringer.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/guns/projectile.dmi' icon_state = "derringer" mag_type = /obj/item/ammo_box/magazine/internal/derringer + fire_delay = 5 obj_flags = UNIQUE_RENAME fire_sound = 'sound/weapons/revolvershot.ogg' casing_ejector = FALSE @@ -23,7 +24,7 @@ return var/num_loaded = magazine.attackby(A, user, params, 1) if(num_loaded) - to_chat(user, "You load [num_loaded] shell\s into \the [src].") + to_chat(user, "You load [num_loaded] bullet\s into \the [src].") playsound(user, 'sound/weapons/bulletinsert.ogg', 60, 1) A.update_icon() update_icon() From 6b4051071dab36a5033698dadccecae7012e2525 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Wed, 21 Apr 2021 10:46:04 -0400 Subject: [PATCH 3/5] Finally, ammo for the funny gun. --- code/modules/projectiles/boxes_magazines/ammo_boxes.dm | 7 +++++++ code/modules/projectiles/guns/ballistic/derringer.dm | 1 + code/modules/uplink/uplink_items/uplink_ammo.dm | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 70058801f8..1f1cc10459 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -60,6 +60,13 @@ desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with." ammo_type = /obj/item/ammo_casing/c38/match +/obj/item/ammo_box/g4570 + name = "ammo box (.45-70 GOVT)" + desc = "Brought to you at great expense,this box contains 10 more .45-70 GOVT bullets." + ammo_type = /obj/item/ammo_casing/g4570 + icon_state = "45box" + max_ammo = 10 + /obj/item/ammo_box/c9mm name = "ammo box (9mm)" icon_state = "9mmbox" diff --git a/code/modules/projectiles/guns/ballistic/derringer.dm b/code/modules/projectiles/guns/ballistic/derringer.dm index d563e58c42..47213f17df 100644 --- a/code/modules/projectiles/guns/ballistic/derringer.dm +++ b/code/modules/projectiles/guns/ballistic/derringer.dm @@ -3,6 +3,7 @@ desc = "A easily concealable derringer. Uses .38 ammo" icon = 'icons/obj/guns/projectile.dmi' icon_state = "derringer" + flags_1 = CONDUCT_1 mag_type = /obj/item/ammo_box/magazine/internal/derringer fire_delay = 5 obj_flags = UNIQUE_RENAME diff --git a/code/modules/uplink/uplink_items/uplink_ammo.dm b/code/modules/uplink/uplink_items/uplink_ammo.dm index 853f6111b2..2ab6c6f490 100644 --- a/code/modules/uplink/uplink_items/uplink_ammo.dm +++ b/code/modules/uplink/uplink_items/uplink_ammo.dm @@ -7,6 +7,13 @@ // Ammunition +/datum/uplink_item/ammo/derringer + name = "Ammo Box - .45-70 GOVT" + desc = "Contains 10 additional .45-70 GOVT rounds. Caliber is exceedingly rare, and thus, comes at a premium." + item = /obj/item/ammo_box/g4570 + cost = 5 + include_modes = list(/datum/game_mode/nuclear) + /datum/uplink_item/ammo/pistol name = "10mm Handgun Magazine" desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. These rounds \ From 7e92781e938cb23c3ab99d7f429d6cb7b02462c3 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Wed, 21 Apr 2021 11:50:41 -0400 Subject: [PATCH 4/5] Improved Cigarette Case Handling --- code/game/objects/items/storage/fancy.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index e73097bf18..f68084d63a 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -367,7 +367,7 @@ /obj/item/storage/fancy/cigarettes/derringer/AltClick(mob/living/carbon/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return - var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) || locate(/obj/item/ammo_casing/g4570) //Easy access smokes and bullets + var/obj/item/W = (locate(/obj/item/ammo_casing/a357) in contents) || (locate(/obj/item/clothing/mask/cigarette) in contents) ||(locate(/obj/item/gun/ballistic/derringer) in contents) || (locate(/obj/item/ammo_casing/c38) in contents) || locate(/obj/item/ammo_casing/g4570) in contents//Easy access smokes and bullets if(W && contents.len > 0) SEND_SIGNAL(src, COMSIG_TRY_STORAGE_TAKE, W, user) user.put_in_hands(W) @@ -382,6 +382,7 @@ new /obj/item/ammo_casing/a357(src) new /obj/item/ammo_casing/a357(src) new /obj/item/ammo_casing/a357(src) + new /obj/item/ammo_casing/a357(src) new /obj/item/clothing/mask/cigarette/syndicate(src) //For traitors with luck/class @@ -404,6 +405,7 @@ new /obj/item/ammo_casing/g4570(src) new /obj/item/ammo_casing/g4570(src) new /obj/item/ammo_casing/g4570(src) + new /obj/item/ammo_casing/g4570(src) new /obj/item/clothing/mask/cigarette/xeno(src) //For Cargomen, looking for a good deal on arms, with no quarrels as to where they're from. @@ -419,6 +421,7 @@ new /obj/item/ammo_casing/c38/lethal(src) new /obj/item/ammo_casing/c38/lethal(src) new /obj/item/ammo_casing/c38/lethal(src) + new /obj/item/ammo_casing/c38/lethal(src) new /obj/item/clothing/mask/cigarette/shadyjims (src) ///////////// //CIGAR BOX// From 59d69125f6df853263169caf23dea2f9ec528b64 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Wed, 21 Apr 2021 12:18:01 -0400 Subject: [PATCH 5/5] Consistency: You can hide it in your boots! --- code/datums/components/storage/concrete/pockets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index 20e1a0a4e2..1e3fff8a17 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -57,7 +57,7 @@ /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/dropper, /obj/item/implanter, /obj/item/screwdriver, /obj/item/weldingtool/mini, /obj/item/firing_pin, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/automatic/magrifle/pistol, - /obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini + /obj/item/toy/plush/snakeplushie, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/ballistic/derringer )) /datum/component/storage/concrete/pockets/shoes/clown/Initialize()