Commit Graph

10928 Commits

Author SHA1 Message Date
Buggy123 6ce76e38d4 CTF flags are no longer locked to CTF. (#33874)
* CTF flags are no longer locked to CTF.

* Var added to enable/disable pickup by anybody.
2017-12-29 00:29:42 -06:00
CitadelStationBot 0d79434b72 Automatic changelog generation for PR #4554 [ci skip] 2017-12-28 23:57:42 -06:00
LetterJay 2ac9d9a171 Merge pull request #4554 from Citadel-Station-13/upstream-merge-33858
[MIRROR] Adds open/close sound to blastdoors and shutters
2017-12-28 23:57:40 -06:00
CitadelStationBot 6a84048518 Automatic changelog generation for PR #4563 [ci skip] 2017-12-28 23:50:03 -06:00
LetterJay 40859e3c0a Merge pull request #4563 from deathride58/anthromedibots
[READY] Adds a new alternate sprite for mediborgs from Paradise (with modifications from Vivi) and more!
2017-12-28 23:50:00 -06:00
LetterJay 98e8e4bbbf Merge pull request #4562 from Citadel-Station-13/upstream-merge-33868
[MIRROR] Fixes EMP runtime
2017-12-28 23:49:45 -06:00
LetterJay bfd0c7edfa Merge pull request #4561 from Citadel-Station-13/upstream-merge-33853
[MIRROR] If the world is launched with the "no-init" param. Master.Initialize isn't called
2017-12-28 23:49:28 -06:00
deathride58 3df98e631b Fixes compiling errors 2017-12-28 16:13:30 -05:00
deathride58 2fdb9e598f Modularizes dogborgs, adds new alternate skins for some modules, and more! 2017-12-28 15:50:33 -05:00
CitadelStationBot 311888361b Fixes EMP runtime 2017-12-28 04:09:06 -06:00
oranges 0223fed7a3 Merge pull request #33868 from Robustin/EMPruntime
Fixes EMP runtime
2017-12-28 04:09:06 -06:00
CitadelStationBot 19df2df07b If the world is launched with the "no-init" param. Master.Initialize isn't called 2017-12-27 23:59:21 -06:00
oranges 0147b4a7e1 Merge pull request #33853 from tgstation/Cyberboss-patch-2
If the world is launched with the "no-init" param. Master.Initialize isn't called
2017-12-27 23:59:21 -06:00
deathride58 90582d2e1a Merge pull request #4557 from Citadel-Station-13/upstream-merge-33831
[MIRROR] adds handholding
2017-12-28 02:59:56 +00:00
deathride58 df14e129f4 Merge pull request #4528 from Citadel-Station-13/upstream-merge-33708
[MIRROR] Adds random seed feedback
2017-12-28 02:59:01 +00:00
deathride58 b8dc623ebc Update poddoor.dm 2017-12-27 21:57:51 -05:00
deathride58 aa83dbf500 Merge pull request #4532 from Citadel-Station-13/upstream-merge-33759
[MIRROR] Modified the starting locations of advanced camera console eyes
2017-12-28 02:54:18 +00:00
CitadelStationBot f55cb8f9b3 Automatic changelog generation for PR #4531 [ci skip] 2017-12-27 20:53:49 -06:00
deathride58 a8154d102a Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777
[MIRROR] Arena shuttle teleport fix
2017-12-28 02:53:47 +00:00
deathride58 b258879423 Merge pull request #4537 from Citadel-Station-13/upstream-merge-33828
[MIRROR] Revert "Vending TGUI"
2017-12-28 02:53:22 +00:00
deathride58 754d3d9b28 Merge pull request #4539 from Citadel-Station-13/upstream-merge-33840
[MIRROR] Logs traumas in the feedback database
2017-12-28 02:53:01 +00:00
CitadelStationBot 59c7a32e1a Automatic changelog generation for PR #4538 [ci skip] 2017-12-27 20:52:47 -06:00
deathride58 0f3e69a420 Merge pull request #4538 from Citadel-Station-13/upstream-merge-33820
[MIRROR] Material containers only insert on help intent
2017-12-28 02:52:45 +00:00
deathride58 3e741abc89 Merge pull request #4541 from Citadel-Station-13/upstream-merge-33832
[MIRROR] Improve parts of CentCom's appearance slightly
2017-12-28 02:52:30 +00:00
CitadelStationBot d87c245227 Automatic changelog generation for PR #4549 [ci skip] 2017-12-27 20:52:11 -06:00
deathride58 c286dfcefb Merge pull request #4549 from Citadel-Station-13/upstream-merge-33833
[MIRROR] Fixes ghost zoom being broken
2017-12-28 02:52:08 +00:00
CitadelStationBot c52c7e9c6f Automatic changelog generation for PR #4552 [ci skip] 2017-12-27 20:50:52 -06:00
deathride58 ca285046b0 Merge pull request #4552 from Citadel-Station-13/upstream-merge-33859
[MIRROR] Hallucinations no longer show open doors "bolting"
2017-12-28 02:50:50 +00:00
deathride58 aa8354c504 Merge pull request #4553 from Citadel-Station-13/upstream-merge-33850
[MIRROR] Radiation sign no longer has blood on it
2017-12-28 02:50:38 +00:00
deathride58 29d46e985a Merge pull request #4559 from Citadel-Station-13/upstream-merge-33888
[MIRROR] relic teleport no longer recursively calls itself
2017-12-28 02:50:11 +00:00
deathride58 36d8ff1811 Update mob.dm 2017-12-27 21:48:18 -05:00
CitadelStationBot 300a2cdf96 relic teleport no longer recursively calls itself 2017-12-27 19:32:26 -06:00
Jordan Brown df080960d4 Merge pull request #33888 from optimumtact/dothefandangomistersantiago
relic teleport no longer recursively calls itself
2017-12-27 19:32:26 -06:00
kevinz000 c8788ed4f7 adds handholding 2017-12-27 16:20:44 -06:00
Jordan Brown dbab8bbdab Adds open/close sound to blastdoors and shutters 2017-12-27 10:50:17 -06:00
CitadelStationBot 85fac687ac Radiation sign no longer has blood on it 2017-12-27 09:20:28 -06:00
Leo 70be709675 Merge pull request #33850 from nicbn/sprites
Radiation sign no longer has blood on it
2017-12-27 09:20:28 -06:00
CitadelStationBot ba3d7bf475 Hallucinations no longer show open doors "bolting" 2017-12-27 08:26:16 -06:00
Robustin 4a93756e6b Hallucinations no longer show open doors "bolting" (#33859)
* No more "bolting" open doors

* Update Hallucination.dm

* Update Hallucination.dm
2017-12-27 08:26:16 -06:00
LetterJay a034383e15 Merge pull request #4449 from Citadel-Station-13/upstream-merge-33627
[MIRROR] dock() re-organization
2017-12-27 07:01:40 -06:00
LetterJay c84a8cc9e1 Merge pull request #4370 from Citadel-Station-13/upstream-merge-33504
[MIRROR] Saves newscaster data and photos to round logs folder
2017-12-27 04:46:04 -06:00
LetterJay e2d2c8cda0 Merge branch 'master' into upstream-merge-33627 2017-12-27 04:41:27 -06:00
CitadelStationBot a5923374ab Automatic changelog generation for PR #4534 [ci skip] 2017-12-27 03:05:51 -06:00
LetterJay 2b77dda3e9 Merge pull request #4534 from Citadel-Station-13/upstream-merge-33780
[MIRROR] Blocks auxiliary bases from being placed on top of lava or indestructible turfs
2017-12-27 03:05:48 -06:00
LetterJay 67ef791794 Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821
[MIRROR] Fixes deleting handcuffs
2017-12-27 03:05:33 -06:00
CitadelStationBot b8af7773e5 Automatic changelog generation for PR #4536 [ci skip] 2017-12-27 03:05:23 -06:00
LetterJay d33fe81662 Merge pull request #4536 from Citadel-Station-13/upstream-merge-33822
[MIRROR] Cut through handcuffs with power wirecutters
2017-12-27 03:05:21 -06:00
CitadelStationBot d70c0ea265 Automatic changelog generation for PR #4551 [ci skip] 2017-12-27 03:04:44 -06:00
LetterJay bb9e223b7d Merge pull request #4551 from Citadel-Station-13/upstream-merge-33749
[MIRROR] Maybe make R&D console icons load faster
2017-12-27 03:04:42 -06:00
LetterJay 0b2e6562af Merge pull request #4550 from Citadel-Station-13/upstream-merge-33770
[MIRROR] adds ABSTRACT_1 flag to internal magazine objects
2017-12-27 03:04:17 -06:00