ddb1dacb0c
Merge pull request #17234 from tgstation/duncathan-patch-1
...
Fixes superconduction runtimes
2016-04-29 14:52:56 +01:00
315c6619f4
Merge pull request #17193 from TechnoAlchemisto/belttweak
...
Tweaks some storage issues with the explorer belt.
2016-04-29 08:50:01 -05:00
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
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
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
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
21e554187d
Merge pull request #17056 from Bawhoppen/randomrebalances
...
Some random TC price rebalances
2016-04-29 15:44:02 +03:00
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
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
ce966f72c3
Merge pull request #16953 from Core0verload/onehalf
...
Adds a new derelict to space ruins
2016-04-29 15:23:50 +03:00
c986212ddb
Merge pull request #16778 from Robustin/commitcommoncult
...
The Cult Rises...
2016-04-29 15:10:16 +03:00
88b50b99cc
Syndicate Sleeper
2016-04-29 12:02:25 +03:00
be3c64caeb
Fixes superconduction runtimes
2016-04-29 02:48:52 -06:00
ed53cec0ed
Merge pull request #17172 from Robustin/travelmode
...
RIP TRAVEL MODE, ALL HAIL EVA MODE
2016-04-29 00:17:38 -05:00
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
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
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
fdb1a1db2d
Merge pull request #17151 from optimumtact/wakemeup
...
Add multiple option to ceiling
2016-04-29 14:30:21 +10:00
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
fbd16c77cd
Merge pull request #16934 from Core0verload/cargo
...
Changes to Stocks Console UI, cargo fixes
2016-04-28 23:22:17 -05:00
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
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
5a627c5b66
Merge pull request #17166 from coiax/cargo-crates-1
...
New cargo crates to buy
2016-04-28 16:33:50 -04:00
b21bc9ad96
Die commas die
2016-04-28 21:24:30 +01:00
173ee4a680
Merge pull request #17178 from ChangelingRain/plantdream
...
Adds plant DNA machine to Dreamstation
2016-04-28 22:50:34 +03:00
8d27948ed1
moves icons to mining.dmi as to avoid merge conflicts.
2016-04-28 12:21:15 -07:00
70e59d729f
Increases cargo shuttle time back to two minutes
2016-04-28 20:11:52 +01:00
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
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
daf01d872e
Merge pull request #17157 from Core0verload/botany_nerf_II
...
Nerfs botany slippery-everything
2016-04-28 18:21:09 +03:00
3c2f41c8d2
dreamstation maps
2016-04-28 10:34:33 -04:00
14bd9172bf
Is this just a hazing ritual
2016-04-28 10:25:51 -04:00
e01a74f8b8
Blend in with the others
2016-04-28 12:38:47 +01:00
f03d8f9b1a
Changes to pause proc
2016-04-27 23:11:20 -07:00
2298862a97
SUPER FINAL CONSTRUCTION TALISMAN CHANGE 100% TESTED AND APPROVED VALVE PLZ ADD THIS!
2016-04-28 00:58:56 -04:00
1728d02b50
fucked up args
2016-04-27 21:53:49 -07:00
49d5ea4bf0
Indentation memes
2016-04-27 23:33:45 -04:00
a21a47a258
Construct Info
2016-04-27 23:29:37 -04:00
4946a06d96
Moves construct shell creation from metal to talismans
2016-04-27 23:25:57 -04:00
3fe4bbc706
Takes construction out of metal into talismans
2016-04-27 23:20:55 -04:00
be3a843101
Color memes
2016-04-27 23:17:20 -04:00
9b3f811113
Merge pull request #17007 from TechnoAlchemisto/beepbeep2
...
Makes syndicate bombs scarier.
2016-04-27 22:47:06 -04:00
e9706a798d
mineral doors are dumb
2016-04-27 22:15:25 -04:00
246a8cb048
Adds some logging to hard deletes that take forever.
...
(and other changes like recording the longest delete so i can figure out if handle_queue is getting called a lot or if something actually is taking forever to hard delete)
2016-04-27 19:10:45 -07:00
5a77cefe2d
humor me here I can't test locally right now
2016-04-27 22:07:14 -04:00
b5952c94cc
Merge branch 'master' of https://github.com/tgstation/-tg-station into commitcommoncult
...
# Conflicts:
# icons/obj/items.dmi
2016-04-27 22:04:06 -04:00
3a05479bdf
Tweaks some storage issues with the explorer belt.
2016-04-27 19:00:34 -07:00
55b830f39d
buffs the staff/wand of door creation: Doors created start open, it can also be used on airlocks to open them akin to the knock spell.
2016-04-27 21:44:53 -04:00
cc59925d2e
Merge pull request #17108 from Bawhoppen/sandbagsz
...
Some sandbag changes
2016-04-27 20:23:21 -04:00
60650b82a5
I should also add the check to here.
2016-04-27 17:13:46 -07:00
Remie Richards
KorPhaeron
Razharas
c0
duncathan salt
Cheridan
Kyle Spier-Swenson
Jordie
Joan Lung
Jack Edge
TechnoAlchemist
Robustin
Shadowlight213
Incoming5643
Incoming