shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • ed95ba20b6 so we dont speed removal plants by missclicks Trilbyspaceclone 2019-05-31 23:03:00 -04:00
  • 2d91388be8 Update mining_tools.dm Trilbyspaceclone 2019-05-31 22:57:28 -04:00
  • 6dacd40c8c Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 Fermi 2019-06-01 03:24:16 +01:00
  • d9058fa53d Merge pull request #13 from Citadel-Station-13/master Thalpy 2019-06-01 03:23:48 +01:00
  • af52ff29fe Fixing merge conflicts. Fermi 2019-06-01 03:23:14 +01:00
  • 6e6a1f4615 Automatic changelog generation for PR #8473 [ci skip] CitadelStationBot 2019-05-31 21:23:05 -05:00
  • 70bad08f95 Merge pull request #8473 from Useroth/clown-fu kevinz000 2019-05-31 19:23:03 -07:00
  • a46312ede6 Update godhand.dm Useroth 2019-06-01 04:20:27 +02:00
  • e63f9f385b Merge pull request #8359 from Useroth/pneumatic-and-stun-buff kevinz000 2019-05-31 19:18:53 -07:00
  • 8af39b8da7 Update godhand.dm Useroth 2019-06-01 04:16:37 +02:00
  • e58a94bcc7 Merge remote-tracking branch 'upstream/master' Fermi 2019-06-01 03:12:38 +01:00
  • 01c3f66f7c Great, merge conflicts. Fermi 2019-06-01 02:42:55 +01:00
  • 5dde4555cc lmao2crate Sishen 2019-05-31 21:11:39 -04:00
  • c390c3e58f Automatic changelog generation for PR #8434 [ci skip] CitadelStationBot 2019-05-31 20:00:49 -05:00
  • 32f6427cf1 Merge pull request #8434 from Ghommie/Ghommie-cit16 kevinz000 2019-05-31 18:00:47 -07:00
  • 65320d1eec Automatic changelog generation for PR #8463 [ci skip] CitadelStationBot 2019-05-31 20:00:14 -05:00
  • 8b27926fee Merge pull request #8463 from Trilbyspaceclone/metal_shields kevinz000 2019-05-31 18:00:12 -07:00
  • 8b69d7e710 Automatic changelog generation for PR #8482 [ci skip] CitadelStationBot 2019-05-31 19:59:35 -05:00
  • 2a5bbfdafc Merge pull request #8482 from Ghommie/Ghommie-cit22 kevinz000 2019-05-31 17:59:33 -07:00
  • 877bca1637 Automatic changelog generation for PR #8495 [ci skip] CitadelStationBot 2019-05-31 19:59:11 -05:00
  • 140e065525 Merge pull request #8495 from BurgerLUA/Anti-Obese kevinz000 2019-05-31 17:59:09 -07:00
  • 89d655aada Automatic changelog generation for PR #8477 [ci skip] CitadelStationBot 2019-05-31 19:58:50 -05:00
  • 59e88e0808 Merge pull request #8477 from deathride58/portsnerditems kevinz000 2019-05-31 17:58:48 -07:00
  • 8ae11fa336 Automatic changelog generation for PR #8485 [ci skip] CitadelStationBot 2019-05-31 19:55:40 -05:00
  • 16c89da587 Merge pull request #8485 from Trilbyspaceclone/plushies kevinz000 2019-05-31 17:55:37 -07:00
  • 067f062a90 Automatic changelog generation for PR #8449 [ci skip] CitadelStationBot 2019-05-31 19:52:42 -05:00
  • 7507831ffa Merge pull request #8449 from Trilbyspaceclone/patch-144 kevinz000 2019-05-31 17:52:40 -07:00
  • 1bb525aefe Automatic changelog generation for PR #8453 [ci skip] CitadelStationBot 2019-05-31 19:52:28 -05:00
  • c645d2129f Merge pull request #8453 from Trilbyspaceclone/patch-148 kevinz000 2019-05-31 17:52:25 -07:00
  • f72db86dad Automatic changelog generation for PR #8452 [ci skip] CitadelStationBot 2019-05-31 19:51:01 -05:00
  • 4224606c5f Merge pull request #8452 from Trilbyspaceclone/patch-147 kevinz000 2019-05-31 17:50:59 -07:00
  • 61f9c2edcd Merge pull request #8461 from Trilbyspaceclone/patch-155 kevinz000 2019-05-31 17:47:08 -07:00
  • 3c06b98170 Automatic changelog generation for PR #8459 [ci skip] CitadelStationBot 2019-05-31 19:46:46 -05:00
  • 14d763bd1d Merge pull request #8459 from Trilbyspaceclone/patch-153 kevinz000 2019-05-31 17:46:44 -07:00
  • 8c6d8eb20b Merge pull request #8471 from Sishen1542/buttslol kevinz000 2019-05-31 17:45:07 -07:00
  • 401fd5c354 Automatic changelog generation for PR #8466 [ci skip] CitadelStationBot 2019-05-31 19:44:41 -05:00
  • 07d3b0361c Merge pull request #8466 from Poojawa/vis-overlay-insolence kevinz000 2019-05-31 17:44:39 -07:00
  • 854eb129f6 Merge pull request #8462 from Trilbyspaceclone/patch-156 kevinz000 2019-05-31 17:43:53 -07:00
  • 8c9faeef54 Automatic changelog generation for PR #8436 [ci skip] CitadelStationBot 2019-05-31 19:43:24 -05:00
  • 1efdfd38e0 Merge pull request #8436 from Trilbyspaceclone/patch-137 kevinz000 2019-05-31 17:43:22 -07:00
  • 7ab61db8b2 Automatic changelog generation for PR #8470 [ci skip] CitadelStationBot 2019-05-31 19:42:30 -05:00
  • f678741a0e Merge pull request #8470 from Ghommie/Ghommie-cit19 kevinz000 2019-05-31 17:42:28 -07:00
  • ca16cd9467 Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS kevinz000 2019-05-31 17:41:39 -07:00
  • a96e414d2f Merge pull request #8486 from BlackMajor/Ooga kevinz000 2019-05-31 17:40:30 -07:00
  • 2eceb6f57b Added a cybernetic tongue and sprites. Fixed furranium. Fermi 2019-06-01 01:28:52 +01:00
  • abfcc25e91 No changed, just staching a comment. Fermi 2019-05-31 23:54:30 +01:00
  • 9badda96d8 huh Trilbyspaceclone 2019-05-31 18:04:02 -04:00
  • 5e67974611 old file fixing Trilbyspaceclone 2019-05-31 18:01:22 -04:00
  • aaaebe625b old file fixes Trilbyspaceclone 2019-05-31 18:00:00 -04:00
  • 995b02b109 Add files via upload Trilbyspaceclone 2019-05-31 17:55:56 -04:00
  • 23d4da8541 Delete storage.dmi Trilbyspaceclone 2019-05-31 17:55:36 -04:00
  • 3891cf1ff6 Update sheet_types.dm Trilbyspaceclone 2019-05-31 17:54:49 -04:00
  • 96a32f7c3d Update boxes.dm Trilbyspaceclone 2019-05-31 17:53:54 -04:00
  • ddfe9812a1 Update shotgun.dm Trilbyspaceclone 2019-05-31 16:06:26 -04:00
  • 46123cb1fa First attempt at making size change damage (doesn't work yet) BlackMajor 2019-06-01 02:45:14 +12:00
  • 2b1931c217 Compression kit can now shrink dicks. Also gives it way more feedback. BlackMajor 2019-06-01 00:42:40 +12:00
  • 5f94441cc7 Adds Clockwork Reflectors BurgerLua 2019-05-30 22:52:43 -07:00
  • e1577111a0 TO BE TESTED: Added the ability for slimes to make MKUltra. Fermi 2019-05-31 05:09:07 +01:00
  • 1244b848bf Compile safe. Fermi 2019-05-31 04:29:35 +01:00
  • d0811e5be6 Adjusted lung health. Fermi 2019-05-31 04:26:41 +01:00
  • adeffe0c47 Fixed lungs. Fermi 2019-05-31 04:16:18 +01:00
  • 08e72ba05e Why does adjustLungLoss not workkkkkkkkkkkkkkkkk Fermi 2019-05-31 03:49:25 +01:00
  • 1461f46292 Added a catch to prevent acid from being rascals. Fermi 2019-05-31 03:12:00 +01:00
  • f8005dd625 Moved the secret cat to the respective fermi.dms. Fermi 2019-05-31 02:47:08 +01:00
  • 5dc3542f90 added BurgerLua 2019-05-30 15:49:53 -07:00
  • c73884aea4 huh... Trilbyspaceclone 2019-05-30 16:12:40 -04:00
  • 751b9adb53 Update recipes.dm Trilbyspaceclone 2019-05-30 16:10:10 -04:00
  • d7fdaed181 Fixes the Oldstation Tile Sishen 2019-05-30 15:45:17 -04:00
  • ee2d75ae22 Removed special screen obj, as I didn't like how they looked. Fermi 2019-05-30 20:05:06 +01:00
  • 5d80fb6811 Update backpack.dm Trilbyspaceclone 2019-05-30 15:04:45 -04:00
  • fa4cf533cb honestly AP bullet spam is ballocks too. Ghommie 2019-05-30 20:20:05 +02:00
  • a6a54219fe Automatic changelog generation for PR #8295 [ci skip] CitadelStationBot 2019-05-30 13:12:38 -05:00
  • f5b3484e92 Merge pull request #8295 from Trilbyspaceclone/T_T kevinz000 2019-05-30 11:12:35 -07:00
  • 85ab988842 0, null, and "", all fulfill the ! operator. Ghommie 2019-05-30 20:09:19 +02:00
  • a8ec60d9c1 Update miscellaneous.dm Trilbyspaceclone 2019-05-30 13:51:55 -04:00
  • e75e629a8a Update code/modules/antagonists/changeling/powers/adrenaline.dm kevinz000 2019-05-30 10:32:02 -07:00
  • 9e35f91706 suggested changes from asky deathride58 2019-05-30 13:18:05 -04:00
  • 5482469a86 Added lightup shoes and heelys to maint loot SkullyRoberts 2019-05-30 13:02:18 -04:00
  • 674e8a4227 Glubbs Coolgat3 2019-05-30 18:59:43 +02:00
  • 59d0360fa6 Add files via upload Trilbyspaceclone 2019-05-30 12:17:21 -04:00
  • a3bf322f3d Delete suit.dmi Trilbyspaceclone 2019-05-30 12:17:00 -04:00
  • bd327f9541 Add files via upload Trilbyspaceclone 2019-05-30 12:04:10 -04:00
  • aa1859f6f1 Delete suit.dmi Trilbyspaceclone 2019-05-30 12:03:58 -04:00
  • a4fc312b15 Add files via upload Trilbyspaceclone 2019-05-30 12:00:24 -04:00
  • d6c954689f Delete suits.dmi Trilbyspaceclone 2019-05-30 11:58:32 -04:00
  • 39700503f9 Update miscellaneous.dm Trilbyspaceclone 2019-05-30 11:40:37 -04:00
  • 618c2c070c Update ert.dm Trilbyspaceclone 2019-05-30 11:36:20 -04:00
  • 0eb468e3a5 Update ert.dm Trilbyspaceclone 2019-05-30 11:33:38 -04:00
  • c0a36a7170 Add files via upload Trilbyspaceclone 2019-05-30 11:29:21 -04:00
  • c0b3f1739a Delete hats.dmi Trilbyspaceclone 2019-05-30 11:28:45 -04:00
  • 70e42eb1a2 Delete suits.dmi Trilbyspaceclone 2019-05-30 11:28:20 -04:00
  • cfa2533b01 Add files via upload Trilbyspaceclone 2019-05-30 11:27:12 -04:00
  • f55323293e Delete suit.dmi Trilbyspaceclone 2019-05-30 11:25:20 -04:00
  • 8ffa934200 Delete head.dmi Trilbyspaceclone 2019-05-30 11:24:51 -04:00
  • bfe4020eda Add files via upload Trilbyspaceclone 2019-05-30 11:23:04 -04:00
  • d0532cf585 Delete suit_digi.dmi Trilbyspaceclone 2019-05-30 11:21:20 -04:00
  • b397a9603c Delete muzzled_helmet.dmi Trilbyspaceclone 2019-05-30 11:21:01 -04:00
  • feca9b7839 Delete taur_naga.dmi Trilbyspaceclone 2019-05-30 11:20:42 -04:00
  • a6e85a63ba Update code/game/objects/items/plushes.dm Trilbyspaceclone 2019-05-30 11:14:31 -04:00
  • 46c548272c move stuff kevinz000 2019-05-29 23:14:55 -07:00