Commit Graph

  • f6e41db49f Travis??? Fermi 2019-10-11 19:20:20 +01:00
  • cd47412db2 Merge branch 'master' into Spookytime Fermi 2019-10-11 19:10:48 +01:00
  • 7495de7d15 Update granters.dm Trilbyspaceclone 2019-10-11 14:04:08 -04:00
  • f165b5e813 darn nutrients. Fermi 2019-10-11 18:58:53 +01:00
  • bfd97a82ca Eh 4 mins. Fermi 2019-10-11 18:56:33 +01:00
  • 489e711b4f pls Fermi 2019-10-11 18:49:30 +01:00
  • 6709dbd161 Requested Change Winter Flare 2019-10-11 13:25:23 -04:00
  • c51bfc153b b Sishen 2019-10-11 13:24:00 -04:00
  • 8f6c988536 Explod Fermi 2019-10-11 18:17:43 +01:00
  • 8e71a20528 Oops Fermi 2019-10-11 18:16:25 +01:00
  • ae46b2932e Bath is ready to go. Fermi 2019-10-11 18:15:46 +01:00
  • 3009f8b2cc Meow Fermi 2019-10-11 17:56:24 +01:00
  • d21f7f9a9b Jacq fix Fermi 2019-10-11 15:26:39 +01:00
  • 349b5f4369 GRUMBLING INTENSIFIES Fermi 2019-10-11 14:36:35 +01:00
  • 3ae8581d96 HOPE Fermi 2019-10-11 14:34:40 +01:00
  • 3e7131c7f6 Update wings.dm r4d6 2019-10-11 05:43:55 -04:00
  • 55e7645773 updating branch YakumoChen 2019-10-11 04:55:57 -04:00
  • 8591cba9a0 Merge pull request #6 from Citadel-Station-13/master YakumoChen 2019-10-11 04:53:36 -04:00
  • e517ece612 Darnit beaker Thalpy 2019-10-11 08:41:08 +01:00
  • 2c54e7390d Update vending.dm Winter Flare 2019-10-11 02:54:44 -04:00
  • 7a454e448a I forgot the one item I wanted to add. Winter Flare 2019-10-11 02:54:23 -04:00
  • 988a943f01 Try number 2 JTGSZ 2019-10-11 02:36:10 -04:00
  • 2286d40882 why am I making it ignore injections???? Poojawa 2019-10-11 01:34:26 -05:00
  • 3afbc5733c Update vending.dm Winter Flare 2019-10-11 01:14:09 -04:00
  • 1b08c541e2 Update wings.dm r4d6 2019-10-10 21:11:48 -04:00
  • 6b2a68f77a Update code/modules/mob/living/carbon/human/species_types/furrypeople.dm r4d6 2019-10-10 21:09:28 -04:00
  • 8b1e140fa0 Update code/__HELPERS/mobs.dm r4d6 2019-10-10 21:09:14 -04:00
  • 618f8f30c5 Update code/__HELPERS/global_lists.dm r4d6 2019-10-10 21:09:09 -04:00
  • e85e499504 I forgot a part. r4d6 2019-10-10 20:45:38 -04:00
  • 2822f43720 Update global_lists.dm r4d6 2019-10-10 20:32:25 -04:00
  • 05fa19c856 Update mobs.dm r4d6 2019-10-10 20:32:24 -04:00
  • fef7dd4ac5 Update flavor_misc.dm r4d6 2019-10-10 20:32:22 -04:00
  • fb715ed955 Update create_mob.dm r4d6 2019-10-10 20:32:20 -04:00
  • a61fed2a73 Update preferences.dm r4d6 2019-10-10 20:32:19 -04:00
  • ce81e657b5 Update preferences_savefile.dm r4d6 2019-10-10 20:32:17 -04:00
  • 2d84b541cf Update wings.dm r4d6 2019-10-10 20:32:15 -04:00
  • 0d5770f986 Update species.dm r4d6 2019-10-10 20:32:12 -04:00
  • e83460853c Update furrypeople.dm r4d6 2019-10-10 20:32:09 -04:00
  • ae843435f0 Merge pull request #9460 from Ghommie/Ghommie-cit230 deathride58 2019-10-10 15:20:20 -04:00
  • e734b36ee3 quickfixes lowpop nuclear war tc malus calculation. Ghommie 2019-10-10 20:54:19 +02:00
  • 2bce423ec3 Added a -ton- of stuff to the Kinkmate Winter Flare 2019-10-10 14:08:14 -04:00
  • 293034d815 Imagine Updating How Tables Work, But Forgetting MY TABLES Dap 2019-10-10 09:04:06 -06:00
  • 1d2b935104 Automatic changelog generation for PR #9324 [ci skip] CitadelStationBot 2019-10-10 04:23:17 -05:00
  • 3e6415d4b5 Merge pull request #9324 from Linzolle/crusher kevinz000 2019-10-10 02:23:15 -07:00
  • aece7b8840 Automatic changelog generation for PR #9412 [ci skip] CitadelStationBot 2019-10-10 04:21:34 -05:00
  • 0f74a735cb Merge pull request #9412 from Ghommie/Ghommie-cit213 kevinz000 2019-10-10 02:21:32 -07:00
  • d9ff4235eb Merge pull request #9447 from Ghommie/Ghommie-cit223 kevinz000 2019-10-10 02:20:45 -07:00
  • 97e7435425 Automatic changelog generation for PR #9257 [ci skip] CitadelStationBot 2019-10-10 04:19:20 -05:00
  • fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger kevinz000 2019-10-10 02:19:17 -07:00
  • 59ba51d865 Automatic changelog generation for PR #9368 [ci skip] CitadelStationBot 2019-10-10 04:18:27 -05:00
  • 89747a3a6e Merge pull request #9368 from Seris02/master kevinz000 2019-10-10 02:18:25 -07:00
  • 1bbc837b9a Automatic changelog generation for PR #9415 [ci skip] CitadelStationBot 2019-10-10 04:13:27 -05:00
  • 6e029c3360 Merge pull request #9415 from Ghommie/Ghommie-cit214 kevinz000 2019-10-10 02:13:25 -07:00
  • 3e1e6a18d0 Automatic changelog generation for PR #9439 [ci skip] CitadelStationBot 2019-10-10 04:12:57 -05:00
  • b233d3556e Merge pull request #9439 from JTGSZ/dominatorfix kevinz000 2019-10-10 02:12:55 -07:00
  • 70983ac6e4 Automatic changelog generation for PR #9432 [ci skip] CitadelStationBot 2019-10-10 04:12:43 -05:00
  • fb028b7997 Merge pull request #9432 from Putnam3145/pandemic-qol kevinz000 2019-10-10 02:12:41 -07:00
  • b9e688f615 Automatic changelog generation for PR #9446 [ci skip] CitadelStationBot 2019-10-10 04:11:19 -05:00
  • f791b399a0 Merge pull request #9446 from Sishen1542/ung kevinz000 2019-10-10 02:11:17 -07:00
  • c4f8956985 Merge pull request #9433 from Poojawa/hoss-tails kevinz000 2019-10-10 02:10:31 -07:00
  • fbf6dce1b4 Automatic changelog generation for PR #9452 [ci skip] CitadelStationBot 2019-10-10 04:10:10 -05:00
  • 236dcc4d63 Merge pull request #9452 from Ghommie/Ghommie-cit225 kevinz000 2019-10-10 02:10:08 -07:00
  • cbbbc13861 Automatic changelog generation for PR #8615 [ci skip] CitadelStationBot 2019-10-10 04:09:54 -05:00
  • f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45 kevinz000 2019-10-10 02:09:51 -07:00
  • e80923fdf0 Automatic changelog generation for PR #8401 [ci skip] CitadelStationBot 2019-10-10 04:09:39 -05:00
  • 0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11 kevinz000 2019-10-10 02:09:37 -07:00
  • 34a540cebb Automatic changelog generation for PR #9234 [ci skip] CitadelStationBot 2019-10-10 04:09:23 -05:00
  • c1bc1d2c77 Merge pull request #9234 from Trilbyspaceclone/reebee_redone kevinz000 2019-10-10 02:09:21 -07:00
  • 41946dd9cf Updates icons Thalpy 2019-10-10 09:27:15 +01:00
  • 4e703f852a Merge remote-tracking branch 'upstream/master' into minor-fixes Winter Flare 2019-10-10 02:57:56 -04:00
  • 348f6a4db4 Fixes Icons Thalpy 2019-10-10 07:36:44 +01:00
  • eaa84418c9 Fixes compile errors Thalpy 2019-10-10 07:17:22 +01:00
  • 689136fe94 Nerfs cyborg disabler to hold 25 shots rather than 43, just like a normal disabler. Ghommie 2019-10-09 23:07:39 +02:00
  • 08267b4274 Merge pull request #6 from Citadel-Station-13/master EmeraldSundisk 2019-10-09 12:41:30 -07:00
  • 8f9622cbe2 Well lets try it Fermi 2019-10-09 18:01:09 +01:00
  • 53e8d64388 Ah I see now Fermi 2019-10-09 17:51:14 +01:00
  • 26e6ba9686 Fixing a runtime when examining unloaded cit hyposprays. Ghommie 2019-10-09 18:34:54 +02:00
  • 2ac24b2ac6 Fixing head rev blebs Ghommie 2019-10-09 18:18:49 +02:00
  • 746a656c27 Merge branch 'master' into Spookytime Fermi 2019-10-09 16:44:39 +01:00
  • 35fe28ce43 oof Fermi 2019-10-09 16:40:55 +01:00
  • 8a7f27803c Maybe Fermi 2019-10-09 16:40:01 +01:00
  • c4ac815598 Oof Fermi 2019-10-09 16:35:20 +01:00
  • 3eea5310c9 Ugh Fermi 2019-10-09 16:32:55 +01:00
  • b023671db4 Damnit Jaqc Fermi 2019-10-09 16:22:09 +01:00
  • 146e0aae29 Crashes make me sad Fermi 2019-10-09 15:03:04 +01:00
  • b34f648e60 Adds landmarks. Fermi 2019-10-09 13:57:19 +01:00
  • b19c078447 Restructuring. Fermi 2019-10-09 12:09:41 +01:00
  • 1dce18962d Jaqc complete. Fermi 2019-10-09 11:58:36 +01:00
  • 8909b0f6c3 Merge branch 'master' into Updates-holder Thalpy 2019-10-09 09:01:09 +01:00
  • 9071826e70 I can't focus Fermi 2019-10-09 08:34:16 +01:00
  • 89d3a0534c Tweaker Fermi 2019-10-09 07:53:20 +01:00
  • ac0b3629f1 roundstart quitters Ghommie 2019-10-09 07:53:59 +02:00
  • ad0f34cdf8 Tweaks wiki a lil Fermi 2019-10-09 06:04:06 +01:00
  • b4e975ef75 mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes. Ghommie 2019-10-09 06:51:07 +02:00
  • f5bc825ef0 Merge branch 'Wiki-fermi' into Updates-holder Fermi 2019-10-09 05:35:05 +01:00
  • c694cb8652 h lolman360 2019-10-09 13:35:23 +11:00
  • 645b8ddf39 cmo: the new CE lolman360 2019-10-09 13:32:45 +11:00
  • f7c2206856 AAAAAAAAA lolman360 2019-10-09 13:30:03 +11:00
  • cfccacafbf Stops all graffiti decals from being named "letter". Ghommie 2019-10-09 01:54:38 +02:00
  • 50ad5f269b unrandomizes mind names. Ghommie 2019-10-09 01:30:31 +02:00