cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-12 18:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,164 Commits 61 Branches 14 Tags
dbd01d8a43e0967ffd7bb17cd910238df8753fb9
Commit Graph

31164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bgobandit
dbd01d8a43 fixed 2016-03-07 12:28:35 -05:00
bgobandit
ed67d189a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into catfixes 
Conflicts:
	icons/mob/pets.dmi
 2016-03-07 07:13:30 -05:00
bgobandit
128cf1e19d test 2016-03-07 07:07:34 -05:00
bgobandit
92d762c8f4 test 2016-03-07 06:54:26 -05:00
sybil-tgstation13
b96daed0f0 Automatic changelog compile 2016-03-07 04:51:58 +00:00
tgstation-server
3743364c45 Automatic changelog generation for PR #15919 2016-03-07 00:58:45 +00:00
Joan Lung
9818f97857 Merge pull request #15919 from WJohn/xeno_sprites 
New xeno queen and praetorian sprites.
 2016-03-06 19:58:43 -05:00
Remie Richards
c71de63ed5 Merge pull request #15934 from ChangelingRain/nautglow 
Blobbernaut damage glow is more visible
 2016-03-06 23:10:51 +00:00
Nerd Lord
9fc8fa3691 use correct flag 2016-03-06 17:59:50 -05:00
Cheridan
c6e664a8bd Merge pull request #15936 from xxalpha/python_mapmerge 
[Mapmerge] Fixed bug that caused duplicate entries. Reduced line changes.
 2016-03-06 13:46:07 -06:00
Cheridan
f68584078c Merge pull request #15916 from Menshin/gc_destroyed2qdeleted 
Replaced last occurences of gc_destroyed by qdeleted()
 2016-03-06 12:29:30 -06:00
Joan Lung
818ec0ce96 Merge pull request #15827 from GunHog/Hardsuit_Jetpack_Upgrade_4_Miners 
Hardsuit Jetpack Upgrade
 2016-03-06 12:52:21 -05:00
Cheridan
51817ef700 Merge pull request #15930 from tkdrg/runtimes 
Fixes camera runtime
 2016-03-06 11:16:23 -06:00
Cheridan
531940cc25 Merge pull request #15932 from Impisi/Maintloot2 
Fixes MaintLoot Drop Table
 2016-03-06 11:15:43 -06:00
sybil-tgstation13
d0652b3b9b Automatic changelog compile 2016-03-05 19:30:31 +00:00
Cheridan
c8fe24e8f4 Merge pull request #15912 from TrustyGun/idontlikeem 
Changes the cockroach sprite for the better
 2016-03-05 13:07:43 -06:00
xxalpha
fa9dba4e67 Fixed bug that caused duplicate entries. Reduced line changes. 
clean
 2016-03-05 18:50:40 +00:00
Nerd Lord
218d456e5a naut 'damage' glow is more visible on all blob types 2016-03-05 10:59:53 -05:00
Razharas
a1d67b58c4 Merge pull request #15911 from sawu-tg/snpcupdate 
SNPC Update v4: ;HELP I'M BEING BEATEN TO DEATH BY GIBBERING ROBOTS
 2016-03-05 16:39:29 +03:00
Impisi
2bb60c13a3 Fixes loottable 2016-03-05 05:31:02 -08:00
Impisi
9eda2e0932 Reduces empty lootdrop slots to rebalance the table according the the original creators instructions. 2016-03-05 05:22:07 -08:00
Tkdrg
9633cae728 Fixes camera runtime 2016-03-05 08:51:48 -03:00
tgstation-server
47e3ab6fa9 Automatic changelog generation for PR #15888 2016-03-05 11:12:30 +00:00
tkdrg
442c769eeb Merge pull request #15888 from ChangelingRain/robustin-can-never-be-satisfied 
Robustin-Sponsored Blobbernaut Nerf PR
 2016-03-05 08:12:29 -03:00
Sawu
430bca51d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into snpcupdate 
Conflicts:
	code/modules/mob/interactive.dm
 2016-03-05 22:09:16 +11:00
