Commit Graph
11400 Commits
Author SHA1 Message Date
deathride58andGitHub 57d8457108 Merge pull request #4705 from Citadel-Station-13/upstream-merge-33645
[MIRROR] Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog
2018-01-08 04:15:47 +00:00
deathride58andGitHub ba909ce9a2 Merge pull request #4704 from Citadel-Station-13/upstream-merge-34128
[MIRROR] Removes the safe dial multiplier
2018-01-08 04:15:12 +00:00
CitadelStationBot 531a2229dd Automatic changelog generation for PR #4703 [ci skip] 2018-01-07 22:14:54 -06:00
deathride58andGitHub d11604e502 Merge pull request #4703 from Citadel-Station-13/upstream-merge-34129
[MIRROR] Adds package wrapping to autolathes
2018-01-08 04:14:52 +00:00
deathride58andGitHub e5f3a5adde Merge pull request #4702 from Citadel-Station-13/upstream-merge-34148
[MIRROR] Make tgui reload.bat work
2018-01-08 04:14:35 +00:00
deathride58andGitHub da3d982ed6 Merge pull request #4701 from Citadel-Station-13/upstream-merge-34118
[MIRROR] Reduces the memory footprint of the gas_mixture datum
2018-01-08 04:14:22 +00:00
deathride58andGitHub b18d720730 Merge pull request #4700 from Citadel-Station-13/upstream-merge-34119
[MIRROR] Fixes uplink_purchase_log GC error
2018-01-08 04:14:04 +00:00
CitadelStationBot 457f6de178 Automatic changelog generation for PR #4699 [ci skip] 2018-01-07 22:13:50 -06:00
deathride58andGitHub d1d2ed1139 Merge pull request #4699 from Citadel-Station-13/upstream-merge-34157
[MIRROR] Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason
2018-01-08 04:13:47 +00:00
CitadelStationBot ca16a7c76e Automatic changelog generation for PR #4698 [ci skip] 2018-01-07 22:13:31 -06:00
deathride58andGitHub 9f3879ce8b Merge pull request #4698 from Citadel-Station-13/upstream-merge-34121
[MIRROR] Fixes decals being created on bad turfs
2018-01-08 04:13:28 +00:00
CitadelStationBot efb304dde4 Automatic changelog generation for PR #4695 [ci skip] 2018-01-07 22:10:20 -06:00
deathride58andGitHub e43f651c89 Merge pull request #4695 from Citadel-Station-13/upstream-merge-34132
[MIRROR] Updates the exp config default override hours and clarifies it a bit.
2018-01-08 04:10:18 +00:00
CitadelStationBot 5be92f68b8 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog 2018-01-07 20:18:28 -06:00
Ashe HiggsandCitadelStationBot c3712f5be5 Servants are now moved to and restricted to Reebe when the Ark starts; also updates the CC changelog (#33645)
* Objects touched by servants now warp to the Ark

* Check by servant

* Replaces with a baselock

* Updates the 'log
2018-01-07 20:18:28 -06:00
CitadelStationBot 611cb76c90 Removes the safe dial multiplier 2018-01-07 20:08:11 -06:00
Jordan BrownandCitadelStationBot bc636ddb2c Merge pull request #34128 from ShizCalev/safe-dial
Removes the safe dial multiplier
2018-01-07 20:08:11 -06:00
CitadelStationBot e25fb1c1d2 Adds package wrapping to autolathes 2018-01-07 20:07:00 -06:00
Jordan BrownandCitadelStationBot f9f6bae65d Merge pull request #34129 from MrDoomBringer/eminem
Adds package wrapping to autolathes
2018-01-07 20:07:00 -06:00
CitadelStationBot 742784d2f1 Make tgui reload.bat work 2018-01-07 19:59:45 -06:00
Jordan BrownandCitadelStationBot 0c606646e3 Merge pull request #34148 from MoreRobustThanYou/patch-44
Make tgui reload.bat work
2018-01-07 19:59:45 -06:00
CitadelStationBot c78de6907f Reduces the memory footprint of the gas_mixture datum 2018-01-07 19:58:35 -06:00
Jordan BrownandCitadelStationBot 1e4a6dd26b Merge pull request #34118 from MrStonedOne/patch-459
Reduces the memory footprint of the gas_mixture datum
2018-01-07 19:58:35 -06:00
CitadelStationBot 3c1d44e591 Fixes uplink_purchase_log GC error 2018-01-07 18:52:26 -06:00
Jordan BrownandCitadelStationBot 1e2e8b7ecb Fixes uplink_purchase_log GC error (#34119)
* Fixes uplink_purchase_log GC error

* Add missing GLOB.
2018-01-07 18:52:26 -06:00
CitadelStationBot d7640c1341 Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason 2018-01-07 18:51:16 -06:00
kevinz000andCitadelStationBot ff80771081 Fixes comms console dchat announcing announcements even if they didn't happen for whatever reason (#34157)
* Fixes dchat broadcast

* Update communications.dm
2018-01-07 18:51:16 -06:00
CitadelStationBot b547151f12 Fixes decals being created on bad turfs 2018-01-07 18:51:09 -06:00
Jordan BrownandCitadelStationBot 801eab4c3c Fixes decals being created on bad turfs (#34121)
* Fixes decals being created on bad turfs

* Fix decal check

* squash me daddy
2018-01-07 18:51:09 -06:00
CitadelStationBot 616ce0adef Updates the exp config default override hours and clarifies it a bit. 2018-01-07 18:45:35 -06:00
Shadowlight213andCitadelStationBot 7f9725c2ae Updates the exp config default override hours and clarifies it a bit. (#34132) 2018-01-07 18:45:35 -06:00
CitadelStationBot 1f65e222b7 Automatic changelog generation for PR #4692 [ci skip] 2018-01-07 14:39:31 -06:00
deathride58andGitHub 1944c08a7b Merge pull request #4692 from Citadel-Station-13/upstream-merge-34140
[MIRROR] Fixes armor penetration not working on objects and therefore mechs
2018-01-07 20:39:29 +00:00
deathride58andGitHub 57d79640f4 Merge pull request #4691 from Citadel-Station-13/upstream-merge-34134
[MIRROR] Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp
2018-01-07 20:30:06 +00:00
deathride58andGitHub cc0cb03046 Merge pull request #4693 from Citadel-Station-13/upstream-merge-34127
[MIRROR] Removes the weird timer shennaigans from exp tracking
2018-01-07 20:21:47 +00:00
deathride58andGitHub 7f19b55888 Merge pull request #4689 from Citadel-Station-13/upstream-merge-34131
[MIRROR] Fixes sunglasses' incorrect description
2018-01-07 20:21:31 +00:00
deathride58andGitHub 4795dce925 Merge pull request #4690 from Citadel-Station-13/upstream-merge-34130
[MIRROR] fixes package wrap stack name
2018-01-07 20:21:17 +00:00
deathride58andGitHub 7f53f7dc08 Update projectile.dm 2018-01-07 15:20:59 -05:00
deathride58andGitHub dd5dc57043 Update blood.dm 2018-01-07 15:20:11 -05:00
CitadelStationBot b54b6a2740 Removes the weird timer shennaigans from exp tracking 2018-01-07 11:06:14 -06:00
LeoandCitadelStationBot d5a54402cf Merge pull request #34127 from tgstation/Cyberboss-patch-7
Removes the weird timer shennaigans from exp tracking
2018-01-07 11:06:14 -06:00
LeoandCitadelStationBot be1fe799db Fixes armor penetration not working on objects and therefore mechs 2018-01-07 11:03:59 -06:00
ShizCalevandCitadelStationBot 7956e3df27 Corrects inconsistent usage of 310.055, 310.15, & 310 as body temp 2018-01-07 11:02:49 -06:00
CitadelStationBot 9fcc37a92b fixes package wrap stack name 2018-01-07 02:08:51 -06:00
modularized_suicideandCitadelStationBot c2851e7837 priority:critical 2018-01-07 02:08:51 -06:00
CitadelStationBot 3bbb18f815 Fixes sunglasses' incorrect description 2018-01-07 02:07:39 -06:00
modularized_suicideandCitadelStationBot f13426c5af many flashes?? 2018-01-07 02:07:39 -06:00
deathride58andGitHub 277320b126 Merge pull request #4685 from Citadel-Station-13/upstream-merge-34114
[MIRROR] Fixes some antags missing from roundend report
2018-01-06 20:30:02 +00:00
LetterJayandGitHub 8c448b0d52 Merge pull request #4686 from Citadel-Station-13/upstream-merge-34116
[MIRROR] Adds ban option for team antags
2018-01-06 10:23:17 -06:00
LetterJayandGitHub f36b07371f Update datum_traitor.dm 2018-01-06 10:23:08 -06:00