Commit Graph
14669 Commits
Author SHA1 Message Date
deathride58andGitHub a9b3b0b7f4 Merge branch 'master' into upstream-merge-36242 2018-03-09 20:38:39 +00:00
CitadelStationBot ce0b0127a9 Automatic changelog generation for PR #5853 [ci skip] 2018-03-09 14:37:00 -06:00
deathride58andGitHub 2c34acc034 Merge pull request #5853 from Citadel-Station-13/upstream-merge-35475
[MIRROR] [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
2018-03-09 20:36:58 +00:00
CitadelStationBot 0aecef50e9 Automatic changelog generation for PR #5871 [ci skip] 2018-03-09 13:39:31 -06:00
deathride58andGitHub 6b8213fff1 Merge pull request #5871 from Citadel-Station-13/upstream-merge-36258
[MIRROR] Makes the smoke machine deconstructable
2018-03-09 19:39:28 +00:00
deathride58andGitHub a62aa577f1 Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
2018-03-09 19:25:12 +00:00
CitadelStationBot 9d6e9a0397 Automatic changelog generation for PR #5857 [ci skip] 2018-03-09 13:24:37 -06:00
deathride58andGitHub bc5447d97b Merge pull request #5857 from Citadel-Station-13/upstream-merge-35947
[MIRROR] [READY] NTNet airlocks
2018-03-09 19:24:35 +00:00
deathride58 c66b390cc1 Moves arousal meter to compensate for mood display 2018-03-09 14:23:49 -05:00
deathride58 936c6a33f2 Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475 2018-03-09 14:18:47 -05:00
CitadelStationBot ce7cf03183 Makes the smoke machine deconstructable 2018-03-09 12:48:31 -06:00
Jordan BrownandCitadelStationBot 7650336507 Merge pull request #36258 from vuonojenmustaturska/bepis
Makes the smoke machine deconstructable
2018-03-09 12:48:31 -06:00
CitadelStationBot e62f090dad Automatic changelog generation for PR #5843 [ci skip] 2018-03-09 12:46:13 -06:00
deathride58andGitHub 45b473f14d Merge pull request #5843 from Poojawa/trek-outfits
Trek outfits
2018-03-09 18:46:11 +00:00
CitadelStationBot 9f976c4574 Automatic changelog generation for PR #5827 [ci skip] 2018-03-09 12:44:07 -06:00
deathride58andGitHub 32812ce624 Merge pull request #5827 from NopeMcHaltman/goddamnit
Nymphotrait
2018-03-09 18:44:05 +00:00
CitadelStationBot 8ebc32cae1 Automatic changelog generation for PR #5830 [ci skip] 2018-03-09 12:43:37 -06:00
deathride58andGitHub 5743ce2222 Merge pull request #5830 from Zna12/Biodegradable-Darts
Degradable Darts, Citadel Style
2018-03-09 18:43:35 +00:00
deathride58andGitHub 31d7baf516 Update runtimestation.dmm 2018-03-09 13:43:12 -05:00
CitadelStationBot 3a8c6c1651 Automatic changelog generation for PR #5850 [ci skip] 2018-03-09 12:41:08 -06:00
deathride58andGitHub aa0dbb5603 Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070
[MIRROR] Beacons are no longer radios
2018-03-09 18:41:05 +00:00
deathride58andGitHub c615d9e6a0 Merge pull request #5870 from Citadel-Station-13/upstream-merge-36252
[MIRROR] Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
2018-03-09 18:40:24 +00:00
deathride58andGitHub fdbd8aec97 Merge pull request #5869 from Citadel-Station-13/upstream-merge-36288
[MIRROR] You can no longer SDQL select certain datums
2018-03-09 18:40:09 +00:00
deathride58andGitHub a4751b0e94 Merge pull request #5868 from Citadel-Station-13/upstream-merge-36289
[MIRROR] [s] Stop qdeling shit you're not supposed to
2018-03-09 18:39:51 +00:00
deathride58andGitHub 2a92653e68 Merge pull request #5867 from Citadel-Station-13/upstream-merge-36290
[MIRROR] [s] Guards client.holder
2018-03-09 18:39:35 +00:00
deathride58andGitHub 8728d99ef9 Merge pull request #5866 from Citadel-Station-13/upstream-merge-36287
[MIRROR] [S] Fixes GLOB protected vars exploit
2018-03-09 18:39:19 +00:00
deathride58andGitHub f10552f7ef Update ntnet_interface.dm 2018-03-09 13:37:55 -05:00
deathride58andGitHub 1387c8e3b6 Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858
[MIRROR] Mushroom people, revived!
2018-03-09 18:37:29 +00:00
deathride58andGitHub 78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
CitadelStationBot 7ae58f96cb Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink 2018-03-09 11:04:28 -06:00
vuonojenmustaturskaandCitadelStationBot 1995f00032 Merge pull request #36252 from kevinz000/patch-463
Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
2018-03-09 11:04:28 -06:00
CitadelStationBot 7c3463dd96 You can no longer SDQL select certain datums 2018-03-09 10:45:58 -06:00
vuonojenmustaturskaandCitadelStationBot bf63e9ad3f Merge pull request #36288 from Cyberboss/BansKevinzFinally
You can no longer SDQL select certain datums
2018-03-09 10:45:58 -06:00
CitadelStationBot 06ddefe04a [s] Stop qdeling shit you're not supposed to 2018-03-09 10:44:46 -06:00
vuonojenmustaturskaandCitadelStationBot ba5b5b433e Merge pull request #36289 from tgstation/Cyberboss-patch-4
[s] Stop qdeling shit you're not supposed to
2018-03-09 10:44:46 -06:00
CitadelStationBot 828740b417 [s] Guards client.holder 2018-03-09 10:28:17 -06:00
vuonojenmustaturskaandCitadelStationBot f25ed2503e Merge pull request #36290 from tgstation/Cyberboss-patch-5
[s] Guards client.holder
2018-03-09 10:28:17 -06:00
CitadelStationBot ff035c8f46 [S] Fixes GLOB protected vars exploit 2018-03-09 09:07:35 -06:00
vuonojenmustaturskaandCitadelStationBot 27928bb1bf Merge pull request #36287 from tgstation/Cyberboss-patch-4
[S] Fixes GLOB protected vars exploit
2018-03-09 09:07:35 -06:00
LetterJayandGitHub ad0be11cbc Merge pull request #5865 from Citadel-Station-13/upstream-merge-36073
[MIRROR] [READY AND TESTED]Projectiles now properly delete themselves if they try to move and their trajectory is at an invalid turf
2018-03-09 04:53:41 -06:00
CitadelStationBot 0db1c5e8b1 Automatic changelog generation for PR #5864 [ci skip] 2018-03-09 04:53:26 -06:00
LetterJayandGitHub 2f2aed48e4 Merge pull request #5864 from Citadel-Station-13/upstream-merge-36051
[MIRROR] The ARM is now harder to obtain
2018-03-09 04:53:23 -06:00
CitadelStationBot 34c508996a Automatic changelog generation for PR #5863 [ci skip] 2018-03-09 04:53:14 -06:00
LetterJayandGitHub 5ac9ce4a02 Merge pull request #5863 from Citadel-Station-13/upstream-merge-36058
[MIRROR] Display cases can now have a list where to randomly spawn items from
2018-03-09 04:53:10 -06:00
LetterJayandGitHub f207fe1f08 Merge pull request #5862 from Citadel-Station-13/upstream-merge-36233
[MIRROR] Adds explicit check for numberless backpack contents in outfits.
2018-03-09 04:52:46 -06:00
CitadelStationBot 6ea8a60314 Automatic changelog generation for PR #5861 [ci skip] 2018-03-09 04:52:34 -06:00
LetterJayandGitHub 0e2531faaf Merge pull request #5861 from Citadel-Station-13/upstream-merge-36106
[MIRROR] To go even further byond... the above lighting layer!
2018-03-09 04:52:32 -06:00
LetterJayandGitHub c86aeef909 Merge pull request #5860 from Citadel-Station-13/upstream-merge-36195
[MIRROR] Minor say code cleanup
2018-03-09 04:52:18 -06:00
CitadelStationBot 6044902543 Automatic changelog generation for PR #5858 [ci skip] 2018-03-09 04:51:44 -06:00
LetterJayandGitHub b139c365c5 Merge pull request #5858 from Citadel-Station-13/upstream-merge-36217
[MIRROR] Sentient diseases get 2 minutes to select their initial host
2018-03-09 04:51:41 -06:00