cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,038 Commits 61 Branches 14 Tags
b38fbf640147d83f3edcb97865be1a5f03dad34d
Commit Graph

13148 Commits

Author SHA1 Message Date
Razharas
b38fbf6401 Merge branch 'master' of https://github.com/tgstation/-tg-station into LootFix 2016-01-18 12:32:50 +03:00
Razharas
f7ae437e74 Delete the crate instead of doing nothing 
Delete the crate instead of doing nothing
 2016-01-18 12:32:31 +03:00
tkdrg
ace569e951 Merge pull request #14678 from Buggy123/patch-9 
Fixes energy ball Destroy()
 2016-01-17 22:05:03 -03:00
tkdrg
0ba3fdc3f2 Merge pull request #14675 from Razharas/BloodFix 
Makes some species disease immune
 2016-01-17 18:45:45 -03:00
Razharas
f727857c19 Fixes loot crates and animal attacks 
Fixes loot crates and animal attacks
Fixes https://github.com/tgstation/-tg-station/issues/10412
 2016-01-17 19:32:42 +03:00
duncathan salt
24784b8283 Merge pull request #14666 from Razharas/SMESfix 
Makes SMES drain cells on deconstruction
 2016-01-17 10:07:16 -06: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
Razharas
a2ecfc0fc4 Merge pull request #14405 from Kole6738/patch-4 
Prevent flipping a coin if wired
 2016-01-17 15:46:08 +03:00
Razharas
28ac3268d1 Merge pull request #14660 from Menshin/flappyflaps 
Generalized CanAStarPass() to all /obj
 2016-01-17 15:33:39 +03:00
Razharas
4a9ef86808 Merge pull request #14653 from ChangelingRain/malfhack 
Fixes a bug where malf hacked apcs couldn't be fixed with an apc frame
 2016-01-17 15:30:25 +03:00
Razharas
885456db1d Merge pull request #14648 from Buggy123/patch-6 
Broken bottles are now the same size as unbroken bottles.
 2016-01-17 12:35:55 +03:00
Razharas
f982fa5327 Merge pull request #14655 from MrStonedOne/patch-126 
HOLY FUCKING SHIT, WHAT THE FUCK IS THAT.
 2016-01-17 12:34:20 +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
Buggy123
52879ba052 Fixes energy ball Destroy() 2016-01-16 19:00:39 -05: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
Bjorn Neergaard
b95a58c8fb Repath canisters; make label code create a new can; use es6 function shorthand 
By making a new canister when relabeled, we can make the name/desc identical to a
mapped canister, and remove hacky snowflake code
 2016-01-16 12:13:51 -06:00
Bjorn Neergaard
f26f6189c7 Inline style/theme once again; fix titlebar color 2016-01-16 12:13:39 -06:00
Razharas
36f0daa071 Makes SMES drain cells on deconstruction 
Makes SMES drain cells on deconstruction
Fixes https://github.com/tgstation/-tg-station/issues/6451
 2016-01-16 19:38:35 +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
Nerd Lord
3f2bcdb25b Fixes an old as fuck bug where the malfhack var wasn't set on APCs hacked by malf AIs. 2016-01-15 23:55:51 -05:00
Buggy123
157af1d006 Broken bottles are now the same size as unbroken bottles. 2016-01-15 22:14:18 -05: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