Skip to content

Commit

Permalink
Merge pull request #2558 from jinxynii/master
Browse files Browse the repository at this point in the history
Casey's Bad Mac10 knockoff
  • Loading branch information
Tk420634 committed Jun 26, 2023
2 parents c0b466d + bb22469 commit a802ca9
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
14 changes: 14 additions & 0 deletions code/modules/projectiles/guns/ballistic/automatic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,20 @@
/datum/firemode/semi_auto/faster
)

//mac-10 but shit.
/obj/item/gun/ballistic/automatic/smg/mini_uzi/mac10/worn
name = "Knockoff Ingram Model 10" //I like naming things quirkily
desc = "A compact machine pistol with a blistering fire rate. Or so they claim."
icon = 'modular_coyote/icons/objects/automatic.dmi'
icon_state = "mac10"
weapon_class = WEAPON_CLASS_NORMAL //kinda bulky for a compact gun
damage_multiplier = GUN_LESS_DAMAGE_T2 //this spits lots of bullets and is compact and can be dual wielded
init_recoil = SMG_RECOIL(2.3, 2.3)
init_firemodes = list(
/datum/firemode/automatic/rpm200,
/datum/firemode/semi_auto/fast
)

/* * * * * * * * * * *
* Carl Gustaf 10mm SMG
* Another 10mm SMG
Expand Down
12 changes: 5 additions & 7 deletions modular_citadel/code/modules/client/loadout/__donator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1139,19 +1139,17 @@
ckeywhitelist = list("tk420634")

/obj/item/storage/box/large/custom_kit/tk420634/PopulateContents()
new /obj/item/clothing/head/beret/sec/navyofficer(src)
new /obj/item/clothing/suit/armor/light/leather(src)
new /obj/item/melee/onehanded/knife/trench(src)
new /obj/item/gun/ballistic/automatic/varmint/bushmaster_arm_gun(src)
new /obj/item/ammo_box/a308box/improvised(src)
new /obj/item/ammo_box/a308box/improvised(src)
new /obj/item/ammo_box/magazine/m556/rifle(src)
new /obj/item/ammo_box/c9mm(src)
new /obj/item/ammo_box/c9mm(src)
new /obj/item/ammo_box/magazine/uzim9mm/(src)
new /obj/item/reagent_containers/food/snacks/grown/poppy/lily(src)
new /obj/item/binoculars(src)
new /obj/item/gun_upgrade/barrel/forged(src)
new /obj/item/tool_upgrade/refinement/stabilized_grip(src)
new /obj/item/gun/ballistic/revolver/thatgun(src)
new /obj/item/ammo_box/a308box(src)
new /obj/item/gun/ballistic/automatic/smg/mini_uzi/mac10/worn(src)
new /obj/item/ammo_box/c9mm(src)

/datum/gear/donator/kits/tk420634_2
name = "Catgirl Kit"
Expand Down

0 comments on commit a802ca9

Please sign in to comment.