Commit Graph
954 Commits
Author SHA1 Message Date
mwerezakandZomgPonies 4a2993b20b Separates the sharp flag into edge and sharp
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
2014-06-17 06:51:51 -04:00
Necaladun 1ce1f0df37 Xray laser
Was still at charge cost 50 - up to 500 now
2014-06-17 16:56:20 +09:30
Necaladun 0265660fb2 Stun Revolver Upgrade
Stun revolver uses the old style single shot rather than a beam, but
hits harder.
2014-06-17 16:56:20 +09:30
Necaladun eb97932ca5 Egun Fix
Eguns now have proper ammo cost, 10 shots standard, not 100.
2014-06-17 16:56:19 +09:30
CheridanandZomgPonies 88aceb454d Update shotgun.dm
shells spin faster
Conflicts:
	code/modules/projectiles/guns/projectile/shotgun.dm
2014-06-17 02:45:09 -04:00
CheridanandZomgPonies 3244291624 Casing rotation
Spent casings ejected from firearms will spin as they 'tumble' towards the ground.
Improved sprites for shotgun shells
Improved sprite for bullet projectile.

Conflicts:
	code/__HELPERS/matrices.dm
	code/modules/projectiles/guns/projectile.dm
	icons/obj/ammo.dmi
	icons/obj/projectiles.dmi
2014-06-17 02:40:47 -04:00
Regen 7263fc5eef More PR fixes I guess 2014-06-14 22:46:05 +02:00
ZomgPonies 386b1b8307 Fixes a bunch more hurt -> harm checks 2014-06-14 01:02:29 -04:00
Regen b6f12108e4 Nerfed combat borgs
Made the cell charge it costs to use the laser 500 instead of 100, since
it gave borgs WAAAY to many shots before they have to even consider
going back to charge
Fire delay also doubled, because we don't want them to waste everything
in two seconds, and it was way quick before, still considerabily fast,
though
2014-06-11 19:49:48 +02:00
ZomgPonies b81acff7a3 Fix charge_costs of guns 2014-05-24 14:03:37 -04:00
ZuhayrandZomgPonies 43e60ab01e Armalis gear and mob icons, plus sonic cannon.
Added sonic cannon skeleton code.

Noise cannon fire sound, Vox shriek sound.

Added Vox Armalis species.

Swapped vox breath mask over to species_restricted check.

Added Vox Armalis gear.

Added a random shriek effect to Vox and Vox Armalis speech.

Added quickspawn Vox Armalis definition.

Vox shriek sound effect. Thought I committed this earlier.

Added r_hand and l_hand icon_overwrite checks.

More work on Armalis. Added gut() and leap() human procs.

Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().

Fixing some missing pixels in the armalis tail.

Almost forgot to whitelist armalis...

Conflicts:
	code/modules/clothing/spacesuits/alien.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	icons/mob/suit.dmi
	icons/obj/clothing/gloves.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/gun.dmi
2014-05-14 18:24:01 -04:00
ZuhayrandZomgPonies 1af09fbfba Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable.
Conflicts:
	baystation12.dme
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/modules/projectiles/guns/projectile/bow.dm
	icons/obj/gun.dmi
2014-05-12 02:59:53 -04:00
ZomgPonies b8a70103d7 Fix soem bugs -- Immortal Facehugger and Cap laser rechargerate 2014-05-07 00:06:50 -04:00
SamCroswell 521467fa3e C4 now explodes on detonation, Stechtkin pistol fix
The Stechtkin pistol now works properly, C4 will now create a small
(Welder tank) sized explosion upon being detonated.
2014-05-04 02:28:06 -04:00
Regen f63a5bed01 Fixed L.W.A.P charge cost 2014-05-03 17:02:41 +02:00
ZomgPonies 36b52731f0 Changing power numbers to balance gun upgrades 2014-05-01 16:23:09 -04:00
ZomgPonies 48ca1f1a32 Fix shotgun sounds 2014-04-30 13:29:48 -04:00
paprkaandZomgPonies f98cfc75ec final stuff
Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-04-28 20:36:56 -04:00
ZomgPonies 8abf352b2a Fixes cyborg laser + emp problem 2014-04-28 20:09:33 -04:00
ZomgPonies 01bbf00d2c Ability to upgrade powercells in energy weapons 2014-04-27 18:20:59 -04:00
DJSnapshotandZomgPonies e1af1f4713 replaced electrodes with insta hit taser beams.
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/projectile/beams.dm
	icons/obj/projectiles.dmi
