Commit Graph
29734 Commits
Author SHA1 Message Date
chopchop1614andGitHub fe242bcee0 Update bscrystal.dm 2016-08-07 00:33:52 +01:00
chopchop1614andGitHub 3658b3b5ad Update stack_recipe.dm 2016-08-07 00:33:32 +01:00
chopchop1614 692754c81a fox's changes 2016-08-07 00:31:36 +01:00
chopchop1614 8d26c41cb1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into keta 2016-08-07 00:16:03 +01:00
chopchop1614 c4756e39e1 fox's suggestion 2016-08-07 00:11:00 +01:00
Fox McCloudandGitHub 7bc9b0c47f Merge pull request #5295 from chopchop1614/feta
Fixes horsemask bug
2016-08-06 06:57:38 -04:00
chopchop1614andGitHub 346dd3cd70 Update horsemask.dm 2016-08-06 11:32:54 +01:00
chopchop1614andGitHub 5ea4d4ab2f Update horsemask.dm 2016-08-06 11:32:26 +01:00
Fox McCloudandGitHub e4756ba621 Merge pull request #5342 from Earthdivine/Secrets-Rename
Strike Team Clarity
2016-08-05 19:59:44 -04:00
ParadiseSS13-Bot 454d0fce02 Automatic changelog generation for PR #5304 2016-08-05 19:34:44 -04:00
Fox McCloudandGitHub 2530555bf6 Merge pull request #5304 from Ar3nn/teleshock
Fixes TK users being shocked for no reason when using shocked machinery
2016-08-05 19:34:42 -04:00
ParadiseSS13-Bot e8eec179a7 Automatic changelog generation for PR #5334 2016-08-05 19:33:43 -04:00
Fox McCloudandGitHub 38206e5b61 Merge pull request #5334 from FlattestGuitar/holy
Nerfs holy water.
2016-08-05 19:33:40 -04:00
Fox McCloudandGitHub 0f3c4ae16d Merge pull request #5341 from LittleBigKid2000/vamp-bite-message-fix
Various grammar/spelling fixes
2016-08-05 19:33:22 -04:00
Earthdivine bd4fa6de04 Changed "Send in a strike team" to "Send in the Deathsquad." for more clarity. 2016-08-05 18:19:11 -05:00
Isaac Erwin f5c0455de5 Oh 2016-08-05 18:58:38 -04:00
Isaac Erwin f2c1c7406d Various grammar/spelling fixes 2016-08-05 18:43:33 -04:00
ParadiseSS13-Bot a8f309f12f Automatic changelog generation for PR #5335 2016-08-04 20:07:09 -04:00
Fox McCloudandGitHub 039885b9d8 Merge pull request #5335 from Ty-Omaha/Fixes
Fixes "is too cumbersome to carry in one hand" from showing up to other players
2016-08-04 20:07:08 -04:00
Ty-Omaha 1b03ac78fd Fix 2016-08-04 19:20:19 -04:00
Mieszko Jędrzejczak 3888bcb1f1 Makes holy water stutters non-op 2016-08-05 00:38:31 +02:00
ParadiseSS13-Bot 5e3d0d5cca Automatic changelog generation for PR #5327 2016-08-04 17:50:38 -04:00
Fox McCloudandGitHub 7dc26f08c5 Merge pull request #5327 from Chakirski/duffelfix
Duffel Voodoo and Spelling Fix
2016-08-04 17:50:37 -04:00
ParadiseSS13-Bot df51c73daf Automatic changelog generation for PR #5294 2016-08-04 17:48:42 -04:00
Fox McCloudandGitHub 7476da1c49 Merge pull request #5294 from yurivw/shuttleoptions
Removed unused options in secrets menu
2016-08-04 17:48:41 -04:00
ParadiseSS13-Bot d45f637ce8 Automatic changelog generation for PR #5318 2016-08-04 17:47:29 -04:00
Fox McCloudandGitHub 2b467d50c8 Merge pull request #5318 from Chakirski/SpritFixes
Fixes Sprite Voodoo and Hoodies
2016-08-04 17:47:26 -04:00
ParadiseSS13-Bot cc953cfdd7 Automatic changelog generation for PR #5324 2016-08-04 14:41:57 -04:00
Fox McCloudandGitHub e661597327 Merge pull request #5324 from Krausus/HumanOverlayCache
Human Overlay Caching and Minor Overlay Fixes
2016-08-04 14:41:55 -04:00
Chakirski 6dca3112b3 The fact this is inconsistent hurts me. 2016-08-04 11:29:26 -05:00
Krausus e9886d05fc Human overlay caching and minor overlay fixes 2016-08-04 11:14:56 -04:00
Fox McCloudandGitHub 5a82177cdc Merge pull request #5317 from Krausus/Changelog
A Completely Ordinary Changelog Update
2016-08-03 23:59:56 -04:00
Krausus 1c48d26897 Changelog generation 2016-08-03 23:54:23 -04:00
Chakirski 1f703104e4 Less stealth more sprite. 2016-08-03 22:54:00 -05:00
ParadiseSS13-Bot 79edf7fa92 Automatic changelog generation for PR #5309 2016-08-03 23:29:11 -04:00
TheDZDandGitHub 44ae3a4a68 Merge pull request #5309 from Fox-McCloud/field-generators
Field Generator Cleanup, Singularity Fixes,
2016-08-03 23:29:09 -04:00
TheDZDandGitHub d018389a12 Merge pull request #5312 from Fox-McCloud/destroy-them-all
Fixes Two Destroys
2016-08-03 23:28:43 -04:00
Fox-McCloud 15d7d16ec8 oops 2016-08-03 22:34:29 -04:00
Fox McCloudandGitHub fde140f3f1 Merge pull request #5315 from monster860/pipe_cable_errors
Cable/pipe fixes - Cyberiad Edition
2016-08-03 22:19:41 -04:00
Fox McCloudandGitHub 11719854a0 Merge pull request #5313 from Krausus/TypecachedTeslaTime
Ports Typecaches and Using One For Tesla Type Checks
2016-08-03 22:14:16 -04:00
monster860 75f1efe728 Cable/pipe fixes - Metastation Edition 2016-08-03 21:41:12 -04:00
monster860 3ea5c906e5 Fix medbay disposals 2016-08-03 21:18:08 -04:00
monster860 380af37d3d Damn it, I missed 2. 2016-08-03 21:15:48 -04:00
monster860 84c0e594ab Cable/pipe fixes - Cyberiad Edition 2016-08-03 21:09:10 -04:00
Krausus ea0f5b9802 Ports typecaches and their use in the tesla 2016-08-03 20:08:51 -04:00
Fox McCloudandGitHub 3c671d7ae4 Merge pull request #5311 from Krausus/TheyreSelfCleaningAndOrMagical
Fixes Cremation of Self-Deleting Mobs
2016-08-03 19:42:35 -04:00
Fox-McCloud 892d796ca3 Fixes Two Destroys 2016-08-03 19:25:53 -04:00
Krausus c8989b36e1 Fixes cremation of self-deleting mobs 2016-08-03 19:21:36 -04:00
ParadiseSS13-Bot 80088e1d50 Automatic changelog generation for PR #5209 2016-08-03 19:12:06 -04:00
Fox McCloudandGitHub a15721b22a Merge pull request #5209 from Krausus/OnceYouLeaveYouCannotComeBack
Changes to Player Respawnability
2016-08-03 19:12:04 -04:00