cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 01:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,505 Commits 61 Branches 14 Tags
908922f24c5cdf435e35e8cd1cbc03f2d7e2dd93
Commit Graph

7183 Commits

Author SHA1 Message Date
tkdrg
7e48be5be0 Merge pull request #6686 from paprka/lizstutterv2 
Removes lizard stuttering
 2014-12-31 23:22:38 -03:00
tkdrg
34c4c02777 Merge pull request #6646 from RemieRichards/TerminalDecon 
Terminal Deconstruction
 2014-12-31 21:47:47 -03:00
Remie Richards
341b147088 You can now deconstruct terminals provided the APC or SMES is prepared for this (eg, open panels, exposed wires etc.) 2014-12-31 23:35:07 +00:00
tkdrg
cdb5066502 Merge pull request #6324 from Razharas/GenShit 
Added datum mutations
 2014-12-31 17:24:15 -03:00
tkdrg
877f90c11a Merge pull request #6655 from phil235/SawnoffFix 
Fixes shortening gun barrel
 2014-12-31 15:11:27 -03:00
phil235
286a9ce4bc Merge pull request #6657 from Lo6a4evskiy/Eyepatch_HUD_fix 
All sec HUDs work properly with examine buttons
 2014-12-31 15:45:40 +01:00
phil235
6cf7cd2c0b Merge pull request #6671 from tkdrg/fuckingSuperMatter-i_SwearTo=god'ThisdamnthingaaA 
Fixes supermatter division by zero runtime
 2014-12-31 15:42:10 +01:00
phil235
183955a877 Fixes shortening barrel: only live chambered ammo goes off in your face; the gun goes off even if not in your hand; when blowing up "you fire the X" message won't show up anymore. 2014-12-31 12:04:39 +01:00
tkdrg
3752254766 Revert "Adds mouse pointers for different ui styles" 2014-12-31 02:17:50 -03:00
phil235
cfff3cd375 Merge pull request #6539 from Xhuis/pounce_nerf 
Nerfs alien hunter pounce
 2014-12-31 02:29:15 +01:00
tkdrg
ff173b82b1 Merge pull request #6656 from Ergovisavi/mushroom_samba 
Fixes mushrooms preying on non mushrooms
 2014-12-30 21:35:46 -03:00
tkdrg
2d7e10ec67 Merge pull request #6662 from Menshin/retractor_not_a_weapon 
Fixes retractor autolathe spawning.
 2014-12-30 20:44:55 -03:00
Xhuis
1c88fbf615 Adds 3-second cooldown to alien hunter pounce; only triggers if successful 2014-12-30 18:19:35 -05:00
Ergovisavi
1329dbf3cb Merge pull request #6652 from AnturK/cleanup 2014-12-30 11:10:08 -08:00
paprka
26fb835323 removes lizard stuttering 2014-12-30 10:04:50 -08:00
Razharas
d1f347f584 Fixes conflicts 
There werent even any conflicts really, but git for some reason thought
there are
 2014-12-30 15:12:09 +03:00
Perakp
ee3617310e Merge remote-tracking branch 'upstream/master' into droneFix 2014-12-30 13:32:51 +02:00
tkdrg
2607a456c0 Merge pull request #6634 from paprka/chefuniform 
Makes the second cook spawn in short order cook clothes, fixes chef uniform
 2014-12-30 03:45:13 -03:00
hornygranny
9ee5d52814 Merge pull request #6601 from paprka/walkthecat 
Adds catwalks
 2014-12-29 19:05:41 -08:00
tkdrg
bdbde78470 Fixes supermatter division by zero runtime 2014-12-29 21:48:21 -03:00
tkdrg
78e5b9e7c7 Merge pull request #6616 from paprka/pointerpride 
Adds mouse pointers for different ui styles
 2014-12-29 16:47:07 -03:00
Menshin
a3f2d06b0b Fixed retractor spawning an /obj/item/weapon/retractor when fabricated in an autolathe. 2014-12-29 20:46:01 +01:00
tkdrg
df2271c300 Merge pull request #6640 from Nyvrem/master 
Preferred colours for Podpeople
 2014-12-29 15:00:01 -03:00
