Commit Graph

25488 Commits

Author SHA1 Message Date
Cheridan
ac0b1d212a Merge pull request #16380 from KazeEspada/pushyblobs
Blob mobs no longer swap
2016-03-27 17:36:18 -05:00
Cheridan
33ecd490b0 Merge pull request #16403 from optimumtact/wizared_mute_fix
Mutes carbon wizards during jaunt
2016-03-27 15:57:23 -05:00
KorPhaeron
525cd8afc6 Crate 2016-03-27 14:56:12 -05:00
KorPhaeron
ced69135ba Merge pull request #16378 from Bawhoppen/swatcratechange
Seperates combat knives from SWAT crate
2016-03-27 14:51:08 -05:00
Cheridan
ca4e898abe Merge pull request #16376 from Tytynguyen/sleepingcarpdeflect
Hopefully made the sleeping carp deflects more obvious
2016-03-27 12:38:48 -05:00
Cheridan
07ed2d15b6 Merge pull request #16398 from tgstation/duncathan-patch-1
Make the BOH warning slightly more helpful
2016-03-27 12:32:24 -05:00
Cheridan
20fb01cda2 Merge pull request #16265 from Iamgoofball/boss_of_this_lavaland
hey spaceman i think you got the wrong vault
2016-03-27 12:30:41 -05:00
Cheridan
ac9bd3a910 Merge pull request #16389 from KorPhaeron/tendril
Fixes collapsing tendrils being draggable
2016-03-27 12:26:27 -05:00
Cheridan
a83d8ebe16 Merge pull request #16388 from KorPhaeron/chasm
Fixes chasm showing invisible things dropping
2016-03-27 12:25:47 -05:00
Cheridan
f0a0410bfb Merge pull request #16385 from KorPhaeron/FREEGOLEM
Adds missing file for FREE GOLEMS
2016-03-27 11:37:54 -05:00
Cheridan
865b744478 Merge pull request #16387 from KorPhaeron/capsuleagainandagain
[s]CAPSULE FIX AGAIN
2016-03-27 11:36:58 -05:00
Cheridan
eeeff80e5f Merge pull request #16366 from Xhuis/the_forbidden_art_of_fixing_issues
Fix bundle
2016-03-26 21:06:00 -05:00
Cheridan
b2fec069f0 Merge pull request #16225 from Ricotez/ghostlooks
Ghosts with hair.
2016-03-26 21:03:44 -05:00
duncathan salt
4b34624b1c Merge pull request #16373 from ChangelingRain/blacklotus
Adds Lotus holoparasite color & Assassin holoparasite stealth toggle button
2016-03-26 19:49:25 -06:00
Cheridan
eab43191a7 Merge pull request #16375 from ChangelingRain/fastbike
Speedbike trails now have a proper, under-speedbike layer
2016-03-26 20:46:35 -05:00
Xhuis
32ef4ffe0a Optimizations, statue changes 2016-03-26 21:24:10 -04:00
Nerd Lord
0d89760b20 dunc told me to do it 2016-03-26 21:18:43 -04:00
Cheridan
a8121204fe Merge pull request #16362 from Bawhoppen/minormedicalbuff
makes bruise packs and ointment not shit
2016-03-26 20:12:56 -05:00
Cheridan
12d1562005 Merge pull request #16365 from Supermichael777/patchpatch
Adds delay to patches
2016-03-26 20:12:15 -05:00
Xhuis
759879a18c Fixes posibrains/MMIs seeing ghosts 2016-03-26 20:30:20 -04:00
Nerd Lord
8f9f5f152b >>reviewing your own code 2016-03-26 20:03:27 -04:00
AndrewJacksonThe2nd
f0d2661829 fuq 2016-03-26 16:57:25 -07:00
AndrewJacksonThe2nd
0849c33f83 cheridan 2016-03-26 16:45:59 -07:00
oranges
f814ec6f41 Minor changes for Dunc plus readability improvements 2016-03-27 10:53:00 +13:00
Kyle Spier-Swenson
d162b60824 Fixes some meteor mode bugs 2016-03-27 10:50:53 +13:00
Kyle Spier-Swenson
490aadf35b Makes meteor math great again. 2016-03-27 10:50:40 +13:00
oranges
d60502fbc6 Mutes carbon wizards during jaunt
Adds two helper procs for mute/unmute
2016-03-27 10:21:42 +13:00
duncathan salt
7759b823da I like trustygun's idea 2016-03-26 14:13:27 -06:00
Cheridan
df61e2ef34 Merge pull request #16256 from Iamgoofball/patch-7
CHECK_TICK
2016-03-26 14:48:42 -05:00
Cheridan
004e59864a Merge pull request #16261 from Core0verload/pda_close
Kills snowflakey PDA close button
2016-03-26 14:30:07 -05:00
Cheridan
3c69d18cc2 Merge pull request #16296 from lzimann/viewrangevehicles
Adds a way to change vehicles view range
2016-03-26 14:26:28 -05:00
Nerd Lord
10e93fe8b1 fold into pr 2016-03-26 15:22:29 -04:00
Cheridan
b361ae5cf7 Merge pull request #15671 from CPTANT/Newtaser
Introduces the new taser.
2016-03-26 14:18:09 -05:00
Xhuis
cc62b89baf Fix bundle 2016-03-26 15:15:31 -04:00
Cheridan
ee005094a9 Merge pull request #16341 from Core0verload/sorted
Allows sorting junction to have multiple sorting tags set
2016-03-26 14:14:13 -05:00
Cheridan
02c8beba12 Merge pull request #16400 from KorPhaeron/nullspace
Fixes ghost spawners putting people in nullspace
2016-03-26 13:42:51 -05:00
KorPhaeron
721e3ba1a5 Ghost nullspace 2016-03-26 13:26:34 -05:00
Cheridan
4dcb43fe6d Merge pull request #16321 from TrustyGun/noir
Noir Ambience: Take Two
2016-03-26 12:07:12 -05:00
duncathan salt
0fd7310f41 Update backpack.dm 2016-03-26 10:08:52 -06:00
Cheridan
647e17deed Merge pull request #16349 from Incoming5643/this_isnt_omnious_at_all
Humanless stations are now possible (not by default calm down)
2016-03-26 10:25:54 -05:00
KorPhaeron
fbef2d5441 Fixes collapsing tendrils being draggable 2016-03-26 04:28:08 -05:00
KorPhaeron
a612b73d9e Chasm Fix 2016-03-26 04:23:11 -05:00
KorPhaeron
ffb0aa5655 AND AGAIN 2016-03-26 04:01:40 -05:00
KorPhaeron
5f06b3f5cf Missing ID card 2016-03-26 02:08:14 -05:00
Jordie
2714a656d5 Merge pull request #16355 from KazeEspada/eastercabin2
Adds easter to Cabin
2016-03-26 16:14:33 +11:00
bawhoppen
96fd665676 honk 2016-03-25 23:12:44 -05:00
KazeEspada
4154fe9078 Blob mobs no longer swap
Blob mobs no longer swap, instead they push others. This leads to disadvantages for the blob and the crew, but swap combat is no longer a thing anymore.
2016-03-25 21:11:03 -07:00
Lularian
2b700895a8 swat stuff 2016-03-25 22:48:38 -05:00
Joan Lung
c5d96796f7 Merge pull request #16275 from KorPhaeron/FREEGOLEM
Lavaland Golems
2016-03-25 23:32:39 -04:00
KorPhaeron
84290c21bc FREE GOLEM 2016-03-25 22:25:18 -05:00