Commit Graph

  • 5f215ff2b4 Merge pull request #6257 from Citadel-Station-13/upstream-merge-36733 deathride58 2018-04-04 21:15:55 +00:00
  • 63ed2b0069 Merge pull request #6259 from Citadel-Station-13/upstream-merge-36711 deathride58 2018-04-04 21:14:13 +00:00
  • c702e9b097 Merge pull request #6260 from Citadel-Station-13/upstream-merge-36927 deathride58 2018-04-04 21:13:23 +00:00
  • 8ad42c519a Merge pull request #6261 from Citadel-Station-13/upstream-merge-36928 deathride58 2018-04-04 21:12:45 +00:00
  • ef7b79eea7 Merge pull request #6262 from Citadel-Station-13/upstream-merge-36945 deathride58 2018-04-04 21:12:26 +00:00
  • af8862bd78 Merge pull request #6263 from Citadel-Station-13/upstream-merge-36867 deathride58 2018-04-04 21:11:44 +00:00
  • cd251d79b2 Merge pull request #6264 from Citadel-Station-13/upstream-merge-36645 deathride58 2018-04-04 21:11:28 +00:00
  • 3b35c63027 Merge pull request #6265 from Citadel-Station-13/upstream-merge-36932 deathride58 2018-04-04 21:11:07 +00:00
  • fdea6d88aa Merge pull request #6266 from Citadel-Station-13/upstream-merge-36897 deathride58 2018-04-04 21:10:47 +00:00
  • e6f411ae5d Merge pull request #6268 from Citadel-Station-13/upstream-merge-36969 deathride58 2018-04-04 21:04:30 +00:00
  • 3eec79f992 Merge pull request #6269 from Citadel-Station-13/upstream-merge-36929 deathride58 2018-04-04 21:02:22 +00:00
  • 5f4509123c Merge pull request #6271 from Citadel-Station-13/upstream-merge-36521 deathride58 2018-04-04 21:02:05 +00:00
  • 7f80338a62 Merge pull request #6270 from Citadel-Station-13/upstream-merge-36958 deathride58 2018-04-04 21:01:41 +00:00
  • e930b98beb Update dance_machine.dm deathride58 2018-04-04 16:59:18 -04:00
  • 740c76beb9 damn loginsandylogout 2018-04-04 13:23:15 -05:00
  • 34fe469aa2 hold on loginsandylogout 2018-04-04 13:22:27 -05:00
  • c2615881c7 ah loginsandylogout 2018-04-04 13:21:42 -05:00
  • e7612b44fe should fix it all loginsandylogout 2018-04-04 13:19:59 -05:00
  • e14ff635ec okay loginsandylogout 2018-04-04 13:18:54 -05:00
  • 7459b8b03c hhhj loginsandylogout 2018-04-04 13:16:49 -05:00
  • c27cb38a53 hhh loginsandylogout 2018-04-04 13:14:30 -05:00
  • 53454d8ab9 d loginsandylogout 2018-04-04 13:13:30 -05:00
  • 3b4b557687 a loginsandylogout 2018-04-04 13:12:52 -05:00
  • d2cf2e8018 HMMM loginsandylogout 2018-04-04 13:12:27 -05:00
  • d845bf84a9 k loginsandylogout 2018-04-04 12:56:34 -05:00
  • a4e3b19891 maybe loginsandylogout 2018-04-04 12:55:52 -05:00
  • 417fa9e264 yes loginsandylogout 2018-04-04 12:52:40 -05:00
  • cee51cd79d should fix conflicts loginsandylogout 2018-04-04 12:50:02 -05:00
  • 4d0b9543a3 Burning ores (from either fire or lava) now yields materials at a decreased rate. CitadelStationBot 2018-04-04 12:00:57 -05:00
  • fc9b02cbbb Burning ores (from either fire or lava) now yields materials at a decreased rate. (#36521) fludd12 2018-04-04 13:01:34 -04:00
  • 3f3fed33f9 fixes revenant deadchat CitadelStationBot 2018-04-04 09:07:06 -05:00
  • 4b505112fc fixes revenant deadchat vuonojenmustaturska 2018-04-03 22:08:53 +03:00
  • 2b7d91481a Fixes chem macros with trailing ; CitadelStationBot 2018-04-04 09:04:53 -05:00
  • 057d10f654 Fixes chem macros with trailing ; Jordan Brown 2018-04-02 18:32:51 -04:00
  • 6912680b2f move enforce_human_authority check before species.before_equip_job() CitadelStationBot 2018-04-04 09:03:37 -05:00
  • 77e51603d4 move enforce_human_authority check before species.before_equip_job() vuonojenmustaturska 2018-04-04 14:58:12 +03:00
  • d7754f90db Fixes errors with making temp rank changes before permanent ones CitadelStationBot 2018-04-03 23:51:45 -05:00
  • 00f5f70b1b Fixes errors with making temp rank changes before permanent ones (#36897) Jordie 2018-04-04 14:53:01 +10:00
  • 59ebf58c2b Fixes asphyxiation disease activating early and ignoring transmission CitadelStationBot 2018-04-03 23:46:28 -05:00
  • 3c7d2c0ab9 Merge pull request #36932 from SailorDave/asphyxiation-fix Jordan Brown 2018-04-04 00:46:49 -04:00
  • 8a296900c2 Fixes mannitol not curing minor brain traumas CitadelStationBot 2018-04-03 22:03:21 -05:00
  • 1ee5b349d7 Fixes mannitol not curing minor brain traumas (#36645) YPOQ 2018-04-03 03:41:17 -06:00
  • 586ce24177 Fixes 0 value not being saved in constant memory circuits CitadelStationBot 2018-04-03 22:03:12 -05:00
  • 1e34269e0c Fixes 0 value not being saved in constant memory circuits (#36867) robbym 2018-04-03 03:00:01 -07:00
  • 6a0ea296b1 Removes april fools from heirlooms CitadelStationBot 2018-04-03 22:03:04 -05:00
  • 5614da1d3b Merge pull request #36945 from KorPhaeron/aprilfools Jordie 2018-04-03 21:10:55 +10:00
  • 41a4708677 Removes @ CitadelStationBot 2018-04-03 22:02:55 -05:00
  • 20f7370ea3 Removes @ (#36928) Jordan Brown 2018-04-03 07:33:47 -04:00
  • b603b48f21 Adds more moth names to prevent duplicate random names CitadelStationBot 2018-04-03 22:02:47 -05:00
  • eb5936c48b Merge pull request #36927 from 81Denton/moff-name-variety Jordan Brown 2018-04-03 13:36:40 -04:00
  • 1ff56032d6 Fixed sometimes using items on full storage items CitadelStationBot 2018-04-03 22:02:39 -05:00
  • 80fee95dab Fixed sometimes using items on full storage items (#36711) John Ginnane 2018-04-04 00:02:44 +01:00
  • 95df3010ba podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?) CitadelStationBot 2018-04-03 22:02:17 -05:00
  • fff22d5409 podpeople, wishgranter victims, and clones no longer get 0 as one of their affixes (?) (#36733) Armhulen 2018-04-03 16:11:31 -07:00
  • e94c4ed24d Fixes bloodbath effects not working on people in crit CitadelStationBot 2018-04-03 22:02:00 -05:00
  • 4fb2e612df Fixes bloodbath effects not working on people in crit (#36598) kevinz000 2018-04-03 17:08:52 -07:00
  • 884f70d233 src. kevinz000 2018-04-03 02:22:28 -07:00
  • 768864d24a looc kevinz000 2018-04-03 02:22:07 -07:00
  • 5dddb2db45 Merge pull request #6083 from Citadel-Station-13/upstream-merge-36149 deathride58 2018-04-03 08:16:59 +00:00
  • edccb8b3e4 Merge pull request #6153 from Citadel-Station-13/upstream-merge-36442 deathride58 2018-04-03 08:16:11 +00:00
  • a196e2c58e Merge pull request #6243 from Citadel-Station-13/upstream-merge-36907 deathride58 2018-04-03 08:15:33 +00:00
  • 1013f3d92e Merge pull request #6245 from Citadel-Station-13/upstream-merge-36490 deathride58 2018-04-03 08:15:12 +00:00
  • 2a8196f618 Merge pull request #6246 from Citadel-Station-13/upstream-merge-36855 deathride58 2018-04-03 08:14:43 +00:00
  • 19b145393a Merge pull request #6244 from Citadel-Station-13/upstream-merge-36930 deathride58 2018-04-03 08:14:27 +00:00
  • 7b91a07658 kek kevinz000 2018-04-02 19:53:36 -07:00
  • ca014a4815 [MIRROR] AI VOX Sound File Fixes (#6242) CitadelStationBot 2018-04-02 21:10:24 -05:00
  • c3e86ebc95 [MIRROR] Updates travis byond to 512.1418 (#6239) CitadelStationBot 2018-04-02 21:09:52 -05:00
  • 16d67fa68c implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo CitadelStationBot 2018-04-02 19:46:01 -05:00
  • 496f73bc56 implant_loyality.dm has been changed to implant_mindshield.dm, better reflecting it's contents and removing a typo (#36855) iksyp 2018-04-02 17:45:03 -07:00
  • fb37429f49 Archaeology... .... Code Cleanup (One day I promise!) CitadelStationBot 2018-04-02 18:14:15 -05:00
  • 2d710e863f Archaeology... .... Code Cleanup (One day I promise!) (#36490) Grandmother of 50 2018-04-02 19:13:32 -04:00
  • 210d31b830 Removes april fools pitch shifting on admin music CitadelStationBot 2018-04-02 18:08:59 -05:00
  • b428142e39 Removes april fools pitch shifting on admin music oranges 2018-04-02 22:44:12 +00:00
  • c5d38d983f Unit tests don't start until after 10s of round time CitadelStationBot 2018-04-02 14:57:18 -05:00
  • 376eee917a Unit tests don't start until after 10s of round time (#36907) Jordan Brown 2018-04-02 15:56:03 -04:00
  • 2d5874d292 Merge pull request #6238 from Citadel-Station-13/upstream-merge-36888 LetterJay 2018-04-02 09:11:59 -05:00
  • 03685c9888 Merge pull request #6241 from Citadel-Station-13/upstream-merge-36906 LetterJay 2018-04-02 09:03:20 -05:00
  • b9c9336cbf Merge pull request #6240 from Citadel-Station-13/upstream-merge-36905 LetterJay 2018-04-02 09:01:04 -05:00
  • 82a3b2d872 Merge pull request #6237 from Citadel-Station-13/upstream-merge-36901 LetterJay 2018-04-02 08:59:10 -05:00
  • 68a4a7d746 Merge pull request #6236 from Citadel-Station-13/upstream-merge-36902 LetterJay 2018-04-02 08:57:18 -05:00
  • 984c9f4d8e Merge pull request #6235 from Citadel-Station-13/upstream-merge-36899 LetterJay 2018-04-02 08:55:56 -05:00
  • 8c1625ce08 Merge pull request #6234 from Citadel-Station-13/upstream-merge-36887 LetterJay 2018-04-02 08:48:01 -05:00
  • 3a1d20a696 Adds missing mood config option CitadelStationBot 2018-04-02 08:37:23 -05:00
  • 4bd86b8c72 Merge pull request #36906 from tgstation/KorPhaeron-patch-1 Jordan Brown 2018-04-02 09:36:26 -04:00
  • 4311e97f34 Removes ancient library readme file CitadelStationBot 2018-04-02 08:37:15 -05:00
  • 383b0d1214 Merge pull request #36905 from Jordie0608/thisreadmepredatesgooglecodeitsprobablyolderthansomeplayers Jordan Brown 2018-04-02 09:36:37 -04:00
  • a3315ba648 Removes unecessary compares in turf atmos init CitadelStationBot 2018-04-02 08:33:48 -05:00
  • 16896254cf Merge pull request #36888 from Robustin/initatmos Jordan Brown 2018-04-02 09:32:29 -04:00
  • c07fbc709b Fixes morgue beeper message CitadelStationBot 2018-04-02 08:32:33 -05:00
  • 5142076ea7 Merge pull request #36901 from KorPhaeron/beeper Jordan Brown 2018-04-02 09:31:17 -04:00
  • af91ca74a6 Fixes drone night vision CitadelStationBot 2018-04-02 08:32:23 -05:00
  • 0dc793129d Merge pull request #36902 from KorPhaeron/dronevision Jordan Brown 2018-04-02 09:31:27 -04:00
  • a69407dce3 Fixes an edge case with atmos gas mixture garbage collection CitadelStationBot 2018-04-02 08:31:11 -05:00
  • 5b2df864e3 Merge pull request #36899 from vuonojenmustaturska/quantumsolace Jordan Brown 2018-04-02 09:30:54 -04:00
  • b56bd695f2 Cid randomizer check no longer triggers if the user's cid changes once then changes back CitadelStationBot 2018-04-02 08:26:55 -05:00
  • 05ae1b304a Cid randomizer check no longer triggers if the user's cid changes once then changes back (#36887) Kyle Spier-Swenson 2018-04-02 06:25:42 -07:00
  • 7de2934a26 Merge pull request #6210 from Citadel-Station-13/upstream-merge-36834 LetterJay 2018-04-02 06:58:18 -05:00
  • 89f382df4e Merge pull request #6025 from Poojawa/increase-age-gap LetterJay 2018-04-02 06:57:24 -05:00
  • aaeb289c78 Automatic changelog generation for PR #6131 [ci skip] LetterJay 2018-04-02 05:50:13 -05:00
  • 5dbb046757 Merge pull request #6131 from deathride58/gearIDwhitelists LetterJay 2018-04-02 05:50:10 -05:00