phil235
809a1be279
Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants
...
Conflicts:
icons/mob/head.dmi
2015-02-25 18:50:42 +01:00
phil235
3e100729bc
Fixes mimana sprites. Small fix to snap corn picking. Fixes russian revolver not killing you.
2015-02-22 23:02:07 +01:00
Remie Richards
5fc7af7fbf
attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
...
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
paprka
cff73d83c6
fixes improvised shotgun back slot invisible shit
2015-02-13 14:04:23 -08:00
paprka
3430cfaf44
Merge branch 'master' of https://github.com/tgstation/-tg-station into jamesbondiguess
...
Conflicts:
code/modules/projectiles/guns/projectile/automatic.dm
2015-01-23 16:55:52 -08:00
paprka
c41e707ee4
restores the ability to attach suppressors
2015-01-22 18:53:46 -08:00
Firecage
72af5ffb8f
Did what HG said to do with Protosmg firing pin
2015-01-22 08:08:14 +02:00
Firecage
d18511eb72
This removes the firing pin from the Prototype SMG, and adds the standard firing pin to its children where they need it.
2015-01-21 23:33:49 +02:00
paprka
88230fabfa
inhand refactor
2015-01-18 20:58:31 -08:00
paprka
a2fe7f0352
bloat killer 9000
2015-01-17 16:36:27 -08:00
paprka
4a0aa0c0a5
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/ammunition/ammo_casings.dm
code/modules/projectiles/ammunition/boxes.dm
icons/obj/ammo.dmi
icons/obj/gun.dmi
2015-01-15 22:16:11 -08:00
tkdrg
6bfebf2e48
Adds bolt-action rifle
...
Sprites from https://tgstation13.org/phpBB/viewtopic.php?f=9&t=2151
These have a bolt that needs to be worked after each shot, and they
need it to be open in order to be reloaded. There is also a stripper
clip. Their bullet does 60 brute damage, and the gun has a 5-shot
internal magazine. They cannot be worn on the back slot as there are
no back sprites provided in that file. Bayonets are not implemented
for the same reason.
The gun can be obtained as a 50% drop from ranged russian mobs (the
other 50% still drop the mateba) and from summon guns.
2015-01-16 03:03:34 -03:00
paprka
ab7d50c90e
Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
code/modules/projectiles/guns/projectile/launchers.dm
code/modules/projectiles/guns/projectile/shotgun.dm
code/modules/research/designs/weapon_designs.dm
icons/obj/gun.dmi
2015-01-15 21:56:23 -08:00
paprka
2fd8b3e749
nerfed saber slightly
2015-01-13 20:05:37 -08:00
paprka
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
Cheridan
03e1d0d60a
-Adds firing pin box define
...
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
2015-01-12 21:21:34 -06:00
Cheridan
0956a86c22
Firing Pin System - The Lockbox Solution
2015-01-09 18:49:02 -06:00
paprka
0cd34c9c2f
changes syndicate borg equipment
2015-01-05 19:42:31 -08:00
paprka
7324891c37
intense p90 fans on /tg/ apparently
2015-01-03 17:21:23 -08:00
paprka
46ee047404
further changes to the ranged stun system
2015-01-01 22:22:03 -08:00
phil235
183955a877
Fixes shortening barrel: only live chambered ammo goes off in your face; the gun goes off even if not in your hand; when blowing up "you fire the X" message won't show up anymore.
2014-12-31 12:04:39 +01:00
Thunder12345
faf5a1dd07
Fixes #6547
...
Shortening a shotgun now uses proper grammar, and displays the original
name of the shotgun for the finish message:
"X shortens the improvised shotgun"
instead of:
"X shortens the sawn-off improvised shotgun"
2014-12-27 18:19:04 +00:00
paprka
21df99154d
Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya
...
Conflicts:
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/obj/gun.dmi
2014-12-25 13:51:43 -08:00
phil235
8707e37845
Fixes russian revolver being abusabled. You can no longer use it on someone other than yourself. Aiming somewhere other than head/eyes/mouth doesn't instakill but still deals damage. You need to spin the chamber after each shooting attempt. Only humans can use the gun.
...
Making a can_trigger_gun() proc that tests if the mob can trigger the gun.
2014-12-23 21:08:00 +01:00
Menshin
20c640ae38
Added some defines for better clarity
2014-12-21 02:10:01 +01:00
Menshin
05378c014d
* fixes #3765 (shotguns sawing off)
...
* fixes #994 (clumsy guns firing)
* fixes #6443 (laser tags firing without vest on)
* fixes #6262 (optimizing revolver reloading)
2014-12-21 01:35:49 +01:00
paprka
e6f88851ac
Adds select fire for burst fire weapons
2014-12-14 20:13:09 -08:00
paprka
0c2ed6ab8f
Fixes a couple missing var settings
2014-12-14 05:15:13 -08:00
paprka
dddacbc245
Burst fire for automatic weapons
2014-12-14 05:06:19 -08:00
paprka
b65df8425f
trims some unnecessary code
2014-12-10 22:56:52 -08:00
paprka
f917bd2906
fixed some double periods
2014-12-08 19:13:44 -08:00
paprka
b01e6ba882
Generic names and buffs
2014-12-08 16:49:48 -08:00
paprka
94c5ea931d
functional grenade launcher shooting
2014-12-08 01:22:27 -08:00
paprka
d082cdd383
commit for grenade launcher moving
2014-12-08 00:30:10 -08:00
paprka
5b6039a521
changes to the uplink and further c90 updates
2014-12-07 19:39:24 -08:00
paprka
1a591f06e7
c90gl improvements for code, added grenade launcher as a stand-in for now
2014-12-05 20:20:45 -08:00
paprka
481fffcb08
second commit for c90gls
2014-12-05 18:13:04 -08:00
paprka
2425903320
intial commit, renames stechkin
2014-12-04 18:13:50 -08:00
phil235
bcd6658575
Fixes the detetive revolver so when modified it can't blow up when shooting with an empty chamber. Adding a firing sound when the malfunction happens.
2014-11-13 14:48:30 +01:00
phil235
128c9222e5
Adding checks for stun, restrained to many object verbs.
...
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
paprka
42e871a6ed
added sawing off to all weapons
2014-10-19 17:49:05 -07:00
paprka
2a8e772131
Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
...
Conflicts:
code/modules/projectiles/ammunition/magazines.dm
code/modules/projectiles/guns/projectile/shotgun.dm
icons/mob/back.dmi
icons/obj/gun.dmi
2014-10-19 17:30:47 -07:00
paprka
929662ad3a
moved files and fixed tablecrafting
2014-10-17 10:30:04 -07:00
paprka
f54cafad83
converted most gun crafting to its own module
2014-10-17 09:15:54 -07:00
paprka
eb6e35bb54
adds sawing off to improvised shotgun
2014-10-16 10:52:42 -07:00
paprka
d244fd6bbd
initial commit
2014-10-15 13:29:19 -07:00
Jordie0608
1fd21a130b
Makes riot shotgun unique
2014-10-14 15:47:43 +11:00
Jordie0608
aabab6cf47
Defines riot shotgun for spawn in the armory
2014-10-14 01:28:53 +11:00
MrPerson
651c3e6db5
Merge to master - sole conflicting file was ninja.dm FUCK NINJAS
2014-10-04 01:45:39 -07:00
paprka
3fca874ea3
even more code optimizing
2014-10-01 15:12:21 -07:00
