unid15
4c154f3b5c
fix chaplain bibles, fix wheelchairs, fix telepathy
2015-09-19 18:54:15 +02:00
Rob Nelson
6b30dc36a9
Merge pull request #5724 from DeityLink/beepsk
...
[Tweak] Hookshots no longer cause Beepsky or ED-209 bots to chase their users
2015-09-18 15:28:41 -07:00
DeityLink
d710dfe862
hookshot safe weapon
2015-09-19 00:24:51 +02:00
DeityLink
5f45609b67
singulo fixes
2015-09-18 20:31:02 +02:00
Orzorn
3cb4e56ccf
Adds Nagant and Obrez, as well as 7.62x55 ammo. Nagant can be spawned by summon guns.
...
modified: code/game/gamemodes/wizard/rightandwrong.dm
modified: code/game/objects/items/weapons/twohanded.dm
modified: code/modules/projectiles/ammunition/boxes.dm
modified: code/modules/projectiles/ammunition/bullets.dm
modified: code/modules/projectiles/ammunition/speedloaders.dm
new file: code/modules/projectiles/guns/projectile/nagant.dm
modified: code/modules/projectiles/projectile/bullets.dm
modified: icons/mob/back.dmi
modified: icons/mob/in-hand/left/guninhands_left.dmi
modified: icons/mob/in-hand/right/guninhands_right.dmi
modified: icons/obj/ammo.dmi
modified: icons/obj/gun.dmi
new file: sound/weapons/nagant.ogg
new file: sound/weapons/nagantreload.ogg
new file: sound/weapons/obrez.ogg
2015-09-05 15:33:53 -05:00
DeityLink
5a3e76d391
fixes and turrets
2015-08-28 03:01:21 +02:00
d3athrow
b56ab673c8
Merge branch 'balance' into 'Bleeding-Edge'
...
Removing hookshot knockdown
* Hookshots no longer knock you down when they reel you in, no matter which intent you're on.
See merge request !147
2015-08-27 18:14:20 +00:00
DeityLink
1fa2590553
removing hookshot knockdown
2015-08-27 15:39:20 +02:00
D3athrow
0b1d78b01d
warning
2015-08-26 23:01:44 -05:00
D3athrow
b135848852
fuck
2015-08-26 22:31:25 -05:00
D3athrow
7a931bf0cb
zibzab tweaks.
...
beam projectiles entering a time bubble will properly fade off their trailing beam and restart when leaving it.
Silicons now take 33% less damage from lightning spell due to them taking brute damage from the EMP
lightning properly doesn't stun anymore.
2015-08-26 22:18:52 -05:00
DeityLink
f09e4bb98e
hookfix
2015-08-26 04:02:24 +02:00
DeityLink
383a99d4de
gravitypull fix
2015-08-26 02:26:06 +02:00
Clusterfack
f32dfb5102
Merge branch 'bugfix' into 'Bleeding-Edge'
...
Fixing a hookshot bug, and adding attack logs
* Fixed a bug that would make hookshots unable to fire, and their projectile chain to remain on the ground.
* Using the hookshot on a mob now creates attack logs.
* Fixed a bug that would allow hookshots to let players clip through walls.
See merge request !144
2015-08-25 23:55:22 +00:00
DeityLink
c94e610e12
hookshot clipping
2015-08-26 01:36:07 +02:00
DeityLink
3e55035c13
hooklogs and fix
2015-08-25 23:59:06 +02:00
D3athrow
57c8aa2d22
Merge branch Bleeding-Edge into snowflake_the_world
...
Conflicts:
code/game/objects/effects/overlays.dm
code/modules/projectiles/projectile.dm
code/modules/projectiles/projectile/beams.dm
2015-08-25 04:18:02 -05:00
DeityLink
65558e780c
Finishing Touches (the Experimental Guns update)
2015-08-25 00:36:46 +02:00
DeityLink
b613f719e0
comments
2015-08-24 15:59:15 +02:00
DeityLink
0d550338d4
putting some order in my guns
2015-08-24 14:58:47 +02:00
DeityLink
58bf419dbd
polishing post-rebase
2015-08-24 01:03:50 +02:00
DeityLink
34a6333d2c
Experimental Guns No10. Hookshot
2015-08-24 00:46:18 +02:00
DeityLink
63e69c2b14
Experimental Guns No9. Gravity Well Gun
2015-08-24 00:45:26 +02:00
DeityLink
72b4d98461
penetration
2015-08-24 00:45:25 +02:00
DeityLink
dc22d6cf7f
Experimental Guns No8. PGM Hecate II
2015-08-24 00:43:06 +02:00
DeityLink
72217708ee
icons
2015-08-24 00:38:29 +02:00
DeityLink
182ef129d0
polishing
2015-08-24 00:38:28 +02:00
DeityLink
79762052a3
fixing Righteous Bison projectile
2015-08-24 00:37:28 +02:00
DeityLink
d928ca2f04
gdammit
2015-08-24 00:37:27 +02:00
DeityLink
d6a8f461b4
lookin good
2015-08-24 00:37:26 +02:00
DeityLink
087f2ab47b
polishing
2015-08-24 00:34:24 +02:00
DeityLink
411caf90cb
Experimental Guns No7. OSIPR
2015-08-24 00:34:22 +02:00
DeityLink
65df0a2388
destroy
2015-08-24 00:28:49 +02:00
DeityLink
dcc133cf60
bounce
2015-08-24 00:28:48 +02:00
DeityLink
45fb48694c
Turrets and Mecha projectiles fixes
2015-08-24 00:28:01 +02:00
DeityLink
962568a2c2
Experimental Guns No5. Nikita
2015-08-24 00:27:57 +02:00
DeityLink
e1ab433363
sfgdrfgh
2015-08-24 00:18:07 +02:00
DeityLink
be2a669cb6
that should do it, or whatever
2015-08-24 00:18:06 +02:00
DeityLink
61ddaf8142
fix
2015-08-24 00:18:05 +02:00
DeityLink
55c97473d6
turf_flick_anim
2015-08-24 00:18:03 +02:00
DeityLink
922ae40f4f
Experimental Guns No5. Stickybomb Launcher
2015-08-24 00:17:09 +02:00
DeityLink
e44c8adf78
fire sounds
2015-08-24 00:06:17 +02:00
DeityLink
0142302d85
fprint
2015-08-24 00:06:16 +02:00
DeityLink
1b4b478e13
Experimental Guns No4. Gatling Gun
2015-08-24 00:06:15 +02:00
d3athrow
10729ecead
Merge pull request #5444 from DeityLink/gunnss
...
Impacts hotfix
2015-08-24 00:05:13 +02:00
clusterfack
a9f7d4954d
Merge pull request #5435 from DeityLink/gunnss
...
[Experimental Guns] No.3: Spur
2015-08-24 00:05:12 +02:00
ComicIronic
0748d11657
Merge pull request #5424 from DeityLink/gunnss
...
[Experimental Guns] No.2: Righteous Bison
2015-08-24 00:01:36 +02:00
ComicIronic
f5a65fbdcc
Merge pull request #5403 from DeityLink/gunnss
...
[Experimental Guns] No.1: Ricochet Rifle, also a few fixes
2015-08-23 23:54:27 +02:00
D3athrow
efbbd98ebb
spell fixes
2015-08-22 16:04:58 -05:00
D3athrow
13a64985f6
lightning tweaks
2015-08-20 19:57:42 -05:00