2014-04-19 16:28:23 -04:00
Necaladun dc417a522d Stun Revolver Upgrade
Stun Revolver update - makes it do slightly less pain, but a little bit
of stun and weaken to give it some actual purpose
2014-04-15 00:28:38 +09:30
ZomgPonies 1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
alex-gh e0d84dba7e Revolver conversion kits now modify revolvers without catastrophic failure chance 2014-02-11 12:10:09 +01:00
SamCroswell bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
Ccomp5950andZomgPonies b79edf513c Sniper Rifle fix.
You have no HUD when zoomed.  None, I'm unable to move every HUD element while zoomed in so you lose it.  Consider it part of your concentration while zoomed in.

If you move while zoomed in you automatically zoom out, you lose concentration.

If the rifle isn't in your active hand you can't zoom in.

Conflicts:
	code/modules/projectiles/guns/energy/special.dm
2014-01-28 23:30:02 -05:00
ErgovisaviandZomgPonies 78bea65a44 Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/projectiles/ammunition/energy.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/special.dm
	icons/mob/animal.dmi
	icons/obj/projectiles.dmi
2014-01-22 16:39:54 -05:00
ZomgPonies 90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
ZomgPonies 2494bfb177 Doubled the shot capacity of the taser 2014-01-11 07:30:35 -05:00
ZomgPonies 54154ce581 Wizard stuff balancing 2013-12-28 19:39:35 -05:00
ZomgPonies a1656037e4 New guns and gun sprites 2013-12-28 10:46:48 -05:00
ZomgPonies ecaaec5257 Magic Overhaul Part Deux 2013-12-18 02:30:55 -05:00
ZomgPonies 12b8ae8d76 Magic Overhaul 2013-12-14 05:54:03 -05:00
ZomgPonies 25becb2c49 Shotgun fix 2013-12-13 00:13:47 -05:00
ZomgPonies d4055a89af Buckshot whee! 2013-12-12 22:10:33 -05:00
ZomgPonies 0faab50c64 Mime love -- Baguette-shooting french crossbow 2013-11-21 09:28:45 -05:00
ZomgPonies f07b6616d3 Added a HONK rifle to the HONKsquad, shoots snap-pops 2013-11-16 02:27:20 -05:00
ZomgPonies a83c4c3fa3 Rocket launcher weapon! 2013-11-07 16:06:09 -05:00
ZomgPonies 1368fb3bfb Projectile update 2013-11-01 14:00:50 -04:00
ZomgPonies a227fa6cbe Removed zombies, added Skellingtons for halloween. Some bug fixes 2013-10-31 03:21:34 -04:00
ZomgPonies 7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -04:00
ZomgPonies 5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies 853d490660 Various fixes. 2013-09-27 02:41:41 -04:00
ZomgPonies b0aff645a3 Massive traitor item overhaul 2013-09-23 05:41:53 -04:00
ZomgPonies db6d58eaaf borgs losing power after stunning fix 2013-09-13 13:30:49 -04:00
ZomgPonies f35ac25847 Detective can now reskin his gun 2013-09-08 07:25:30 -04:00
Mloc-Argent a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Segrain 292b04399c Doublesuperheating fix. 2013-08-08 02:43:23 +03:00
comma bdaeb2c6fb Adds fire delay to all weapons (except automatics).
For most weapons it is only slightly bigger than clicking own delay, but still can see difference between revolver and SMG.
Shotungs do not get special delay because they are slow as they are anyway.
Biggest delays go to laser cannon (40 damage per shot) and pulse rifle, ~2 seconds for one shot.
2013-07-10 21:19:21 +04:00
Zuhayr b33e91fbb1 Cleaned up a lot of the module selection code, added Combat module. 2013-06-29 22:14:43 -07:00