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

Commit Graph

  • d761a78a7f Merge pull request #7 from dtfe3/revert-6-dtfe3-pink-panties dtfe3 2019-06-05 19:30:04 +02:00
  • d1d0f38460 Revert "test" dtfe3 2019-06-05 19:29:53 +02:00
  • 0513f3464a one Ghommie 2019-06-05 19:20:25 +02:00
  • 057107da3b Automatic changelog generation for PR #8424 [ci skip] CitadelStationBot 2019-06-05 11:54:39 -05:00
  • 98304e4975 Merge pull request #8424 from Arturlang/CTRL-Alt-Click-port deathride58 2019-06-05 12:54:36 -04:00
  • b4bcc97aa2 Merge pull request #6 from dtfe3/dtfe3-pink-panties dtfe3 2019-06-05 16:22:37 +02:00
  • 2e47c973c6 Pink Panties dtfe3 2019-06-05 16:15:38 +02:00
  • 064e52e3de Delete underwear.dmi dtfe3 2019-06-05 16:04:27 +02:00
  • 71c7dd0dba Delete underwear.dm dtfe3 2019-06-05 16:04:19 +02:00
  • a8f2af3899 Merge pull request #5 from dtfe3/dtfe3-pinkpanties dtfe3 2019-06-05 15:59:21 +02:00
  • fe1821d170 Merge pull request #1 from Citadel-Station-13/master Arturlang 2019-06-05 16:37:33 +03:00
  • 27ef3ce281 Without this, everyone is broken Poojawa 2019-06-05 08:10:20 -05:00
  • f6c7eeb4da Update mining_tools.dm Trilbyspaceclone 2019-06-05 09:06:47 -04:00
  • 6c6df79e19 pink panties! dtfe3 2019-06-05 15:01:50 +02:00
  • bc80c03679 these too please thanks Poojawa 2019-06-05 04:55:49 -05:00
  • 11d10d3805 fuckit, I'm just gunna wholesale port from baycode I guess Poojawa 2019-06-05 04:55:36 -05:00
  • d44aa44ec6 Automatic changelog generation for PR #8528 [ci skip] CitadelStationBot 2019-06-05 04:02:43 -05:00
  • 2c84d75ae6 Merge pull request #8528 from Poojawa/marking-mysteries kevinz000 2019-06-05 02:02:40 -07:00
  • 4dcef2b618 Merge pull request #8472 from Sishen1542/Crewmonitors kevinz000 2019-06-05 01:59:19 -07:00
  • ecef40258b Automatic changelog generation for PR #8387 [ci skip] CitadelStationBot 2019-06-05 03:55:21 -05:00
  • 980c48180c Merge pull request #8387 from JTGSZ/gangs kevinz000 2019-06-05 01:55:19 -07:00
  • 962afa97bc Automatic changelog generation for PR #8516 [ci skip] CitadelStationBot 2019-06-05 03:53:37 -05:00
  • cc2d3a7f10 Merge pull request #8516 from Ghommie/Ghommie-cit26 kevinz000 2019-06-05 01:53:34 -07:00
  • 055396d110 Automatic changelog generation for PR #8491 [ci skip] CitadelStationBot 2019-06-05 03:52:19 -05:00
  • 89bf36e6a9 Merge pull request #8491 from Ghommie/Ghommie-cit24 kevinz000 2019-06-05 01:52:17 -07:00
  • 65e2d1d37c Automatic changelog generation for PR #8489 [ci skip] CitadelStationBot 2019-06-05 03:49:59 -05:00
  • 3ab46405b8 Merge pull request #8489 from Coolgat3/tacticalwear kevinz000 2019-06-05 01:49:57 -07:00
  • f18943387f Automatic changelog generation for PR #8504 [ci skip] CitadelStationBot 2019-06-05 03:49:13 -05:00
  • 98491cd2f8 Merge pull request #8504 from Trilbyspaceclone/patch-160 kevinz000 2019-06-05 01:49:11 -07:00
  • 8dc5619369 Automatic changelog generation for PR #8506 [ci skip] CitadelStationBot 2019-06-05 03:44:07 -05:00
  • cd38a29449 Merge pull request #8506 from CalamaBanana/Elf-Ears-and-Deer-taurs-for-mammals kevinz000 2019-06-05 01:44:05 -07:00
  • 1eef9b39e3 Automatic changelog generation for PR #8517 [ci skip] CitadelStationBot 2019-06-05 03:42:50 -05:00
  • adbbb2944a Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess kevinz000 2019-06-05 01:42:48 -07:00
  • 73fe37ada0 Automatic changelog generation for PR #8518 [ci skip] CitadelStationBot 2019-06-05 03:41:25 -05:00
  • 102d68a243 Merge pull request #8518 from Ghommie/Ghommie-cit27 kevinz000 2019-06-05 01:41:23 -07:00
  • 52b189dc98 Merge pull request #8502 from Sishen1542/meatyors kevinz000 2019-06-05 01:40:50 -07:00
  • 60ab3b54d5 Automatic changelog generation for PR #8524 [ci skip] CitadelStationBot 2019-06-05 03:40:31 -05:00
  • 58bdac6965 Merge pull request #8524 from BurgerLUA/Ass-Blast-USA kevinz000 2019-06-05 01:40:28 -07:00
  • 81ba2011d3 Merge pull request #8510 from Sishen1542/ghostmanbad kevinz000 2019-06-05 01:32:42 -07:00
  • a2b4f4261c Fixes missing hands and marking overlap Poojawa 2019-06-05 02:33:25 -05:00
  • b053fe3c86 Probably fixes synth hand issues Poojawa 2019-06-04 23:36:58 -05:00
  • b175150719 fixes missing chest markings Poojawa 2019-06-04 23:27:33 -05:00
  • 228ab5b7c9 +Acute hepatic pharmacokinesis. (untested, will test with alterations)CC Fermi 2019-06-05 00:23:42 +01:00
  • da67bdf63d >_> Trilbyspaceclone 2019-06-04 12:40:29 -04:00
  • 9e01a078ec lel Poojawa 2019-06-03 20:06:25 -05:00
  • 7fb1f7fba1 Update snacks_pastry.dm Trilbyspaceclone 2019-06-03 18:38:55 -04:00
  • 5d397fafda Automatic changelog generation for PR #8515 [ci skip] CitadelStationBot 2019-06-03 16:51:15 -05:00
  • b95b14d033 Merge pull request #8515 from Ghommie/Ghommie-cit25 deathride58 2019-06-03 17:51:13 -04:00
  • ed7d0575b2 Ass Blast USA BurgerLua 2019-06-03 14:40:57 -07:00
  • ebb820ed38 Made the changeling tentacle disarm a bit more reliable. Useroth 2019-06-03 22:56:01 +02:00
  • 1f1f951924 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-06-03 05:35:52 -05:00
  • fc1611d86a Merge pull request #8426 from Sishen1542/sloom-hnngh kevinz000 2019-06-03 00:51:36 -07:00
  • c98d2ce5a0 nuke be gone BurgerLua 2019-06-02 15:21:45 -07:00
  • 255aa60441 Final pooj changes. Fermi 2019-06-02 22:57:50 +01:00
  • 0eec1ed3f3 Pooj changes. Fermi 2019-06-02 22:49:04 +01:00
  • a5b3ec7939 Acid changes. Fermi 2019-06-02 22:38:55 +01:00
  • a3e60843bc Renamed blood trait and spelt minutes right. Fermi 2019-06-02 22:35:16 +01:00
  • 4513dd9815 MINUTE define changes. Fermi 2019-06-02 22:26:53 +01:00
  • 6be3496d36 Merge branch 'Ghommie-cit15' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit15 Ghommie 2019-06-02 22:50:02 +02:00
  • a0898a779a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit15 Ghommie 2019-06-02 22:48:38 +02:00
  • 1a73cf6efe This is why you compile test. Fermi 2019-06-02 21:09:31 +01:00
  • c11d2bac80 Okay, now it checks the right thing. Fermi 2019-06-02 21:03:16 +01:00
  • 5b56225b72 Wait how can the dead inspect? Fermi 2019-06-02 21:01:05 +01:00
  • e0690c610a Added a check to ensure empath target isn't dead. Thalpy 2019-06-02 20:53:41 +01:00
  • abb76baeca Update code/modules/mob/living/carbon/human/examine.dm Thalpy 2019-06-02 19:14:08 +01:00
  • e607cd3c7d Fixes para's abilities to use other vehicles. Fermi 2019-06-02 19:11:34 +01:00
  • 59e5372abd Made it so prosthetics can't replace legs. Compiled and tested. Fermi 2019-06-02 18:40:56 +01:00
  • a1e92ce654 Actually check legs. Fermi 2019-06-02 18:26:00 +01:00
  • 472d7ef8cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27 Ghommie 2019-06-02 19:03:34 +02:00
  • da4ce71ba3 alphabetic index, you silly brainfrying wonks. Ghommie 2019-06-02 19:02:16 +02:00
  • 73e279dada excessive parenthesis wrapping. Ghommie 2019-06-02 18:29:43 +02:00
  • d6e54bf237 Fixes and updates pod's emergency suits storage. Ghommie 2019-06-02 18:28:30 +02:00
  • d4abb85641 Update preferences.dm Poojawa 2019-06-02 09:40:18 -05:00
  • 25458fad63 I refuse to eat crow. Poojawa 2019-06-02 08:40:51 -05:00
  • 69b1373209 compile testing and tweaks Poojawa 2019-06-02 08:06:16 -05:00
  • 1cfaf62a75 multi-boobies sprited Poojawa 2019-06-02 07:47:37 -05:00
  • e6e06a1a43 Makes clockwork wall - sonic jackhammer interaction account the wall's superheating. Ghommie 2019-06-02 13:59:36 +02:00
  • ae5d68c6f9 Fixes stunbatons' icons not properly updating on cell removal, and more cell charge leniency. Ghommie 2019-06-02 13:24:03 +02:00
  • 818ec19561 Working as intended, fixed a few other missing sprites Poojawa 2019-06-02 04:44:57 -05:00
  • e7802a9b03 Arcade Loot Improvements BurgerLua 2019-06-02 02:02:47 -07:00
  • 17ad519f24 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess Poojawa 2019-06-02 03:00:46 -05:00
  • fd22dbfc0d More fixes. Need to check over merging math. Fermi 2019-06-02 03:59:52 +01:00
  • 0fa445c153 Fixes and test. Fermi 2019-06-02 03:24:01 +01:00
  • 9347ad57b1 sneaky erp Sishen 2019-06-01 20:20:55 -04:00
  • 9aaeed6f81 Update packs.dm Sishen 2019-06-01 19:46:09 -04:00
  • 3cf3268c76 New non-harmful medicinal darts. Fermi 2019-06-01 22:52:03 +01:00
  • 0105dbf562 Removed duplicate headpat code. Fermi 2019-06-01 20:04:41 +01:00
  • 5918b026aa Fixes, PLEASE CHECK HEADPATS IN MOODULAR. Fermi 2019-06-01 20:02:51 +01:00
  • f8586c9699 Adds Friendly and empahty quirk from tg. Fermi 2019-06-01 18:51:25 +01:00
  • cd310b37fe One pixel missing. Fermi 2019-06-01 18:33:42 +01:00
  • 4603019046 Quick fix to prevent parapalegics driving with no legs. Fermi 2019-06-01 18:24:17 +01:00
  • bebaf8e7a8 Wheelchairs are apparently banned, we now have HOVERCHAIRS! Fermi 2019-06-01 18:17:49 +01:00
  • 7990a20ea6 We don't have wheelchairs? Heresy. Plus fixes to work on citcode. Csafe Fermi 2019-06-01 17:20:04 +01:00
  • 7fe18b5a37 Parapalegic trait. Fermi 2019-06-01 16:55:31 +01:00
  • 44d13818f0 Inital paralysis. (https://github.com/tgstation/tgstation/pull/41140) Fermi 2019-06-01 16:52:58 +01:00
  • a37f84fb9b Ports RP Deer taur and adds Elf Ears to Mammals CalamaBanana 2019-06-01 17:28:17 +02:00
  • d67b179bff RCD Memes BurgerLua 2019-05-31 20:32:17 -07:00
  • 40aa231b64 Made MKUltra's OD on self turn the player into a narcissist. Fermi 2019-06-01 04:31:34 +01:00
  • d6486e2f6c Update resonator.dm Trilbyspaceclone 2019-05-31 23:13:31 -04:00
  • 78822d2e42 Update resonator.dm Trilbyspaceclone 2019-05-31 23:06:08 -04:00