diff --git a/_maps/RandomZLevels/mothership_astrum.dmm b/_maps/RandomZLevels/mothership_astrum.dmm index 2677849297a..2fdb3361571 100644 --- a/_maps/RandomZLevels/mothership_astrum.dmm +++ b/_maps/RandomZLevels/mothership_astrum.dmm @@ -1396,7 +1396,6 @@ "xb" = ( /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood, -/obj/item/ammo_casing/c14mm, /obj/effect/mob_spawn/corpse/human/assistant{ brute_damage = 70; desc = null; @@ -2129,9 +2128,7 @@ "GK" = ( /obj/machinery/porta_turret/syndicate/pod{ faction = list("Abductor"); - lethal_projectile = /obj/projectile/bullet/c14mm; max_integrity = 120; - stun_projectile = /obj/projectile/bullet/c14mm }, /turf/open/floor/plating/abductor2, /area/awaymission/mothership_astrum/halls) diff --git a/modular_nova/modules/moretraitoritems/code/syndicate.dm b/modular_nova/modules/moretraitoritems/code/syndicate.dm index 33a063c2a51..56290b7ec56 100644 --- a/modular_nova/modules/moretraitoritems/code/syndicate.dm +++ b/modular_nova/modules/moretraitoritems/code/syndicate.dm @@ -79,24 +79,6 @@ name = "dark leather holster" icon_state = "syndicate_holster" -//Robohand -/obj/item/storage/backpack/duffelbag/syndie/robohand/PopulateContents() - new /obj/item/gun/ballistic/automatic/pistol/robohand(src) - new /obj/item/ammo_box/magazine/m14mm(src) - new /obj/item/ammo_box/magazine/m14mm(src) - new /obj/item/ammo_box/magazine/m14mm(src) - new /obj/item/ammo_box/magazine/m14mm(src) - new /obj/item/storage/belt/military(src) - new /obj/item/clothing/under/pants/track/robohand(src) - new /obj/item/clothing/gloves/combat(src) - new /obj/item/clothing/shoes/combat(src) - new /obj/item/clothing/glasses/sunglasses/robohand(src) - new /obj/item/clothing/suit/jacket/trenchcoat/gunman(src) - new /obj/item/autosurgeon/bodypart/r_arm_robotic(src) - new /obj/item/autosurgeon/syndicate/esword_arm(src) - new /obj/item/autosurgeon/syndicate/nodrop(src) - - /obj/item/storage/box/syndie_kit/gunman_outfit name = "gunman clothing bundle" desc = "A box filled with armored and stylish clothing for the aspiring gunmans." diff --git a/modular_nova/modules/moretraitoritems/code/weapons.dm b/modular_nova/modules/moretraitoritems/code/weapons.dm index f5498832f41..c0c3a069ab6 100644 --- a/modular_nova/modules/moretraitoritems/code/weapons.dm +++ b/modular_nova/modules/moretraitoritems/code/weapons.dm @@ -1,5 +1,3 @@ -#define CALIBRE_14MM "14mm" - /obj/item/gun/ballistic/revolver/ocelot name = "Colt Peacemaker revolver" desc = "A modified Peacemaker revolver that chambers .357 ammo. Less powerful than the regular .357, but ricochets a lot more." // We need tension...conflict. The world today has become too soft. We're living in an age where true feelings are suppressed. So we're going to shake things up a bit. We'll create a world dripping with tension... ...a world filled with greed and suspicion, bravery and cowardice. @@ -75,117 +73,6 @@ //I.throw_mode_off(THROW_MODE_TOGGLE) //so they can catch it on the return. //return ..() - -/* -* Malorian Arms 3516 14MM -* If you have this, you're a badass. -*/ - -/obj/item/gun/ballistic/automatic/pistol/robohand - name = "Malorian Arms 3516" - desc = "The Malorian Arms 3516 is a 14mm heavy pistol, sporting a titanium frame and unique wooden grip. A custom Dyna-porting and \ - direct integral cyber-interlink means only someone with a cyberarm and smartgun link can take full advantage of the pistol's features." - icon = 'modular_nova/modules/moretraitoritems/icons/3516.dmi' - icon_state = "3516" - w_class = WEIGHT_CLASS_NORMAL - accepted_magazine_type = /obj/item/ammo_box/magazine/m14mm - can_suppress = FALSE - fire_sound = 'modular_nova/modules/moretraitoritems/sound/fire2.ogg' - load_sound = 'modular_nova/modules/moretraitoritems/sound/reload.ogg' - load_empty_sound = 'modular_nova/modules/moretraitoritems/sound/reload.ogg' - eject_sound = 'modular_nova/modules/moretraitoritems/sound/release.ogg' - eject_empty_sound = 'modular_nova/modules/moretraitoritems/sound/release.ogg' - vary_fire_sound = FALSE - rack_sound = 'modular_nova/modules/moretraitoritems/sound/slide.ogg' - fire_sound_volume = 100 - bolt_wording = "fuckin' slide" - var/unrestricted = FALSE - -/obj/item/gun/ballistic/automatic/pistol/robohand/unrestricted - unrestricted = TRUE - -//The gun cannot shoot if you do not have a cyborg arm. -/obj/item/gun/ballistic/automatic/pistol/robohand/afterattack(atom/target, mob/living/user, flag, params) - //This is where we are checking if the user has a cybernetic arm to USE the gun. ROBOHAND HAS A ROBO HAND - if(!unrestricted) - var/mob/living/carbon/human/human_user = user - var/obj/item/bodypart/selected_hand = human_user.get_active_hand() - if(IS_ORGANIC_LIMB(selected_hand)) - to_chat(user, span_warning("You can't seem to figure out how to use [src], perhaps you need to check the manual?")) - return - . = ..() - -/obj/item/gun/ballistic/automatic/pistol/robohand/insert_magazine(mob/user, obj/item/ammo_box/magazine/inserted_mag, display_message) - if(!istype(inserted_mag, accepted_magazine_type)) - to_chat(user, span_warning("\The [inserted_mag] doesn't seem to fit into \the [src]...")) - return FALSE - if(!user.transferItemToLoc(inserted_mag, src)) - to_chat(user, span_warning("You cannot seem to get \the [src] out of your hands!")) - return FALSE - magazine = inserted_mag - if(display_message) - to_chat(user, span_notice("You load a new [magazine_wording] into \the [src].")) - playsound(src, load_empty_sound, load_sound_volume, load_sound_vary) - if(bolt_type == BOLT_TYPE_OPEN && !bolt_locked) - chamber_round(TRUE) - drop_bolt(user) - update_appearance() - animate(src, 0.2 SECONDS, 1, transform = turn(matrix(), 120)) //Le johnny robohand woosh woosh twirl - animate(time = 0.2 SECONDS, transform = turn(matrix(), 240)) - animate(time = 0.2 SECONDS, transform = null) - return TRUE - -/obj/item/gun/ballistic/automatic/pistol/robohand/eject_magazine(mob/user, display_message, obj/item/ammo_box/magazine/tac_load) - if(bolt_type == BOLT_TYPE_OPEN) - chambered = null - if(magazine.ammo_count()) - playsound(src, eject_sound, eject_sound_volume, eject_sound_volume) //This is why we've copied this proc, it should play the eject sound when ejecting. - else - playsound(src, eject_empty_sound, eject_sound_volume, eject_sound_volume) - magazine.forceMove(drop_location()) - var/obj/item/ammo_box/magazine/old_mag = magazine - if(tac_load) - if (insert_magazine(user, tac_load, FALSE)) - to_chat(user, span_notice("You perform an elite tactical reload on \the [src].")) - else - to_chat(user, span_warning("You dropped the old [magazine_wording], but the new one doesn't fit. How embarassing.")) - magazine = null - else - magazine = null - user.put_in_hands(old_mag) - old_mag.update_appearance() - if(display_message) - to_chat(user, span_notice("You pull the [magazine_wording] out of \the [src].")) - update_appearance() - animate(src, transform = turn(matrix(), 120), time = 0.2 SECONDS, loop = 1) //Le johnny robohand again - animate(transform = turn(matrix(), 240), time = 0.2 SECONDS) - animate(transform = null, time = 0.2 SECONDS) - -//Magazine stuff -/obj/item/ammo_box/magazine/m14mm - name = "pistol magazine (14mm)" - icon = 'modular_nova/modules/moretraitoritems/icons/3516_mag.dmi' - icon_state = "14mm" - base_icon_state = "14mm" - ammo_type = /obj/item/ammo_casing/c14mm - caliber = CALIBRE_14MM - max_ammo = 10 - multiple_sprites = AMMO_BOX_FULL_EMPTY - -/obj/item/ammo_casing/c14mm - name = "14mm bullet casing" - desc = "A 14mm bullet casing. Badass." - caliber = CALIBRE_14MM - projectile_type = /obj/projectile/bullet/c14mm - -/obj/projectile/bullet/c14mm - name = "14mm bullet" - damage = 60 - embedding = list(embed_chance = 90, fall_chance = 3, jostle_chance = 4, ignore_throwspeed_threshold = TRUE, pain_stam_pct = 0.4, pain_mult = 5, jostle_pain_mult = 9, rip_time = 10) - dismemberment = 50 - pierces = 1 - projectile_piercing = PASSCLOSEDTURF|PASSGRILLE|PASSGLASS - //nullrod katana /obj/item/katana/weak/curator //This has the same stats as the curator's claymore desc = "An ancient Katana. Forged by... Well, it doesn't really say, but surely it's authentic! And sharp to boot!" diff --git a/modular_nova/modules/moretraitoritems/icons/3516.dmi b/modular_nova/modules/moretraitoritems/icons/3516.dmi deleted file mode 100644 index ba6dcaff993..00000000000 Binary files a/modular_nova/modules/moretraitoritems/icons/3516.dmi and /dev/null differ diff --git a/modular_nova/modules/moretraitoritems/icons/3516_mag.dmi b/modular_nova/modules/moretraitoritems/icons/3516_mag.dmi deleted file mode 100644 index 33696b9df41..00000000000 Binary files a/modular_nova/modules/moretraitoritems/icons/3516_mag.dmi and /dev/null differ diff --git a/modular_nova/modules/moretraitoritems/sound/fire2.ogg b/modular_nova/modules/moretraitoritems/sound/fire2.ogg deleted file mode 100644 index 0390bf31b66..00000000000 Binary files a/modular_nova/modules/moretraitoritems/sound/fire2.ogg and /dev/null differ diff --git a/modular_nova/modules/moretraitoritems/sound/release.ogg b/modular_nova/modules/moretraitoritems/sound/release.ogg deleted file mode 100644 index dff2ceeaf30..00000000000 Binary files a/modular_nova/modules/moretraitoritems/sound/release.ogg and /dev/null differ diff --git a/modular_nova/modules/moretraitoritems/sound/reload.ogg b/modular_nova/modules/moretraitoritems/sound/reload.ogg deleted file mode 100644 index 44b556f8d4c..00000000000 Binary files a/modular_nova/modules/moretraitoritems/sound/reload.ogg and /dev/null differ diff --git a/modular_nova/modules/moretraitoritems/sound/slide.ogg b/modular_nova/modules/moretraitoritems/sound/slide.ogg deleted file mode 100644 index fb7daceb752..00000000000 Binary files a/modular_nova/modules/moretraitoritems/sound/slide.ogg and /dev/null differ