cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-05 05:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,045 Commits 63 Branches 14 Tags
7cc2d242ac41ad657cdcf08360bbd4aa328dd2ae
Commit Graph

1188 Commits

Author SHA1 Message Date
KorPhaeron
18ce641950 Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA 2016-04-23 15:14:09 -05:00
KorPhaeron
ad4782ac41 Tesla Revolver 2016-04-23 13:55:03 -05:00
KorPhaeron
c771988284 Gatling Autoclick 2016-04-23 13:47:05 -05:00
KorPhaeron
6ec28fc001 Runtime and MC crash fixes 2016-04-22 11:17:42 -05:00
KorPhaeron
a39e3f3f1f Ausops Sprites 2016-04-22 02:16:26 -05:00
KorPhaeron
5009d5eb5d Faster firing 2016-04-21 23:32:56 -05:00
KorPhaeron
84e0fe2b79 Hell lets do 10 damage its an endgame weapon that takes all your inventory 2016-04-21 21:37:58 -05:00
KorPhaeron
a78ce8712e Gatling Gun icon fixes 2016-04-21 20:59:07 -05:00
Shadowlight213
ba3e64ab51 Fixes syringe gun chem reactions 2016-04-21 18:49:22 -07:00
KorPhaeron
b646b12480 Bit weaker gatling gun 2016-04-21 20:26:58 -05:00
KorPhaeron
5a813a96a5 Gatling Laser 2016-04-21 20:26:13 -05:00
KorPhaeron
3527347160 Shock Revolver 2016-04-18 21:29:43 -05:00
Robustin
64bd2125fa Slowed recharge 2016-04-16 23:11:25 -04:00
Robustin
bbf573addb Update staff.dm 2016-04-16 20:31:30 -04:00
Robustin
44ff69c799 Honk Bullet (#16788) 
Adds honk bullet and staff.
 2016-04-16 12:39:04 +02:00
AnturK
80eb5833e9 Merge pull request #16470 from KorPhaeron/accelerator 
Laser Cannon Changes
 2016-04-07 18:51:18 +02:00
KorPhaeron
4d0cc1e0f0 Cannon 2016-04-06 11:37:32 -05:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2016-04-03 18:22:20 -06:00
Joan Lung
a2bd358eb8 Merge pull request #16507 from PKPenguin321/patch-16 
fixes being able to grind guns with an autolathe
 2016-04-02 20:09:06 -04:00
KorPhaeron
55434a673d Heavy Weapon Fix 2016-03-31 12:23:46 -05:00
KorPhaeron
a74b7c209c Mining Drone Upgrades 2016-03-31 03:41:03 -05:00
duncathan
eeb0119acb Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm
 2016-03-30 22:55:00 -06:00
PKPenguin321
0e93ef9544 fixes being able to grind guns with an autolathe 
>but revolver for 90000 TCs
>accidentally click autolathe when you're printing more ammo
>it turns into half a metal sheet's worth of material
 2016-03-30 17:03:43 -07:00
KorPhaeron
fad0e3934e Fixes recoil, re-adds suit icon toggling 2016-03-30 13:11:33 -05:00
KorPhaeron
e3dcebc65e Merge remote-tracking branch 'refs/remotes/tgstation/master' into mecha2 
# Conflicts:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
 2016-03-30 02:12:20 -05:00
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
Xhuis
b44fa098ac Fixes animated statues being invisible 2016-03-29 19:56:33 -04:00
duncathan
3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
 2016-03-29 14:46:06 -06:00
duncathan
b9950c4358 turf/open and turf/closed 2016-03-29 13:38:56 -06:00
KorPhaeron
feb0e6ac70 IT GROWS 2016-03-29 14:34:40 -05:00
KorPhaeron
8ab833932a Why'd I do this? 2016-03-29 01:31:15 -05:00
KorPhaeron
6a55a5b82b Forgot to tick a file 2016-03-29 01:21:25 -05:00
KorPhaeron
114ede069c Lets the projectile pass grilles/windows 2016-03-29 01:09:45 -05:00
KorPhaeron
177c4c18f8 Accelerator Cannon 2016-03-29 00:44:39 -05: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
KorPhaeron
e829213938 Mining Balance 2016-03-28 06:30:26 -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
Nerd Lord
e41a25549e Xray lasers now have unique sprites and inhands 2016-03-17 23:21:52 -04:00
duncathan salt
fa62cefaac Merge pull request #15958 from Impisi/ImprovisedShellChanges 
Improvised Shell Rework Attempt 2
 2016-03-12 15:16:08 -06:00
KorPhaeron
b204c2f333 Merge pull request #15825 from tkdrg/am_i_hg_yet 
Nerfs the detective's revolver
 2016-03-11 12:52:50 -06:00
duncathan
12a6205372 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs 
Conflicts:
	_maps/RandomRuins/SpaceRuins/asteroid4.dmm
	_maps/RandomRuins/SpaceRuins/spacebar.dmm
	_maps/RandomZLevels/Academy.dmm
	_maps/RandomZLevels/beach.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/spacebattle.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/RandomZLevels/wildwest.dmm
	_maps/map_files/AsteroidStation/AsteroidStation.dmm
	_maps/map_files/BirdStation/BirdStation.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/DreamStation/z5.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/map_files/generic/z5.dmm
	_maps/map_files/generic/z6.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	_maps/templates/lavaland_surface_ufo_crash.dmm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/structures/lattice.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/misc_floor.dm
	code/game/turfs/simulated/floor/plasteel_floor.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/mulebot.dm
	code/modules/mob/mob_movement.dm
 2016-03-10 23:07:21 -06:00
duncathan
5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -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
c0
1dea7ac78b Defines 2016-03-02 00:23:50 +03:00
c0
af5276467b Allows aliens/monkeys to use magic and arm-mounted guns 2016-03-01 23:52:58 +03:00
Jordie
32bf31f3a0 Merge pull request #15707 from Core0verload/breathing_implant 
[Ready] New cyberimplant: breathing tube
 2016-02-29 14:53:42 +11:00
Tkdrg
7f79c983c3 Nerfs the detective's revolver 
It now takes three full seconds to reload.
 2016-02-28 20:38:32 -03:00