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
17,553 Commits 61 Branches 14 Tags
08598fb2bebb0d5e50a4d2e8eaa24afe202fe48e
Commit Graph

565 Commits

Author SHA1 Message Date
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
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
Cheridan
63e09d0928 Merge pull request #6966 from Steelpoint/ERTv2 
[FEATURE] Emergency Response Team V2
 2015-01-15 23:41:20 -06:00
Cheridan
ea4b5b2872 Merge branch 'pinned' of https://github.com/Cheridan/-tg-station into pinned 2015-01-15 16:17:51 -06:00
Cheridan
5f46ebe2b9 Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-15 16:14:27 -06:00
phil235
9e8531448a Fixes admin logging of gibtonite and gibtonite deposit. Drilling it with a mech, using a kinetic accelerator, and using a resonator log the attacker's name. 
Gibtonite and gibtonite deposit being triggered by an explosion is now correctly logged.

The explosion of the gibtonite deposit (outside of mining level of course) is now logged.
 2015-01-15 00:56:50 +01:00
phil235
bd189431d0 Merge pull request #7002 from Menshin/gunlights_runtimes_fix 
Fixes "Toggle Gunlight" verb runtimes
 2015-01-14 17:29:15 +01:00
paprka
2fd8b3e749 nerfed saber slightly 2015-01-13 20:05:37 -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
7f46070abf Update pins.dm 
-name change for muh fluff
-i am in paprika's pocket
 2015-01-13 02:57:08 -06: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
Cheridan
f8e1fac30c Merge branch 'master' of https://github.com/tgstation/-tg-station into pinned 2015-01-12 21:29:00 -06:00
Cheridan
03e1d0d60a -Adds firing pin box define 
-Examining a gun now shows its pin
-You can now emag a firing pin to make it function without checks.
-Loyalty pins unable to be constructed
 2015-01-12 21:21:34 -06:00
Menshin
0582d87a08 * Fixes "Toggle Gunlight" verb runtimes for guns without any light. 
* The verb will now only appear if there's a gunlight attached to the gun.
 2015-01-13 00:30:54 +01:00
Steelpoint
982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
tkdrg
3f802d1ae4 Merge pull request #6917 from Nienhaus/FoxV2 
Fox 2.0
 2015-01-10 20:38:58 -03:00
tkdrg
b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
tkdrg
1756bfc3f0 Merge pull request #6913 from paprka/secborg 
Hybrid taser / Cyborg taser hotfix
 2015-01-10 17:59:27 -03:00
Cheridan
0956a86c22 Firing Pin System - The Lockbox Solution 2015-01-09 18:49:02 -06:00
Nienhaus
4d34f2235e Fox 2.0 
https://github.com/tgstation/-tg-station/pull/6489/
 2015-01-09 16:41:37 -06:00
paprka
b201c9211e advanced / cyborg taser hotfix 2015-01-09 09:51:03 -08:00