cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 06:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,016 Commits 61 Branches 14 Tags
fa8cc5cd12ffee32662ddd413f1f80f4ced7e794
Commit Graph

5974 Commits

Author SHA1 Message Date
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
Razharas
28ac3268d1 Merge pull request #14660 from Menshin/flappyflaps 
Generalized CanAStarPass() to all /obj
 2016-01-17 15:33:39 +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
Incoming
4eaaf49dc2 Shuffles bot scanning 
Because tile scanning uses view() the results were always presented with the southwest corner placed first the list, and since the for loop returns on finding a valid tile this means that a bot will always head southwest if that is a valid option. By shuffling up the turfs in priority we can be fairly sure that different bots working in the same area won't constantly try to fix a problem another bot is already fixing, and that when a bunch of bots are released into an environment with lots of valid tiles they'll usually fan outwards in all directions instead of all heading to the southwest corner to sulk.
 2016-01-13 11:13:05 -05:00
Jordie
84b943f349 Merge pull request #14606 from MrStonedOne/patch-124 
makes pulling stop if the thing clicked can't be pulled
 2016-01-13 19:41:58 +11:00
Bjorn Neergaard
f7d829c811 Support IE8 2016-01-13 00:20:06 -06:00
Nerd Lord
60bf17156a Adds a space between the follow link and ayylien chat. 2016-01-12 21:55:15 -05:00
Nerd Lord
a272b6a7e5 6 additional metals, woo woo 2016-01-12 21:37:19 -05:00
Kyle Spier-Swenson
89c5b288b3 makes pulling stop if the thing clicked can't be pulled 
This is better then making it a toggle, as people spam click or may think that the pull didn't go thru clicking again, and this causes the pull to stop.
 2016-01-12 15:22:47 -08:00
Nerd Lord
fed4212716 Updates guardian HUD button icons. 
Adds two new holoparasite colors, light purple and crimson.
Replaces silver in the possible holoparasite prefix list with platinum.
Updates descriptions for the guardian types traitors have access to.

Adds glow effects when guardians teleport or recall, including fire guardian teleporting and support guardian teleporting.
 2016-01-12 16:39:08 -05:00
Cheridan
61922631cf Revert "Severe bloodloss no longer permanently knocks you out" 2016-01-12 14:19:49 -06:00
Cheridan
235f826889 Merge pull request #14556 from Buggy123/Buggy123-bloodfix 
Severe bloodloss no longer permanently knocks you out
 2016-01-12 14:01:22 -06:00
tkdrg
54d4782975 Merge pull request #14565 from AnturK/mimicfixes 
Staff of Animation Fixes
 2016-01-12 16:19:19 -03:00
AnturK
5e89af5ff7 change mimic CopyObject argument name 2016-01-12 12:40:19 +01:00
Shadowlight213
f922fc94f6 Makes the pinpointer actually track the nuking AI 2016-01-11 17:55:16 -08:00
Shadowlight213
a5a2a105ad Fixes camera light for multiple Ais. 2016-01-11 17:14:45 -08:00
tkdrg
bf278539fb Merge pull request #14574 from ChangelingRain/titaniumrose 
Holoparasites are now named after silvery metals and flowers and have updated sprites
 2016-01-11 00:13:09 -03:00
Nerd Lord
93f412c497 Adds three new holoparasite colors and updates the parasite sprites to have better shading. 
Holoparasite naming is now like Titanium Rose/Gallium Ivy/Bismuth Daisy
 2016-01-10 21:53:36 -05:00
AnturK
e10fb29776 Moves adding self-reference faction to mob/living 
Fixes mimic creator not setting properly
 2016-01-10 14:12:18 +01:00
Buggy123
06ad56dd64 Update constructs.dm 2016-01-10 02:43:02 -05:00
Buggy123
4983e0cb6a better fix 2016-01-10 02:22:05 -05:00
Buggy123
e80786213b Severe blood loss won't permanently knock you out anymore. 2016-01-10 02:12:46 -05:00
Cheridan
6c9fa9eb72 Merge pull request #14389 from phil235/VisibleMessageRefactor 
Refactor the visible_message() proc to be faster in some cases.
 2016-01-09 22:16:57 -06:00
tkdrg
1d7a2c187e Merge pull request #14448 from KorPhaeron/hippies 
Fixes pAIs not being able to use messenger
 2016-01-09 21:22:41 -03:00
tkdrg
d8f168f3da Merge pull request #14529 from AnturK/evenmorefixes 
Misc fixes
 2016-01-09 20:32:02 -03:00
AnturK
bd24560cfb Fixes Hulk punches missing message. 2016-01-09 00:21:32 +01:00
tkdrg
920bbeb2c4 Merge pull request #14480 from AnturK/minor 
Minor Fixes
 2016-01-08 15:13:22 -03:00
phil235
b9c3836f7b Merge pull request #14493 from KorPhaeron/monkey 
Fixes monkeys
 2016-01-08 16:49:15 +01:00
phil235
e5a6113157 Merge pull request #14354 from Arquebusier/eggfix 
Eggfixv2
 2016-01-08 14:31:31 +01:00