cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 04:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,269 Commits 60 Branches 14 Tags
17fe36ebda4ef2ed2879aaedaefdba03e7243e0a
Commit Graph

457 Commits

Author SHA1 Message Date
Bjorn Neergaard
b2629a56e2 Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes 2016-01-22 19:25:33 -06:00
Bjorn Neergaard
87b0857b93 Refactor wire datums 
Finish wire port and refactor wire datums to use string keys; widen color
range to support more wires and more colors.
 2016-01-22 19:22:09 -06:00
Nerd Lord
dc6ecbe8f3 missed one 2016-01-20 15:51:33 -05: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
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
Razharas
a2ecfc0fc4 Merge pull request #14405 from Kole6738/patch-4 
Prevent flipping a coin if wired
 2016-01-17 15:46:08 +03: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
tkdrg
d8f168f3da Merge pull request #14529 from AnturK/evenmorefixes 
Misc fixes
 2016-01-09 20:32:02 -03:00
tkdrg
24b7eaa23a Merge pull request #14488 from KorPhaeron/wall_layer 
Walls are a slightly higher layer than floors
 2016-01-09 18:41:59 -03:00
KorPhaeron
1d9b334e50 Fixes layers 2016-01-09 15:32:35 -06:00
AnturK
23efe5f675 Adds a variable to block shuttles from changing destinations midflight for mining shuttle 2016-01-09 17:44:16 +01:00
Tkdrg
b6d0cee2f7 Merge branch 'KorPhaeron-lava_rivers' into HEAD 
Closes #13511
 2016-01-09 12:07:34 -03:00
KorPhaeron
b96bec5157 River Generation Module 
This is going to be used for lava rivers in lavaland.
 2016-01-09 12:06:55 -03:00
duncathan salt
227b3149b2 Merge pull request #14441 from SouDescolado/master 
Fixes abandoned crates minigame / Also fixes tuberculosis kit
 2016-01-08 07:16:22 -06:00
KorPhaeron
224c5d1029 Use defines 2016-01-07 13:10:12 -06:00
KorPhaeron
c93fcdb5dc Wall layer 2016-01-07 13:02:36 -06:00
Cheridan
d16fe1c490 Merge pull request #14419 from KorPhaeron/chasm_fix 
Chasm Fix
 2016-01-06 13:30:17 -06:00
SouDescolado
4a7cb6a066 Fixes abandoned crates minigame 
Replaces the user input 0 with "z"(Code side only. Player can still use
0). Wont return 0 as "cows" anymore.

Remove useless variable
 2016-01-06 10:43:54 -02:00
Kole6738
d20194a546 removes else 2016-01-05 18:28:31 -08:00
Kole6738
f88595d073 Thanks 2016-01-05 15:25:21 -08:00
KorPhaeron
936973a68d Chasm Fix 2016-01-05 13:54:12 -06:00
Kole6738
292837a248 Prevent flipping a coin if wired 
Fixes graphical bug #14343 with extreme overkill. If the coin has an attached wire, it won't flip. Someone else might want to instead fix the animation so that the wire moves with the coin.
 2016-01-04 18:36:32 -08:00
Nerd Lord
4815a0f37c Simple animals no longer convert other damage types to brute using the brute damage proc, allowing you to make mobs immune to brute but not all damage types. 
No, no, do it properly not half-ass it
 2016-01-04 15:29:23 -05:00
duncathan salt
c510fb69c2 Merge pull request #14337 from AnturK/miningbot 
Fixes mining bot being hard to repair.
 2016-01-04 20:23:23 +01:00
MrStonedOne
5d86ed49f6 Merge conflic fix 2016-01-03 14:51:14 -08:00
AnturK
41f7d95aa4 Fixes mining bot being hard to repair. 
Stops bruisepacks working on mining bot
 2016-01-03 13:18:02 +01:00
Aranclanos
29977a2d16 Merge pull request #14243 from KorPhaeron/darkness 
Fixes floor is lava and advanced darkness
 2016-01-03 02:54:21 -03:00
KorPhaeron
28a0c48403 Moves spawn to weather 2016-01-02 23:21:46 -06:00
MrStonedOne
b50e8d2a63 removes a bunch of unneeded spawns 
spawns have a high overhead.

I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
 2016-01-02 18:23:02 -08:00
duncathan
b18c6c2c5c Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos 
Conflicts:
	nano/assets/nanoui.js
	nano/bower.json
	nano/templates/atmos_filter.dot
 2016-01-02 18:02:54 -06:00
KorPhaeron
dde4690cb4 Fixes floor is lava and advanced darkness 2016-01-01 05:43:17 -06:00
tkdrg
e5941a59a2 Merge pull request #14124 from KorPhaeron/darkness 
Advanced Darkness (wizard event)
 2016-01-01 00:51:55 -03:00
KorPhaeron
b9bf6ef547 Advanced Darkness 2015-12-31 19:32:02 -06:00
KorPhaeron
ff5767d785 Nevermind 2015-12-30 20:12:40 -06:00
KorPhaeron
9499d35c6b Diety name 2015-12-30 19:39:35 -06:00
KorPhaeron
79e5f3d37e Check that actually works 2015-12-30 19:10:49 -06:00
KorPhaeron
e0157185fc Blacklist 2015-12-30 10:10:54 -06:00
KorPhaeron
9148b9ccd2 Bluespace shelter 2015-12-29 13:08:29 -06:00
KorPhaeron
9cf6a315b7 Advanced Darkness 2015-12-28 15:25:42 -06:00
duncathan salt
b943109a02 Merge pull request #13905 from KorPhaeron/weather 
Weather datums [WIP]
 2015-12-28 22:06:31 +01:00
duncathan
b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
KorPhaeron
15d4ad156c Final (I hope) weather tweaks 2015-12-24 23:03:32 -06:00
KorPhaeron
4d7d3654bc False alarm fix 2015-12-24 05:05:13 -06:00
KorPhaeron
6716fc9282 Entirely area based 2015-12-24 03:50:27 -06:00
KorPhaeron
1b7892a37e Lavaland Turfs 2015-12-23 06:33:22 -06:00
KorPhaeron
07bdfef551 Opacity Fix 2015-12-23 05:02:48 -06:00
KorPhaeron
404666546b More weather updates 2015-12-23 04:45:09 -06:00
KorPhaeron
ef30f9e64d Less copypaste 2015-12-22 10:29:27 -06:00
KorPhaeron
772451816d Code clean up 2015-12-22 10:18:06 -06:00
KorPhaeron
70060cb6c1 Weather datums 2015-12-22 05:31:46 -06:00