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

14989 Commits

Author SHA1 Message Date
AnturK
fee254926e Merge pull request #16680 from Core0verload/nomoremagic 
Wizard events will no longer fire unless actually summoned by a wizard
 2016-04-09 15:57:30 +02:00
AnturK
86eee6605d Merge pull request #16478 from GunHog/WJ_Likes_To_Inspect_His_Xenos 
Xenomorph changes and features
 2016-04-09 12:23:20 +02:00
KorPhaeron
d06a1ea62e New Mining Loot (#16718) 
New Mining Loot
 2016-04-09 05:21:06 +01:00
Cheridan
5b526b1cb6 Merge pull request #16517 from bgobandit/fluffstocks 
Localizes stock text.
 2016-04-08 22:57:46 -05:00
Remie Richards
637f451b9a Merge pull request #16708 from Bawhoppen/pinremovaltweak 
Pin removal recipe change
 2016-04-09 03:35:09 +01:00
bawhoppen
5c513649dd changes welding tool requirement 2016-04-08 21:12:18 -05:00
GunHog
d67feceb07 Forgot to close the span 2016-04-08 18:26:58 -05:00
GunHog
8ed74088c1 Dropper change 
- Droppers once again work on all mobs, but now do not work on aliens.
1000% more snowflake yet less anger inducing!
 2016-04-08 18:25:23 -05:00
KorPhaeron
82786783f4 Merge pull request #16716 from coiax/plant-genes 
Added a "plant DNA manipulator" to Botany backroom
 2016-04-08 16:34:34 -05:00
Jack Edge
0465ea35f8 Fixed inaccurate description of design item 2016-04-08 22:25:05 +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
Cheridan
108eefb86c Merge pull request #16705 from Shadowlight213/adminghostruntime 
Fixes a runtime with IsAdminGhost
 2016-04-08 12:39:01 -05:00
Nerd Lord
5f955ad012 50% increase 2016-04-08 10:51:51 -04:00
Jack Edge
d3d4b43e6a Added plant data disks to Protolathe 
Print out some botany data disks if they ask nicely.
 2016-04-08 10:34:21 +01:00
Jack Edge
452577a9dd Added plant DNA circuit board to imprinter designs 
As above.
 2016-04-08 10:22:46 +01: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
Nerd Lord
8caca4a78e mining mobs fire less often 2016-04-07 20:46:41 -04: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
GunHog
6725a2e682 Membrane change, dropper nerf 
- Droppers now only work on human mobs
- Resin membranes now block lasers.
 2016-04-07 18:04:12 -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
Lularian
04fa742e0c pin removal 2016-04-07 09:07:02 -05:00
Shadowlight213
9e296ed32e Fixes a runtime with IsAdminGhost 2016-04-07 00:05:29 -07: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
GunHog
afbe7c0dcc Merge remote-tracking branch 'remotes/upstream/master' into WJ_Likes_To_Inspect_His_Xenos 
# Conflicts:
#	code/game/objects/effects/aliens.dm
 2016-04-06 14:10:07 -05: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
c35fe4ea66 Wizard events will no longer fire unless actually summoned by a wizard 2016-04-06 12:03:44 +03: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