cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-02-07 06:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,825 Commits 63 Branches 14 Tags
e4559ff03e33e7db28fa5978f7b400cc709c5897
Commit Graph

1211 Commits

Author SHA1 Message Date
phil235
524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment 
Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm
 2016-05-05 21:57:10 +02:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
Cheridan
51466932c1 Merge pull request #17275 from Fox-McCloud/energy 
Makes Shock Revolver Use Energy Projectiles
 2016-05-04 15:16:39 -05:00
Jordie
265938e7d9 Merge pull request #17220 from Incoming5643/badmins_doing_shit 
View vars will now tell you if something has been previously var edited
 2016-05-01 17:02:02 +10:00
Cheridan
718d80fa84 Merge pull request #17238 from optimumtact/patch-4 
Dead code trimming
 2016-04-30 05:25:49 -05:00
Fox-McCloud
e2790c7165 Makes Shock Revolver Use Energy Projectiles 2016-04-30 03:48:54 -04:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes 
No longer deaf while inside pipes
 2016-04-29 20:34:03 -05:00
phil235
7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge 
Conflicts:
	code/game/objects/structures/aliens.dm
 2016-04-29 20:58:02 +02:00
KorPhaeron
b6bdc66e30 Merge pull request #17192 from Incoming5643/I_was_feeling_down_so_heres_some_magic 
Buffs the staff/wand of door creation
 2016-04-29 08:27:49 -05:00
oranges
586ed8eb29 Dead code trimming 
Don't mind me gardening away here
 2016-04-29 22:07:46 +12:00
Incoming
10b966b97c View vars will now tell you if something's been previously var edited 2016-04-28 19:38:21 -04:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
phil235
be57a223b5 Moves alien structure into the proper folder objs/structures/aliens.dm 
Removes incorrect comment about forcedodge projectile.
 2016-04-28 22:44:26 +02:00
Incoming5643
e9706a798d mineral doors are dumb 2016-04-27 22:15:25 -04:00
Incoming
5a77cefe2d humor me here I can't test locally right now 2016-04-27 22:07:14 -04:00
Incoming
55b830f39d buffs the staff/wand of door creation: Doors created start open, it can also be used on airlocks to open them akin to the knock spell. 2016-04-27 21:44:53 -04:00
Cheridan
e6509ddd23 Merge pull request #17115 from KorPhaeron/gun_fix 
[S] Fixes minigun bugs
 2016-04-27 02:52:22 -05:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-26 21:49:51 +02:00
KorPhaeron
e8cc449e41 Fixes gun duping 2016-04-25 13:39:38 -05:00
KorPhaeron
f44688ed87 Minigun Fixes 2016-04-25 13:30:16 -05:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction 
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
 2016-04-24 21:22:37 +02:00
phil235
0caa59b21a First commit of this big PR 
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
 2016-04-24 20:26:24 +02:00
KorPhaeron
d93d6160cd Gatling Buff 2016-04-23 19:54:30 -05:00
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