Commit Graph

29805 Commits

Author SHA1 Message Date
Putnam
edcdb531cc kwargs 2020-02-06 15:57:42 -08:00
Putnam
e6d353dd01 that's not how switch works... 2020-02-06 15:56:58 -08:00
Putnam
d05c2426a8 Added a config for map voting types. 2020-02-06 15:47:04 -08:00
CitadelStationBot
5123c6b455 Automatic changelog generation for PR #10623 [ci skip] 2020-02-06 17:25:25 -06:00
kevinz000
62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
Ghom
ce6b37da1e Merge pull request #10920 from Arturlang/debbuging
Adds vscode debbuging
2020-02-06 20:33:21 +01:00
CitadelStationBot
6373b263c0 Automatic changelog generation for PR #10917 [ci skip] 2020-02-06 13:31:49 -06:00
Ghom
cd14f13d0d Merge pull request #10917 from Arturlang/Hyposprays_QOL
Removes the hypospray verb for toggling spray/inject mode and makes it into an Alt click proc.
2020-02-06 20:31:46 +01:00
Ghom
2888a3c6b9 Merge pull request #10938 from Arturlang/patch-7
[s]Fixes ore boxes being emptyable by ghosts
2020-02-06 20:29:27 +01:00
Arturlang
0353f1602d Fixes ore boxes 2020-02-06 20:10:02 +01:00
CitadelStationBot
90bdc0c3e8 Automatic changelog generation for PR #10901 [ci skip] 2020-02-06 04:47:32 -06:00
kevinz000
cf99ad9671 Merge pull request #10901 from Trilbyspaceclone/more-box-fixes-and-tweaks
Corrects Box'es caps office + some other tweaks
2020-02-06 03:47:28 -07:00
kevinz000
7898dd089e Merge pull request #10888 from Ghommie/Ghommie-cit554
Ports "Cleans up plante gene mutability."
2020-02-06 00:49:09 -07:00
CitadelStationBot
365b41022e Automatic changelog generation for PR #10870 [ci skip] 2020-02-06 01:43:49 -06:00
kevinz000
fe2007d687 Merge pull request #10870 from Citadel-Station-13/Ghommie-patch-5
Fixed wheelchair-goers appearing as shoeless
2020-02-06 00:43:45 -07:00
CitadelStationBot
e77c8bef98 Automatic changelog generation for PR #10868 [ci skip] 2020-02-06 01:42:42 -06:00
kevinz000
75d3a8b35d Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4
Holofans visual tweak.
2020-02-06 00:42:39 -07:00
CitadelStationBot
c54786e3bb Automatic changelog generation for PR #10906 [ci skip] 2020-02-06 01:42:08 -06:00
kevinz000
542cae89d4 Merge pull request #10906 from Hatterhat/tg-48717-48726
husking is stupid - 5u rezadone/100u synthflesh heals husking, husking takes more burn
2020-02-06 00:42:05 -07:00
CitadelStationBot
1c82779846 Automatic changelog generation for PR #10881 [ci skip] 2020-02-06 01:41:32 -06:00
kevinz000
18910a23a2 Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
2020-02-06 00:41:28 -07:00
CitadelStationBot
b3fb11559e Automatic changelog generation for PR #10700 [ci skip] 2020-02-06 01:38:34 -06:00
kevinz000
73aa761c69 Merge pull request #10700 from Ghommie/Ghommie-cit526
Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
kevinz000
1288a463cf Merge pull request #10772 from Ghommie/Ghommie-cit537
Removing unused vore files and commented out code.
2020-02-06 00:37:52 -07:00
CitadelStationBot
1dd6514bd7 Automatic changelog generation for PR #10919 [ci skip] 2020-02-06 01:37:03 -06:00
kevinz000
ead2be5116 Merge pull request #10919 from Ghommie/Ghommie-cit556
Fixing accidental nerfs to the magpistol.
2020-02-06 00:36:59 -07:00
CitadelStationBot
3a47e49cb3 Automatic changelog generation for PR #10883 [ci skip] 2020-02-06 00:46:07 -06:00
kevinz000
3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
CitadelStationBot
109b15ebdd Automatic changelog generation for PR #10902 [ci skip] 2020-02-06 00:45:49 -06:00
kevinz000
e0dd12ecbd Merge pull request #10902 from Citadel-Station-13/Ghommie-patch-1
Fixes some mounted defibrillator issue.
2020-02-05 23:45:45 -07:00
CitadelStationBot
984af3cc9a Automatic changelog generation for PR #10885 [ci skip] 2020-02-06 00:45:33 -06:00
kevinz000
cda01e10f6 Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
2020-02-05 23:45:30 -07:00
kevinz000
50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555
runtime drifting
2020-02-05 23:44:52 -07:00
CitadelStationBot
0263502a05 Automatic changelog generation for PR #10899 [ci skip] 2020-02-06 00:44:33 -06:00
kevinz000
d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate
Almost all venders now can be restocked
2020-02-05 23:44:30 -07:00
CitadelStationBot
cbf1497996 Automatic changelog generation for PR #10900 [ci skip] 2020-02-06 00:44:11 -06:00
kevinz000
27d3fcf5fd Merge pull request #10900 from Putnam3145/port-atmos-fix
Ports atmos priority reaction mix from TG
2020-02-05 23:44:08 -07:00
CitadelStationBot
1c4fb05a98 Automatic changelog generation for PR #10905 [ci skip] 2020-02-06 00:43:56 -06:00
kevinz000
5059c0fa8c Merge pull request #10905 from Hatterhat/engishit
consoleless interfaces default, standard RCD ammo added to industrial engi
2020-02-05 23:43:54 -07:00
CitadelStationBot
f6d0c177be Automatic changelog generation for PR #10907 [ci skip] 2020-02-06 00:43:25 -06:00
kevinz000
b17b98ff5f Merge pull request #10907 from Citadel-Station-13/Ghommie-patch-2
Fixes no-grav lavaland labor/mining shuttle areas.
2020-02-05 23:43:21 -07:00
kevinz000
51bc7a5dec Merge pull request #10909 from Citadel-Station-13/Ghommie-patch-3
Fixes the panic bunker persistence.
2020-02-05 23:43:05 -07:00
kevinz000
b8c5f7e319 Merge pull request #10931 from Citadel-Station-13/Ghommie-patch-9
Fixing admin ranks configs loading.
2020-02-05 23:41:21 -07:00
Ghom
181944bb36 Update admin_ranks.dm 2020-02-06 03:07:42 +01:00
Hatterhat
f100b6c5e4 multitools in basic tools, dumb headers 2020-02-05 19:47:20 -06:00
Arturlang
23834ce3f5 Parent call
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-05 22:54:01 +02:00
Artur
78339881de Wierd ass formatting causing tabs to betray me 2020-02-05 21:37:36 +01:00
CitadelStationBot
3b30990e22 Automatic changelog generation for PR #10898 [ci skip] 2020-02-05 13:47:58 -06:00
Ghom
c4e7f2f8cd Merge pull request #10898 from EmeraldSundisk/smalltime
Disposing of a problem on Delta.
2020-02-05 20:47:54 +01:00
Artur
c2b68d0ba3 Adds debbuging 2020-02-05 20:35:24 +01:00