cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-09 00:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,960 Commits 60 Branches 14 Tags
303bdec6f55bd00a9b4d1aa9570f493bfe740368
Commit Graph

605 Commits

Author SHA1 Message Date
Cheridan
6b144046de Merge pull request #16992 from ChangelingRain/reeland 
Fixes occasional asteroid turfs on lavaland
 2016-04-20 21:42:50 -05:00
Jack Edge
4446fd85f9 Flying mobs ignore chasms 2016-04-20 08:31:43 +01:00
Cheridan
044a3a1baa Merge pull request #16963 from KorPhaeron/capsule2 
Only anchored dense objects block the shelter capsule
 2016-04-20 00:42:43 -05:00
Joan Lung
5abc7f484a Merge pull request #16830 from KorPhaeron/BOATS 
Adds lava boats
 2016-04-19 20:48:25 -04:00
KorPhaeron
bd3c2647aa Added item state for oar 2016-04-19 19:34:45 -05:00
KorPhaeron
684a355f51 Boat Sprites 2016-04-19 19:31:02 -05:00
Nerd Lord
341ebb7a4d Fixes occasional asteroid turfs on lavaland 2016-04-19 14:48:46 -04:00
KorPhaeron
ff7ef14b87 Capsule 2016-04-18 14:47:48 -05:00
c0
4419774792 Fixes endless division by zero runtimes 2016-04-16 11:18:44 +03:00
Cheridan
64ddf0c924 Merge pull request #16852 from ChangelingRain/thisisdumbblamecoreoverload 
Some spots on lavaland no longer produce asteroid flooring
 2016-04-14 11:52:50 -05:00
Joan Lung
7db9aa0e76 Merge pull request #16848 from KorPhaeron/butcher 
Lavaland Buterching and Suit Fixes
 2016-04-14 09:32:50 -04:00
Nerd Lord
3be807d95c Some spots on lavaland no longer produce asteroid flooring. 2016-04-13 06:55:22 -04:00
KorPhaeron
a372d7028d Butchering and Suit Fixes 2016-04-13 00:03:51 -05:00
c0
04f1aafa78 Exports 2016-04-13 06:01:40 +03:00
KorPhaeron
1b904fdfc4 Adds boats 2016-04-12 14:07:44 -05:00
KorPhaeron
51eee26d54 Merge pull request #16795 from octareenroon91/juggling-for-golems 
Pickaxe portability
 2016-04-11 20:07:24 -05:00
RandomMarine
0c48762aee Removed comment. 2016-04-10 21:31:54 -07:00
octareenroon91
5b6680d905 Pickaxes - but not drills - can now be equipped to the back. I copied the sprite for spears for visibility when worn on the back. 2016-04-10 19:30:29 -05:00
RandomMarine
9a6b11e785 Merge branch 'master' of https://github.com/tgstation/-tg-station into golemship 
# Conflicts:
#	config/admins.txt
 2016-04-10 17:13:19 -07:00
RandomMarine
af01ed7e00 Golem ship tweaks and additions 2016-04-09 21:19:38 -07:00
Cheridan
4f108b6913 Merge pull request #16745 from coiax/muh-ore-box 
Ore box changes
 2016-04-09 15:43:02 -05:00
