Commit Graph
544 Commits
Author SHA1 Message Date
mwerezak b1546ee3eb Fixes projectiles embedding in mobs that they pass through 2015-02-17 01:36:50 -05:00
mwerezak 8c3660357a Projectile penetration fixes
Fixes projectiles Bump()-ing twice when penetrating walls. Fixes
projectiles being unable to penetrate a wall that was destroyed because
it turned into plating.
2015-02-16 23:00:47 -05:00
mwerezak 46ef0a8949 Fixes accuracy not being reset when unzoomed 2015-02-16 23:00:25 -05:00
mwerezak 672709382d Fixes runtime 2015-02-16 23:00:00 -05:00
mwerezak c804d818fd Fixes rocket launcher icon
Also makes the missiles a little bit less of a joke.
2015-02-16 22:59:35 -05:00
mwerezak 9b3ab4358d Fixes empty casings not being ejected or cycled 2015-02-16 22:59:11 -05:00
mwerezak 2791a93bf2 SAW and c20r fixes
Fixes SAW unloading. Fixes c20r and SAW icon states. Tweaks sniper desc, and makes clip icons for 7.62mm ammo less pixelated - still pretty much a codersprite though. Fixes ptrs item_state.
2015-02-16 22:54:09 -05:00
mwerezak 7f19a8a77b Tweaks bullet penetration 2015-02-16 03:04:48 -05:00
mwerezak 500ca93278 Fixes guns being unremovable
Fixes certain guns being unremovable due to unloading ammo taking
precedence over picking up. Also adds on-back icon for the merc sniper
which is just a copy of the LWAP's.
2015-02-16 01:47:07 -05:00
mwerezak c20986b140 Fixes quoted paths 2015-02-16 01:12:43 -05:00
mwerezak 83780ef550 Adds sts-35 automatic rifle 2015-02-16 01:12:16 -05:00
mwerezak 3c1ec28a37 Reorganizes colt pistols, moves renaming verb 2015-02-15 23:32:35 -05:00
mwerezak 2a4d1b08cd Fixes beakers splashing onto the dart gun when being loaded. 2015-02-15 20:27:45 -05:00
SkyMarshal 03e8acd957 Fixes errors in energy/special.dm 2015-02-15 10:45:34 -07:00
mwerezak ad24aa8e47 Adds mercenary sniper rifle
Adds the scoped mercenary sniper rifle and ammunition defines. Does not
add syndicate uplink option.
2015-02-14 22:33:43 -05:00
mwerezak cd81f0b706 Improves gun scope zooming 2015-02-14 22:12:16 -05:00
mwerezak a6095a3610 Updates L6 SAW
Also changes src in user checks, probably unnecessary.
2015-02-14 22:09:19 -05:00
mwerezak e5f8ac50b4 Rewrites grenade launchers 2015-02-14 13:39:11 -05:00
mwerezak 08635587e1 Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
2015-02-14 13:38:05 -05:00
mwerezak 8cb3c6a821 ammo_magazine icon state data caching 2015-02-14 01:33:55 -05:00
mwerezak e3be255f59 Adds dart gun projectile sprite, dart gun fixes 2015-02-14 01:33:15 -05:00
mwerezak 2b8cd929a7 Adds accuracy modifier support 2015-02-14 00:54:06 -05:00
mwerezak f8977c65af Much nicer syringe gun implementation
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
2015-02-13 23:48:35 -05:00
mwerezak 0d89717cf2 Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
mwerezak 01798c98b6 Rewrites syringe and dart guns 2015-02-13 01:34:35 -05:00
mwerezak 1e9143a1f0 Reorganizes launcher source files 2015-02-12 01:38:54 -05:00
mwerezak 628bc5eecc Crossbow strings no longer magically pull back by themselves 2015-02-12 01:38:03 -05:00
mwerezak 5ab6b91c5e Generalizes emp energy weapon drain to power cells 2015-02-12 01:37:41 -05:00
mwerezak ea39f7f718 Cleanup can_fire(), projectile flag
Removes can_fire() and moves some of it's functionality into
get_next_projectile(), which was renamed to consume_next_projectile() to
indicate the possibility of side-effects.
Also renamed flag var to check_armour
2015-02-12 01:37:19 -05:00
mwerezak 931213fb7e Adds targeting hotkey 2015-02-11 22:54:40 -05:00
mwerezak 630369b9dd More flash shell tweaks, autolathe recipes
Tweaks the flash shell some more.
Tweaks shotgun stun shells, adds spent icon.
Additional autolathe ammo recipes.
2015-02-11 22:48:21 -05:00
mwerezak 9e3667540c Fixes merge errors 2015-02-11 20:56:46 -05:00
mwerezak 5740f52964 Merge branch 'guns' into gun-rewrite
Conflicts:
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/nuclear.dm
	code/modules/projectiles/guns/energy/pulse.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/launcher.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
