Commit Graph

  • 83b34a053b Automatic changelog generation for PR #11461 [ci skip] CitadelStationBot 2020-03-14 22:03:53 -05:00
  • d34d46f00d i think you're a thief cause you stole my heart, stole my heart, trapped my soul like azura's star (#11461) Kraseo 2020-03-15 04:03:50 +01:00
  • 29f7c9026f buffies kappa-sama 2020-03-14 22:09:08 -04:00
  • d81247e15e and also map merge ZeroMan 2020-03-14 21:26:40 -04:00
  • ec93e194d2 oh yeah disposals exists ZeroMan 2020-03-14 21:25:57 -04:00
  • d5bd1c1f4c and map merge exists ZeroMan 2020-03-14 20:51:11 -04:00
  • 3f3def6715 i am gonna choom ZeroMan 2020-03-14 20:50:08 -04:00
  • e73e1b03ec Revert "Stunbaton disarm mode also works on disarm intent now" (#11446) kevinz000 2020-03-14 15:14:57 -07:00
  • e54011c7c3 day one updates simulator ZeroMan 2020-03-14 17:38:40 -04:00
  • 6a0b7ecdeb my ocd takes over ZeroMan 2020-03-14 17:29:17 -04:00
  • 1c92ef27b4 quite the quirky momentumeus ZeroMan 2020-03-14 17:21:00 -04:00
  • ea5fac9197 breathing is fine too ZeroMan 2020-03-14 16:56:33 -04:00
  • 8970cb433e i really hate life ZeroMan 2020-03-14 16:39:59 -04:00
  • 6b486a64f5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into brigmedbayssaltpr ZeroMan 2020-03-14 16:34:06 -04:00
  • 06d641b46a Webedit fixing electrocute_act stuns. Ghom 2020-03-14 21:19:09 +01:00
  • b726f274a7 map merge exists too ZeroMan 2020-03-14 16:14:05 -04:00
  • 98c66d2fc9 and the finishing touches ZeroMan 2020-03-14 16:13:24 -04:00
  • 863d564d38 couple more bug fixes ZeroMan 2020-03-14 16:02:43 -04:00
  • 0d7237b3ec do them more workies ZeroMan 2020-03-14 15:29:02 -04:00
  • cda2ace252 Automatic changelog generation for PR #11450 [ci skip] CitadelStationBot 2020-03-14 11:12:15 -05:00
  • 7a27baa699 Merge pull request #11450 from zeroisthebiggay/timefornekerchiefsuwu kevinz000 2020-03-14 09:12:12 -07:00
  • e343dde291 Automatic changelog generation for PR #11452 [ci skip] CitadelStationBot 2020-03-14 11:12:00 -05:00
  • d4131912e9 Merge pull request #11452 from Citadel-Station-13/Linzolle-patch-1 kevinz000 2020-03-14 09:11:58 -07:00
  • 3cc584a040 Automatic changelog generation for PR #11453 [ci skip] CitadelStationBot 2020-03-14 11:11:41 -05:00
  • 0953ec19e5 Merge pull request #11453 from necromanceranne/I_am_at_high_risk_of_stroke kevinz000 2020-03-14 09:11:38 -07:00
  • fe915189e4 Automatic changelog generation for PR #11436 [ci skip] CitadelStationBot 2020-03-14 11:11:15 -05:00
  • 5949e35bda Merge pull request #11436 from MrJWhit/kilostation-fixes-kevinz-edition kevinz000 2020-03-14 09:11:12 -07:00
  • a858316bdb Automatic changelog generation for PR #11437 [ci skip] CitadelStationBot 2020-03-14 11:10:57 -05:00
  • a21458bba6 Merge pull request #11437 from keronshb/BlobBuffPort kevinz000 2020-03-14 09:10:54 -07:00
  • 46edd143e7 Automatic changelog generation for PR #11447 [ci skip] CitadelStationBot 2020-03-14 11:09:53 -05:00
  • 395fa32136 Merge pull request #11447 from Ghommie/Ghommie-cit618 kevinz000 2020-03-14 09:09:50 -07:00
  • 09afc31673 Automatic changelog generation for PR #11448 [ci skip] CitadelStationBot 2020-03-14 11:09:14 -05:00
  • a35049fc94 Merge pull request #11448 from Ghommie/Ghommie-cit619 kevinz000 2020-03-14 09:09:11 -07:00
  • caaff519d6 and heres some more ZeroMan 2020-03-14 12:03:33 -04:00
  • f8a365490b FUCK² Kraseo 2020-03-14 13:15:09 +01:00
  • 3f44882c1a FUCK Kraseo 2020-03-14 13:13:26 +01:00
  • a2592483b5 hey did you know there's not one, not two, but three tiles on roid7.dmm that don't have /area/ruin/space but rather /area/ruin/unpowered? yeah i'm angry too Kraseo 2020-03-14 13:07:13 +01:00
  • 5a04b43db4 duffel baaaaaaaaaaags Seris02 2020-03-14 16:12:17 +08:00
  • f5ed38ebf9 ae it is time ZeroMan 2020-03-14 00:49:54 -04:00
  • 8c1f1cb5d0 merge fixes Seris02 2020-03-14 11:50:32 +08:00
  • 48076c921d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers Seris02 2020-03-14 11:41:39 +08:00
  • c8922547de Automatic changelog generation for PR #11451 [ci skip] CitadelStationBot 2020-03-13 20:49:28 -05:00
  • d9dc91db1a More dynamic fixes (#11451) Putnam3145 2020-03-13 18:49:25 -07:00
  • 1d51ac5ff2 Fixing some bug reports. Ghommie 2020-03-14 02:34:25 +01:00
  • 888cdbeaf6 Bump minimist from 1.2.0 to 1.2.2 in /tgui dependabot[bot] 2020-03-13 23:43:45 +00:00
  • 6993dfde2a Now stocked at your local robotics Trilbyspaceclone 2020-03-13 18:29:46 -04:00
  • 888f67c4bc Update borghydro.dm Trilbyspaceclone 2020-03-13 18:21:12 -04:00
  • 487c18cb7e Update misc.dm Trilbyspaceclone 2020-03-13 14:20:28 -04:00
  • 49c0aba205 bleeding out from a toolbox smack is not cool gamers necromanceranne 2020-03-14 04:25:12 +11:00
  • 0ca58b5ed8 why though Lin 2020-03-13 04:19:20 +00:00
  • a2baa47600 50 commits of hell Trilbyspaceclone 2020-03-12 21:27:12 -04:00
  • 7b02915cc7 Update sheet_types.dm Trilbyspaceclone 2020-03-12 21:24:20 -04:00
  • 3fa39fd7ab i hate my ocd ZeroMan 2020-03-12 20:57:41 -04:00
  • aad3953355 Update all_nodes.dm Trilbyspaceclone 2020-03-12 20:52:07 -04:00
  • f5ec7f5b65 it works it works ZeroMan 2020-03-12 20:47:35 -04:00
  • b1a94f7667 Made hijack, martyr more common Putnam 2020-03-12 15:05:53 -07:00
  • ae94083dbe Added more explanation to hijack. Putnam 2020-03-12 14:59:04 -07:00
  • da5b293033 underscores. Ghommie 2020-03-12 21:31:17 +01:00
  • d1b39b6590 . Ghommie 2020-03-12 21:22:39 +01:00
  • 0602e728c0 Doesn't delete the old auto transfer behavior. Ghommie 2020-03-12 21:15:12 +01:00
  • 663a849afe Makes the autotransfer subsystem a bit more optional. Ghommie 2020-03-12 21:02:34 +01:00
  • a6361357d4 Merge branch 'Ghommie-cit595' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit595 Ghommie 2020-03-12 20:36:27 +01:00
  • 8ccd0d2cbc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595 Ghommie 2020-03-12 20:31:14 +01:00
  • 0876a1eef6 Porting datum components system updates. Ghommie 2020-03-12 18:22:26 +01:00
  • 245b7ed306 Automatic changelog generation for PR #11431 [ci skip] CitadelStationBot 2020-03-12 11:49:53 -05:00
  • bbd69c407c Merge pull request #11431 from Citadel-Station-13/Ghommie-patch-1 kevinz000 2020-03-12 09:49:50 -07:00
  • 579799e72d Automatic changelog generation for PR #11416 [ci skip] CitadelStationBot 2020-03-12 11:49:29 -05:00
  • 78aa46d8de Merge pull request #11416 from Trilbyspaceclone/patch-306 kevinz000 2020-03-12 09:49:26 -07:00
  • b4f57a8885 Update others.dm Trilbyspaceclone 2020-03-12 10:56:25 -04:00
  • c6a9423c51 Automatic changelog generation for PR #11422 [ci skip] CitadelStationBot 2020-03-12 08:25:57 -05:00
  • 41ed18a537 Changes up some lava land ruins spawns (#11422) Trilbyspaceclone 2020-03-12 09:25:54 -04:00
  • 87928d43ea stamcrit check for fireaxe afterattack() (#11426) kevinz000 2020-03-12 06:21:47 -07:00
  • 661a898dd9 Automatic changelog generation for PR #11425 [ci skip] CitadelStationBot 2020-03-12 08:20:52 -05:00
  • 442eb13e75 Merge pull request #11425 from Citadel-Station-13/kevinz000-patch-3 Ghom 2020-03-12 14:20:49 +01:00
  • 166abfb1ee Automatic changelog generation for PR #11429 [ci skip] CitadelStationBot 2020-03-12 08:20:31 -05:00
  • 9e3a3dddfd Merge pull request #11429 from Putnam3145/dynamic-tweaks Ghom 2020-03-12 14:20:28 +01:00
  • 89a87f4b53 Automatic changelog generation for PR #11430 [ci skip] CitadelStationBot 2020-03-12 08:20:13 -05:00
  • 9e970b4a3e Merge pull request #11430 from Putnam3145/fix-transfer Ghom 2020-03-12 14:20:10 +01:00
  • 3b8f9887a3 Automatic changelog generation for PR #11406 [ci skip] CitadelStationBot 2020-03-12 08:18:42 -05:00
  • c771471895 Merge pull request #11406 from kevinz000/minimaps Ghom 2020-03-12 14:18:39 +01:00
  • ff264a06a9 Merge pull request #11442 from Citadel-Station-13/kevinz000-patch-5 Putnam3145 2020-03-11 18:20:15 -07:00
  • 0b6c5b7960 Update twohanded.dm kevinz000 2020-03-11 18:19:09 -07:00
  • cdfab524ce travis kevinz000 2020-03-11 17:55:51 -07:00
  • 88bdc6d068 Merge pull request #11440 from kevinz000/master_fix Ghom 2020-03-12 01:54:15 +01:00
  • dbc54ab699 Update actions.dm Ghom 2020-03-12 01:47:51 +01:00
  • fa160d4c3a Merge pull request #11434 from Citadel-Station-13/Ghommie-patch-3 kevinz000 2020-03-11 17:44:35 -07:00
  • 9533747d36 Automatic changelog generation for PR #11307 [ci skip] CitadelStationBot 2020-03-11 19:43:25 -05:00
  • db188f8681 Merge pull request #11307 from kappa-sama/patch-17 kevinz000 2020-03-11 17:43:23 -07:00
  • 6127f6a453 k kevinz000 2020-03-11 17:41:12 -07:00
  • 14b22f0b67 Merge remote-tracking branch 'citadel/master' into minimaps kevinz000 2020-03-11 17:32:15 -07:00
  • 165f9faf2c Automatic changelog generation for PR #11373 [ci skip] CitadelStationBot 2020-03-11 19:27:25 -05:00
  • 3ae8016ec8 Merge pull request #11373 from kappa-sama/supershotty kevinz000 2020-03-11 17:27:22 -07:00
  • 77c8b789a5 Automatic changelog generation for PR #11408 [ci skip] CitadelStationBot 2020-03-11 19:26:36 -05:00
  • 54713dc1e4 Merge pull request #11408 from necromanceranne/sleeping_carp_port kevinz000 2020-03-11 17:26:33 -07:00
  • 80b17cff1f Merge branch 'master' into patch-17 kappa-sama 2020-03-11 20:26:13 -04:00
  • 0e1490791c Automatic changelog generation for PR #11424 [ci skip] CitadelStationBot 2020-03-11 19:24:05 -05:00
  • b8642c5622 Merge pull request #11424 from necromanceranne/death_coma_stuff kevinz000 2020-03-11 17:24:03 -07:00
  • fa1aea4ab5 Automatic changelog generation for PR #10327 [ci skip] CitadelStationBot 2020-03-11 19:01:40 -05:00
  • 69c21f4b76 Merge pull request #10327 from Seris02/tggenetics kevinz000 2020-03-11 17:01:37 -07:00
  • 480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615 Putnam3145 2020-03-11 17:01:13 -07:00