cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 18:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,449 Commits 61 Branches 14 Tags
4bbdeaa9fa91fa2a2c6fde4f6f6eb349cd6703ab
Commit Graph

26663 Commits

Author SHA1 Message Date
Cheridan
4bbdeaa9fa Merge branch 'master' of https://github.com/tgstation/-tg-station into scavengers 2016-04-29 17:06:53 -05:00
KorPhaeron
7c1c35e6d8 Merge pull request #17250 from tgstation/duncathan-patch-1 
this should deal with those pesky atmos runtimes
 2016-04-29 15:38:25 -05:00
KorPhaeron
323d340a9e Merge pull request #17216 from phil235/FixAlienStructureProjDodge 
Fix bundle: alien structure and forcedodge projectile
 2016-04-29 15:21:56 -05:00
duncathan salt
c3b91d6e86 fixes #17248 2016-04-29 13:32:35 -06:00
phil235
7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge 
Conflicts:
	code/game/objects/structures/aliens.dm
 2016-04-29 20:58:02 +02:00
Cheridan
4a6358ae87 Merge pull request #17213 from phil235/FixMorphHarvest 
Fixes butchering a morph not dropping anything.
 2016-04-29 13:57:23 -05:00
Cheridan
48924d957e Merge pull request #17107 from Core0verload/botany_nerf 
Nerfs botany Potency gene extraction
 2016-04-29 13:38:36 -05:00
Cheridan
02614f8175 Merge pull request #17207 from phil235/FireAlarmBreakFix 
Fixes being able to break fire alarms
 2016-04-29 13:34:53 -05:00
