MMMiracles
ea3e03ec48
adds a blue variant of the rifle for team-based stuff or something
2016-01-30 01:57:14 -05:00
MMMiracles
cb8e000580
adds instagib rifle
2016-01-30 01:24:56 -05:00
Firecage
d034a3f8ab
Compile fix
2016-01-27 13:30:46 +02:00
Firecage
7f96592b87
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
KazeEspada
17fe36ebda
Merge branch 'master' of https://github.com/tgstation/-tg-station into LizardHunting
2016-01-24 15:14:00 -07:00
KazeEspada
b774041648
Lizards now hunt and kill insects, they swallow them whole.
...
"We vorestation now." -Iamgoofball.
2016-01-24 15:13:46 -07:00
duncathan salt
0d5885a1f0
Merge pull request #14819 from KorPhaeron/polymorph
...
Polymorph Fixes
2016-01-24 13:08:11 -06:00
AnturK
229724a6e7
Fixes medbeam pass flags
2016-01-24 12:56:02 +01:00
KorPhaeron
f76d8567c7
Polymorph
2016-01-23 13:03:21 -06:00
Firecage
d1327d4076
Merge conflict fix
2016-01-19 10:02:50 +02:00
Firecage
0cb6814c18
Merge conflict fix
2016-01-17 19:15:30 +02:00
Firecage
332bde0f4f
Does the rest of the if()'s/ else's
2016-01-17 19:03:12 +02:00
AnturK
e39d5bb7cb
Fixes firing_pin not qdeling.
2016-01-17 16:06:36 +01:00
Firecage
754491ce4c
Changes relatives paths into absolute paths and makes some if()'s better
2016-01-17 01:36:56 +02:00
Nerd Lord
4f6f6e9973
Changes accelerator sniper rounds to use their own, unique projectile sprites.
2016-01-12 23:16:01 -05:00
tkdrg
8cb75f1c68
Merge pull request #14501 from KorPhaeron/clips
...
Fixes magazine desc
2016-01-08 18:12:52 -03:00
duncathan salt
a1d0b96396
Merge pull request #14475 from bgobandit/fixtres
...
Slung improvised shotgun now properly updates its sprite.
2016-01-08 07:09:58 -06:00
KorPhaeron
a960dcf5e6
Clip descriptions
2016-01-07 16:08:02 -06:00
bgobandit
8aa51b79ec
Slung improvised shotgun now properly updates its sprite.
2016-01-07 07:55:59 -05:00
MrStonedOne
5d86ed49f6
Merge conflic fix
2016-01-03 14:51:14 -08:00
Razharas
6eb5e5016b
Merge pull request #14068 from Bawhoppen/revert-13901-new_clip_in
...
Reverts yelling about reloading
2016-01-03 10:03:09 +03:00
MrStonedOne
b50e8d2a63
removes a bunch of unneeded spawns
...
spawns have a high overhead.
I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
tkdrg
6a5ab98c0f
Merge pull request #14221 from KorPhaeron/reloading_clips
...
Fixes being unable to load autorifle magazines
2016-01-01 20:18:13 -03:00
KorPhaeron
a38a9d55c7
Autorifle magazine
2015-12-31 17:40:40 -06:00
tkdrg
4485cc3dfb
Merge pull request #14146 from KorPhaeron/guns
...
Lesser Summon Guns
2015-12-30 23:32:13 -03:00
KorPhaeron
504926883f
Cleans up code
2015-12-30 20:10:15 -06:00
duncathan salt
f09025abf9
Merge pull request #13983 from PKPenguin321/arm-mods
...
Adds Arm-Mods (Mounted Taser & Mounted Laser)
2015-12-30 23:37:01 +01:00
PKPenguin321
bdaf037434
fixes the force values and removes ".0"s
...
thanks @jordie0608
pls let this be ready for merge
2015-12-29 12:07:50 -08:00
KorPhaeron
9bcca100ca
Lesser Summon Guns
2015-12-29 10:58:27 -06:00
tkdrg
dc0c056fc9
Merge pull request #14109 from Incoming5643/guns_and_guns_and_more_guns
...
Summon Guns 2016
2015-12-28 22:58:47 -03:00
Incoming
b7ecdf6a2f
Adds scatter lasers to the drop list
...
Changes it so scatter lasers start in scatter mode to drive home the point
CODING STANDARDS
2015-12-28 20:47:32 -05:00
tkdrg
75df8a35e0
Merge pull request #14102 from KorPhaeron/foam
...
Unrestricted foam force weapons for admin spawn
2015-12-28 18:47:59 -03:00
Incoming
5a10810df7
Adds a buttload of guns to summon guns to bring it up to speed for 2016. I intentionally skipped any guns that had enough stopping power to OHKO a spessman from full health.
...
adds a gun proc, Unlock() that automatically swaps whatever pin the gun has for a generic electronic one.
2015-12-27 21:55:53 -05:00
KorPhaeron
ccf44431fa
Foam force
2015-12-27 15:41:20 -06:00
bawhoppen
d15b2ed643
Revert "Spacemens will loudly announce that they are changing magazines"
2015-12-26 12:50:44 -06:00
Incoming5643
7c28017be5
changes the desc to be more referencing
2015-12-24 23:39:41 -05:00
Incoming
f4a07cab95
Adds the golden revolver. Shakes the screen like a bastard and sounds really painful, but only does normal revolver damage.
...
A little easter egg weapon for a game you should have played.
Will be added to summon guns at some point
2015-12-24 22:36:20 -05:00
duncathan salt
b4519573c2
Merge pull request #13901 from KorPhaeron/new_clip_in
...
Spacemens will loudly announce that they are changing magazines
2015-12-24 12:51:08 +01:00
KorPhaeron
f8404eff5f
Tactical reloads
2015-12-24 05:03:29 -06:00
PKPenguin321
ab2158d8e0
Adds Arm-Mods.
...
Can be easily made with the example parent type. Includes two premade arm-mods, a mounted taser and a mounted laser.
2015-12-23 22:54:20 -08:00
KorPhaeron
b4a02cea5f
Updates phrases
2015-12-23 11:21:03 -06:00
KorPhaeron
c79c6e4671
Properly reverts dual wielding
2015-12-23 01:59:02 -06:00
tkdrg
434598b0e4
Merge pull request #13853 from KorPhaeron/NOSHIELD
...
Removes NOSHIELD flag, gives NOSHIELD items armour penetration
2015-12-23 03:17:01 -03:00
tkdrg
822ce165cd
Merge pull request #13891 from LanCartwright/wjaskedfor000shotgunrounds
...
Adds 1 more pellet to rubbers and buck
2015-12-22 19:51:04 -03:00
tkdrg
aad01cec73
Merge pull request #13874 from KorPhaeron/steelrifles
...
Removes pointless toggle fire button from autorifles
2015-12-22 15:00:56 -03:00
KorPhaeron
b4b1f7b714
RELOADING
2015-12-22 00:54:09 -06:00
tkdrg
ff51c8519a
Merge pull request #13813 from MMMiracles/toomanybullets
...
Nerfs Saber SMG to 21 per magazine
2015-12-21 23:47:42 -03:00
MMMiracles
36cba7e874
ALL THESE NUMBERS AND YOU CHOOSE 30?
2015-12-21 21:34:55 -05:00
Akke
e5936939a2
adds 1 more pellet
2015-12-21 22:57:16 +00:00
tkdrg
1074e7d161
Merge pull request #13831 from KorPhaeron/dual_wield
...
Dual wielding guns
2015-12-21 14:11:09 -03:00
