Commit Graph

  • 304eae3407 Automatic changelog generation for PR #9339 [ci skip] CitadelStationBot 2019-10-13 16:00:54 -05:00
  • 4c52b7a416 Merge pull request #9339 from Ghommie/Ghommie-cit205 kevinz000 2019-10-13 14:00:52 -07:00
  • bd12f2336c Automatic changelog generation for PR #9461 [ci skip] CitadelStationBot 2019-10-13 16:00:10 -05:00
  • 48e4187cef Merge pull request #9461 from r4d6/master kevinz000 2019-10-13 14:00:07 -07:00
  • 1fda4deef7 Merge pull request #9465 from Trilbyspaceclone/patch-230 kevinz000 2019-10-13 13:58:03 -07:00
  • c9960cdcb0 Automatic changelog generation for PR #9416 [ci skip] CitadelStationBot 2019-10-13 15:56:05 -05:00
  • 53858e1818 Merge pull request #9416 from Ghommie/Ghommie-cit215 kevinz000 2019-10-13 13:56:03 -07:00
  • ea44c60923 Automatic changelog generation for PR #9464 [ci skip] CitadelStationBot 2019-10-13 15:55:23 -05:00
  • 3d9f012cdb Merge pull request #9464 from JTGSZ/speciesrestrictions2 kevinz000 2019-10-13 13:55:21 -07:00
  • 9e944bffb8 Automatic changelog generation for PR #9474 [ci skip] CitadelStationBot 2019-10-13 15:55:07 -05:00
  • 064e6980f9 Merge pull request #9474 from Putnam3145/fix-nanites kevinz000 2019-10-13 13:55:05 -07:00
  • 1332c15087 Automatic changelog generation for PR #9463 [ci skip] CitadelStationBot 2019-10-13 15:54:27 -05:00
  • adeb33cdae Merge pull request #9463 from Owai-Seek/minor-fixes kevinz000 2019-10-13 13:54:26 -07:00
  • bf1d4ed7d4 Update holidays.dm kevinz000 2019-10-13 13:52:17 -07:00
  • d28b0fa5f9 Update species.dm kevinz000 2019-10-13 13:49:55 -07:00
  • 89f39a8ddb Automatic changelog generation for PR #9473 [ci skip] CitadelStationBot 2019-10-13 15:46:42 -05:00
  • 32b2d629e4 Merge pull request #9473 from PersianXerxes/stopCultSpareTPing kevinz000 2019-10-13 13:46:40 -07:00
  • 18f10afcd7 Borgs are now consumable by scrub pups. Zna12 2019-10-13 15:23:50 -05:00
  • 023d031f15 Update toylathe.dm Zna12 2019-10-13 14:40:19 -05:00
  • 356a1279f1 Adds vars for the ball. Thalpy 2019-10-13 20:06:40 +01:00
  • a13218b99a Fixes Coronary and Lipo Thalpy 2019-10-13 17:23:49 +01:00
  • 150b20103e Random tab Thalpy 2019-10-13 16:39:37 +01:00
  • 764c3e5757 Missed one Thalpy 2019-10-13 16:38:05 +01:00
  • fc08d06352 Reverts 3/4 link buttons Thalpy 2019-10-13 16:36:38 +01:00
  • 7b27d9bd24 Library time Thalpy 2019-10-13 16:19:32 +01:00
  • 3cd99dff1e Merge pull request #9438 from Ghommie/Ghommie-cit222 kevinz000 2019-10-13 08:06:40 -07:00
  • bd66219767 Clarifies ID Console descriptions Poojawa 2019-10-13 03:06:22 -05:00
  • 3211138a75 wwwwwwww lolman360 2019-10-13 18:07:25 +11:00
  • c78078bdd4 typo Ghommie 2019-10-13 06:08:53 +02:00
  • 7b65343f45 z-level checks. Ghommie 2019-10-13 06:04:57 +02:00
  • 1b97c50ef7 Makes pod people not constantly slightly fat Putnam 2019-10-12 17:50:51 -07:00
  • 3b8ea30d9b I did it Thalpy 2019-10-12 20:06:46 +01:00
  • f6796b93b3 Fixes graft Thalpy 2019-10-12 18:22:48 +01:00
  • 04b40fd557 Tongues decay slower. Thalpy 2019-10-12 18:01:02 +01:00
  • 96d5a0f74c Heart decay Thalpy 2019-10-12 18:00:34 +01:00
  • 7ad16947a7 Cleanups Thalpy 2019-10-12 18:00:16 +01:00
  • 0c8b82168d Merge branch 'master' into Ghommie-cit222 deathride58 2019-10-12 11:20:32 -04:00
  • cbc20d33d5 Phew Thalpy 2019-10-12 15:13:18 +01:00
  • 3f16c287a9 I'm big silly Thalpy 2019-10-12 13:40:40 +01:00
  • 82446681bf Everything is pain Thalpy 2019-10-12 13:22:05 +01:00
  • 3abbfffdb8 Argh Thalpy 2019-10-12 13:20:39 +01:00
  • d94f796ffb aaaa Thalpy 2019-10-12 12:42:51 +01:00
  • 7003080440 Merge branch 'master' into fix-nanites Putnam 2019-10-12 02:36:51 -07:00
  • ba444978c6 Merge pull request #8 from Citadel-Station-13/master YakumoChen 2019-10-12 05:27:57 -04:00
  • ecfc988911 Okay! Fermi 2019-10-12 09:15:32 +01:00
  • db1f459151 Set clockcult teleport in Captain's Quarters to false. Persi 2019-10-12 03:01:52 -04:00
  • 2a6b84151e Removed something I didn't mean to Fermi 2019-10-12 07:59:44 +01:00
  • c389099a47 Makes brain-healing nanites not work uselessly Putnam 2019-10-11 23:58:34 -07:00
  • 2e03985696 aaaa Fermi 2019-10-12 07:55:19 +01:00
  • f922a3dda5 Fast!! Fermi 2019-10-12 07:18:39 +01:00
  • 350da04a20 readds slime heart Poojawa 2019-10-11 23:13:45 -05:00
  • 394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-10-11 23:10:45 -05:00
  • 076b2d48fc Update secbot.dm kevinz000 2019-10-11 20:46:19 -07:00
  • 8c07a79700 Update bot.dm kevinz000 2019-10-11 20:45:42 -07:00
  • 5cf627e889 Update computer.dm kevinz000 2019-10-11 20:43:36 -07:00
  • f393c7fff2 Update new_player.dm kevinz000 2019-10-11 20:43:10 -07:00
  • e600b59217 Update computer.dm kevinz000 2019-10-11 20:42:01 -07:00
  • 730ca35a31 this really shuoldn't be here Linzolle 2019-10-11 21:10:10 -05:00
  • d2ea3b0165 one letter off Linzolle 2019-10-11 20:53:19 -05:00
  • 9ac22a9fc5 god damn it fermis Linzolle 2019-10-11 20:19:22 -05:00
  • b50804dfc3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dissection Linzolle 2019-10-11 20:06:26 -05:00
  • 026240098f Fix dupes Thalpy 2019-10-11 22:25:59 +01:00
  • 6e07f8139c Small vampire balance tweaks - Ventcrawling in bat form now requires starvation, cuts down the damage the chapel does outside of batform deathride58 2019-10-11 17:25:55 -04:00
  • 6b986632be Merge branch 'master' into FERMICHEMCurTweaks Thalpy 2019-10-11 22:23:18 +01:00
  • 7bce68bb11 Merge branch 'master' into Spookytime Fermi 2019-10-11 21:51:48 +01:00
  • 29f7be9aca surgeri.dmi Fermi 2019-10-11 21:49:29 +01:00
  • 6e7c433536 Song fix Fermi 2019-10-11 21:34:30 +01:00
  • f57fa7f471 Automatic changelog generation for PR #9467 [ci skip] CitadelStationBot 2019-10-11 14:34:27 -05:00
  • d33b866805 Merge pull request #9467 from deathride58/compscithree kevinz000 2019-10-11 12:34:25 -07:00
  • a9dcf681ce Merge pull request #9457 from Ghommie/Ghommie-cit227 kevinz000 2019-10-11 12:16:50 -07:00
  • a2f5395b39 [s] fixes the client analyzation having cid and ip swapped deathride58 2019-10-11 15:16:35 -04:00
  • 46994f2475 Merge pull request #9448 from MrJWhit/zombie-eyes kevinz000 2019-10-11 12:16:06 -07:00
  • 97964a9fe8 Automatic changelog generation for PR #9374 [ci skip] CitadelStationBot 2019-10-11 14:13:51 -05:00
  • b56563fcfe Merge pull request #9374 from kappa-sama/walktime kevinz000 2019-10-11 12:13:49 -07:00
  • 65db48f619 Automatic changelog generation for PR #9450 [ci skip] CitadelStationBot 2019-10-11 14:13:22 -05:00
  • e717272129 Merge pull request #9450 from JTGSZ/offsets4stuff kevinz000 2019-10-11 12:13:19 -07:00
  • a5da73edd1 Automatic changelog generation for PR #9386 [ci skip] CitadelStationBot 2019-10-11 14:13:06 -05:00
  • bcc92d234b Merge pull request #9386 from Sishen1542/suitrad kevinz000 2019-10-11 12:13:04 -07:00
  • 4eb7f90eb2 Automatic changelog generation for PR #9387 [ci skip] CitadelStationBot 2019-10-11 14:11:52 -05:00
  • 0643a7b230 Merge pull request #9387 from Sishen1542/goose kevinz000 2019-10-11 12:11:50 -07:00
  • 62e11c79b4 Merge pull request #9403 from Poojawa/patch-3 kevinz000 2019-10-11 12:11:19 -07:00
  • 9120e4b7c8 Merge pull request #9399 from Arturlang/patch-1 kevinz000 2019-10-11 12:10:53 -07:00
  • 2adbd72cab Automatic changelog generation for PR #9441 [ci skip] CitadelStationBot 2019-10-11 14:10:33 -05:00
  • b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches kevinz000 2019-10-11 12:10:31 -07:00
  • 506d66ea17 Automatic changelog generation for PR #9435 [ci skip] CitadelStationBot 2019-10-11 14:09:16 -05:00
  • 9cd75c82a4 Merge pull request #9435 from Linzolle/firefix kevinz000 2019-10-11 12:09:14 -07:00
  • 546a52ac04 Automatic changelog generation for PR #9437 [ci skip] CitadelStationBot 2019-10-11 14:08:59 -05:00
  • 620af601b2 Merge pull request #9437 from JTGSZ/clothingrestrictions kevinz000 2019-10-11 12:08:57 -07:00
  • 02defe6640 Automatic changelog generation for PR #9442 [ci skip] CitadelStationBot 2019-10-11 14:08:46 -05:00
  • 4ab08802a1 Merge pull request #9442 from YakumoChen/air-hog kevinz000 2019-10-11 12:08:44 -07:00
  • d19385fb4b Automatic changelog generation for PR #9444 [ci skip] CitadelStationBot 2019-10-11 14:08:14 -05:00
  • 2e74833e72 Merge pull request #9444 from Thalpy/Updates-holder kevinz000 2019-10-11 12:08:12 -07:00
  • cc607b257d Automatic changelog generation for PR #9459 [ci skip] CitadelStationBot 2019-10-11 14:05:55 -05:00
  • 98d03c73be Merge pull request #9459 from dapnee/Imagine-people-reading-code-to-see-if-it-forgets-something kevinz000 2019-10-11 12:05:53 -07:00
  • 929556004f Automatic changelog generation for PR #9451 [ci skip] CitadelStationBot 2019-10-11 14:05:14 -05:00
  • 1896b43c79 Merge pull request #9451 from Ghommie/Ghommie-cit224 kevinz000 2019-10-11 12:05:12 -07:00
  • 1fbb3519a1 Automatic changelog generation for PR #9458 [ci skip] CitadelStationBot 2019-10-11 14:04:51 -05:00
  • 9805e1b5fb Merge pull request #9458 from Ghommie/Ghommie-cit228 kevinz000 2019-10-11 12:04:49 -07:00
  • dbcda948fb Darn thing Fermi 2019-10-11 19:56:58 +01:00
  • 60749f8b07 Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert) deathride58 2019-10-11 14:33:32 -04:00