Commit Graph

25353 Commits

Author SHA1 Message Date
nik707
12a69dcee5 Merge pull request #9574 from r4d6/patch-4
Add departemental Winter Coats to loadout
2019-11-05 13:52:48 -06:00
r4d6
0114b7fbe2 Comment out Sec coat 2019-11-03 16:51:07 -05:00
CitadelStationBot
4e8c8ad335 Automatic changelog generation for PR #9687 [ci skip] 2019-11-03 07:24:56 -06:00
kevinz000
2cdbf04272 Merge pull request #9687 from Ghommie/Ghommie-cit305
Refactoring how Jacqueen teleportation destination is selected.
2019-11-03 06:24:53 -07:00
kevinz000
a750721fd2 Merge pull request #9653 from Poojawa/job-ordering
Level Order listing
2019-11-03 06:24:08 -07:00
CitadelStationBot
193e54c6a8 Automatic changelog generation for PR #9654 [ci skip] 2019-11-03 07:21:26 -06:00
kevinz000
3365522bdf Merge pull request #9654 from Putnam3145/dynamic-config-2
Adds dynamic antag injection to config
2019-11-03 06:21:24 -07:00
kevinz000
a7e13ff359 Merge pull request #9655 from Citadel-Station-13/dependabot/pip/tools/mapmerge2/pillow-6.2.0
Bump pillow from 5.1.0 to 6.2.0 in /tools/mapmerge2
2019-11-03 06:21:10 -07:00
CitadelStationBot
75914dd085 Automatic changelog generation for PR #9658 [ci skip] 2019-11-03 07:20:32 -06:00
kevinz000
6462d0c8c8 Merge pull request #9658 from Ghommie/Ghommie-cit291
Fixing dogborg sleepers runtimes, how atrocious...
2019-11-03 06:20:30 -07:00
CitadelStationBot
a2c1881990 Automatic changelog generation for PR #9659 [ci skip] 2019-11-03 07:20:08 -06:00
kevinz000
5e9c1901b4 Merge pull request #9659 from Ghommie/Ghommie-cit292
Fixing deep space gorilla runtimes, how ape...
2019-11-03 06:20:06 -07:00
kevinz000
0fa57f6102 Merge pull request #9660 from Ghommie/Ghommie-cit293
Fixing riding component runtimes, how drifting...
2019-11-03 06:19:56 -07:00
kevinz000
5bfcc663f5 Merge pull request #9662 from Ghommie/Ghommie-cit294
Fixes some average runtimes, how null...
2019-11-03 06:19:40 -07:00
kevinz000
0615189629 Merge pull request #9665 from Ghommie/Ghommie-cit295
Removing references to national socialism
2019-11-03 06:18:47 -07:00
CitadelStationBot
e8c7afb69c Automatic changelog generation for PR #9668 [ci skip] 2019-11-03 07:18:03 -06:00
kevinz000
bd29bd1e36 Merge pull request #9668 from Putnam3145/starlight
Gives ways for various slime-killing healing viruses not to do that.
2019-11-03 06:18:01 -07:00
kevinz000
c484a209a7 Merge pull request #9669 from Ghommie/Ghommie-cit297
modkit uninstall() calling forceMove() calling loc.Exited() calling modkit uninstall()
2019-11-03 06:17:21 -07:00
kevinz000
6127593446 Merge pull request #9670 from Ghommie/Ghommie-cit298
Mapping in arcade dirs.
2019-11-03 06:17:02 -07:00
kevinz000
906c58d339 Merge pull request #9672 from Ghommie/Ghommie-cit299
Obligatory changes for 513 support kevinz forgot about.
2019-11-03 06:15:42 -07:00
CitadelStationBot
6873f0b0cb Automatic changelog generation for PR #9674 [ci skip] 2019-11-03 07:15:19 -06:00
kevinz000
a9cf83476f Merge pull request #9674 from Ghommie/Ghommie-300
Updating ratvarian computer sprites.
2019-11-03 06:15:17 -07:00
CitadelStationBot
5d2678a2b6 Automatic changelog generation for PR #9675 [ci skip] 2019-11-03 07:14:57 -06:00
kevinz000
333532034b Merge pull request #9675 from PersianXerxes/fixReebeRodExploits
Patches an exploit that allows the crew to shoot the Ark from the Ree…
2019-11-03 06:14:55 -07:00
kevinz000
828501d0f5 Merge pull request #9678 from Ghommie/Ghommie-cit301
Resprited the ore redemption and miner vending machines.
2019-11-03 06:14:33 -07:00
CitadelStationBot
23b6881453 Automatic changelog generation for PR #9679 [ci skip] 2019-11-03 07:14:15 -06:00
kevinz000
3a2ce8c5ce Merge pull request #9679 from Ghommie/Ghommie-cit302
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
2019-11-03 06:14:13 -07:00
CitadelStationBot
b12d7842d6 Automatic changelog generation for PR #9686 [ci skip] 2019-11-03 07:11:23 -06:00
kevinz000
dcee360ac5 Merge pull request #9686 from Ghommie/Ghommie-cit304
Fixing storage implant transplant.
2019-11-03 06:11:20 -07:00
Ghommie
2653a2965d How about we only check the living? 2019-11-02 20:46:33 +01:00
Ghommie
f4587b4260 This is very unprofessional. Yet I'm no google architect. 2019-11-02 16:47:25 +01:00
Ghommie
50fc1004ba Actually holopads, so they won't end up in maintenance... 2019-11-02 16:46:02 +01:00
Ghommie
3193e3ce20 fix. 2019-11-02 16:12:37 +01:00
Ghommie
a949f84557 missing bits. 2019-11-02 16:00:48 +01:00
Ghommie
1bf10c0435 Improving Jacqueen's teleportation area selection. 2019-11-02 15:50:54 +01:00
Ghommie
91625b6e60 item/doMove() calling dropped() callign qdel(src) because of DROPDEL. 2019-11-02 14:15:31 +01:00
Ghommie
874cdfefb8 fixing storage implant transplant. 2019-11-02 14:03:14 +01:00
Putnam
9506a78429 whoops replaced this var with a simpler check 2019-11-01 18:46:31 -07:00
CitadelStationBot
ab92421e20 Automatic changelog generation for PR #9677 [ci skip] 2019-10-31 19:27:41 -05:00
kevinz000
c2aa28d775 Merge pull request #9677 from Putnam3145/clone-no-delay
Makes clone scans lock while processing
2019-10-31 17:27:39 -07:00
CitadelStationBot
1f53f5ee72 Automatic changelog generation for PR #8948 [ci skip] 2019-10-31 19:27:06 -05:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
2019-10-31 17:27:03 -07:00
Putnam
64b8122548 made it go back to previous locked state instead 2019-10-31 16:46:04 -07:00
Putnam
d81d1c6b2d actually make it lock instead 2019-10-31 16:39:54 -07:00
Putnam
848c9dce00 Revert "makes cloning have no 2-second delay"
This reverts commit 57dd768950.
2019-10-31 16:39:02 -07:00
Ghommie
b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01:00
Ghommie
9f97f768da Respriting the ore redemption and miner vending machines. 2019-10-31 18:59:00 +01:00
Putnam
57dd768950 makes cloning have no 2-second delay 2019-10-30 23:11:50 -07:00
CitadelStationBot
2e2c85eb95 Automatic changelog generation for PR #9667 [ci skip] 2019-10-30 22:22:29 -05:00
kevinz000
a89f490220 Merge pull request #9667 from kappa-sama/patch-3
Gee Kevinz, why does YOUR research division let you have A HUNDRED AND SIXTY fetish gas points?
2019-10-30 20:22:24 -07:00