Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites.
This commit is contained in:
Ghommie
@@ -1,117 +0,0 @@
|
||||
//////Flechette Launcher//////
|
||||
|
||||
///projectiles///
|
||||
|
||||
/obj/item/projectile/bullet/cflechetteap //shreds armor
|
||||
name = "flechette (armor piercing)"
|
||||
damage = 8
|
||||
armour_penetration = 80
|
||||
|
||||
/obj/item/projectile/bullet/cflechettes //shreds flesh and forces bleeding
|
||||
name = "flechette (serrated)"
|
||||
damage = 15
|
||||
dismemberment = 10
|
||||
armour_penetration = -80
|
||||
|
||||
/obj/item/projectile/bullet/cflechettes/on_hit(atom/target, blocked = FALSE)
|
||||
if((blocked != 100) && iscarbon(target))
|
||||
var/mob/living/carbon/C = target
|
||||
C.bleed(10)
|
||||
return ..()
|
||||
|
||||
///ammo casings (CASELESS AMMO CASINGS WOOOOOOOO)///
|
||||
|
||||
/obj/item/ammo_casing/caseless/flechetteap
|
||||
name = "flechette (armor piercing)"
|
||||
desc = "A flechette made with a tungsten alloy."
|
||||
projectile_type = /obj/item/projectile/bullet/cflechetteap
|
||||
caliber = "flechette"
|
||||
throwforce = 1
|
||||
throw_speed = 3
|
||||
|
||||
/obj/item/ammo_casing/caseless/flechettes
|
||||
name = "flechette (serrated)"
|
||||
desc = "A serrated flechette made of a special alloy intended to deform drastically upon penetration of human flesh."
|
||||
projectile_type = /obj/item/projectile/bullet/cflechettes
|
||||
caliber = "flechette"
|
||||
throwforce = 2
|
||||
throw_speed = 3
|
||||
embedding = list("embedded_pain_multiplier" = 0, "embed_chance" = 40, "embedded_fall_chance" = 10)
|
||||
|
||||
///magazine///
|
||||
|
||||
/obj/item/ammo_box/magazine/flechette
|
||||
name = "flechette magazine (armor piercing)"
|
||||
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
||||
icon_state = "flechettemag"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/flechetteap
|
||||
caliber = "flechette"
|
||||
max_ammo = 40
|
||||
multiple_sprites = 2
|
||||
|
||||
/obj/item/ammo_box/magazine/flechette/s
|
||||
name = "flechette magazine (serrated)"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/flechettes
|
||||
|
||||
///the gun itself///
|
||||
|
||||
/obj/item/gun/ballistic/automatic/flechette
|
||||
name = "\improper CX Flechette Launcher"
|
||||
desc = "A flechette launching machine pistol with an unconventional bullpup frame."
|
||||
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
||||
icon_state = "flechettegun"
|
||||
item_state = "gun"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
slot_flags = 0
|
||||
/obj/item/firing_pin/implant/pindicate
|
||||
mag_type = /obj/item/ammo_box/magazine/flechette/
|
||||
fire_sound = 'sound/weapons/gunshot_smg.ogg'
|
||||
can_suppress = 0
|
||||
burst_size = 5
|
||||
fire_delay = 1
|
||||
casing_ejector = 0
|
||||
spread = 10
|
||||
recoil = 0.05
|
||||
|
||||
/obj/item/gun/ballistic/automatic/flechette/update_icon()
|
||||
..()
|
||||
if(magazine)
|
||||
cut_overlays()
|
||||
add_overlay("flechettegun-magazine")
|
||||
else
|
||||
cut_overlays()
|
||||
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
|
||||
|
||||
///unique variant///
|
||||
|
||||
/obj/item/projectile/bullet/cflechetteshredder
|
||||
name = "flechette (shredder)"
|
||||
damage = 5
|
||||
dismemberment = 40
|
||||
|
||||
/obj/item/ammo_casing/caseless/flechetteshredder
|
||||
name = "flechette (shredder)"
|
||||
desc = "A serrated flechette made of a special alloy that forms a monofilament edge."
|
||||
projectile_type = /obj/item/projectile/bullet/cflechettes
|
||||
|
||||
/obj/item/ammo_box/magazine/flechette/shredder
|
||||
name = "flechette magazine (shredder)"
|
||||
icon_state = "shreddermag"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/flechetteshredder
|
||||
|
||||
/obj/item/gun/ballistic/automatic/flechette/shredder
|
||||
name = "\improper CX Shredder"
|
||||
desc = "A flechette launching machine pistol made of ultra-light CFRP optimized for firing serrated monofillament flechettes."
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
mag_type = /obj/item/ammo_box/magazine/flechette/shredder
|
||||
spread = 15
|
||||
recoil = 0.1
|
||||
|
||||
/obj/item/gun/ballistic/automatic/flechette/shredder/update_icon()
|
||||
..()
|
||||
if(magazine)
|
||||
cut_overlays()
|
||||
add_overlay("shreddergun-magazine")
|
||||
else
|
||||
cut_overlays()
|
||||
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
|
||||
@@ -86,7 +86,7 @@
|
||||
/obj/item/ammo_box/magazine/mmag/small
|
||||
name = "magpistol magazine (non-lethal disabler)"
|
||||
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
||||
icon_state = "nlmagmag"
|
||||
icon_state = "smallmagmag"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/anlmags
|
||||
caliber = "mags"
|
||||
max_ammo = 15
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
/obj/item/ammo_box/magazine/mmag_e/small
|
||||
name = "magpistol magazine (non-lethal disabler)"
|
||||
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
|
||||
icon_state = "nlmagmag"
|
||||
icon_state = "smallmagmag"
|
||||
ammo_type = /obj/item/ammo_casing/caseless/mag_e/anlmags
|
||||
caliber = "mag_e"
|
||||
max_ammo = 16
|
||||
|
||||
@@ -123,8 +123,8 @@
|
||||
item_state = "gun"
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
slot_flags = 0
|
||||
/obj/item/firing_pin/implant/pindicate
|
||||
mag_type = /obj/item/ammo_box/magazine/flechette/
|
||||
pin = /obj/item/firing_pin/implant/pindicate
|
||||
mag_type = /obj/item/ammo_box/magazine/flechette
|
||||
fire_sound = 'sound/weapons/gunshot_smg.ogg'
|
||||
can_suppress = 0
|
||||
burst_size = 5
|
||||
@@ -134,12 +134,9 @@
|
||||
recoil = 0.05
|
||||
|
||||
/obj/item/gun/ballistic/automatic/flechette/update_icon()
|
||||
..()
|
||||
cut_overlays()
|
||||
if(magazine)
|
||||
cut_overlays()
|
||||
add_overlay("flechettegun-magazine")
|
||||
else
|
||||
cut_overlays()
|
||||
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
|
||||
|
||||
///unique variant///
|
||||
@@ -163,17 +160,13 @@
|
||||
name = "\improper CX Shredder"
|
||||
desc = "A flechette launching machine pistol made of ultra-light CFRP optimized for firing serrated monofillament flechettes."
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
mag_type = /obj/item/ammo_box/magazine/flechette/shredder
|
||||
spread = 15
|
||||
recoil = 0.1
|
||||
|
||||
/obj/item/gun/ballistic/automatic/flechette/shredder/update_icon()
|
||||
..()
|
||||
cut_overlays()
|
||||
if(magazine)
|
||||
cut_overlays()
|
||||
add_overlay("shreddergun-magazine")
|
||||
else
|
||||
cut_overlays()
|
||||
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
|
||||
|
||||
/*/////////////////////////////////////////////////////////////
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 43 KiB |
-186
@@ -768,191 +768,6 @@
|
||||
#include "code\game\objects\effects\temporary_visuals\projectiles\muzzle.dm"
|
||||
#include "code\game\objects\effects\temporary_visuals\projectiles\projectile_effects.dm"
|
||||
#include "code\game\objects\effects\temporary_visuals\projectiles\tracer.dm"
|
||||
#include "code\game\objects\items\AI_modules.dm"
|
||||
#include "code\game\objects\items\airlock_painter.dm"
|
||||
#include "code\game\objects\items\apc_frame.dm"
|
||||
#include "code\game\objects\items\blueprints.dm"
|
||||
#include "code\game\objects\items\body_egg.dm"
|
||||
#include "code\game\objects\items\bodybag.dm"
|
||||
#include "code\game\objects\items\candle.dm"
|
||||
#include "code\game\objects\items\cardboard_cutouts.dm"
|
||||
#include "code\game\objects\items\cards_ids.dm"
|
||||
#include "code\game\objects\items\charter.dm"
|
||||
#include "code\game\objects\items\chrono_eraser.dm"
|
||||
#include "code\game\objects\items\cigs_lighters.dm"
|
||||
#include "code\game\objects\items\clown_items.dm"
|
||||
#include "code\game\objects\items\control_wand.dm"
|
||||
#include "code\game\objects\items\cosmetics.dm"
|
||||
#include "code\game\objects\items\courtroom.dm"
|
||||
#include "code\game\objects\items\crayons.dm"
|
||||
#include "code\game\objects\items\defib.dm"
|
||||
#include "code\game\objects\items\dehy_carp.dm"
|
||||
#include "code\game\objects\items\dice.dm"
|
||||
#include "code\game\objects\items\dna_injector.dm"
|
||||
#include "code\game\objects\items\documents.dm"
|
||||
#include "code\game\objects\items\eightball.dm"
|
||||
#include "code\game\objects\items\extinguisher.dm"
|
||||
#include "code\game\objects\items\flamethrower.dm"
|
||||
#include "code\game\objects\items\gift.dm"
|
||||
#include "code\game\objects\items\granters.dm"
|
||||
#include "code\game\objects\items\handcuffs.dm"
|
||||
#include "code\game\objects\items\his_grace.dm"
|
||||
#include "code\game\objects\items\holosign_creator.dm"
|
||||
#include "code\game\objects\items\holy_weapons.dm"
|
||||
#include "code\game\objects\items\hot_potato.dm"
|
||||
#include "code\game\objects\items\inducer.dm"
|
||||
#include "code\game\objects\items\kitchen.dm"
|
||||
#include "code\game\objects\items\latexballoon.dm"
|
||||
#include "code\game\objects\items\manuals.dm"
|
||||
#include "code\game\objects\items\miscellaneous.dm"
|
||||
#include "code\game\objects\items\mop.dm"
|
||||
#include "code\game\objects\items\paint.dm"
|
||||
#include "code\game\objects\items\paiwire.dm"
|
||||
#include "code\game\objects\items\pet_carrier.dm"
|
||||
#include "code\game\objects\items\pinpointer.dm"
|
||||
#include "code\game\objects\items\plushes.dm"
|
||||
#include "code\game\objects\items\pneumaticCannon.dm"
|
||||
#include "code\game\objects\items\powerfist.dm"
|
||||
#include "code\game\objects\items\RCD.dm"
|
||||
#include "code\game\objects\items\RCL.dm"
|
||||
#include "code\game\objects\items\religion.dm"
|
||||
#include "code\game\objects\items\RPD.dm"
|
||||
#include "code\game\objects\items\RSF.dm"
|
||||
#include "code\game\objects\items\scrolls.dm"
|
||||
#include "code\game\objects\items\sharpener.dm"
|
||||
#include "code\game\objects\items\shields.dm"
|
||||
#include "code\game\objects\items\shooting_range.dm"
|
||||
#include "code\game\objects\items\signs.dm"
|
||||
#include "code\game\objects\items\singularityhammer.dm"
|
||||
#include "code\game\objects\items\stunbaton.dm"
|
||||
#include "code\game\objects\items\taster.dm"
|
||||
#include "code\game\objects\items\teleportation.dm"
|
||||
#include "code\game\objects\items\teleprod.dm"
|
||||
#include "code\game\objects\items\theft_tools.dm"
|
||||
#include "code\game\objects\items\toys.dm"
|
||||
#include "code\game\objects\items\trash.dm"
|
||||
#include "code\game\objects\items\twohanded.dm"
|
||||
#include "code\game\objects\items\vending_items.dm"
|
||||
#include "code\game\objects\items\weaponry.dm"
|
||||
#include "code\game\objects\items\circuitboards\circuitboard.dm"
|
||||
#include "code\game\objects\items\circuitboards\computer_circuitboards.dm"
|
||||
#include "code\game\objects\items\circuitboards\machine_circuitboards.dm"
|
||||
#include "code\game\objects\items\devices\aicard.dm"
|
||||
#include "code\game\objects\items\devices\anomaly_neutralizer.dm"
|
||||
#include "code\game\objects\items\devices\beacon.dm"
|
||||
#include "code\game\objects\items\devices\camera_bug.dm"
|
||||
#include "code\game\objects\items\devices\chameleonproj.dm"
|
||||
#include "code\game\objects\items\devices\compressionkit.dm"
|
||||
#include "code\game\objects\items\devices\dogborg_sleeper.dm"
|
||||
#include "code\game\objects\items\devices\doorCharge.dm"
|
||||
#include "code\game\objects\items\devices\electroadaptive_pseudocircuit.dm"
|
||||
#include "code\game\objects\items\devices\flashlight.dm"
|
||||
#include "code\game\objects\items\devices\forcefieldprojector.dm"
|
||||
#include "code\game\objects\items\devices\geiger_counter.dm"
|
||||
#include "code\game\objects\items\devices\glue.dm"
|
||||
#include "code\game\objects\items\devices\gps.dm"
|
||||
#include "code\game\objects\items\devices\instruments.dm"
|
||||
#include "code\game\objects\items\devices\laserpointer.dm"
|
||||
#include "code\game\objects\items\devices\lightreplacer.dm"
|
||||
#include "code\game\objects\items\devices\megaphone.dm"
|
||||
#include "code\game\objects\items\devices\multitool.dm"
|
||||
#include "code\game\objects\items\devices\paicard.dm"
|
||||
#include "code\game\objects\items\devices\pipe_painter.dm"
|
||||
#include "code\game\objects\items\devices\powersink.dm"
|
||||
#include "code\game\objects\items\devices\pressureplates.dm"
|
||||
#include "code\game\objects\items\devices\reverse_bear_trap.dm"
|
||||
#include "code\game\objects\items\devices\scanners.dm"
|
||||
#include "code\game\objects\items\devices\sensor_device.dm"
|
||||
#include "code\game\objects\items\devices\taperecorder.dm"
|
||||
#include "code\game\objects\items\devices\traitordevices.dm"
|
||||
#include "code\game\objects\items\devices\transfer_valve.dm"
|
||||
#include "code\game\objects\items\devices\PDA\cart.dm"
|
||||
#include "code\game\objects\items\devices\PDA\PDA.dm"
|
||||
#include "code\game\objects\items\devices\PDA\PDA_types.dm"
|
||||
#include "code\game\objects\items\devices\PDA\radio.dm"
|
||||
#include "code\game\objects\items\devices\PDA\virus_cart.dm"
|
||||
#include "code\game\objects\items\devices\radio\electropack.dm"
|
||||
#include "code\game\objects\items\devices\radio\encryptionkey.dm"
|
||||
#include "code\game\objects\items\devices\radio\headset.dm"
|
||||
#include "code\game\objects\items\devices\radio\intercom.dm"
|
||||
#include "code\game\objects\items\devices\radio\radio.dm"
|
||||
#include "code\game\objects\items\grenades\antigravity.dm"
|
||||
#include "code\game\objects\items\grenades\chem_grenade.dm"
|
||||
#include "code\game\objects\items\grenades\clusterbuster.dm"
|
||||
#include "code\game\objects\items\grenades\emgrenade.dm"
|
||||
#include "code\game\objects\items\grenades\flashbang.dm"
|
||||
#include "code\game\objects\items\grenades\ghettobomb.dm"
|
||||
#include "code\game\objects\items\grenades\grenade.dm"
|
||||
#include "code\game\objects\items\grenades\plastic.dm"
|
||||
#include "code\game\objects\items\grenades\smokebomb.dm"
|
||||
#include "code\game\objects\items\grenades\spawnergrenade.dm"
|
||||
#include "code\game\objects\items\grenades\syndieminibomb.dm"
|
||||
#include "code\game\objects\items\implants\implant.dm"
|
||||
#include "code\game\objects\items\implants\implant_abductor.dm"
|
||||
#include "code\game\objects\items\implants\implant_chem.dm"
|
||||
#include "code\game\objects\items\implants\implant_clown.dm"
|
||||
#include "code\game\objects\items\implants\implant_exile.dm"
|
||||
#include "code\game\objects\items\implants\implant_explosive.dm"
|
||||
#include "code\game\objects\items\implants\implant_freedom.dm"
|
||||
#include "code\game\objects\items\implants\implant_krav_maga.dm"
|
||||
#include "code\game\objects\items\implants\implant_mindshield.dm"
|
||||
#include "code\game\objects\items\implants\implant_misc.dm"
|
||||
#include "code\game\objects\items\implants\implant_spell.dm"
|
||||
#include "code\game\objects\items\implants\implant_stealth.dm"
|
||||
#include "code\game\objects\items\implants\implant_storage.dm"
|
||||
#include "code\game\objects\items\implants\implant_track.dm"
|
||||
#include "code\game\objects\items\implants\implantcase.dm"
|
||||
#include "code\game\objects\items\implants\implantchair.dm"
|
||||
#include "code\game\objects\items\implants\implanter.dm"
|
||||
#include "code\game\objects\items\implants\implantpad.dm"
|
||||
#include "code\game\objects\items\implants\implantuplink.dm"
|
||||
#include "code\game\objects\items\melee\energy.dm"
|
||||
#include "code\game\objects\items\melee\misc.dm"
|
||||
#include "code\game\objects\items\melee\transforming.dm"
|
||||
#include "code\game\objects\items\robot\ai_upgrades.dm"
|
||||
#include "code\game\objects\items\robot\robot_items.dm"
|
||||
#include "code\game\objects\items\robot\robot_parts.dm"
|
||||
#include "code\game\objects\items\robot\robot_upgrades.dm"
|
||||
#include "code\game\objects\items\stacks\bscrystal.dm"
|
||||
#include "code\game\objects\items\stacks\cash.dm"
|
||||
#include "code\game\objects\items\stacks\medical.dm"
|
||||
#include "code\game\objects\items\stacks\rods.dm"
|
||||
#include "code\game\objects\items\stacks\stack.dm"
|
||||
#include "code\game\objects\items\stacks\telecrystal.dm"
|
||||
#include "code\game\objects\items\stacks\wrap.dm"
|
||||
#include "code\game\objects\items\stacks\sheets\glass.dm"
|
||||
#include "code\game\objects\items\stacks\sheets\leather.dm"
|
||||
#include "code\game\objects\items\stacks\sheets\light.dm"
|
||||
#include "code\game\objects\items\stacks\sheets\mineral.dm"
|
||||
#include "code\game\objects\items\stacks\sheets\sheet_types.dm"
|
||||
#include "code\game\objects\items\stacks\sheets\sheets.dm"
|
||||
#include "code\game\objects\items\stacks\tiles\light.dm"
|
||||
#include "code\game\objects\items\stacks\tiles\tile_mineral.dm"
|
||||
#include "code\game\objects\items\stacks\tiles\tile_types.dm"
|
||||
#include "code\game\objects\items\storage\backpack.dm"
|
||||
#include "code\game\objects\items\storage\bags.dm"
|
||||
#include "code\game\objects\items\storage\belt.dm"
|
||||
#include "code\game\objects\items\storage\book.dm"
|
||||
#include "code\game\objects\items\storage\boxes.dm"
|
||||
#include "code\game\objects\items\storage\briefcase.dm"
|
||||
#include "code\game\objects\items\storage\dakis.dm"
|
||||
#include "code\game\objects\items\storage\fancy.dm"
|
||||
#include "code\game\objects\items\storage\firstaid.dm"
|
||||
#include "code\game\objects\items\storage\lockbox.dm"
|
||||
#include "code\game\objects\items\storage\secure.dm"
|
||||
#include "code\game\objects\items\storage\storage.dm"
|
||||
#include "code\game\objects\items\storage\toolbox.dm"
|
||||
#include "code\game\objects\items\storage\uplink_kits.dm"
|
||||
#include "code\game\objects\items\storage\wallets.dm"
|
||||
#include "code\game\objects\items\tanks\jetpack.dm"
|
||||
#include "code\game\objects\items\tanks\tank_types.dm"
|
||||
#include "code\game\objects\items\tanks\tanks.dm"
|
||||
#include "code\game\objects\items\tanks\watertank.dm"
|
||||
#include "code\game\objects\items\tools\crowbar.dm"
|
||||
#include "code\game\objects\items\tools\screwdriver.dm"
|
||||
#include "code\game\objects\items\tools\weldingtool.dm"
|
||||
#include "code\game\objects\items\tools\wirecutters.dm"
|
||||
#include "code\game\objects\items\tools\wrench.dm"
|
||||
#include "code\game\objects\structures\ai_core.dm"
|
||||
#include "code\game\objects\structures\aliens.dm"
|
||||
#include "code\game\objects\structures\artstuff.dm"
|
||||
@@ -3016,7 +2831,6 @@
|
||||
#include "modular_citadel\code\modules\projectiles\bullets\bullets\smg.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\guns\pumpenergy.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\guns\toys.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\guns\ballistic\flechette.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\guns\ballistic\handguns.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\guns\ballistic\magweapon.dm"
|
||||
#include "modular_citadel\code\modules\projectiles\guns\ballistic\magweapon_energy.dm"
|
||||
|
||||
Reference in New Issue
Block a user