cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,949 Commits 61 Branches 14 Tags
2cbff9e2dd2c2e7b2b54b33e79d24d2f35ebbfa9
Commit Graph

586 Commits

Author SHA1 Message Date
Swag McYolosteinen
e5e8b27790 Merge pull request #7491 from paprka/simplyepicbuff 
Removes range from ebow bolts + price revert + bugfix
 2015-02-10 17:15:44 +01:00
Steelpoint
ea3bb2e80b Merge branch 'master' of https://github.com/tgstation/-tg-station into SecBorgDisabler 
Conflicts:
	code/modules/research/designs/mechfabricator_designs.dm
 2015-02-06 13:19:15 +08:00
paprka
53a1590a9e fixes ebow sound when reloading 2015-02-03 14:48:04 -08:00
Cheridan
5f884b6017 Merge pull request #7496 from dannno/killyoselfmyman 
Adds proper suicide messages to like a lot of stuff
 2015-02-03 16:43:09 -06:00
paprka
18a90495b2 updates to ERT stuff 2015-02-02 03:33:37 -08:00
paprka
8173cd2460 fixes pulse rifles not being emp proof apparently 2015-02-01 23:27:56 -08:00
paprka
f6be6754ae readds the stun revolver (oops) 2015-02-01 21:32:51 -08:00
paprka
a5dcd1abd8 improves ert spawning and centcomm 2015-02-01 21:16:11 -08:00
paprka
55bdca20da Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 2015-02-01 18:22:02 -08:00
dannno
c48bf44a47 framework for a future "suicide hotline" job 2015-02-01 19:44:54 -05:00
dannno
a0b2e72b4c gun suicide messages 2015-02-01 11:04:40 -05:00
paprka
6108f10b63 removes range from ebow bolts 2015-02-01 03:56:23 -08:00
Swag McYolosteinen
d5ccc9cffe Merge pull request #7436 from Incoming5643/WaitingForTheSun 
Fixes #6885
 2015-02-01 12:46:16 +01:00
paprka
453a3db196 etc 2015-01-30 23:18:02 -08:00
Cheridan
9eb4e67d58 Merge pull request #7412 from paprka/capwazer 
adds unique inhands for the captain's laser
 2015-01-30 14:07:12 -06:00
Incoming
31b84ca71f changes how the bolt of door creation works so it behaves expectedly on shuttles 
adds butterflies to the staff/wand of change/polymorph since I'm here.

Removes two colons
 2015-01-29 16:30:31 -05:00
paprka
e5b4a32cc4 adds unique inhands for the captain's laser 2015-01-28 16:37:03 -08:00
Steelpoint
4262a1c89c WrongDescription 2015-01-27 20:37:00 +08:00
Steelpoint
f279e0754b MisplacedLine 2015-01-27 17:47:25 +08:00
Steelpoint
8b78853c68 Tweaking 2015-01-27 17:43:13 +08:00
Steelpoint
359514e239 SecBorgDisabler 2015-01-27 17:24:13 +08:00
Cheridan
b28d1773a3 Fixes firing pins replicating original lockbox anti-melee functionality. 2015-01-26 16:23:25 -06:00
Cheridan
8c893f6aca Merge pull request #7065 from phil235/GibtoniteLogFix 
Gibtonite log fix
 2015-01-25 00:29:18 -06:00
Swag McYolosteinen
ab0518ef55 Merge pull request #7203 from Delimusca/theyshootback 
Night of the living deathwands
 2015-01-24 13:55:09 +01:00
Swag McYolosteinen
de47d7cea6 Merge pull request #7298 from paprka/fixlmg 
fixes borg lmg
 2015-01-24 12:49:47 +01: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
Swag McYolosteinen
d19f48fe15 Merge pull request #7265 from Firecage/ProtoSMGpin 
Fixes proto SMG having a firing pin.
 2015-01-23 17:48:21 +01:00
Swag McYolosteinen
10ea66cb6b Merge pull request #7164 from Steelpoint/ERTBalanceV1 
[BALANCE|FIX]ERT Balance Pass: 1 + Minor Ops Ship Fix
 2015-01-23 17:16:33 +01:00
paprka
d96c9c2fdd fixes borg lmg 2015-01-23 02:57:52 -08:00
paprka
c41e707ee4 restores the ability to attach suppressors 2015-01-22 18:53:46 -08:00
hornygranny
22e96d3377 Merge pull request #7277 from pudl/chemfix 
replaces all instances of pacid with facid
 2015-01-22 17:06:46 -08:00
Steelpoint
399524dd36 MoreMoreRefinements 2015-01-23 03:06:12 +08:00
Swag McYolosteinen
b44956df86 Merge pull request #7191 from paprka/ebowfix 
fixes ebow and KA breaking once emp'd
 2015-01-22 18:04:08 +01:00
Steelpoint
e63c805494 FixMissingIonGunFiringPin+LoyaltyPinsForPulseGuns 2015-01-22 16:47:01 +08:00
Firecage
72af5ffb8f Did what HG said to do with Protosmg firing pin 2015-01-22 08:08:14 +02:00
pudl
08f8bb3ce8 replaces all instances of pacid with facid 2015-01-21 20:17:23 -06: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
Steelpoint
a5c1faafb6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTBalanceV1 2015-01-22 03:24:54 +08:00
Cheridan
793243763d Merge pull request #7185 from paprka/inhandrefactor 
Inhand refactor
 2015-01-20 22:16:06 -06:00
Cheridan
29af018796 Some fixes 
-Fixes magic wands having electronic firing pins, now have FANCY CRYSTAL SHARDS
-Fixes grammer issue.
-Fixes code not compiling due to outdated proc
 2015-01-20 21:41:36 -06:00
Swag McYolosteinen
63cb7dad4a Merge pull request #7145 from paprka/gunsicons 
splits gun.dmi up into multiple files
 2015-01-20 17:56:41 +01:00
Delimusca
07927e759d added ranged mimic 2015-01-19 11:44:34 -07:00
paprka
2566cf030e fixes ebow and KA breaking once emp'd 2015-01-19 01:28:14 -08:00
paprka
f58096575c refactors guns 2015-01-18 23:28:24 -08:00
paprka
88230fabfa inhand refactor 2015-01-18 20:58:31 -08:00
Steelpoint
a097f86ac6 ERTBalancePassV1 2015-01-18 19:18:47 +08:00
paprka
a2fe7f0352 bloat killer 9000 2015-01-17 16:36:27 -08:00
paprka
1b6831dab1 splits gun.dmi up into multiple files 2015-01-17 15:34:30 -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