Steelpoint
9ce2add084
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-25 14:10:54 +08:00
paprka
1d552123dc
hos gun revert
2015-02-24 21:54:48 -08:00
paprka
7fad8a3bab
nerfs energy bolts more
2015-02-24 20:04:48 -08:00
paprka
393123b50b
Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs
...
Conflicts:
code/modules/projectiles/gun.dm
icons/obj/guns/energy.dmi
2015-02-24 20:03:33 -08:00
Steelpoint
da53175ad5
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-25 11:44:27 +08:00
Steelpoint
1221f012c6
Breach to Disable
2015-02-20 11:41:56 +08:00
hornygranny
ea12d68e60
Merge pull request #7817 from paprka/whatthefucktg
...
Syndicate shotguns spawn with buckshot by default
2015-02-19 13:07:08 -08:00
paprka
efbb4f5116
makes syndicate shotguns spawn with buckshot by default
2015-02-18 14:10:46 -08:00
paprka
388e0a330e
fixes firing delay
2015-02-18 02:55:28 -08:00
paprka
15e2b88a0f
removes bloat from magazines icons
2015-02-17 19:43:20 -08:00
paprka
8b12b14f59
hospistol and disabler stun revolver
2015-02-15 13:31:31 -08:00
Steelpoint
a9c9f7c2cb
BalanceChange-5stun10laser
2015-02-14 17:56:35 +08:00
paprka
354ce2a458
removes shot delay on stun revolver
2015-02-13 09:35:30 -08:00
paprka
54040d9867
stun changes and stun revolver
2015-02-13 09:26:31 -08:00
Steelpoint
8c2961c79b
MoreConflictFixing
2015-02-04 19:37:57 +08:00
paprka
f6be6754ae
readds the stun revolver (oops)
2015-02-01 21:32:51 -08:00
paprka
453a3db196
etc
2015-01-30 23:18:02 -08:00
Steelpoint
a097f86ac6
ERTBalancePassV1
2015-01-18 19:18:47 +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
8bde2dea03
crossbow, speargun, and grenade updates
2015-01-13 20:00:58 -08:00
Steelpoint
3f88acb6f6
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
...
Conflicts:
icons/mob/head.dmi
2015-01-14 11:25:07 +08:00
Cheridan
c81eada938
Merge pull request #6737 from tkdrg/hurr
...
Changes the practice beam name to "practice laser"
2015-01-13 02:13:38 -06:00
Steelpoint
982c54c2f3
EmergencyResponseTeamV2
2015-01-11 19:21:38 +08:00
tkdrg
b0635993a4
Revert "[FEATURE] Emergency Response Team"
2015-01-10 19:55:30 -03:00
Steelpoint
34589f52bf
Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
...
Conflicts:
code/modules/projectiles/guns/energy/nuclear.dm
icons/obj/gun.dmi
2015-01-09 11:02:50 +08:00
tkdrg
778eb28c15
Repaths practice laser
...
It's now /obj/item/projectile/beam/practice to inherit laser stuff.
2015-01-07 04:45:49 -03:00
paprka
0cd34c9c2f
changes syndicate borg equipment
2015-01-05 19:42:31 -08:00
paprka
460a06e683
Reverted some other magazine name changes
2015-01-03 17:23: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
Steelpoint
f72ced26fd
PulseRifleVarients+ArmouryRooms+FixesAndRefinements
2015-01-01 13:33:23 +08:00
Steelpoint
dd111a7c54
EmergencyResponseTeam
2014-12-31 17:31:45 +08:00
paprka
109be766d6
fixes a few bugs
2014-12-26 19:23:22 -08:00
paprka
1d1baa96bc
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
2014-12-24 18:56:26 -08:00
paprka
47659dbbf4
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-21 20:32:34 -08: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
Cuboos
0bb7d2a5a5
Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1
...
Conflicts:
code/game/objects/items/weapons/defib.dm
config/admins.txt
2014-12-15 18:12:14 -08:00
paprka
1fd9e6bfda
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/obj/gun.dmi
2014-12-14 21:55:28 -08:00
Cheridan
753202d008
Merge pull request #6341 from paprka/gunspritefix
...
Fixes a few bugs with gun and ammo icons
2014-12-14 23:26:36 -06:00
paprka
30cbff2802
fixes a few bugs with gun and ammo icons/obj/gun.dmi
2014-12-13 17:13:25 -08:00
Thunder12345
3bc8b4f777
Description update
...
Changed the description of the FRAG-12.
2014-12-11 21:23:16 +00:00
Thunder12345
8e2dc381ed
FRAG-12 + admins.txt
...
+ FRAG-12 shotgun shells, created from the unloaded technological
shotshell
+ Adding myself to admins.txt
2014-12-11 21:16:45 +00:00
paprka
dc01a092af
Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
...
Conflicts:
icons/mob/items_lefthand.dmi
icons/mob/items_righthand.dmi
icons/obj/gun.dmi
2014-12-10 23:55:51 -08:00
paprka
e53f8294d7
initial commit for nerfing ranged stuns
2014-12-10 00:16:53 -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
