cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-30 02:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,265 Commits 61 Branches 14 Tags
6e27f01c94de6f69d1f0ac3afb181bdea2532d6a
Commit Graph

204 Commits

Author SHA1 Message Date
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
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
MMMiracles
f6407ab136 moist nugget now has its own ammo 2016-01-25 21:54:37 -05:00
MMMiracles
045f2d480b saw and bulldog changes fight me kiddo 1v1 2016-01-25 20:58:38 -05:00
KorPhaeron
a960dcf5e6 Clip descriptions 2016-01-07 16:08:02 -06:00
KorPhaeron
a38a9d55c7 Autorifle magazine 2015-12-31 17:40:40 -06: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
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
MMMiracles
98407f821e democracy demands 30 bullets 2015-12-19 16:04:07 -05:00
MMMiracles
f0a56c0eb2 27 for consistency 2015-12-19 13:07:39 -05:00
MMMiracles
5f3b31d0a5 bullet 2015-12-19 12:56:37 -05:00
MMMiracles
6c2731b22b conflicts are dumb tbh 2015-12-17 21:17:06 -05:00
MMMiracles
cbc9904c4c saw balance 2015-12-16 20:23:03 -05:00
MMMiracles
b548de38cd gives syndicate ranged mobs non-stamina giving versions of bullets 2015-12-15 21:53:55 -05:00
bgobandit
bcd456eea1 Added new PKA, R&D designs, tweaked numbers, honked the honk up the honk 2015-11-23 18:44:54 -05:00
bgobandit
899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear 
Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm
 2015-11-18 19:55:06 -05:00
bgobandit
47dcbc2fd0 Various mining additions, fixes and rebalances. 2015-11-18 19:14:28 -05:00
KorPhaeron
015c480e8f Lasertag beams 2015-11-01 20:55:46 -06:00
Steelpoint
0070b9911d InitalCommit 2015-10-15 01:51:54 +08:00
c0
93fb95993e Instant merge is the fastest action type for this operation 2015-09-22 00:20:36 +03:00
c0
ef8bb5e0e0 Russian roulette 2015-09-22 00:20:36 +03:00
Steelpoint
62e7f1204d NewChanges 2015-09-16 17:53:04 +08:00