kevinz000
e8ddb7a4d7
why the fuck
2016-06-04 02:44:25 -07:00
kevinz000
8b79a21698
why
2016-06-04 02:39:38 -07:00
kevinz000
607c4be5f9
hjope this works
2016-06-04 02:38:07 -07:00
kevinz000
4b2077fd6b
fortheloveofallthatisholyworkplease
2016-06-04 02:30:38 -07:00
oranges
24056f9df3
Merge pull request #18146 from pudl/angela
...
Fixes smg magazines icon
2016-06-03 09:10:04 +12:00
pudl
74a5ff30ad
Another one bites the dust
2016-06-01 20:04:46 -05:00
oranges
5cbce38a55
Removes peacekeeper bola snare
2016-05-31 23:21:18 +00:00
oranges
d3bcd231f8
Merge pull request #17998 from phil235/ShotgunSawoffFix
...
Fixes sawn off shotguns not showing the right sprite.
2016-05-30 10:55:42 +12:00
Lularian
8aa135f470
fixes some of the crap maybe
2016-05-28 11:08:46 -05:00
phil235
111259dae4
Fixes sawn off shotguns not showing the right sprite.
...
Moves some code around.
2016-05-28 17:45:42 +02:00
Jack Edge
bc113b6aa2
Refactors NOREACT flag; minor cig refactor
...
The reagents datum now has its own flags, which currently includes
REAGENT_NOREACT, which functions in the same way. Shouldn't be touched
directly, use set_reacting(bool) to modify it, as modification also adds
or removes the reagents datum from the SSobj.processing list.
Also refactors cigs a little, adds a Destroy(), uses the open_flame()
proc for the hotspot exposure.
2016-05-26 10:12:59 +01:00
oranges
4dd328a9fa
Merge pull request #17355 from kevinz000/KeepersOfThePeace
...
Peacekeeper Borgs
2016-05-23 12:32:06 +12:00
Lularian
d8af0ac003
pixel projectiles dream
2016-05-16 21:26:20 -05:00
kevinz000
95ca999d44
FixesGrammer+otherstuff
2016-05-13 23:31:38 -07:00
kevinz000
de0d6b3172
woopsies
2016-05-13 21:51:56 -07:00
kevinz000
7895f0be9f
Nerfs
2016-05-13 21:42:04 -07:00
Iamgoofball
65fb5163bd
Removes revolver speed loading delay ( #17595 )
...
Desucake said to do this.
2016-05-13 12:57:27 -05:00
Cruix
d97b15ef8d
Fixed some foam dart bugs ( #17563 )
...
* Fixed foam darts being reset when fired
Added the ability to remove pens from foam darts
Foam darts with pens inside them are no longer destroyed on being fired
* Fixed foam dart duplication bug
* Added destroy procs to projectiles and foam darts.
2016-05-13 13:27:19 +02:00
paprika
a45ea3293f
Merge branch 'master' of https://github.com/tgstation/-tg-station into PixelProjectiles
2016-05-11 19:18:50 -07:00
Jordie
a406abfaa7
new sprites for tesla gun ( #17509 )
2016-05-09 11:40:32 -05:00
paprika
28a8387b17
initial commit
2016-05-07 14:39:17 -07:00
kevinz000
4c1f7632d2
Some fixes
2016-05-03 00:05:17 -07:00
kevinz000
67456fb6a1
Peacekeeper Borgs!
2016-05-02 23:34:06 -07:00
Robustin
44ff69c799
Honk Bullet ( #16788 )
...
Adds honk bullet and staff.
2016-04-16 12:39:04 +02:00
Cheridan
cf7885addd
Merge pull request #16402 from Core0verload/revert-15671-Newtaser
...
Revert "Introduces the new taser"
2016-03-28 18:44:34 -05:00
Cheridan
eeeff80e5f
Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues
...
Fix bundle
2016-03-26 21:06:00 -05:00
Core0verload
fe253ec0b9
Revert "Introduces the new taser. "
2016-03-26 23:01:18 +03:00
Xhuis
cc62b89baf
Fix bundle
2016-03-26 15:15:31 -04:00
CPTANT
b9090ffef2
Merged with master.
...
Solved armor bypass.
2016-03-22 16:07:38 +01:00
duncathan salt
fa62cefaac
Merge pull request #15958 from Impisi/ImprovisedShellChanges
...
Improvised Shell Rework Attempt 2
2016-03-12 15:16:08 -06:00
Impisi
6670b9993a
unfucks everything. Well, at least I think so. Oh and the overloaded shot now fires four pellets instead of six. Feels a little limp dicked for the cost and prep but I'm getting paranoid over its power potential. Lets see how people use this before making balance changes.
2016-03-07 04:40:54 -08:00
Tkdrg
7f79c983c3
Nerfs the detective's revolver
...
It now takes three full seconds to reload.
2016-02-28 20:38:32 -03:00
Cheridan
d51a1907f8
Merge pull request #15750 from Steelpoint/M90
...
C20r Buff | M90 Removal
2016-02-27 00:22:01 -06:00
Steelpoint
628be2f67d
C20rChange
2016-02-25 15:54:37 +08:00
tkdrg
3ad21db02f
Merge pull request #15647 from Boredone/master
...
Fixs Breach Slugs Magazines
2016-02-21 22:16:34 -03:00
CPTANT
588757890a
Introduces the new taser. 2 shot with several stat changes.
...
Adds light lasers to hybrid tasers.
2016-02-21 22:48:02 +01:00
Boredone
40005aca32
Hope I didn't mess up here as I didn't branch off earlier changes.
2016-02-20 15:34:01 -07:00
CPTANT
086dd558f3
Merge branch 'master' of https://github.com/tgstation/-tg-station into laserfire
...
# Conflicts:
# code/game/gamemodes/malfunction/Malf_Modules.dm
2016-02-16 03:23:55 +01:00
Thunder12345
1861e65bdd
Stechkin buff
2016-02-13 20:11:58 +00:00
Thunder12345
7b6c6b3356
Added 7.62x38mmR ammo box with 14 rounds
2016-02-13 20:11:58 +00:00
Thunder12345
b5c79e3781
Adds military russian
...
Adds camouflage fatiges, functionally identical to turtlenecks
Adds buckshot loaded pump shotgun variant
Adds sprites for the new russian
2016-02-13 20:05:51 +00:00
Thunder12345
b9fcf72e12
Added 9mm stechkin APS, 12 round magazine, 3 round burst fire or semi auto.
2016-02-13 20:05:51 +00:00
Thunder12345
f4f227412f
Added nagant revolver, and its new ammo type
2016-02-13 20:05:51 +00:00
KorPhaeron
aecf08655d
Nerf LSG
2016-02-07 22:41:08 -06:00
tkdrg
0dbbcce675
Merge pull request #15216 from KorPhaeron/fixes_bulldogs
...
Fixes bulldogs being unable to load special ammo
2016-02-06 14:19:35 -03:00
tkdrg
eda3c54d9d
Merge pull request #15070 from MMMiracles/instagib
...
Adds an Instagib Rifle
2016-02-06 08:36:06 -03:00
KorPhaeron
2f6c9ec50e
Bulldog Fix
2016-02-05 12:06:53 -06:00
MMMiracles
64b09f82e5
outlining on rifle is more defined, made a red and blue variant along with a generic variant.
2016-02-02 18:19:22 -05:00
CPTANT
fb154f0b2e
cleans up the code and brings fire stacks back to 0.5
2016-02-02 21:02:53 +01:00
CPTANT
34e22c8a1b
adds on hit fire effect to lasers.
...
Makes lasers a subtype of beam
2016-02-02 16:13:11 +01:00
