cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 01:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,143 Commits 61 Branches 14 Tags
9fc02e0c9a5cc98c1d39ce30ffcd3c00a2d2659f
Commit Graph

6000 Commits

Author SHA1 Message Date
Menshin
f5b619147a Fixes lag on new player login. 2016-01-20 19:50:46 +01:00
duncathan salt
7ea17e7925 Merge pull request #14743 from neersighted/mo_tguis 
tgui: fix-22
 2016-01-19 23:40:04 -06:00
xxalpha
346c698162 conflict fix 
FORWARD SLASH
 2016-01-19 23:06:23 +00:00
Bjorn Neergaard
1c34479376 Fix uplink code once and for all 
Fixes #14733
 2016-01-19 16:42:57 -06:00
xxalpha
aff9db930d Merge remote-tracking branch 'upstream/master' into emaggedbots 2016-01-19 14:38:26 +00:00
duncathan salt
410885e609 Merge pull request #14709 from xxalpha/thiswasalreadyfixed 
jump to area uses safepick
 2016-01-19 07:26:33 -06:00
duncathan salt
f9e35f1695 Merge pull request #14706 from xxalpha/straightouttajacket 
Fixes the straightjacket
 2016-01-19 07:24:51 -06:00
Razharas
6143894aae Merge pull request #14704 from AnturK/jetpacksareforlosers 
Fixes simple syndicates space move
 2016-01-19 03:48:31 +03:00
Razharas
9e1923cc52 Merge pull request #14694 from xxalpha/zhe 
Fixes covering clothing not hiding gender on examine()
 2016-01-19 03:46:35 +03:00
Razharas
3020846f97 Merge pull request #14692 from AnturK/rollforfixes 
Random Fixes
 2016-01-19 03:45:43 +03:00
duncathan salt
118af31dc3 Merge pull request #14699 from Razharas/GibFix 
Fixes ling armour being ungibbable
 2016-01-18 18:31:14 -06:00
Bjorn Neergaard
09aff20b6f Hotfix for MULEs 2016-01-18 16:26:18 -06:00
Bjorn Neergaard
1c64360882 tgui atmos control computers 2016-01-18 14:21:57 -06:00
Bjorn Neergaard
0a7236d955 Allow relabeling any canister; port MULEbot to tgui 2016-01-18 14:21:56 -06:00
xxalpha
9a9aaabb8d Removed bot/Emag() proc. Silicons can't interface with human emagged bots. 2016-01-18 19:12:19 +00:00
xxalpha
577488e0d8 safepick 
more safepick
 2016-01-18 05:46:44 +00:00
xxalpha
53b74da4bd Fixes the straightjacket 
More straightfixes
 2016-01-17 22:12:34 +00:00
AnturK
a39de9eb6d Fixes simple syndicates space move 2016-01-17 22:47:42 +01:00
tkdrg
0ba3fdc3f2 Merge pull request #14675 from Razharas/BloodFix 
Makes some species disease immune
 2016-01-17 18:45:45 -03:00
Razharas
21d62df0c6 Fixes ling armour being ungibbable 
Fixes ling armour being ungibbable
Fixes https://github.com/tgstation/-tg-station/issues/11388
 2016-01-17 20:37:04 +03:00
xxalpha
0189be9519 Fixed covering clothing not hiding gender on examine(). 2016-01-17 15:57:46 +00:00
tkdrg
6fab2e82d8 Merge pull request #14662 from MrStonedOne/patch-127 
Fixes control click to unpull not working with turfs.
 2016-01-17 11:57:55 -03:00
AnturK
b31c6f1e15 Adds friendly fire check for some ranged hostile mobs 2016-01-17 15:54:24 +01:00
AnturK
038a947c9c Fixes MMI custom emotes 2016-01-17 15:49:01 +01:00
Razharas
28ac3268d1 Merge pull request #14660 from Menshin/flappyflaps 
Generalized CanAStarPass() to all /obj
 2016-01-17 15:33:39 +03:00
Razharas
61fadf75ad Makes species with funky blood virusimmune 
Makes species with funky blood virusimmune
 2016-01-17 12:28:16 +03:00