sybil-tgstation13
a8fb6bf088 Automatic changelog compile 2016-03-05 09:19:19 +00:00
Cheridan
5658a4d14b Merge pull request #15904 from KorPhaeron/lmao2cat 
Nerfs catsplosion
 2016-03-04 20:55:01 -06:00
WJohn
c1a1e36660 New xeno queen and praetorian sprites, as well as their inhands. 2016-03-04 20:52:07 -05:00
tkdrg
96d8652ec4 Merge pull request #15885 from phil235/ReagentMobUpdateFix2 
Health update from reagent metabolization now only happens once. Part 2
 2016-03-04 22:18:39 -03:00
tkdrg
2389fd0b01 Merge pull request #15899 from phil235/ResistandGrabFixes 
Fixes being able to resist while dead.
 2016-03-04 22:14:35 -03:00
Menshin
9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
tkdrg
4b683584c8 Merge pull request #15900 from kyrahabattoir/ministation-recreation-area 
[MAP][MiniStation] Replaced the useless visitor console by the full library console
 2016-03-04 21:36:09 -03:00
tkdrg
8972a07f62 Merge pull request #15898 from KorPhaeron/rpd2 
Adds RPD to Chief Engineer's locker
 2016-03-04 21:35:30 -03:00
tkdrg
e0b4569165 Merge pull request #15895 from TehZombehz/firstfashion 
Adds green version of the plaid skirt.
 2016-03-04 21:34:42 -03:00
tkdrg
829926d71d Merge pull request #15891 from Ultimate-Chimera/XenoStuff 
Fixes xenomorph hiss emote sounds because I am stupid.
 2016-03-04 21:34:10 -03:00
tkdrg
3585fd3e9c Merge pull request #15889 from phil235/BolaNogravThrowFix 
Fixes throwing bola and embeddable items in no gravity
 2016-03-04 21:33:56 -03:00
tkdrg
1da99d9be8 Merge pull request #15906 from Buggy123/beachfix 
Fixes the beach away mission.
 2016-03-04 21:33:08 -03:00
Cheridan
a7eb9f657e Merge pull request #15905 from KorPhaeron/chaplain 
Holy Weapon typo fix
 2016-03-04 18:08:58 -06:00
tgstation-server
d308801864 Automatic changelog generation for PR #15847 2016-03-04 23:56:50 +00:00
tkdrg
fd74fafb63 Merge pull request #15847 from Core0verload/cyborg_tools 
New, faster tools for engineering cyborgs
 2016-03-04 20:56:48 -03:00
tkdrg
e1c2f70ca3 Merge pull request #15812 from Shadowlight213/secborgremoval 
Adds a config option to disable the security cyborg module.
 2016-03-04 20:54:57 -03:00
tgstation-server
1b8393a877 Automatic changelog generation for PR #15901 2016-03-04 22:08:23 +00:00
Cheridan
519a517206 Merge pull request #15901 from ChangelingRain/chemfixes 
Fixes and tweaks blob chemicals
 2016-03-04 16:08:21 -06:00
Nerd Lord
d63dbdcb96 I guess they can be fast if it's 1 per 2016-03-04 17:07:31 -05:00
TrustyGun
8102d9b142 Alters the sprite a little bit 2016-03-04 16:57:41 -05:00
Shadowlight213
ebcbbec8e2 Reverses the config var so it forbids instead of allows 2016-03-04 10:49:00 -08:00
Joan Lung
6a79d12862 Merge pull request #15884 from RemieRichards/XenoBreathNoises 
Aliens now make breathing noises
 2016-03-04 12:22:45 -05:00
phil235
44eb9607e0 Some adjustments to wrapping code. I removed my possibility to wrap non-box storage item (that was at the expense of seeing a warning message that the packagewrap doesn't fit in the storage item every time you wrap one). So we're back to only wrapping boxes. 
You can now wrap an item that is in your hand, and wrapping an item puts the created package in you hand.
Also, opening a package puts the item in your hand instead of being dropped on the ground.
 2016-03-04 17:24:36 +01:00
TrustyGun
b9d269c677 Increases animation speed a little 2016-03-04 09:25:24 -05:00
TrustyGun
81e8ecab2d Changed cockroach sprite to be better 2016-03-04 09:01:16 -05:00