Commit Graph

16247 Commits

Author SHA1 Message Date
kevinz000 1d184b8cad s 2020-01-16 00:21:21 -07:00
kevinz000 350c5aa060 compile 2020-01-16 00:18:40 -07:00
kevinz000 26525b8fa7 s 2020-01-16 00:14:03 -07:00
kevinz000 1acac87da3 compile 2020-01-15 23:54:30 -07:00
Tupinambis dd9e62c8bb Sillycon law prevention clause removal. 2020-01-15 23:15:18 -06:00
kevinz000 88d6c1a166 OKFINE 2020-01-15 22:02:07 -07:00
kevinz000 327c1e04e0 s 2020-01-15 22:00:08 -07:00
r4d6 f98f033bb3 Fix linter 2020-01-15 23:57:13 -05:00
Putnam de4e65c467 Savefile conversion for inesct 2020-01-15 20:13:09 -08:00
kevinz000 512b112154 happythink 2020-01-15 20:45:05 -07:00
kevinz000 ab0c1f3f59 oh it's a list 2020-01-15 19:36:20 -07:00
kevinz000 4f665930cc a a 2020-01-15 19:32:38 -07:00
Ghom 7d9f4f9fe5 Merge pull request #10417 from kevinz000/nightshift_1
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
2020-01-16 03:21:49 +01:00
Ghom 70c1b0635a early returns. 2020-01-16 03:14:39 +01:00
kevinz000 eca7eeace3 aa 2020-01-15 19:11:49 -07:00
kevinz000 45c92bcb6f s 2020-01-15 19:07:47 -07:00
kevinz000 ded4d1bed6 compile 2020-01-15 18:58:26 -07:00
Ghommie 9c526d0348 riot foam dart design cost consistency. 2020-01-16 02:56:58 +01:00
kevinz000 02841f8e92 compile 2020-01-15 18:49:37 -07:00
kevinz000 b42de8d457 compile 2020-01-15 18:49:29 -07:00
r4d6 8bc8edb56f Fixes 2020-01-15 20:46:28 -05:00
kevinz000 c710c332e4 compile 2020-01-15 18:37:09 -07:00
kevinz000 e8d8d32a33 ree 2020-01-15 18:34:16 -07:00
kevinz000 90be124730 Merge remote-tracking branch 'citadel/master' into map_network_helpers 2020-01-15 18:30:14 -07:00
kevinz000 2a4e2204c5 no definemania then.. 2020-01-15 18:29:45 -07:00
kevinz000 8f7460ff96 definemania 2020-01-15 18:24:13 -07:00
kevinz000 c5b95ff5d0 Mapping helpers 2020-01-15 18:22:43 -07:00
kevinz000 554f23e790 aight bet 2020-01-15 18:04:05 -07:00
kevinz000 872628d9aa Apply suggestions from code review
thank you gamer

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-01-15 18:02:23 -07:00
r4d6 755b0fac3c Merge branch 'master' into Passive-Vents 2020-01-15 19:15:50 -05:00
r4d6 6045d818d8 Add passive vents 2020-01-15 19:12:13 -05:00
Putnam d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
r4d6 f7791c3db7 Hopefully help travis 2020-01-15 17:27:09 -05:00
r4d6 e685c3fc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit 2020-01-15 17:15:21 -05:00
Ghommie 4b090f938c ok 2020-01-15 20:51:36 +01:00
Ghom 7b34daae48 Merge pull request #10563 from Trilbyspaceclone/patch-268
Makes fragile suit less likely to brake from toys
2020-01-15 15:51:15 +01:00
Ghom 5eb26682e2 Merge pull request #10557 from timothyteakettle/timothyteakettle-gene-modder-1
remove trait genes without disks
2020-01-15 14:54:11 +01:00
kevinz000 b0c2e4cbdd Revert "shotgun pointblanking people actually throws them" 2020-01-15 01:13:26 -07:00
Artur bede695ebd Undoes minter changes 2020-01-15 09:49:57 +02:00
Artur 5c9b59aa74 Ready for testmerge 2020-01-15 09:44:29 +02:00
Artur d04c09aba0 Compiles, just need to fix goonchat 2020-01-15 09:44:03 +02:00
Artur 8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
Seris02 a8e4989d74 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-15 12:15:13 +08:00
Hatterhat 7b322ff467 Merge branch 'master' into greytide-standard-uniform 2020-01-14 19:39:16 -06:00
kevinz000 97ded4b27b ok 2020-01-14 18:09:12 -07:00
kevinz000 5f315ab418 ok 2020-01-14 18:04:19 -07:00
kevinz000 41bbdae220 micro optimization 2020-01-14 17:50:14 -07:00
kevinz000 59ab4c0670 hm 2020-01-14 17:32:54 -07:00
kevinz000 6ead30eab3 more shit 2020-01-14 17:22:54 -07:00
Trilbyspaceclone 5351bc9f8a Update miscellaneous.dm 2020-01-14 19:15:35 -05:00