Commit Graph

31952 Commits

Author SHA1 Message Date
Shadowlight213
d026232f63 Fixes latejoin antag jobbans 2016-03-27 23:28:41 -07:00
Shadowlight213
0679db361d Fixes ooc ban 2016-03-27 23:01:19 -07:00
Jordie
0c92576c8d fixes failing compile 2016-03-28 16:19:35 +11:00
Jordie
c37425135f deleted april fools changelog from master branch 2016-03-28 14:41:55 +11:00
tgstation-server
119ca29604 Automatic changelog generation for PR #16381 2016-03-28 03:41:16 +00:00
KorPhaeron
3709f57f40 Merge pull request #16381 from ChangelingRain/justthetooltip
Adds alien tooltip style and updates operative tooltip style
2016-03-27 22:41:15 -05:00
Nerd Lord
6196b39351 update operative tooltip style(matches syndicate uplink theme) 2016-03-27 19:04:18 -04:00
tgstation-server
35a80f7664 Automatic changelog generation for PR #16380 2016-03-27 22:36:19 +00:00
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
Cheridan
275fdf4928 Merge pull request #16422 from KorPhaeron/crate_fix
Fixes combat knife crates
2016-03-27 15:16:27 -05:00
KorPhaeron
525cd8afc6 Crate 2016-03-27 14:56:12 -05:00
tgstation-server
71da79e978 Automatic changelog generation for PR #16378 2016-03-27 19:51:11 +00: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
c6e08b3449 Merge pull request #16399 from KorPhaeron/fix3
Fixes silver golem icon
2016-03-27 12:44:55 -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
tgstation-server
2738894e93 Automatic changelog generation for PR #16386 2016-03-27 17:29:58 +00: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
Jordie
8c8f5f7f4c removes april fools branch entries from master log 2016-03-27 16:34:48 +11:00
tgstation-server
835aff2802 Automatic changelog generation for PR #16366 2016-03-27 02:06:02 +00: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
tgstation-server
05888b6cdb Automatic changelog generation for PR #16225 2016-03-27 02:03:46 +00: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
tgstation-server
002e6a5a3c Automatic changelog generation for PR #16362 2016-03-27 01:12:59 +00: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
AnturK
e5b081ea88 Merge pull request #16172 from optimumtact/revert-13907-meatyores
Make meteor game mode great again
2016-03-26 23:07:08 +01: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
sybil-tgstation13
be9099409b Automatic changelog compile 2016-03-26 19:56:35 +00:00
Cheridan
df61e2ef34 Merge pull request #16256 from Iamgoofball/patch-7
CHECK_TICK
2016-03-26 14:48:42 -05:00
tgstation-server
6520a6ee09 Automatic changelog generation for PR #16324 2016-03-26 19:31:14 +00: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