Ergovisavi
f286d2602b Fixes mushrooms not being cannibals only 2014-12-29 07:28:30 -08:00
Lo6a4evskiy
9276e43e6e Fixes eyepatch and night vision HUDs not working with examine sec record buttons 2014-12-29 18:23:47 +04:00
Razharas
f7e6552e33 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-29 17:05:20 +03:00
tkdrg
48374658a8 Merge pull request #6638 from paprka/beamexplody 
Fixes disabler beams exploding fuel tanks
 2014-12-29 10:37:43 -03:00
AnturK
aa79311dff Fixes janiborg trashbag emptying 2014-12-29 14:21:08 +01:00
tkdrg
80cc2d4100 Merge pull request #6622 from Thunder12345/grammarFixes 
Fixes for some grammer and formatting issues
 2014-12-29 10:20:35 -03:00
Thunder12345
d7dd967c34 Simplification 
Simplified nuzzling, never knew visible_message wound repeat the first
argument if there weren't any others.
 2014-12-29 11:35:48 +00:00
Razharas
10b21b20ab Conflicts resolution 
In items weapons melee misc
 2014-12-29 11:49:30 +03:00
Razharas
418e3a0613 General cleanup 
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
 2014-12-29 11:36:01 +03:00
tkdrg
ad2fee37be Merge pull request #6625 from phil235/HalluAttackAnimationFix 
Fixes hallucinated attackers not doing the attack animation.
 2014-12-29 01:56:19 -03:00
tkdrg
dc6f1895fe Merge pull request #6608 from paprka/disablerrebuff 
Reverts disabler nerf
 2014-12-29 01:12:52 -03:00
tkdrg
67b32194f1 Merge pull request #6612 from paprka/fixesstamdamprojguns 
Fixes stamina damage on projectile weapons
 2014-12-29 00:57:24 -03:00
paprka
1869e9d6ae reverts c90r stuff 2014-12-28 19:47:54 -08:00
paprka
bbc83fed1c Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy 2014-12-28 18:39:39 -08:00
paprka
2e8907ed4c adds a preference for custom pointers 2014-12-28 18:13:48 -08:00
Razharas
4c3f83d085 This shall fix the hunger system 
I really really hope it does
 2014-12-28 21:51:28 +03:00
Nyvrem
05a1cadac3 Preferred colours for podpeople 
Make podpeople use preferrence colours instead of being grey with black eyes.
 2014-12-28 18:39:20 +01:00
paprka
88a0ee34f4 fixes disabler beams exploding fuel tanks 2014-12-28 03:15:26 -08:00
paprka
e8738e8dd5 Changes some clothing and chef gear 2014-12-28 02:13:28 -08:00
paprka
d57256cf11 makes the second cook spawn in short order clothes, fixes chef uniform 2014-12-28 01:12:49 -08:00
Razharas
76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
 2014-12-28 11:20:15 +03:00
Razharas
208b59c30e Fixed stuff tkdrg pointed out 
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
 2014-12-28 10:49:04 +03:00
paprka
79e2eedacb Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2014-12-27 22:26:21 -08:00
tkdrg
bf25d38fb2 Merge pull request #6607 from paprka/aiturrets 
Fixes ai turrets having disable mode instead of stun
 2014-12-28 02:21:04 -03:00
tkdrg
c57c75b232 Merge pull request #6604 from paprka/disablerhitsound 
Disabler now makes a sound when it hits
 2014-12-28 02:06:55 -03:00
tkdrg
60fc73d018 Merge pull request #6587 from phil235/MonkeyBiteMaskFix 
Fixes being able to bite as a monkey with your mouth covered by a mask.
 2014-12-28 01:01:14 -03:00
Ergovisavi
ff68a2d55b Merge pull request #6490 from tkdrg/nomoreadmingrudges 
Adds cfg option to let players see their own notes
 2014-12-27 19:25:43 -08:00