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

Commit Graph

  • 08d139ee2c Merge pull request #9608 from Ghommie/Ghommie-cit272 kevinz000 2019-10-25 20:11:01 -07:00
  • 275ecbf468 Merge pull request #9604 from Ghommie/Ghommie-cit268 kevinz000 2019-10-25 20:10:39 -07:00
  • 4eca1ca5ad Merge pull request #9605 from Ghommie/Ghommie-cit269 kevinz000 2019-10-25 20:09:52 -07:00
  • 8b22c95479 Merge pull request #9606 from Ghommie/Ghommie-cit270 kevinz000 2019-10-25 20:09:26 -07:00
  • 9b7b2ce0b2 Merge pull request #9607 from Ghommie/Ghommie-cit271 kevinz000 2019-10-25 20:07:48 -07:00
  • f97e244cc9 Update deployable.dm JTGSZ 2019-10-25 21:23:52 -04:00
  • 6cce995f77 Makes jukeboxes work again after 512.1459's changes to SOUND_UPDATE deathride58 2019-10-25 20:59:10 -04:00
  • d792c25767 resprited wooden and critter crates. Ghommie 2019-10-26 01:23:00 +02:00
  • f983db61bf Update halloween.dm Trilbyspaceclone 2019-10-25 18:08:33 -04:00
  • 5bafab9447 missing period Linzolle 2019-10-25 16:34:32 -05:00
  • 8fb0a68feb Adds Hat Throwing (#45355) MMMiracles 2019-07-26 15:23:56 -04:00
  • 9e89e898ee not again Linzolle 2019-10-25 15:58:10 -05:00
  • 50b9ae3cf3 Update large_objects.dm kevinz000 2019-10-25 09:39:00 -07:00
  • 8f1c983b25 Update armory.dm kevinz000 2019-10-25 09:36:54 -07:00
  • 5f75664350 Update shuttle.dm kevinz000 2019-10-25 09:35:59 -07:00
  • ce0ba51b61 Fixing schlongs and death. Ghommie 2019-10-25 12:52:32 +02:00
  • 79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 Ghommie 2019-10-25 12:42:28 +02:00
  • cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 Ghommie 2019-10-25 12:40:50 +02:00
  • 514b023779 kev request: admin ooc is no bigger. Ghommie 2019-10-25 12:30:05 +02:00
  • c1f84da39e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 Ghommie 2019-10-25 12:26:17 +02:00
  • c37088a767 Merge pull request #9609 from BlackMajor/master kevinz000 2019-10-25 03:18:18 -07:00
  • 885b866130 Merge pull request #15 from BlackMajor/BlackMajor-patch-1 BlackMajor 2019-10-25 23:03:15 +13:00
  • 1705765555 Update hilbertshotel.dm BlackMajor 2019-10-25 23:02:09 +13:00
  • 2c4cb6f2c4 Merge pull request #14 from Citadel-Station-13/master BlackMajor 2019-10-25 23:00:58 +13:00
  • dcb4c6ae04 Merge branch 'master' into assu Anonymous 2019-10-25 10:29:47 +03:00
  • dbaf5a54e6 Merge branch 'master' into abductor-update Lin 2019-10-25 06:17:24 +00:00
  • bb9b0ce312 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic Putnam 2019-10-24 22:38:33 -07:00
  • e55cb64b78 Automatic changelog generation for PR #9549 [ci skip] CitadelStationBot 2019-10-24 21:15:39 -05:00
  • 4af2233c5f Merge pull request #9549 from Ghommie/Ghommie-cit252 kevinz000 2019-10-24 19:15:33 -07:00
  • cc0162b5a9 Automatic changelog generation for PR #9579 [ci skip] CitadelStationBot 2019-10-24 21:13:56 -05:00
  • bd9443252a Merge pull request #9579 from YakumoChen/shapeshift kevinz000 2019-10-24 19:13:54 -07:00
  • e87997d753 Automatic changelog generation for PR #9593 [ci skip] CitadelStationBot 2019-10-24 21:10:19 -05:00
  • 7beb00abba Merge pull request #9593 from Ghommie/Ghommie-cit263 kevinz000 2019-10-24 19:10:17 -07:00
  • 30d201ee3a Automatic changelog generation for PR #8654 [ci skip] CitadelStationBot 2019-10-24 21:07:35 -05:00
  • 9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 kevinz000 2019-10-24 19:07:33 -07:00
  • cea6728e9e Automatic changelog generation for PR #9535 [ci skip] CitadelStationBot 2019-10-24 21:05:27 -05:00
  • da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 kevinz000 2019-10-24 19:05:25 -07:00
  • debe707432 Automatic changelog generation for PR #9568 [ci skip] CitadelStationBot 2019-10-24 21:04:17 -05:00
  • 2a57a7c8a6 Merge pull request #9568 from r4d6/patch-3 kevinz000 2019-10-24 19:04:15 -07:00
  • 236cf328d1 Merge pull request #9567 from BlackMajor/Yote kevinz000 2019-10-24 19:03:49 -07:00
  • d301aa1b70 Automatic changelog generation for PR #9594 [ci skip] CitadelStationBot 2019-10-24 20:57:01 -05:00
  • 281b254066 Merge pull request #9594 from Hatterhat/patch-3 kevinz000 2019-10-24 18:56:59 -07:00
  • 3e455f76e9 Merge pull request #9591 from Ghommie/Ghommie-cit261 kevinz000 2019-10-24 18:56:26 -07:00
  • 8c5293b8b0 Automatic changelog generation for PR #9582 [ci skip] CitadelStationBot 2019-10-24 20:55:32 -05:00
  • d5041b7dde Merge pull request #9582 from Putnam3145/dynamic-config kevinz000 2019-10-24 18:55:29 -07:00
  • 5015a320c6 Automatic changelog generation for PR #9542 [ci skip] CitadelStationBot 2019-10-24 20:51:36 -05:00
  • 9a74d91106 Merge pull request #9542 from Trilbyspaceclone/patch-231 kevinz000 2019-10-24 18:51:34 -07:00
  • ca38a6d606 Automatic changelog generation for PR #9564 [ci skip] CitadelStationBot 2019-10-24 20:49:50 -05:00
  • d8fc3e7211 Merge pull request #9564 from kappa-sama/aliumtators kevinz000 2019-10-24 18:49:48 -07:00
  • c0ae552b45 Automatic changelog generation for PR #9548 [ci skip] CitadelStationBot 2019-10-24 20:48:35 -05:00
  • 02a1aaea34 Merge pull request #9548 from Ghommie/Ghommie-cit251 kevinz000 2019-10-24 18:48:33 -07:00
  • dec1dd41c0 Automatic changelog generation for PR #9550 [ci skip] CitadelStationBot 2019-10-24 20:48:11 -05:00
  • eb50df892a Merge pull request #9550 from Ghommie/Ghommie-cit253 kevinz000 2019-10-24 18:48:09 -07:00
  • 4b2b3a26b3 Merge pull request #9577 from Feasel/patch-1 kevinz000 2019-10-24 18:47:29 -07:00
  • 59c9972e5e Automatic changelog generation for PR #9585 [ci skip] CitadelStationBot 2019-10-24 20:46:29 -05:00
  • d0e9f63734 Merge pull request #9585 from Ghommie/Ghommie-cit257 kevinz000 2019-10-24 18:46:27 -07:00
  • 969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw kevinz000 2019-10-24 18:45:57 -07:00
  • 16998d8814 Merge pull request #9193 from Citadel-Station-13/kevinz000-patch-77 BlackMajor 2019-10-25 14:38:51 +13:00
  • 29d464b3a2 Automatic changelog generation for PR #9587 [ci skip] CitadelStationBot 2019-10-24 20:38:41 -05:00
  • 2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 kevinz000 2019-10-24 18:38:39 -07:00
  • 05516aad97 Automatic changelog generation for PR #9589 [ci skip] CitadelStationBot 2019-10-24 20:38:18 -05:00
  • f9120ed9e1 Merge pull request #9589 from Ghommie/Ghommie-cit259 kevinz000 2019-10-24 18:38:15 -07:00
  • 9fd3ef7801 Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again kevinz000 2019-10-24 18:36:04 -07:00
  • a62fcdcccb forgot about the file extension. Ghommie 2019-10-25 03:34:13 +02:00
  • ad7101d0aa ports anti-magic component code updates (holymelon not included). Ghommie 2019-10-25 03:20:42 +02:00
  • 31f9ed9665 fixes kevinz000 2019-10-24 15:31:45 -07:00
  • 4b0b130c36 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit272 Ghommie 2019-10-25 00:27:04 +02:00
  • 85b35433b2 Unmodularize Eutactic Blades. Ghommie 2019-10-25 00:14:38 +02:00
  • 238fca4e59 2 Ghommie 2019-10-24 23:42:02 +02:00
  • 6fbe7f9086 unmodularize events Ghommie 2019-10-24 23:41:31 +02:00
  • 6f19899dd2 Unmodularize research. Ghommie 2019-10-24 23:28:15 +02:00
  • 29584aff69 emagged travis now succeeds. Ghommie 2019-10-24 23:11:18 +02:00
  • 0da6ae549f Unmodularize vox sounds Ghommie 2019-10-24 23:02:21 +02:00
  • 0a829a8517 .dme updates when compiling, closing or opening the program, but not when deleting a file with dreammaker. Ghommie 2019-10-24 22:52:32 +02:00
  • f035d77b53 Slips. Ghommie 2019-10-24 22:50:53 +02:00
  • 2a07bf95d8 Unmodularize job types Ghommie 2019-10-24 22:44:40 +02:00
  • cd6e9e22b1 avacuate dreammaker. Ghommie 2019-10-24 22:17:23 +02:00
  • f01b5c853f Unmodularize lavaknights. Ghommie 2019-10-24 22:08:36 +02:00
  • 6b95611ae9 another 3 px Ghommie 2019-10-24 20:59:13 +02:00
  • 507e9b7aa0 kinda a dumb workaround Linzolle 2019-10-24 13:57:00 -05:00
  • 17a79bc7f9 Offsets the new linen bin sprites 3 pixels up. Ghommie 2019-10-24 20:56:06 +02:00
  • b29fc9aa58 fermis code looks very 2k17, sad. Ghommie 2019-10-24 20:44:29 +02:00
  • a5c95f20b6 typo. Ghommie 2019-10-24 19:58:32 +02:00
  • c5a62a4288 earth kappa-sama 2019-10-24 13:29:34 -04:00
  • deaf1a0e00 guess tahts what ghom meant Linzolle 2019-10-24 12:14:22 -05:00
  • 5e1658445c that doesn't exist Linzolle 2019-10-24 12:11:58 -05:00
  • 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. Ghommie 2019-10-24 18:01:46 +02:00
  • f592aca594 Merge branch 'master' into assu Anonymous 2019-10-24 17:18:26 +03:00
  • 841f9ae878 Update lavaland_surface_ash_walker1.dmm Trilbyspaceclone 2019-10-24 10:05:26 -04:00
  • aeca5f5fb2 ffs Ghommie 2019-10-24 12:21:57 +02:00
  • da03439ac8 Ports "New Revenant icons" Ghommie 2019-10-24 12:21:37 +02:00
  • 7b257242c2 bullets won't work... Ghommie 2019-10-24 10:44:57 +02:00
  • a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 Ghommie 2019-10-24 10:10:07 +02:00
  • 4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 Ghommie 2019-10-24 09:50:20 +02:00
  • 0ae8953da9 various runtime fixes - plasman tounges no longer have a maxhealth value of "alien", simplemobs no longer runtime when shot, removing filters from something that lacks filters now works deathride58 2019-10-24 02:52:40 -04:00
  • 1937ad9241 thats probably not gonna work Linzolle 2019-10-23 22:04:09 -05:00
  • 3e9dfd6441 i was suggested to try this YakumoChen 2019-10-24 02:59:15 +00:00
  • 326e5ec8a9 when are we gonna port this Linzolle 2019-10-23 21:54:14 -05:00
  • c6939864c1 and this YakumoChen 2019-10-24 02:42:38 +00:00
  • 8f78bfeb26 oops Linzolle 2019-10-23 21:36:47 -05:00