Commit Graph

14712 Commits

Author SHA1 Message Date
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
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
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
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
AndrewJacksonThe2nd
f0d2661829 fuq 2016-03-26 16:57:25 -07:00
AndrewJacksonThe2nd
0849c33f83 cheridan 2016-03-26 16:45:59 -07:00
oranges
d60502fbc6 Mutes carbon wizards during jaunt
Adds two helper procs for mute/unmute
2016-03-27 10:21:42 +13: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
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
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
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
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
KorPhaeron
197490e726 FREE GOLEM 2016-03-25 22:10:13 -05:00
Nerd Lord
ee65384437 Speedbike trails now have a proper, under-speedbike layer 2016-03-25 22:10:14 -04:00
Tytynguyen
3eca2f047f Added a sound to deflects and bolded the text. 2016-03-25 18:40:23 -07:00
KorPhaeron
31dea914a2 Merge pull request #16304 from ChangelingRain/vinelayer
Space vine mobs now layer under ghosts
2016-03-25 20:24:56 -05:00
Nerd Lord
e0d355ced9 why bother with a new PR rite 2016-03-25 21:15:04 -04:00
Nerd Lord
760ba5cd34 Adds Lotus holoparasite color 2016-03-25 20:28:28 -04:00
KorPhaeron
095bede7ed Merge pull request #16334 from ChangelingRain/parasitic
Adds assassin holoparasites
2016-03-25 19:24:28 -05:00
Nerd Lord
9bb05224ca there are better ways 2016-03-25 20:15:21 -04:00
Supermichael777
621b2ec948 fixes from local testing 2016-03-25 15:37:45 -04:00
Supermichael777
80688df26c and adds the actual delay 2016-03-25 15:00:35 -04:00
Supermichael777
c141cc59a2 updates pills to alow for a delay because inheritance 2016-03-25 14:58:35 -04:00
Nerd Lord
15714b8a74 oh right the tiny paper thing 2016-03-25 12:04:50 -04:00
KorPhaeron
a1ba04ef94 Merge pull request #16358 from tgstation/RemieRichards-patch-1
Updates the prices of Bee crates
2016-03-25 09:59:43 -05:00
KorPhaeron
da06025ced Merge pull request #16241 from PKPenguin321/patch-16
anotha reactive teleport armor nerf
2016-03-25 09:58:36 -05:00
Remie Richards
496190a4e2 Updates the prices of Bee crates, due to Goofcargo thinking big numbers is ~more fun~ or something. 2016-03-25 14:47:36 +00:00