Commit Graph

10332 Commits

Author SHA1 Message Date
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
220e1cd8cf Merge pull request #4400 from Citadel-Station-13/revert-4329-tgsync_1
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:10:41 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
LetterJay
715960b324 Merge pull request #4329 from Citadel-Station-13/tgsync_1
[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC
2017-12-16 12:54:00 -06:00
deathride58
b1efb191bc fixes brain_damage_lines.json compile errors 2017-12-15 16:35:07 -08:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
CitadelStationBot
b6b0ab69e3 Automatic changelog generation for PR #4338 [ci skip] 2017-12-14 22:21:58 -06:00
deathride58
ebf0817c76 Merge pull request #4338 from Citadel-Station-13/upstream-merge-33468
[MIRROR] Designs now default to department flag ALL instead of NONE
2017-12-15 04:21:56 +00:00
CitadelStationBot
4680a22b4c Automatic changelog generation for PR #4359 [ci skip] 2017-12-14 22:21:36 -06:00
deathride58
fdb9de488e Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-15 04:21:34 +00:00
CitadelStationBot
a39e1d5515 Automatic changelog generation for PR #4383 [ci skip] 2017-12-14 22:20:52 -06:00
deathride58
5c4d9576db Merge pull request #4383 from Citadel-Station-13/upstream-merge-33216
[MIRROR] Player Z-tracking, again
2017-12-15 04:20:50 +00:00
deathride58
c4b7b940d2 Merge pull request #4345 from Citadel-Station-13/upstream-merge-33475
[MIRROR] Antag spawner fixes
2017-12-15 04:20:27 +00:00
deathride58
d2d9cd7fc2 Update logout.dm 2017-12-14 19:12:27 -05:00
vuonojenmustaturska
c27c52cf58 Player Z-tracking, again 2017-12-14 17:35:35 -06:00
deathride58
e5671eece5 Merge pull request #4379 from Citadel-Station-13/upstream-merge-33298
[MIRROR] Fixes zombie head removal
2017-12-14 22:20:45 +00:00
CitadelStationBot
6108a71595 Automatic changelog generation for PR #4378 [ci skip] 2017-12-14 16:20:27 -06:00
deathride58
f1ad5fe4d8 Merge pull request #4378 from Citadel-Station-13/upstream-merge-33207
[MIRROR] New closet sprites
2017-12-14 22:20:24 +00:00
deathride58
94b93878be Merge pull request #4376 from Citadel-Station-13/upstream-merge-33366
[MIRROR] Adds SDQL chat command
2017-12-14 22:20:05 +00:00
CitadelStationBot
54bd072932 Fixes zombie head removal 2017-12-14 15:54:07 -06:00
oranges
382017cbe8 Merge pull request #33298 from QualityVan/zombrain
Fixes zombie head removal
2017-12-14 15:54:07 -06:00
CitadelStationBot
7cb8f5ceb3 New closet sprites 2017-12-14 15:49:50 -06:00
nicbn
6f9ecf2f32 New closet sprites (#33207)
They're new sprites deal with it
2017-12-14 15:49:49 -06:00
CitadelStationBot
c7ce6d338a Adds SDQL chat command 2017-12-14 15:44:25 -06:00
Jordan Brown
253a3d519e Adds SDQL chat command (#33366)
Allow's calling SDQL from bots supporting the CHAT system API
2017-12-14 15:44:25 -06:00
deathride58
a22b225015 Merge pull request #4373 from Citadel-Station-13/upstream-merge-33511
[MIRROR] Adds feedback for explosions
2017-12-14 21:19:16 +00:00
CitadelStationBot
6abac0e1d5 Adds feedback for explosions 2017-12-14 14:00:51 -06:00
Jordan Brown
7f997a6a6d Adds feedback for explosions (#33511)
* Adds feedback for explosions

* Remove stray quote

* Fixes + flash and flame
2017-12-14 14:00:51 -06:00
deathride58
7fafaa5500 Merge pull request #4371 from Citadel-Station-13/upstream-merge-33506
[MIRROR] Split personality now logs when a ghost gets control of it
2017-12-14 19:42:21 +00:00
deathride58
7b4e1b2e6b Update designs.dm 2017-12-14 14:38:10 -05:00
deathride58
37851fe771 Update antag_spawner.dm 2017-12-14 14:36:19 -05:00
deathride58
91530e2747 Update admin_ranks.txt 2017-12-14 14:34:03 -05:00
deathride58
4d61ea105d Update holder2.dm 2017-12-14 14:33:17 -05:00
CitadelStationBot
7a04015fdb Automatic changelog generation for PR #4353 [ci skip] 2017-12-14 13:32:26 -06:00
deathride58
77107aab10 Merge pull request #4353 from deathride58/mapsyncsandmore
Map syncs - departmental lathes and more
2017-12-14 19:32:23 +00:00
CitadelStationBot
9b3fa61c65 Automatic changelog generation for PR #4365 [ci skip] 2017-12-14 13:32:01 -06:00
deathride58
78f36fb424 Merge pull request #4365 from Citadel-Station-13/upstream-merge-33490
[MIRROR] Fixes Cybernetic Lungs not being available in cyber_organs techweb node
2017-12-14 19:31:58 +00:00
deathride58
bb603498e1 Merge pull request #4368 from Citadel-Station-13/upstream-merge-33509
[MIRROR] Fixes canceling on rule/report/forum buttons
2017-12-14 19:30:58 +00:00
deathride58
1031ccc3b4 Update tgstation.dme 2017-12-14 14:29:34 -05:00
CitadelStationBot
301d073c81 Automatic changelog generation for PR #4372 [ci skip] 2017-12-14 13:27:52 -06:00
deathride58
9c1843c746 Merge pull request #4372 from Citadel-Station-13/upstream-merge-33503
[MIRROR] Adds new gun dry firing sounds
2017-12-14 19:27:48 +00:00
CitadelStationBot
b95aa08c02 Adds new gun dry firing sounds 2017-12-14 06:15:11 -06:00
ShizCalev
712b86089d Adds new gun dry firing sounds (#33503)
* Adds new gun dry firing sounds

* Don't want to hear click when you want to hear bang
2017-12-14 06:15:11 -06:00
CitadelStationBot
d5fed83b3b Split personality now logs when a ghost gets control of it 2017-12-14 06:12:58 -06:00
Leo
d59fb8c61c Split personality now logs when a ghost gets control of it (#33506) 2017-12-14 06:12:57 -06:00
CitadelStationBot
783c52abe0 Fixes canceling on rule/report/forum buttons 2017-12-14 03:41:54 -06:00
AnturK
4d247d88e6 Fixes canceling on rule/report/forum buttons (#33509)
* Fixes report issue cancel

* Other buttons to while i'm at it.
2017-12-14 03:41:54 -06:00
CitadelStationBot
05fa72f0c0 Fixes Cybernetic Lungs not being available in cyber_organs techweb node 2017-12-13 22:09:56 -06:00
Epoc
b2f24a3773 Adds Cybernetic Lungs to cyber_organs techweb node (#33490) 2017-12-13 22:09:56 -06:00
CitadelStationBot
fb7cb2f063 Automatic changelog generation for PR #4354 [ci skip] 2017-12-13 21:54:33 -06:00