Commit Graph

24890 Commits

Author SHA1 Message Date
tkdrg 5d6b18b177 Merge pull request #14446 from KorPhaeron/take_their_boxes_away
Fixes cardboard boxes deleting people
2016-01-06 15:52:14 -03:00
AnturK cec4df95ff Fixes NOBLOOD species bleeding 2016-01-06 19:49:03 +01:00
KorPhaeron d76f6ad564 Hippie 2016-01-06 12:46:21 -06:00
KorPhaeron cf537737a1 Closets 2016-01-06 12:39:07 -06:00
Cheridan 1e516a68c7 Merge pull request #14347 from Iamgoofball/patch-143
Tesla Nerf (shh dont tell aran)
2016-01-06 12:22:05 -06:00
Dorsisdwarf ae789ed651 Generalises the check 2016-01-06 18:02:05 +00:00
SouDescolado 783e669c2d Fixes Tuberculosis kit
Name was wrong
2016-01-06 15:52:38 -02:00
xxalpha 7caab87021 Fix recursive action buttons 2016-01-06 17:27:31 +00:00
tkdrg c9deb43f4e Merge pull request #14401 from Kole6738/patch-1
Fix missing plural apostrophe
2016-01-06 14:21:25 -03:00
tkdrg 987ec645f1 Merge pull request #14403 from Kole6738/patch-2
Pluralize Engineer's
2016-01-06 14:20:56 -03:00
tkdrg cf2a12120d Merge pull request #14412 from MrStonedOne/patch-118
Revert commit f6d13b9 (blame RR) (fixes fires from crashing clients)
2016-01-06 14:19:40 -03:00
tkdrg 45e813ffd2 Merge pull request #14414 from phil235/GuardianDerpFix
Fixes path typo
2016-01-06 14:18:52 -03:00
Nerd Lord dcb8f18ea9 flip it upside down and typecast it 2016-01-06 10:26:20 -05:00
Nerd Lord aec8099e15 Simplify, get more speed. 2016-01-06 10:18:58 -05:00
SouDescolado 4a7cb6a066 Fixes abandoned crates minigame
Replaces the user input 0 with "z"(Code side only. Player can still use
0). Wont return 0 as "cows" anymore.

Remove useless variable
2016-01-06 10:43:54 -02:00
Kyle Spier-Swenson 196c98e056 Fixes map loader not initializing map edited path/type vars 2016-01-06 03:54:03 -08:00
AnturK 1a5bffc424 Fixes morph eating message showing up multiple times for the same object 2016-01-06 11:51:40 +01:00
KorPhaeron f2f868e7c7 Vine controller 2016-01-06 02:32:25 -06:00
bgobandit b1dbe47bbf Windows give a message when repaired. 2016-01-06 01:30:19 -05:00
KorPhaeron cc69b62c5c Fixes fake nuke 2016-01-05 22:51:04 -06:00
KorPhaeron d4ac9b3cdd Adds intro text to malf AI 2016-01-05 22:48:19 -06:00
duncathan salt bee40cf9cd Merge pull request #14388 from ChangelingRain/notsosimpleisit
Fixes simple animal damage type handling
2016-01-05 22:23:23 -06:00
duncathan salt 33ce734c03 Merge pull request #14404 from KorPhaeron/gang
Fixes gang implanter message
2016-01-05 22:18:26 -06:00
duncathan salt 50ebfa0f17 Merge pull request #14395 from MrStonedOne/nomoreminus1
Removes a bunch of sleep(-1) and spawn(-1) from the code
2016-01-05 22:16:17 -06:00
Nerd Lord 2156790f8c Clamp()s instead of min(max()) in living damage procs 2016-01-05 23:16:15 -05:00
Nerd Lord bfc0e468f3 Drone messages now have a follow link for ghosts.
GAME and SAY are not span classes that do anything.
2016-01-05 23:03:16 -05:00
Nerd Lord 240263c5d5 Clamp it! 2016-01-05 22:51:18 -05:00
Jordie 1c48e9fc0f Merge pull request #14409 from neersighted/more_tgui_fixes
Fix some typos, don't wash out button hover colors, fix APC delays
2016-01-06 14:24:36 +11:00
Kole6738 d20194a546 removes else 2016-01-05 18:28:31 -08:00
tkdrg 2c15df59c5 Merge pull request #14400 from ChangelingRain/standards
Adds a space after the ghost follow link for messages that lacked it
2016-01-05 21:26:41 -03:00
Kole6738 f88595d073 Thanks 2016-01-05 15:25:21 -08:00
tkdrg ece39f0fb4 Merge pull request #14157 from TrustyGun/iseethecolors
Adds two new UI styles: Slimecore and Operative
2016-01-05 20:10:10 -03:00
AnturK e34fed4566 Fixes soulstones 2016-01-06 00:04:36 +01:00
tkdrg 8f26a86e4c Merge pull request #14279 from KorPhaeron/pod_launch_fix
Pod early launch fixes
2016-01-05 19:00:43 -03:00
KorPhaeron cf6b95b755 Runtime 2016-01-05 14:25:56 -06:00
KorPhaeron 556b89501d Beepsky Fix 2016-01-05 14:21:03 -06:00
KorPhaeron e2b09f5604 Gate Fix 2016-01-05 13:56:26 -06:00
KorPhaeron 936973a68d Chasm Fix 2016-01-05 13:54:12 -06:00
SouDescolado 3b257854f0 Merge pull request #1 from tgstation/master
Merge shit
2016-01-05 14:44:37 -02:00
SouDescolado 92b3c84a22 Make the code beautiful
Less lines, same code.

Trying to fix merge conflict.

Gah
2016-01-05 14:36:39 -02:00
AnturK c32fd8daaa Fixes mechs using occupant spacemove 2016-01-05 17:24:08 +01:00
KorPhaeron 68b2c6d505 Uses define instead of ! 2016-01-05 10:01:05 -06:00
phil235 36d057a4f5 Fixes path typo. 2016-01-05 17:00:22 +01:00
phil235 60f72d059d - switch visible_message() back to using get_hearers_in_view(), because using inLineOfSight() creates some bugs. visible_message() will still be faster than current version, but only when there's a blind_message used.
- Fixes hostile animal not seeing any target near them if they are sitting on something opaque (wall, mech,..).
2016-01-05 16:46:26 +01:00
AnturK 02e31875ff Fixes Ian wearing deathsquad suit 2016-01-05 16:20:20 +01:00
TrustyGun 3f31949bb5 Merge branch 'test' into iseethecolors 2016-01-05 03:41:27 -05:00
tkdrg de09f8ee0b Merge pull request #14306 from MrStonedOne/patch-114
Makes pda cartridges use proper type safety.
2016-01-05 05:21:51 -03:00
Aranclanos 4cfab7f991 Merge pull request #14367 from Gartley/Grammar-fix-14297
Small grammar fix to shielded message.
2016-01-05 05:02:25 -03:00
Aranclanos 6a667d080e Merge pull request #14349 from AnturK/awayareas
Adds away areas to ghost teleport/ admin jump list
2016-01-05 04:54:39 -03:00
Aranclanos a9ef05807e Merge pull request #14362 from Bawhoppen/czechbarmanhelp
Gives barman back his new gear
2016-01-05 04:52:21 -03:00