cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 04:55:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,613 Commits 61 Branches 14 Tags
8f53dcbfb0b7ed5ebded784db309aae1b002a623
Commit Graph

7236 Commits

Author SHA1 Message Date
phil235
8f53dcbfb0 Merge pull request #6770 from Menshin/cryptobiolin_process_fix 
Fixes cryptobiolin quantity never diminishing in a mob
 2015-01-04 15:10:58 +01:00
Remie Richards
ed1375d454 Fixes Humanize and Monkeyize producing invisible changelings and never deleting their Animation overlay. 2015-01-04 11:03:10 +00:00
Remie Richards
3a10a3b198 Merge pull request #6427 from paprka/janitorbuffholyfuckvalvepleasenerf 
Adds dirt overlays for walking on simulated turfs
 2015-01-04 02:22:50 +00:00
tkdrg
b94fcf06b3 Merge pull request #6756 from phil235/VinesDescFix 
Makes mutated vines description more explicit about the mutation type
 2015-01-03 20:04:43 -03:00
tkdrg
a411154581 Merge pull request #6755 from phil235/SpritesFixes 
Three sprite related fixes
 2015-01-03 19:20:00 -03:00
Ergovisavi
d26c47d33c Merge pull request #6752 from phil235/PotatoParmigianaFixes 
Fixes potato cell construction and eggplant parmigiana recipe
 2015-01-03 09:58:38 -08:00
tkdrg
8180da65fa Merge pull request #6528 from TZK13/Socks 
Adds socks as an underwear option and adds a few new undershirts
 2015-01-03 14:17:17 -03:00
tkdrg
732dff0796 Merge pull request #6751 from Menshin/gun_message_fix 
Fixed a typo that could prevent gun firing message from appearing.
 2015-01-03 13:44:30 -03:00
TZK13
c0b4ea1092 Reverted removal of jerseys. 2015-01-03 10:33:45 -06:00
TZK13
bf5bddf0c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Socks 
Conflicts:
	config/admins.txt
 2015-01-03 07:07:03 -06:00
Menshin
2c28b745ab Fixes cryptobiolin quantity never diminishing in a mob (#6769). 2015-01-03 11:18:13 +01:00
tkdrg
bbe34b2a53 Merge pull request #6186 from Dorsisdwarf/Chemoverlaysreal 
Chemdispenser Overlays [feature]
 2015-01-03 02:26:10 -03:00
tkdrg
1a4c360640 Merge pull request #6743 from Boggart/readmin 
Adds the ability for admins to re-admin themselves once they de-admin.
 2015-01-03 00:36:02 -03:00
phil235
235f92623b Description now meantions all mutations that the vine has. 2015-01-03 00:15:06 +01:00
phil235
840d2e87bd Makes mutated vines description be explicit about the type and special function of the vines. "These are oxygen consuming vines." 2015-01-02 23:35:25 +01:00
phil235
eacdc7e920 Fixes emt cap sprite disappearing. 
Fixes bloodyhand overlay appearing in front of shield.
Fixes white pixels on some disposal pipe junctions sprites.
 2015-01-02 22:36:07 +01:00
Boggart
bb6125a5f1 Fixes feedback on failure due to null rank or disconnected DB. Sanitizes ckey in DB query. 2015-01-02 13:24:49 -07:00
phil235
cf48bb8364 Fixes potato cell construction being broken 
Fixes eggplant parmigiana recipe (it was inheriting reagent requirements from spaghetti). I changed recipes so that they never inherit items or reagents requirements from a parent recipe to make adding new recipes in each categories less prone to mistakes.
 2015-01-02 18:18:26 +01:00
Menshin
ea6d74992f Fixed a typo that can prevent gun firing message from appearing. 2015-01-02 17:51:34 +01:00
Boggart
aed9d6b0e2 Fixes some tabs being spaces. 2015-01-01 23:05:32 -07:00
Boggart
2b0932047a Improves feedback to the user of the re-admin verb. 2015-01-01 23:02:18 -07:00
tkdrg
84e3eaaf16 Merge pull request #6676 from Jordie0608/beeverycarefulwiththese 
Adds bee and butterfly disease to virus pack
 2015-01-02 02:33:23 -03:00
Boggart
0ceda7939c Adds the ability for admins to re-admin themselves once they de-admin. 2015-01-01 20:42:53 -07:00
tkdrg
8e8b761ae2 Merge pull request #6716 from psykzz/patch-2 
Refactor Ears self healing
 2015-01-01 17:18:08 -03:00
tkdrg
6a0f1be7cd Merge pull request #6584 from phil235/HoloSwordFix 
Fixes being able to smash grille/newscaster/mirror/lights with holo esword
 2015-01-01 16:39:16 -03:00
tkdrg
be85bb6d17 Merge pull request #6707 from phil235/HostileAttackingTargetFix 
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
 2015-01-01 12:47:27 -03:00
MrStonedOne
2bb2469038 Fixes error with logging admin rank changes to the user's database record. 
I forgot to add a field to the query in commit 138567b7cf when I modified it.
 2014-12-31 23:19:43 -08:00
Remie Richards
215da4399a Merge pull request #6690 from Xhuis/hidden_book_in_bookcase 
Allows you to put hollowed-out books in bookcases
 2015-01-01 04:12:07 +00:00
Xhuis
88105318a6 Defines allowed books in main bookcase define 2014-12-31 23:08:23 -05:00
tkdrg
371b66a334 Merge pull request #6678 from paprka/nitrile 
Adds nitrile gloves
 2015-01-01 00:29:04 -03:00
Xhuis
c17e25aafa Polishes code with lists 2014-12-31 22:00:08 -05:00
tkdrg
7e48be5be0 Merge pull request #6686 from paprka/lizstutterv2 
Removes lizard stuttering
 2014-12-31 23:22:38 -03:00
paprka
8661025135 Moves the typecast under the ischeck for space cleaner 2014-12-31 17:25:23 -08:00
paprka
9de9f4b3f8 istypes the space cleaner dirt clean 2014-12-31 17:21:36 -08:00
paprka
d048dd87bd Merge branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf 2014-12-31 17:14:03 -08: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
Matt Smith
a9203dcc66 Updating ear code from humans. 
Keeping it together.
 2014-12-31 21:57:25 +00:00
Matt Smith
9bdc62fae3 Fixing initial ear_damage 
Was missing a 0.
 2014-12-31 21:35:23 +00:00
Matt Smith
1f8c748309 Refactor Ears self healing 
Aims to fix #291
 2014-12-31 21:09:35 +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
27d8c489ee Fixes carp, mimic and tree nog being able to knockdown their target. 
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
Fixes player controlled hostile simple animal's ranged attack targeting the target from their previous melee attack instead of the target clicked.
 2014-12-31 15:01:23 +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
Xhuis
a003cdc347 Lets you put hollowed books in bookcases 2014-12-30 19:18:08 -05:00