2015-02-11 18:08:43 -05:00
mwerezak 611a42bb33 Gun cleanup and rewrite
Rewrites gun.dm. Reorganizes the firing procedure into logical procs and cleans up some unnecessary variables or demotes them to the subtypes that actually care. Energy weapons that create their own projectiles no longer care about in_chamber. Launcher support is much more natural now.

Cleans up duplicated cyborg energy weapon power supply code. Adds support for energy weapons to recharge from external power sources, unifying cyborg and hardsuit mounted weapons. Incorporates the cyborg taser recharging mechanism. Cleans up laser tag gun duplication

Changes path strings to actual paths. Changes relative paths to absolute paths.

Renamed several targeting vars to make their purposes more clear.

Fixed targeting not handling firing correctly for certain subtypes.
2015-02-11 15:46:09 -05:00
mwerezak ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
2015-02-10 20:59:22 -05:00
mwerezak 2e6a0f4ebb Adjusts some gun force values
Gave some of the heavier looking weapons the same force value as the
shotgun.
2015-02-10 20:26:33 -05:00
mwerezak 1b35d5d53d Adds option for projectile guns to cycle casings 2015-02-10 20:26:07 -05:00
mwerezak bf24ac82b8 Removes IsHandgun() proc, adds slot flag 2015-02-10 20:25:41 -05:00
mwerezak 47a1639b6d Adds removing single casings, runtime fix 2015-02-10 19:54:54 -05:00
mwerezak ee894d6b99 Flash projectile adjustment
Adjusts brightness, adds some effects, adds 9mm flash rounds and pistol
variant.
2015-02-10 19:54:30 -05:00
PsiOmega 3a6c4dacd6 Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC. 2015-02-10 22:39:40 +01:00
Chinsky ec6278f028 Merge pull request #8097 from mwerezak/projectile-fix
Fixes errors introduced by merge
2015-02-10 09:23:09 +03:00
mwerezak 5ddbbc0371 Fixes ammo_magazine icon states being handled incorrectly. 2015-02-09 21:35:37 -05:00
mwerezak fc6dfb5f1b Ammo magazine and casing update
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
2015-02-09 21:32:49 -05:00
mwerezak d8a8384c41 Fixes errors introduced by merge
Fixes errors introduced by commit
fac32d07e9.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).
2015-02-09 17:53:47 -05:00
mwerezak a679d22db8 Cleaner click parameter handling 2015-02-08 19:42:18 -05:00
mwerezak 9e62e08d2e Absolute paths 2015-02-08 19:39:41 -05:00
SkyMarshalandSkyMarshal a78ef81712 To make PsiOmegaDelta happy
I hate this format.  Bluh bluh huge bitch
2015-02-08 04:04:06 -07:00
SkyMarshalandSkyMarshal c8d6214657 Fix indent thing for pointdefense 2015-02-08 04:03:19 -07:00
SkyMarshal 84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00