Jack Edge
71ffa79379 Changed WOOD variable to wo 2016-04-09 20:34:39 +01:00
Jack Edge
8c4d4df68d Ore box deconstruction with a crowbar 2016-04-09 20:20:32 +01:00
KorPhaeron
d06a1ea62e New Mining Loot (#16718) 
New Mining Loot
 2016-04-09 05:21:06 +01:00
Jack Edge
a066e1f3b4 Changed "the" to "/the" 
I don't know why I did this, I was told to.
 2016-04-08 21:49:42 +01:00
KorPhaeron
05e72de3f1 Merge pull request #16727 from ChangelingRain/mineate 
You can no longer drop survival capsules on top of dense objects
 2016-04-08 13:36:29 -05:00
Nerd Lord
5f955ad012 50% increase 2016-04-08 10:51:51 -04:00
Jack Edge
2250fa6929 Cyborgs can use ore boxes when adjacent 
Also, you can't empty an ore box unless you're next to it.
It's possible that was innately enforced before I did some changes,
with the super call in Topic(), so I checked explicitly.

Oh, also ore boxes now drop their ore when destroyed.
 2016-04-08 15:26:22 +01:00
Jack Edge
64e03b60fc Removed automatic inventory close when ore dumping 
Not really sure why this is here, surely you want to see the now empty
bag if you've got it open?
 2016-04-08 14:52:37 +01:00
Jack Edge
f2700e05a1 Fixed "emptying satchel" messages for ore boxes 
Regardless of what container you were emptying into the ore box,
it would always call it a satchel. This has been fixed.
 2016-04-08 14:19:25 +01:00
KorPhaeron
3478183cd8 Merge pull request #16624 from TechnoAlchemisto/Better_pickaxes 
Makes pickaxe upgrades less horrible and irrelevant.
 2016-04-08 01:29:34 -05:00
Nerd Lord
ae22f792c2 fuck this in particular 2016-04-07 20:30:33 -04:00
Nerd Lord
46f0dd8734 you can no longer drop survival capsules on top of dense objects, like windows 2016-04-07 19:13:20 -04:00
Razharas
89d8e8dfca Merge pull request #16679 from Core0verload/LAVALAND-SUCKS 
Asteroid fixes
 2016-04-07 23:52:37 +03:00
KorPhaeron
b5b523f7f0 Black Bedsheets 2016-04-07 14:42:26 -05:00
KorPhaeron
166cb54a60 Fixes for survival pod, GPS toggling 2016-04-07 11:49:50 -05:00
KorPhaeron
2c091aee80 Various Mining Pod Fixes 2016-04-06 17:25:18 -05:00
KorPhaeron
f743754ec3 Survival Pod 2016-04-06 15:36:53 -05:00
KorPhaeron
5e416d2188 Merge pull request #16661 from ChangelingRain/fixkorsshit2k16 
Fixes minerals showing up weird with mining scanners
 2016-04-06 10:57:31 -05:00
c0
feb6c6bdf3 Asteroid fixes 2016-04-06 11:39:45 +03:00
KorPhaeron
55ca4d89ca Merge pull request #16641 from ChangelingRain/coolitoff 
Simple Animal ranged cooldowns now use world.time
 2016-04-05 18:45:48 -05:00
KorPhaeron
511f65200d Shorter ash storms 
* Shorter ash storms
 2016-04-05 20:05:12 +02:00
KorPhaeron
91255b25e2 Merge pull request #16623 from TechnoAlchemisto/explore_this_fam_unzips_pickaxe 
Lets pickaxes be held in explorer suits.
 2016-04-05 11:11:51 -05:00
Nerd Lord
0741e4876b Fixes minerals showing up weird with mining scanners 2016-04-05 12:03:13 -04:00
Cheridan
663cabf337 Merge pull request #16625 from KorPhaeron/building 
Fixes blueprints not working on lavaland
 2016-04-05 10:38:24 -05:00
Nerd Lord
8038c4dd33 Simple Animal ranged cooldowns now use world.time 
this might fuck stuff up but ~oh well~
 2016-04-04 19:59:59 -04:00
TechnoAlchemist
d4f6c01b1c Line Spacing 2016-04-04 16:35:25 -07:00
Nerd Lord
d5a9fc1319 IT IS DONE 2016-04-04 10:31:13 -04:00
KorPhaeron
0e52777d19 Fixes blueprints on lavaland 2016-04-04 04:14:36 -05:00
TechnoAlchemist
fd361c1862 Makes pickaxe upgrades less horrible and irrelevant. 2016-04-04 01:52:20 -07:00