Uplink Additions: The Hitman DLC (#18152)

* adds the gun

* let's get it

* braindead danse

* Why is this here?

* Update code/modules/projectiles/guns/projectile/automatic.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

* updates

* the curse of spaces

---------

Co-authored-by: DanseMacabre <rsurname1212@gmail.com>
Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
TheDanseMacabre
2024-01-10 23:44:51 +00:00
committed by GitHub
co-authored by Fluffy DanseMacabre
parent 6f6a5b56a4
commit 7599b96e22
11 changed files with 121 additions and 0 deletions
@@ -301,6 +301,16 @@
/obj/item/ammo_magazine/submachinemag/empty
initial_ammo = 0
/obj/item/ammo_magazine/submachinemag/assassin
name = "magazine (6mm)"
icon_state = "tommy-mag"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c6mm
matter = list(DEFAULT_WALL_MATERIAL = 1500)
caliber = "6mm"
insert_sound = /singleton/sound_category/polymer_slide_reload
max_ammo = 30
/obj/item/ammo_magazine/submachinedrum
name = "drum magazine (.45)"
icon_state = "tommy-drum"
@@ -469,3 +469,9 @@
caliber = ".599 Kumar Super"
projectile_type = /obj/item/projectile/bullet
max_stack = 5
/obj/item/ammo_casing/c6mm
desc = "A 6mm bullet casing."
caliber = "6mm"
projectile_type = /obj/item/projectile/bullet/pistol/assassin
max_stack = 15
@@ -617,6 +617,26 @@
..()
icon_state = (ammo_magazine)? "owen" : "owen-empty"
/obj/item/gun/projectile/automatic/tommygun/assassin
name = "integrally suppressed machine pistol"
desc = "An Eridanian “rat hunting” gun manufactured by the Amon Pest Control Company. Commonly used by corporate assassins, uncommonly used by pest control workers. Chambered in 6mm."
desc_extended = "The APCC RatAway SMG is manufactured by a shell company of Ringspire for use in corporate assassination duties. Extremely quiet and firing caseless ammunition, it is an ideal weapon for putting down those who dare to threaten megacorporate interests."
icon = 'icons/obj/guns/assassin_smg.dmi'
icon_state = "assassin_smg"
item_state = "assassin_smg"
magazine_type = /obj/item/ammo_magazine/submachinemag/assassin
allowed_magazines = list(/obj/item/ammo_magazine/submachinemag/assassin)
caliber = "6mm"
suppressed = TRUE
can_unsuppress = FALSE
handle_casings = DELETE_CASINGS
max_shells = 30
allowed_magazines = list(/obj/item/ammo_magazine/submachinemag/assassin)
/obj/item/gun/projectile/automatic/tommygun/assassin/update_icon()
..()
icon_state = (ammo_magazine) ? "assassin_smg" : "assassin_smg-empty"
/obj/item/gun/projectile/automatic/rifle/dnac
name = "dNAC-6.5 assault rifle"
desc = "A durable, sleek-looking bullpup rifle manufactured by d.N.A Defense & Aerospace for the All-Xanu Armed Forces. This model has been adopted by a majority of the Coalition's military forces as well due to its simplicity and reliability."
@@ -255,3 +255,25 @@
toggle_folded(user)
return FALSE
return ..()
/obj/item/gun/projectile/shotgun/foldable/cameragun
name = "camera"
desc = "A polaroid camera"
icon = 'icons/obj/guns/cameragun.dmi'
icon_state = "cameragun"
item_state = "cameragun"
slot_flags = SLOT_BELT
w_class = ITEMSIZE_NORMAL
magazine_type = /obj/item/ammo_magazine/mc9mm
allowed_magazines = list(/obj/item/ammo_magazine/mc9mm)
fire_delay = ROF_PISTOL
load_method = MAGAZINE
max_shells = 12
caliber = "9mm"
fire_sound = 'sound/weapons/gunshot/gunshot_pistol.ogg'
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2, TECH_ILLEGAL = 2)
/obj/item/gun/projectile/shotgun/foldable/cameragun/examine(mob/user, distance, ...)
. = ..()
if(distance <= 1)
to_chat(user, SPAN_NOTICE("Upon closer inspection, this is not a camera at all, but a 9mm firearm concealed inside the shell of one, which can be deployed by pressing a button."))
@@ -222,6 +222,10 @@
agony = 40
embed = 0
/obj/item/projectile/bullet/pistol/assassin
damage = 20
armor_penetration = 5
/* shotgun projectiles */
/obj/item/projectile/bullet/shotgun