Commit Graph
17403 Commits
Author SHA1 Message Date
Cw3040 dee92640a8 Cryosleeper Bug Fix
Adds Cyborg weapon modules to var/list/do_not_preserve_items for
Cryosleepers, hopefully eliminating a bug where borg gun modules drop on
cryosleep.
2018-06-08 14:33:40 -04:00
Cw3040 d5e3001261 Changes
This should fix Travis's issue.
2018-06-07 21:14:21 -04:00
Cw3040 45ec368d76 Pubby Changes
-Added Cryogenics
-Kinkmates, of course.
-Keg in maint bar
2018-06-07 20:53:15 -04:00
Cw3040 b833a88204 MetaStation Changes
Added Cryosleepers and KinkMates
2018-06-07 20:44:02 -04:00
Cw3040 fa2cbe7fdc BoxStation Changes
-Maintbar
-Added Cryosleepers
-Added KinkMate in Locker Room
2018-06-07 20:43:22 -04:00
CitadelStationBot 1fbf5af360 Automatic changelog generation for PR #7024 [ci skip] 2018-06-06 23:34:48 -05:00
deathride58andGitHub 8d97bc79e5 Merge pull request #7024 from Citadel-Station-13/upstream-merge-38300
[MIRROR] Fixes Pubby maint boozeomat
2018-06-07 04:34:46 +00:00
deathride58andGitHub a4d1d3d89b Merge pull request #7025 from Citadel-Station-13/upstream-merge-37790
[MIRROR] Individual Logs now follow the client around automatically
2018-06-07 04:34:11 +00:00
deathride58andGitHub cb63c82805 Merge pull request #7026 from Citadel-Station-13/upstream-merge-38209
[MIRROR] Fixes some holocall stuff
2018-06-07 04:33:40 +00:00
deathride58andGitHub 3d623fdf7b Merge pull request #7028 from Citadel-Station-13/upstream-merge-38314
[MIRROR] Adds missing races to mob spawn list
2018-06-07 04:32:55 +00:00
letterjay 86a767df4a Adds missing races to mob spawn list 2018-06-06 17:49:08 -05:00
81Dentonandletterjay afadb178d2 Adds missing races to mob spawn list (#38314)
* adds moths to mob species list

* adds missing species
2018-06-06 17:49:08 -05:00
letterjay f10f0f2709 Fixes some holocall stuff 2018-06-06 14:25:24 -05:00
AnturKandletterjay 717e635d28 Fixes some holocall stuff (#38209)
* Fixes some holocall stuff

* Yep
2018-06-06 14:25:23 -05:00
letterjay 514374b110 Individual Logs now follow the client around automatically 2018-06-06 04:10:20 -05:00
orangesandletterjay de68aa9571 Individual Logs now follow the client around automatically (#37790)
The logging is now stored in the persistent client/player_details datum,
that will survive an entire round

The existing mob log is retained and a new admin verb is added to access
it. It will only show logs for the mob in question, across all players
who possibly spent time in that mob

A new log type is added that tracks the mobs the player changes across
into and the times they occured, to better help admins manage complex
situations, this also appears in the mob log as a record of the players
who entered/exited control of the mob
2018-06-06 04:10:20 -05:00
letterjay 1f21f1edcd Fixes Pubby maint boozeomat 2018-06-06 02:36:34 -05:00
81Dentonandletterjay e3f9229e08 Fixes Pubby maint boozeomat (#38300) 2018-06-06 02:36:34 -05:00
CitadelStationBot 32b91ef798 Automatic changelog generation for PR #7021 [ci skip] 2018-06-06 01:14:50 -05:00
CitadelStationBotandkevinz000 a298f20fa5 [MIRROR] [s] Fixes syndicate sentience exploit (#7021)
* Fixes syndicate sentience exploit (#38299)

* [s] Fixes syndicate sentience exploit
2018-06-05 23:14:48 -07:00
CitadelStationBot 286de1b966 Automatic changelog generation for PR #6868 [ci skip] 2018-06-06 01:12:57 -05:00
LetterJayandkevinz000 fb4c1e8e28 Increases head jobs restricted from antag RNG (#6868)
* restricts traitor and ling jobs

* Update changeling.dm

* Update traitor.dm
2018-06-05 23:12:55 -07:00
CitadelStationBot 7893cb360e Automatic changelog generation for PR #6960 [ci skip] 2018-06-05 18:38:57 -05:00
deathride58andGitHub aab6a78305 Merge pull request #6960 from Citadel-Station-13/upstream-merge-38165
[MIRROR] Adds config for monkey cap
2018-06-05 23:38:54 +00:00
CitadelStationBot 93488e81da Automatic changelog generation for PR #6971 [ci skip] 2018-06-05 18:37:40 -05:00
deathride58andGitHub 98fa9db020 Merge pull request #6971 from Citadel-Station-13/upstream-merge-38179
[MIRROR] Fix Pubby auxiliary mining base
2018-06-05 23:37:37 +00:00
CitadelStationBot 129971c6ba Automatic changelog generation for PR #6979 [ci skip] 2018-06-05 18:37:22 -05:00
deathride58andGitHub bdef4e4e77 Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116
[MIRROR] Refactor machinery to default to being anchored
2018-06-05 23:37:20 +00:00
CitadelStationBot da008a2d83 Automatic changelog generation for PR #7019 [ci skip] 2018-06-05 18:36:39 -05:00
deathride58andGitHub cf170aee33 Merge pull request #7019 from Citadel-Station-13/upstream-merge-38193
[MIRROR] Turns /datum.isprocessing into a datum flag
2018-06-05 23:36:37 +00:00
CitadelStationBot ebe0695af3 Automatic changelog generation for PR #7020 [ci skip] 2018-06-05 18:36:24 -05:00
deathride58andGitHub 629c4a649c Merge pull request #7020 from Citadel-Station-13/upstream-merge-38290
[MIRROR] Admin Supplypod tweaks (Behaves like fireballs, also stuns targets)
2018-06-05 23:36:22 +00:00
letterjay 9535ef1a1f Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) 2018-06-05 18:02:36 -05:00
MrDoomBringerandletterjay 71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290)
* Arianya

* whups caps
2018-06-05 18:02:36 -05:00
letterjay d397b3ab94 Turns /datum.isprocessing into a datum flag 2018-06-05 18:00:21 -05:00
vuonojenmustaturskaandletterjay 83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58andGitHub b3b9a44689 Merge branch 'master' into upstream-merge-38165 2018-06-05 21:53:14 +00:00
deathride58andGitHub 255ffb96bb Merge branch 'master' into upstream-merge-38179 2018-06-05 21:32:22 +00:00
deathride58andGitHub b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
CitadelStationBot 3489ed23c6 Automatic changelog generation for PR #6983 [ci skip] 2018-06-05 16:23:56 -05:00
deathride58andGitHub 963ad5dce9 Merge pull request #6983 from Citadel-Station-13/upstream-merge-38238
[MIRROR] Fixes pda style loading
2018-06-05 21:23:53 +00:00
CitadelStationBot 93d43c1d50 Automatic changelog generation for PR #7015 [ci skip] 2018-06-05 16:04:18 -05:00
deathride58andGitHub 79d304eeb7 Merge pull request #7015 from Citadel-Station-13/upstream-merge-38283
[MIRROR] Stops swarmers from attacking field gens/turret covers
2018-06-05 21:04:15 +00:00
deathride58andGitHub 2b02092639 Update preferences.dm 2018-06-05 17:03:55 -04:00
CitadelStationBot b2bc6dc213 Automatic changelog generation for PR #7016 [ci skip] 2018-06-05 15:52:06 -05:00
deathride58andGitHub d92f976917 Merge pull request #7016 from Citadel-Station-13/upstream-merge-38268
[MIRROR] [Ready] Arcade reward: snack rigs
2018-06-05 20:52:03 +00:00
deathride58andGitHub 71d68a7284 Merge pull request #7017 from Citadel-Station-13/upstream-merge-38284
[MIRROR] Blacklist ion trails from chasms
2018-06-05 20:51:42 +00:00
letterjay c42819368f Blacklist ion trails from chasms 2018-06-05 13:29:53 -05:00
81Dentonandletterjay 9fd7bfb347 Blacklist ion trails from chasms (#38284) 2018-06-05 13:29:53 -05:00
letterjay 0885986bba [Ready] Arcade reward: snack rigs 2018-06-05 13:27:39 -05:00