Commit Graph

28198 Commits

Author SHA1 Message Date
Lin fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
CitadelStationBot a2d6ba063b Automatic changelog generation for PR #10486 [ci skip] 2020-01-10 17:56:49 -06:00
Lin cd8e83e7c0 Merge pull request #10486 from Seris02/observe
moves observe to ghost tab instead of sticking it in the ooc tab
2020-01-10 23:56:46 +00:00
CitadelStationBot 5f5eeca593 Automatic changelog generation for PR #10485 [ci skip] 2020-01-10 17:56:11 -06:00
Lin 845617867d Merge pull request #10485 from Detective-Google/sprites-request
replaces old "zulie" sprites with new ones
2020-01-10 23:56:08 +00:00
CitadelStationBot a7a8fed007 Automatic changelog generation for PR #10498 [ci skip] 2020-01-10 17:55:09 -06:00
Lin 147d948ad8 Merge pull request #10498 from Citadel-Station-13/kevinz000-patch-13
reduces table cooldown to 0.4
2020-01-10 23:55:07 +00:00
kevinz000 8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
2020-01-10 14:01:06 -08:00
kevinz000 d4592449d2 Merge pull request #10484 from deathride58/topiccommandlimit
[s] Caches the status topic to prevent low-effort DDoSes
2020-01-10 14:00:43 -08:00
CitadelStationBot c4f64c13e5 Automatic changelog generation for PR #10503 [ci skip] 2020-01-09 23:24:21 -06:00
Putnam3145 c21dbe850a Merge pull request #10503 from r4d6/quick-fix
[S] Fix a pipe problem for the 5x5 SM
2020-01-09 21:24:19 -08:00
r4d6 f11cc9bcee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into quick-fix 2020-01-10 00:09:24 -05:00
r4d6 48abd31dee Fix SM 5x5 2020-01-10 00:06:06 -05:00
CitadelStationBot b522cfafb8 Automatic changelog generation for PR #10329 [ci skip] 2020-01-09 19:34:42 -06:00
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
CitadelStationBot 4887510573 Automatic changelog generation for PR #10112 [ci skip] 2020-01-09 19:31:23 -06:00
Lin c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
Lin ee5d6a3d4a Merge pull request #10449 from Ghommie/Ghommie-cit498
Improves the set_APTFT verb into a proc.
2020-01-10 00:38:06 +00:00
kevinz000 52a0f5779d Update tables_racks.dm 2020-01-09 15:20:57 -08:00
CitadelStationBot 42b7255a40 Automatic changelog generation for PR #10463 [ci skip] 2020-01-09 16:08:57 -06:00
Ghom 959e87185a Merge pull request #10463 from Putnam3145/random-engine
Allowed random engines to be weighted
2020-01-09 23:08:54 +01:00
Unknown 753c572a5e I'm about to go into a comma 2020-01-09 11:21:00 -07:00
Unknown 62396bffb1 Clothesmate vending 2020-01-08 22:47:28 -07:00
Unknown 6cc856d9af Loadout Menu 2020-01-08 22:44:04 -07:00
Putnam3145 3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
Unknown 07b8169d52 Fuggin more DMI merges 2020-01-08 20:58:07 -07:00
Unknown 8e58c416f6 Fuggin DMI merges amirite 2020-01-08 20:40:34 -07:00
Unknown 8a8d0bf6da Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:36:22 -07:00
Unknown afc0ca44f2 Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:35:36 -07:00
deathride58 c39058379e Merge branch 'master' into topiccommandlimit 2020-01-08 22:19:56 -05:00
deathride58 0b9d566076 Merge pull request #10469 from kevinz000/fail2topic
Ports fail2topic from Aurora
2020-01-08 22:19:22 -05:00
CitadelStationBot f4e508615d Automatic changelog generation for PR #10473 [ci skip] 2020-01-08 21:16:06 -06:00
kevinz000 356286f0e5 Merge pull request #10473 from deathride58/serverhopsanity
[s] adds a basic sanity check to server_hop
2020-01-08 19:16:03 -08:00
Seris02 c7790aba1a moves observe to ghost tab 2020-01-09 10:46:18 +08:00
CitadelStationBot 5dd58950ab Automatic changelog generation for PR #10483 [ci skip] 2020-01-08 20:04:47 -06:00
Ghom dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs
Fix limb damage
2020-01-09 03:04:44 +01:00
Detective Google 6d7dd52a84 replaces old "zulie" sprites with new ones 2020-01-08 18:42:28 -06:00
deathride58 580119f038 makes it account for key_valid 2020-01-08 19:17:09 -05:00
deathride58 33df154689 Caches the status topic to prevent low-effort DDoSes 2020-01-08 18:47:45 -05:00
Putnam df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
kappa-sama 5d19ad5212 autoylathe 2020-01-08 17:04:49 -05:00
kappa-sama 5605ea284a tabs 2020-01-08 17:03:55 -05:00
kappa-sama f69c67cf5c tabs 2020-01-08 17:03:48 -05:00
kappa-sama 63e4f698aa vendors 2020-01-08 17:02:30 -05:00
kappa-sama 390a6d6a74 bye bye 2020-01-08 16:51:32 -05:00
kappa-sama ff3370d382 bye 2020-01-08 16:50:49 -05:00
kappa-sama ff5901cadb hi 2020-01-08 16:50:40 -05:00
kappa-sama 440eac208d cya 2020-01-08 16:47:36 -05:00
kappa-sama 87698297fb bye bye 2020-01-08 16:47:28 -05:00