cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-28 02:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,686 Commits 59 Branches 14 Tags
8f9686d77dfc1089c1cb15f430aa43d0b7c33b56
Commit Graph

320 Commits

Author SHA1 Message Date
phil235
7df5998740 Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma. 2015-04-08 03:44:56 +02:00
pudl
69924a15be plasma/ripley update 2015-03-25 18:06:26 -05:00
Fayrik
0173c7af6e Adds everything and makes it all work perfectly. It's like I'm almost good at this or something. (Seriously, points of interest: Secbots react to being shot. Dart rigging. Donksoft guns.) 2015-03-21 16:18:32 +00:00
Fayrik
d3d491588e Cleaned up the functionality and prepared things for PR. 2015-03-20 23:19:19 +00:00
Fayrik
57f544ffdf Removed dangerous "hacked" foam darts, as they were a little more powerful than intended. Hopefully this is something I can fix at a later date. Fixed non-magazine ammo boxes not accepting their correct ammo type. Added a speed collection system to all ammo boxes. Finally balanced out the cargo ordering stuff. 2015-03-20 23:19:04 +00:00
Fayrik
a030c9889e Glorious second commit, introducing (mildly) dangerous rounds and a new suicide check. 2015-03-20 23:03:06 +00:00
Fayrik
b758992e8c First (of probably several) commits to add Foam Force toy guns. Adds the new guns and crossbow, removes the old crossbow, and makes these new guns available to cargo. 2015-03-20 23:02:53 +00:00
Jordie
fb6aa85094 Merge pull request #8274 from Thunder12345/techshellening 
Shotgun party, new shells, an improvement and a fix
 2015-03-16 18:30:14 +11:00
Thunder12345
8a780e89bf Overloading improvised shells 
Improvised shells can be overloaded with black powder to have a random
pellet count and damage for each pellet. Damage ranges from 0 to 80.
 2015-03-11 11:41:26 +00:00
Miauw
09cf2e474f Reduces the taser firing delay. 2015-03-10 19:36:05 +01:00
Thunder12345
9723f6d092 Laser slugs + improvised shell fix 
Adds laser slugs, fixes improvised slug recipe
 2015-03-10 15:55:29 +00:00
Thunder12345
56ab83d4e7 Ion shell updates 
Ion shell now acts as a shotgun of weaker ion bolts. Stronger than a
regular ion rifle when fired point blank, but suffers at longer ranges.
 2015-03-10 14:42:08 +00:00
Thunder12345
a1a5edd314 FRAG-12, ion, improvised shotgun shells 
Adds: Ion slug, ion rifle in a shotgun shell
Improves: Improvised shell, new sprite + recipe
Fixes: FRAG-12 slug, now with 100% more explosion
 2015-03-10 13:57:54 +00:00
Steelpoint
9ce2add084 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/obj/guns/energy.dmi
 2015-02-25 14:10:54 +08:00
paprka
1d552123dc hos gun revert 2015-02-24 21:54:48 -08:00
paprka
7fad8a3bab nerfs energy bolts more 2015-02-24 20:04:48 -08:00
paprka
393123b50b Merge branch 'master' of https://github.com/tgstation/-tg-station into youlovenerfs 
Conflicts:
	code/modules/projectiles/gun.dm
	icons/obj/guns/energy.dmi
 2015-02-24 20:03:33 -08:00
Steelpoint
da53175ad5 Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun 
Conflicts:
	icons/mob/inhands/guns_lefthand.dmi
	icons/mob/inhands/guns_righthand.dmi
	icons/obj/guns/energy.dmi
 2015-02-25 11:44:27 +08:00
Steelpoint
1221f012c6 Breach to Disable 2015-02-20 11:41:56 +08:00
hornygranny
ea12d68e60 Merge pull request #7817 from paprka/whatthefucktg 
Syndicate shotguns spawn with buckshot by default
 2015-02-19 13:07:08 -08:00
paprka
efbb4f5116 makes syndicate shotguns spawn with buckshot by default 2015-02-18 14:10:46 -08:00
paprka
388e0a330e fixes firing delay 2015-02-18 02:55:28 -08:00
paprka
15e2b88a0f removes bloat from magazines icons 2015-02-17 19:43:20 -08:00
paprka
8b12b14f59 hospistol and disabler stun revolver 2015-02-15 13:31:31 -08:00
Steelpoint
a9c9f7c2cb BalanceChange-5stun10laser 2015-02-14 17:56:35 +08:00
paprka
354ce2a458 removes shot delay on stun revolver 2015-02-13 09:35:30 -08:00
paprka
54040d9867 stun changes and stun revolver 2015-02-13 09:26:31 -08:00
Steelpoint
8c2961c79b MoreConflictFixing 2015-02-04 19:37:57 +08:00
paprka
f6be6754ae readds the stun revolver (oops) 2015-02-01 21:32:51 -08:00
paprka
453a3db196 etc 2015-01-30 23:18:02 -08:00
Steelpoint
a097f86ac6 ERTBalancePassV1 2015-01-18 19:18:47 +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
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
c81eada938 Merge pull request #6737 from tkdrg/hurr 
Changes the practice beam name to "practice laser"
 2015-01-13 02:13:38 -06:00
Steelpoint
982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
tkdrg
b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
Steelpoint
34589f52bf Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi
 2015-01-09 11:02:50 +08:00
tkdrg
778eb28c15 Repaths practice laser 
It's now /obj/item/projectile/beam/practice to inherit laser stuff.
 2015-01-07 04:45:49 -03:00
paprka
0cd34c9c2f changes syndicate borg equipment 2015-01-05 19:42:31 -08:00
paprka
460a06e683 Reverted some other magazine name changes 2015-01-03 17:23:31 -08:00
paprka
7324891c37 intense p90 fans on /tg/ apparently 2015-01-03 17:21:23 -08:00
paprka
46ee047404 further changes to the ranged stun system 2015-01-01 22:22:03 -08:00
Steelpoint
f72ced26fd PulseRifleVarients+ArmouryRooms+FixesAndRefinements 2015-01-01 13:33:23 +08:00
Steelpoint
dd111a7c54 EmergencyResponseTeam 2014-12-31 17:31:45 +08:00
paprka
109be766d6 fixes a few bugs 2014-12-26 19:23:22 -08:00
paprka
1d1baa96bc Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-12-24 18:56:26 -08:00
paprka
47659dbbf4 Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2014-12-21 20:32:34 -08:00