Commit Graph

  • bf431155b7 test kevinz000 2019-06-08 18:29:30 -07:00
  • 3b9188d301 let's see how badly this goes kevinz000 2019-06-08 18:28:04 -07:00
  • c3db9a3cd9 stuff kevinz000 2019-06-08 18:22:37 -07:00
  • 4a6f2d2b5a Merge pull request #8590 from Citadel-Station-13/kevinz000-patch-49 kevinz000 2019-06-08 18:13:17 -07:00
  • 7706ec6329 I LOVE THE SMELL OF NAPALM IN THE MORNING! Ghommie 2019-06-09 02:45:14 +02:00
  • 1a07f304c9 Update examine.dm kevinz000 2019-06-08 17:32:36 -07:00
  • 5cf0a9e67f Update carbon_defense.dm kevinz000 2019-06-08 17:30:50 -07:00
  • 7755bf6b0a Merge pull request #8508 from Thalpy/FriendlyEmpathy kevinz000 2019-06-08 17:26:01 -07:00
  • 5c6100dfc6 Update food_reagents.dm kevinz000 2019-06-08 15:52:55 -07:00
  • 628482e53b Merge branch 'master' into FriendlyEmpathy Thalpy 2019-06-08 23:45:37 +01:00
  • 30b8d8db1a Made the nudity permit cover genitals and boobs SkullyRoberts 2019-06-08 18:38:28 -04:00
  • e83365daed Added a penis autosurgeon as rare maint loot SkullyRoberts 2019-06-08 17:12:51 -04:00
  • 60e89a6ca4 wrong w_class Trilbyspaceclone 2019-06-08 16:19:16 -04:00
  • b073c29b19 Update all_nodes.dm Trilbyspaceclone 2019-06-08 16:17:49 -04:00
  • 3b941210e5 Update medical_designs.dm Trilbyspaceclone 2019-06-08 16:16:17 -04:00
  • a86d6fd9cc Update firstaid.dm Trilbyspaceclone 2019-06-08 16:06:36 -04:00
  • 52d217a92b deathride man good. Ghommie 2019-06-08 21:48:39 +02:00
  • 90d0ce5897 Automatic changelog generation for PR #8567 [ci skip] CitadelStationBot 2019-06-08 14:05:28 -05:00
  • 543c9c07e2 Merge pull request #8567 from Arturlang/RPD-Update kevinz000 2019-06-08 12:05:26 -07:00
  • 2288346876 Automatic changelog generation for PR #8566 [ci skip] CitadelStationBot 2019-06-08 14:05:19 -05:00
  • be9a551eea Merge pull request #8566 from Ghommie/Ghommie-cit39 kevinz000 2019-06-08 12:05:17 -07:00
  • 480ee9a9da Reskinnable PDAs. Ghommie 2019-06-08 19:55:47 +02:00
  • b8ddbb5008 Update shields.dm Trilbyspaceclone 2019-06-08 11:21:40 -04:00
  • b1439ecdb9 Update gang_items.dm Trilbyspaceclone 2019-06-08 11:09:18 -04:00
  • 9464e8f55a Clears up Extinguisher's slippery instructions. Ghommie 2019-06-08 15:24:30 +02:00
  • e1c94ef8af named arguments. Ghommie 2019-06-08 15:06:07 +02:00
  • ec2da508b8 Gonna go with 25 since it won't be usable on lying people. Ghommie 2019-06-08 15:05:26 +02:00
  • 53d5ad5820 no exclamation point. Ghommie 2019-06-08 14:45:26 +02:00
  • fc536dcfe4 Urist McSpaceman goes vigilant! Urist McSpaceman seems attentive! Urist McSpaceman looks alert! Ghommie 2019-06-08 14:44:40 +02:00
  • 40030c40bf lmao2reach Sishen 2019-06-08 07:19:11 -04:00
  • b2e964f169 Automatic changelog generation for PR #8514 [ci skip] CitadelStationBot 2019-06-08 05:53:15 -05:00
  • b69986e544 Merge pull request #8514 from BurgerLUA/Arcade-Loot-Improvements kevinz000 2019-06-08 03:53:13 -07:00
  • 2cda2380f6 durasteel toolboxes kevinz000 2019-06-08 03:50:22 -07:00
  • 3f34e3c93d Update stun.dm kevinz000 2019-06-08 03:30:25 -07:00
  • 50cee124c5 Merge pull request #8563 from Sishen1542/Prideful kevinz000 2019-06-08 03:00:05 -07:00
  • 26ffc2ef38 Automatic changelog generation for PR #8522 [ci skip] CitadelStationBot 2019-06-08 03:32:54 -05:00
  • bd0e16461b Merge pull request #8522 from Useroth/changeling-hentai kevinz000 2019-06-08 01:32:52 -07:00
  • e8665aef4f Automatic changelog generation for PR #8556 [ci skip] CitadelStationBot 2019-06-08 03:29:44 -05:00
  • d36b8068fa Merge pull request #8556 from Poojawa/ninja-speak kevinz000 2019-06-08 01:29:42 -07:00
  • 1ac9235ca2 Automatic changelog generation for PR #8560 [ci skip] CitadelStationBot 2019-06-08 03:27:45 -05:00
  • d28754cb4d Merge pull request #8560 from Ghommie/Ghommie-cit37 kevinz000 2019-06-08 01:27:43 -07:00
  • 511377e0e1 Automatic changelog generation for PR #8559 [ci skip] CitadelStationBot 2019-06-08 03:26:47 -05:00
  • 658f14275b Merge pull request #8559 from Ghommie/Ghommie-cit36 kevinz000 2019-06-08 01:26:45 -07:00
  • 9953f1bae8 Automatic changelog generation for PR #8558 [ci skip] CitadelStationBot 2019-06-08 03:26:29 -05:00
  • 2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 kevinz000 2019-06-08 01:26:28 -07:00
  • 8807e7ea1d Automatic changelog generation for PR #8557 [ci skip] CitadelStationBot 2019-06-08 03:26:19 -05:00
  • 4650e4d353 Merge pull request #8557 from Ghommie/Ghommie-cit34 kevinz000 2019-06-08 01:26:17 -07:00
  • 3d5b220c1a Automatic changelog generation for PR #8555 [ci skip] CitadelStationBot 2019-06-08 03:25:39 -05:00
  • aca85123be Merge pull request #8555 from Ghommie/Ghommie-cit32 kevinz000 2019-06-08 01:25:37 -07:00
  • 3eec46a8b9 Automatic changelog generation for PR #8554 [ci skip] CitadelStationBot 2019-06-08 03:25:01 -05:00
  • 1488af1a52 Merge pull request #8554 from Ghommie/Ghommie-cit33 kevinz000 2019-06-08 01:24:59 -07:00
  • 3b2a8fdc66 Automatic changelog generation for PR #8553 [ci skip] CitadelStationBot 2019-06-08 03:24:37 -05:00
  • eb1c767ab7 Merge pull request #8553 from Poojawa/ghost-erp kevinz000 2019-06-08 01:24:36 -07:00
  • aaf841aa72 Automatic changelog generation for PR #8552 [ci skip] CitadelStationBot 2019-06-08 03:24:19 -05:00
  • ae5d4de111 Merge pull request #8552 from Ghommie/Ghommie-cit31 kevinz000 2019-06-08 01:24:16 -07:00
  • 9314656c7c Automatic changelog generation for PR #8551 [ci skip] CitadelStationBot 2019-06-08 03:24:01 -05:00
  • 95abaf6a6e Merge pull request #8551 from Ghommie/Ghommie-cit30 kevinz000 2019-06-08 01:23:59 -07:00
  • 22b634fe61 Automatic changelog generation for PR #8549 [ci skip] CitadelStationBot 2019-06-08 03:23:33 -05:00
  • 4050ba98eb Merge pull request #8549 from Trilbyspaceclone/patch-168 kevinz000 2019-06-08 01:23:31 -07:00
  • 876850b325 Automatic changelog generation for PR #8548 [ci skip] CitadelStationBot 2019-06-08 03:22:54 -05:00
  • 1ad200fcf4 Merge pull request #8548 from dtfe3/dtfe3-loadout-schoolgirl kevinz000 2019-06-08 01:22:52 -07:00
  • d593d32ed4 Automatic changelog generation for PR #8547 [ci skip] CitadelStationBot 2019-06-08 03:22:18 -05:00
  • ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 kevinz000 2019-06-08 01:22:16 -07:00
  • a6d7e618f1 Automatic changelog generation for PR #8544 [ci skip] CitadelStationBot 2019-06-08 03:21:43 -05:00
  • 88990f5ae0 Merge pull request #8544 from Trilbyspaceclone/patch-166 kevinz000 2019-06-08 01:21:41 -07:00
  • 6dfde9654f Automatic changelog generation for PR #8541 [ci skip] CitadelStationBot 2019-06-08 03:21:30 -05:00
  • a37bf5bfaf Merge pull request #8541 from Trilbyspaceclone/patch-164 kevinz000 2019-06-08 01:21:28 -07:00
  • 2b3af1672c Merge branch 'master' into patch-135 kevinz000 2019-06-08 01:19:37 -07:00
  • 886978e46b Automatic changelog generation for PR #8540 [ci skip] CitadelStationBot 2019-06-08 03:17:06 -05:00
  • 9edac9fc6c Merge pull request #8540 from BurgerLUA/assssssssssssssssssssssss kevinz000 2019-06-08 01:17:04 -07:00
  • 457a6bcdc1 Automatic changelog generation for PR #8543 [ci skip] CitadelStationBot 2019-06-08 03:16:00 -05:00
  • a866ceb8a2 Merge pull request #8543 from Trilbyspaceclone/patch-165 kevinz000 2019-06-08 01:15:58 -07:00
  • ba849b83af Automatic changelog generation for PR #8569 [ci skip] CitadelStationBot 2019-06-08 03:13:39 -05:00
  • cb16dd0fbf Merge pull request #8569 from dtfe3/dtfe3-ears-fox kevinz000 2019-06-08 01:13:37 -07:00
  • e518d6e4b1 Merge pull request #8490 from SkullyRoberts/Heelys kevinz000 2019-06-08 01:12:57 -07:00
  • 92b5afab52 Automatic changelog generation for PR #8503 [ci skip] CitadelStationBot 2019-06-08 03:10:36 -05:00
  • f458828659 Merge pull request #8503 from Trilbyspaceclone/patch-159 kevinz000 2019-06-08 01:10:34 -07:00
  • a0067193e6 Automatic changelog generation for PR #8501 [ci skip] CitadelStationBot 2019-06-08 03:10:13 -05:00
  • 80aa303b4e Merge pull request #8501 from Trilbyspaceclone/boxen kevinz000 2019-06-08 01:10:11 -07:00
  • 642bfc1d91 Automatic changelog generation for PR #8494 [ci skip] CitadelStationBot 2019-06-08 03:09:28 -05:00
  • f201bd1508 Merge pull request #8494 from Trilbyspaceclone/ash_walker kevinz000 2019-06-08 01:09:26 -07:00
  • 772ab1dc92 Automatic changelog generation for PR #8500 [ci skip] CitadelStationBot 2019-06-08 03:09:03 -05:00
  • 487461fbda Merge pull request #8500 from Trilbyspaceclone/patch-158 kevinz000 2019-06-08 01:09:00 -07:00
  • e13efe26bd Merge pull request #8493 from Sishen1542/Oldstat kevinz000 2019-06-08 01:08:44 -07:00
  • 10782559c5 Automatic changelog generation for PR #8414 [ci skip] CitadelStationBot 2019-06-08 03:08:02 -05:00
  • c8435a5658 Merge pull request #8414 from Trilbyspaceclone/MASON kevinz000 2019-06-08 01:08:00 -07:00
  • 57aa92b080 Automatic changelog generation for PR #8483 [ci skip] CitadelStationBot 2019-06-08 03:07:20 -05:00
  • 3b24e05dd6 Merge pull request #8483 from Ghommie/Ghommie-cit23 kevinz000 2019-06-08 01:07:18 -07:00
  • 24e836807d Automatic changelog generation for PR #8476 [ci skip] CitadelStationBot 2019-06-08 03:05:30 -05:00
  • 61d0ac9993 Merge pull request #8476 from Trilbyspaceclone/patch-157 kevinz000 2019-06-08 01:05:28 -07:00
  • 7875ca73be Merge pull request #8444 from dtfe3/patch-1 kevinz000 2019-06-08 01:03:37 -07:00
  • 2e18e963fe Automatic changelog generation for PR #8432 [ci skip] CitadelStationBot 2019-06-08 03:03:03 -05:00
  • 68ef76e09a Merge pull request #8432 from Ghommie/Ghommie-cit15 kevinz000 2019-06-08 01:03:01 -07:00
  • 89d1d74d9d Automatic changelog generation for PR #8442 [ci skip] CitadelStationBot 2019-06-08 03:02:23 -05:00
  • c7f346a03c Merge pull request #8442 from Trilbyspaceclone/patch-139 kevinz000 2019-06-08 01:02:21 -07:00
  • 31d77ef58e Merge pull request #8403 from Ghommie/Ghommie-cit12 kevinz000 2019-06-08 01:01:20 -07:00
  • ef3c0cba63 Automatic changelog generation for PR #8391 [ci skip] CitadelStationBot 2019-06-08 03:00:43 -05:00
  • 8c632bed6f Merge pull request #8391 from Trilbyspaceclone/patch-132 kevinz000 2019-06-08 01:00:41 -07:00
  • 87023134e0 Automatic changelog generation for PR #8538 [ci skip] CitadelStationBot 2019-06-08 00:37:31 -05:00
  • 1dde6b90ae Merge pull request #8538 from dtfe3/dtfe3-hair-twintail deathride58 2019-06-08 01:37:29 -04:00