Razharas
c9c13e4f33 Revert "Makes some species disease immune" 
This reverts commit b2049f008a.
 2016-01-17 12:24:03 +03:00
Razharas
b2049f008a Makes some species disease immune 
Makes some species disease immune
Fixes https://github.com/tgstation/-tg-station/issues/7775
 2016-01-17 00:45:41 +03:00
Kyle Spier-Swenson
3467c3f61a Some wrapper code. 2016-01-16 07:26:01 -08:00
Menshin
828c1ddf2c * Generalized AStar check for objects preventing passability 
* Fixed AStar not detecting plastic flaps as impassable for mobs that can't pass them (fixes #14616)
 2016-01-16 15:27:31 +01:00
Kyle Spier-Swenson
1cdc33cdef HOLY FUCKING SHIT, WHAT THE FUCK IS THAT. 2016-01-15 21:47:36 -08:00
Razharas
2df84aa0b8 Merge pull request #14624 from ChangelingRain/3ammaniaproject 
Adds a number of new speechbubble icons.
 2016-01-15 20:36:51 +03:00
Razharas
4aea0db29b Merge pull request #14120 from duncathan/listmos 
[READY] Listmos & "Datum Gases"
 2016-01-15 11:58:05 +03:00
tkdrg
fbeb5cf5c4 Merge pull request #14559 from Buggy123/patch-2 
Non-cultist artificers now poop out non-cultist soulstones
 2016-01-14 20:04:11 -03:00
tkdrg
58f6c9ad31 Merge pull request #14615 from Incoming5643/stopgoingsouthwestibegofyou 
Shuffles bot scanning
 2016-01-14 19:45:34 -03:00
Tkdrg
e597110e38 Merge branch 'Buggy123-patch-5' into HEAD 
Closes #14605
 2016-01-14 19:36:19 -03:00
Buggy123
033aa5d7b0 Update construct_spells.dm 
Update soulstone.dm

Update constructs.dm

Update construct_spells.dm

Plz compile

Plz

Compile

Update construct_spells.dm

Update soulstone.dm

Update soulstone.dm

Sarawak

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update soulstone.dm

Update constructs.dm

Update constructs.dm

YES! YES! YES!

Update soulstone.dm
 2016-01-14 17:32:49 -05:00
Buggy123
abd7b8ead5 Moderate blood loss now does tapering damage. 2016-01-14 19:29:30 -03:00
tkdrg
79ece99a92 Merge pull request #14592 from Shadowlight213/Perfectpointer 
[s]Makes the pinpointer actually track the nuking AI.
 2016-01-14 18:22:47 -03:00
tkdrg
214c7a942b Merge pull request #14590 from Shadowlight213/Cameralightfix 
Fixes camera lights for multiple Ais.
 2016-01-14 18:22:19 -03:00
Nerd Lord
9bfcb1d678 Adds swarmer and slime bubbles. 
Also removes a duplicate line~
 2016-01-14 15:50:12 -05:00
Nerd Lord
901325d8ae The speechbubble a mob uses is now a var instead of an argument on say() 2016-01-14 12:28:49 -05:00
tkdrg
99cc12b4e4 Merge pull request #14607 from ChangelingRain/ayyyspaces 
Adds a space between the follow link and abductor chat.
 2016-01-14 00:56:23 -03:00
Jordie
41454f9391 Merge pull request #14604 from ChangelingRain/aluminiumlilac 
Updates guardian HUD button icons and adds guardian teleport effects
 2016-01-14 14:55:19 +11:00
duncathan
31d9757e98 the game compiles I swear 2016-01-13 20:41:57 -06:00
duncathan
9066bc7c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract
 2016-01-13 20:07:21 -06:00
Shadowlight213
f056cb5ae6 Made malf pinpointer tracking use curated list instead of world. Also used ai_list instead of player list 2016-01-13 15:07:32 -08:00
Nerd Lord
81efcbbac0 Generalize! 2016-01-13 16:56:02 -05:00
Nerd Lord
33ece2fd29 Less obvious, obvious things after freeze. 2016-01-13 16:44:13 -05:00
Nerd Lord
a99b39f18b More glows. 
Some typo fixes, adds feedback to light toggling.
 2016-01-13 15:42:08 -05:00