cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 20:16:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,434 Commits 61 Branches 14 Tags
022d9e573fd80db94a1507a9db6c052d7c7fe8e0
Commit Graph

14964 Commits

Author SHA1 Message Date
TrustyGun
022d9e573f okay mr.phil man 2016-04-09 10:43:35 -04:00
TrustyGun
0b3779ab11 removes the cap's flask from spawn code and replaces the one in his office with his new one 2016-04-08 20:11:24 -04:00
TrustyGun
927e08d271 Flasks! 2016-04-08 06:26:30 -04:00
KorPhaeron
6d519c4e26 Merge pull request #16673 from PKPenguin321/fuck-you-goofball 
Reverts most of goof's grab nerf
 2016-04-08 02:05:21 -05: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
KorPhaeron
9bf9aa056f Merge pull request #16695 from TechnoAlchemisto/the_steaks_have_never_been_fire 
Goliath meat is now unplated, has its own sprite uncooked.
 2016-04-07 23:03:41 -05:00
KorPhaeron
7809e4dc79 Merge pull request #16692 from Core0verload/cargo-improvements 
New Engineering Crates, Shuttle Loan fix
 2016-04-07 21:28:29 -05:00
Razharas
89d8e8dfca Merge pull request #16679 from Core0verload/LAVALAND-SUCKS 
Asteroid fixes
 2016-04-07 23:52:37 +03:00
Joan Lung
ab129c57c6 Merge pull request #16689 from KorPhaeron/survival_pod 
New Survival Pods
 2016-04-07 16:03:03 -04:00
KorPhaeron
b5b523f7f0 Black Bedsheets 2016-04-07 14:42:26 -05:00
Cheridan
2420e43d1d Merge pull request #16671 from bgobandit/copydocs 
Secret documents can now be copied.
 2016-04-07 13:00:57 -05:00
AnturK
80eb5833e9 Merge pull request #16470 from KorPhaeron/accelerator 
Laser Cannon Changes
 2016-04-07 18:51:18 +02:00
KorPhaeron
166cb54a60 Fixes for survival pod, GPS toggling 2016-04-07 11:49:50 -05:00
TechnoAlchemist
c8bb360fe3 Goliath meat has its own sprite, goliath steaks don't magically generate plates. 2016-04-06 21:15:48 -07:00
c0
8807c26945 Shuttle Loan fix 2016-04-07 03:26:38 +03:00
c0
43798574f6 Engineering Crates 2016-04-07 03:26:18 +03: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
Remie Richards
da4b6df395 Merge branch 'master' of https://github.com/tgstation/-tg-station into alternate_appearances 
Conflicts:
	code/game/atoms.dm
 2016-04-06 21:26:46 +01:00
Kyle Spier-Swenson
91d90c602f fixes trees fucking up atmos. 2016-04-06 12:37:54 -07:00
Cheridan
fe73fc2b58 Merge pull request #16664 from erwgd/PortaseederDesign 
Adds portable seed extractor to protolathe designs
 2016-04-06 13:23:40 -05:00
AnturK
2ecaea5525 Merge pull request #16595 from Core0verload/on_species_gain 
Adds on_species_gain proc to human species
 2016-04-06 20:18:15 +02:00
AnturK
a09b6819c1 Merge pull request #16662 from MrStonedOne/patch-187 
Fixes directional atmos spread blockers (like small windows/windoors)
 2016-04-06 20:13:26 +02:00
KorPhaeron
4d0cc1e0f0 Cannon 2016-04-06 11:37:32 -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
Core0verload
4e9db5beac Slimes can now be put in stasis by CO2 2016-04-06 02:25:49 -06:00
Core0verload
04ce5e42cd World "?status" expansion, Topic() rework 
* World "?status" expansion

* New helper procs for shuttles

* fix

* a fix
 2016-04-06 02:15:25 -06:00
Cheridan
3b3bdcdb75 Merge pull request #16640 from KorPhaeron/snow_biome 
Fixes snow biome alarm bolting doors in every ruin
 2016-04-06 00:21:21 -05:00
Cheridan
3ad85b8171 Merge pull request #16642 from LatD/freegolems 
Makes lavaland golem shell name and description better
 2016-04-06 00:18:45 -05:00
Cheridan
457888ce0b Merge pull request #16628 from erwgd/AutolatheMakeHydroTools 
Adds hydroponics tools and shovels to autolathe_designs.dm
 2016-04-05 19:35:47 -05:00
PKPenguin321
272c7bb896 reverts most of goof's grab nerf 2016-04-05 17:19:10 -07: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
bgobandit
beef151236 whoops 2016-04-05 19:10:00 -04:00
bgobandit
94fe7ef642 Secret documents can now be copied. 2016-04-05 19:00:21 -04:00
Cheridan
b1a20326ec Merge pull request #16616 from bgobandit/clownmegaphone 
Gives the clown a megaphone.
 2016-04-05 15:35:36 -05:00
AnturK
3d9c0e3d66 Merge pull request #16584 from MrStonedOne/patch-183 
Better sleep()s for procs that abuse it
 2016-04-05 21:03:30 +02:00
Joan Lung
43471f70f7 Merge pull request #16627 from erwgd/AutoLatheMakeToolbox 
Add toolbox to autolathe_designs.dm
 2016-04-05 14:13:46 -04:00
MrStonedOne
5098a3c884 Made more sleeps use stoplag 
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
 2016-04-05 11:08:28 -07:00
KorPhaeron
511f65200d Shorter ash storms 
* Shorter ash storms
 2016-04-05 20:05:12 +02:00
duncathan salt
f405096258 Merge pull request #16659 from MrStonedOne/airfixes 
Final stage of fixes for space getting gas.
 2016-04-05 11:52:02 -06:00
Kyle Spier-Swenson
c3ae0ea393 Fixes directional atmos spread blockers (like small windows/windoors) 
byond and `in` are lame, and it processes wrong with tinaries this is better anyways as it avoids a list loop.
 2016-04-05 10:28:12 -07:00
erwgd
66a12a9233 added portable seed extractor to designs.dm 2016-04-05 18:14:47 +01:00
Cheridan
90cb067020 Merge pull request #16621 from duncathan/atmosspawnair 
Makes atmos_spawn_air() use the new gas string parser
 2016-04-05 11:38:12 -05:00
Cheridan
15e66ce517 Merge pull request #16630 from AnturK/gorilla_warfare 
Monkeys can now use all guns without restrictions.
 2016-04-05 11:24:58 -05: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
KorPhaeron
f0bb212355 Merge pull request #16658 from ChangelingRain/hahawhoops 
Fixes support holo beacon teleportation not working under most conditions
 2016-04-05 11:09:11 -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
MrStonedOne
fd70645f43 Final stage of fixes for space getting gas. 
There might be some other edge cases, but this should get most of them now.
 2016-04-05 08:27:04 -07:00