Joan Lung
6fc1d4fde4 Blobs can no longer eat the supermatter (#17205) 
* Blobs can no longer eat the supermatter

* phil'd

* phil'd
 2016-04-29 20:29:20 +02:00
Cheridan
1e0c5acd1f Merge pull request #17211 from phil235/FixThermiteBorg 
Fix bundle: borg module, thermite, chairs
 2016-04-29 13:22:50 -05:00
Mercenaryblue
7601144eb7 Paper Planes Mk2 (#17058) 
Adds Paper Planes
 2016-04-29 19:17:36 +02:00
Razharas
ae78dd582a Merge pull request #17208 from phil235/FixMechaMaskToxin 
Fix bundle and mech melee attack animation
 2016-04-29 19:32:38 +03:00
KorPhaeron
29baead8a5 Merge pull request #17165 from Incoming5643/no_cat_cucks 
Fixes? Catsploision? [Maybe?]
 2016-04-29 11:18:24 -05:00
Razharas
d8232cbf33 Revert "Adds player preference to hide irrelevant tablecraft recipes" 2016-04-29 17:47:31 +03:00
Joan Lung
2bd45f793b Merge pull request #17239 from Core0verload/nanofix 
One symbol fix
 2016-04-29 10:23:35 -04:00
Remie Richards
ddb1dacb0c Merge pull request #17234 from tgstation/duncathan-patch-1 
Fixes superconduction runtimes
 2016-04-29 14:52:56 +01:00
KorPhaeron
315c6619f4 Merge pull request #17193 from TechnoAlchemisto/belttweak 
Tweaks some storage issues with the explorer belt.
 2016-04-29 08:50:01 -05:00
KorPhaeron
b6bdc66e30 Merge pull request #17192 from Incoming5643/I_was_feeling_down_so_heres_some_magic 
Buffs the staff/wand of door creation
 2016-04-29 08:27:49 -05:00
Razharas
d059510b88 Merge pull request #17194 from MrStonedOne/patch-191 
Adds some logging to hard deletes that take forever.
 2016-04-29 16:10:03 +03:00
Razharas
6f8b1bc295 Merge pull request #17124 from MrPerson/wrapped_up_nicely_with_a_bow 
Removes monkeycube and chocolate unwrapping
 2016-04-29 16:03:59 +03:00
Razharas
81dadcec5f Merge pull request #17086 from MrPerson/planes_on_a_snake 
Move some stuff from different layers to different planes
 2016-04-29 15:51:41 +03:00
Razharas
21e554187d Merge pull request #17056 from Bawhoppen/randomrebalances 
Some random TC price rebalances
 2016-04-29 15:44:02 +03:00
Razharas
4ddf6015d8 Merge pull request #17032 from Robustin/ThisEndsNow 
Ends the confusing inconsistency of power cable and CONDUCT weapons
 2016-04-29 15:34:25 +03:00
Razharas
7b49961371 Merge pull request #16978 from nullbear/tablecraft-tweak 
Adds player preference to hide irrelevant tablecraft recipes
 2016-04-29 15:26:14 +03:00
Razharas
ce966f72c3 Merge pull request #16953 from Core0verload/onehalf 
Adds a new derelict to space ruins
 2016-04-29 15:23:50 +03:00
Razharas
c986212ddb Merge pull request #16778 from Robustin/commitcommoncult 
The Cult Rises...
 2016-04-29 15:10:16 +03:00
c0
44c1917de2 One symbol fix 2016-04-29 13:48:36 +03:00
c0
88b50b99cc Syndicate Sleeper 2016-04-29 12:02:25 +03:00
duncathan salt
be3c64caeb Fixes superconduction runtimes 2016-04-29 02:48:52 -06:00
Cheridan
ed53cec0ed Merge pull request #17172 from Robustin/travelmode 
RIP TRAVEL MODE, ALL HAIL EVA MODE
 2016-04-29 00:17:38 -05:00
Kyle Spier-Swenson
32cdbe2eea makes the log from long deletes more noisey. 
This is so that when this happens, admin's have immediate feedback as to what caused the lag.
 2016-04-28 21:56:47 -07:00
Cheridan
034500f622 Merge pull request #17188 from phil235/FixClosetStuffing 
Fixes weird shit happening when clickdragging things from your
 2016-04-28 23:49:34 -05:00
Cheridan
167d743bcd Merge pull request #17183 from Shadowlight213/Tickcheck 
Adds var to disable Tick checking in the MC for subsystems.
 2016-04-28 23:38:21 -05:00
Jordie
fdb1a1db2d Merge pull request #17151 from optimumtact/wakemeup 
Add multiple option to ceiling
 2016-04-29 14:30:21 +10:00
Cheridan
1e800a04b4 Merge pull request #17186 from phil235/FixMisterSlotFlag 
Fixes the backpack watertank's water mister spray being equippable on…
 2016-04-28 23:24:45 -05:00
Cheridan
fbd16c77cd Merge pull request #16934 from Core0verload/cargo 
Changes to Stocks Console UI, cargo fixes
 2016-04-28 23:22:17 -05:00
Cheridan
f8f8008a09 Merge pull request #17189 from MrStonedOne/patch-190 
Fixes the mc not running paused dwait systems properly
 2016-04-28 22:27:54 -05:00
Cheridan
6e27f01c94 Merge pull request #17185 from phil235/FixBundle48 
Fix Bundle: holosign creator, status procs, teleporter hub, timestop effect
 2016-04-28 22:11:29 -05:00
phil235
be57a223b5 Moves alien structure into the proper folder objs/structures/aliens.dm 
Removes incorrect comment about forcedodge projectile.
 2016-04-28 22:44:26 +02:00
Joan Lung
5a627c5b66 Merge pull request #17166 from coiax/cargo-crates-1 
New cargo crates to buy
 2016-04-28 16:33:50 -04:00
Jack Edge
b21bc9ad96 Die commas die 2016-04-28 21:24:30 +01:00
phil235
5f8c58170e Fixes butchering a morph not dropping anything. 2016-04-28 21:59:03 +02:00
Razharas
173ee4a680 Merge pull request #17178 from ChangelingRain/plantdream 
Adds plant DNA machine to Dreamstation
 2016-04-28 22:50:34 +03:00
TechnoAlchemist
8d27948ed1 moves icons to mining.dmi as to avoid merge conflicts. 2016-04-28 12:21:15 -07:00
Jack Edge
70e59d729f Increases cargo shuttle time back to two minutes 2016-04-28 20:11:52 +01:00
TechnoAlchemist
e2a6dac71f Merge branch 'master' of https://github.com/tgstation/-tg-station into realkinkystuff 
fixes conflicts probably

# Conflicts:
#	icons/obj/items.dmi
 2016-04-28 12:03:31 -07:00
phil235
d3fa99e58b Fixes runtime when thermiting a wall 
Fixes not being able to put down a chair on a tile with a border window.
Fixes Borg module cycling not working when the first module is empty.
 2016-04-28 20:44:02 +02:00
phil235
0d060d8daf A bit simpler like that. 2016-04-28 19:17:09 +02:00
Joan Lung
fd8942e70c Adds survival pod windows to the code 
* Adds survival pod windows to the code

* Light and dark pod flooring

* looks better
 2016-04-28 10:57:39 -06:00
phil235
b8164b7b92 * Add an attack animation for mech melee attack. 
* Fixes mech action button icon not updating whent the button is activated.
* Fixes internal tank action button icon not updating to off when we adjusted our masks out.
* Fixes mime/clown mask not updating their action button icon when adjusting. Fixes clown mask not updating
its on mob icon if adjusted when worn.
* Fixes typo in the human threshold for toxin in the air.
* Fixes changing the thermomachine circuitboard settings not giving any feedback.
 2016-04-28 18:56:14 +02:00