cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-22 23:15:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,934 Commits 61 Branches 14 Tags
3467c3f61afc190825bd89b937482b4558270b69
Commit Graph

13122 Commits

Author SHA1 Message Date
Kyle Spier-Swenson
3467c3f61a Some wrapper code. 2016-01-16 07:26:01 -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
e8dd5db665 Merge pull request #14610 from ChangelingRain/gausscannon 
Changes accelerator sniper rounds to have unique projectile sprites
 2016-01-14 00:57:16 -03: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
tkdrg
5c3f5ac9c8 Merge pull request #14609 from ChangelingRain/teslaarmornotrevenantarmor 
Reactive tesla armor uses the proper lightning bolt sprites
 2016-01-14 00:55:34 -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
4f6f6e9973 Changes accelerator sniper rounds to use their own, unique projectile sprites. 2016-01-12 23:16:01 -05:00
Bjorn Neergaard
bb80fd647c Fix state checks 2016-01-12 21:55:37 -06:00
Bjorn Neergaard
07747e4410 Put tgui interactions behind admin toggle 2016-01-12 21:55:36 -06:00
Bjorn Neergaard
c32ce28733 Improve IE8/old IE messages 2016-01-12 21:55:35 -06:00
Bjorn Neergaard
345e4a5d71 Continue to remove Coffeescript for es6 2016-01-12 21:55:34 -06:00
Bjorn Neergaard
743cb09a8f Continue to ES6 everything, drop IE8 support 2016-01-12 21:55:33 -06:00
Nerd Lord
eae13b9e06 Reactive tesla armor uses the tesla lightning bolts instead of revenant lightning 2016-01-12 22:54:50 -05: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
fd2078fea2 Merge pull request #14554 from Buggy123/Buggy123-teslagateway-fix 
The Goofball no longer deletes parts of the gateway
 2016-01-12 16:22:47 -03:00
tkdrg
54d4782975 Merge pull request #14565 from AnturK/mimicfixes 
Staff of Animation Fixes
 2016-01-12 16:19:19 -03:00
tkdrg
85e13a0c16 Merge pull request #14586 from Shadowlight213/Howwasthisnotnoticedforsolong 
Removed unused defined proc in APC code.
 2016-01-12 16:11:58 -03:00
tkdrg
c3f95333f0 Merge pull request #14541 from lzimann/aghostfix 
Fix re-enter corpse message in adminghost
 2016-01-12 16:06:07 -03:00
AnturK
5e89af5ff7 change mimic CopyObject argument name 2016-01-12 12:40:19 +01:00
Cheridan
006d3f51b0 Merge pull request #14578 from neersighted/chem_fix 
Fix reagent division errors
 2016-01-12 02:58:41 -06:00
Leo
92584201f4 Fix indentation 
Because I am stupid.
 2016-01-12 03:21:18 -02:00
Leo
ea69ea0fef Change so it works as intended 
But at least stops triggering the message when you don't have a body
 2016-01-12 03:12:42 -02:00
Leo
cb8080dd60 Changed so you can re-enter corpse with normal ghost verb 2016-01-12 02:43:25 -02: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
Cheridan
be3801dc76 Merge pull request #14515 from GunHog/Sawu_Does_It_Again 
Makes E.X.P.E.R.I-MENTOR interface less annoying + fixes
 2016-01-11 16:09:56 -06:00