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

Commit Graph

  • 9da433a45f hopefully fixes conflicts Dap 2019-08-26 08:42:57 -06:00
  • d7ec568efc Allows xeno weeds to regenerate lost blood Poojawa 2019-08-26 09:08:00 -05:00
  • 44893b6ee7 It just works TrilbySpaceClone 2019-08-26 06:32:54 -04:00
  • f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! Dap 2019-08-25 21:38:04 -06:00
  • 3a31785dee Merge pull request #9196 from Citadel-Station-13/kevinz000-patch-78 deathride58 2019-08-25 19:51:00 -04:00
  • d64e5b29fd Update reactions.dm kevinz000 2019-08-25 15:59:45 -07:00
  • 89f8578a35 Merge pull request #9195 from Sishen1542/bzoinks deathride58 2019-08-25 18:58:19 -04:00
  • 170eb96fca Merge pull request #6 from kappa-sama/kappa-sama-keys kappa-sama 2019-08-25 17:33:04 -04:00
  • b093439c73 aaaaaaaa Sishen 2019-08-25 16:27:02 -04:00
  • 036115eddb wallets can hold keys kappa-sama 2019-08-25 15:45:47 -04:00
  • ed471480de Merge pull request #5 from Citadel-Station-13/master kappa-sama 2019-08-25 15:43:56 -04:00
  • 0eb1fdd9dc Update mood.dm kevinz000 2019-08-25 11:19:01 -07:00
  • 3e782795dd get up Linzolle 2019-08-25 13:14:57 -05:00
  • 1ba9d374fe whatever, I guess Poojawa 2019-08-25 01:19:16 -05:00
  • 955fafee11 make it Work Linzolle 2019-08-24 23:22:02 -05:00
  • 14ba00d477 shakes my head Linzolle 2019-08-24 22:21:46 -05:00
  • 9651ae45b1 love to work with merge conflicts Linzolle 2019-08-24 20:27:47 -05:00
  • 5e94a5db80 ports #44155 from /tg/station Rob Bailey 2019-06-09 04:54:02 -07:00
  • b01f135d3a addresses a few concerns Poojawa 2019-08-24 19:09:56 -05:00
  • 4878510c2b Fixes that make this complie TrilbySpaceClone 2019-08-24 19:46:51 -04:00
  • db317b65af Grand! TrilbySpaceClone 2019-08-24 19:39:15 -04:00
  • 24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 Ghommie 2019-08-24 19:05:51 +02:00
  • 5d1cac62da Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 Ghommie 2019-08-24 13:50:22 +02:00
  • f843a53fe9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 Ghommie 2019-08-24 12:52:16 +02:00
  • d60ba0a207 Fixes missing DNA info for slimes, resolves virology issues Poojawa 2019-08-24 04:14:47 -05:00
  • 3fcf9b329f Update his_grace.dm chefferz 2019-08-23 21:46:04 -04:00
  • 20f4e260e1 minigun ooga Sishen 2019-08-23 19:39:20 -04:00
  • 05a8c3bb20 aaaaaaa Sishen 2019-08-23 14:47:19 -04:00
  • 3f86a92efa Merge branch 'walk-like-an-egyptian' into walklikeanegyptian Sishen 2019-08-23 14:42:35 -04:00
  • a80dfada21 [WIP] Plasmaglass Tables! Dap 2019-08-23 12:38:07 -06:00
  • 2ce01b3bda Removes an obnoxious temporary overlay var. Ghommie 2019-08-23 19:57:57 +02:00
  • 106cd7b845 Fixes "Blood Cult Conversion Prompt Issues" Ghommie 2019-08-23 19:38:39 +02:00
  • 0f4f20c29a Update buffs.dm chefferz 2019-08-23 03:50:28 -04:00
  • 788d616c76 Update his_grace.dm chefferz 2019-08-23 03:47:21 -04:00
  • bd1dae9082 Update buffs.dm chefferz 2019-08-23 03:46:13 -04:00
  • 580ea38199 Update buffs.dm chefferz 2019-08-23 03:45:44 -04:00
  • 62a51d8df5 infinite sword exploit Linzolle 2019-08-23 01:25:46 -05:00
  • 7a481f4354 TABS Linzolle 2019-08-23 01:08:53 -05:00
  • de4d4a990b Updated weight class chefferz 2019-08-22 21:07:31 -04:00
  • 9a32d437a5 grants poly the ability to speak through the TGS relay (with a 0.01% chance) deathride58 2019-08-22 20:33:12 -04:00
  • 2e37ca390a Merge pull request #1 from chefferz/chefferz-balance1 chefferz 2019-08-22 20:16:42 -04:00
  • 1376791e7a fixes the poly tgs command not working at all deathride58 2019-08-22 20:13:56 -04:00
  • dca81de36c Gives His Grace stamina regeneration chefferz 2019-08-22 20:09:52 -04:00
  • e6dbaf8473 this should work JTGSZ 2019-08-22 13:02:01 -04:00
  • 62e931c62d Merge pull request #9174 from deathride58/fuckprinters kevinz000 2019-08-22 03:11:10 -07:00
  • 5be9f3fc01 pice 2 names lolman360 2019-08-22 14:24:00 +10:00
  • c618ce114d Ebb lolman360 2019-08-22 14:18:49 +10:00
  • 5df9ea3578 pice lolman360 2019-08-22 14:18:15 +10:00
  • 379674e849 Durasprites for real. lolman360 2019-08-22 14:17:52 +10:00
  • 70581af613 Epic recipie moment. lolman360 2019-08-22 14:17:11 +10:00
  • ea9eaedf1a Ports BeeStation/BeeStation-Hornet#345 deathride58 2019-08-21 22:16:44 -04:00
  • 8195fb84d3 Automatic changelog generation for PR #9164 [ci skip] CitadelStationBot 2019-08-21 10:17:41 -05:00
  • fc2fdf71ca Merge pull request #9164 from lolman360/sprites deathride58 2019-08-21 11:17:39 -04:00
  • 2f9ca28d38 this is bad performance and probably unnecessary but juuust in case.. kevinz000 2019-08-21 08:17:34 -07:00
  • b8615e8659 Automatic changelog generation for PR #8968 [ci skip] CitadelStationBot 2019-08-21 10:16:08 -05:00
  • 25a7d3af51 Merge pull request #8968 from Trilbyspaceclone/patch-199 kevinz000 2019-08-21 08:16:06 -07:00
  • 8bec3bc705 Automatic changelog generation for PR #9145 [ci skip] CitadelStationBot 2019-08-21 10:15:11 -05:00
  • ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212 kevinz000 2019-08-21 08:15:08 -07:00
  • 4cf684b5d4 Automatic changelog generation for PR #9142 [ci skip] CitadelStationBot 2019-08-21 10:11:46 -05:00
  • 7fe2d2b5f2 Merge pull request #9142 from Trilbyspaceclone/patch-211 kevinz000 2019-08-21 08:11:44 -07:00
  • 861bd2a53d Automatic changelog generation for PR #9155 [ci skip] CitadelStationBot 2019-08-21 10:10:25 -05:00
  • 1e76941160 Merge pull request #9155 from Poojawa/Poly-bot-lite kevinz000 2019-08-21 08:10:23 -07:00
  • 3f6256d945 Update all_nodes.dm kevinz000 2019-08-21 08:06:08 -07:00
  • 3c59b43ff7 Update shotgun.dm kevinz000 2019-08-21 06:39:18 -07:00
  • 32c7a7c3ee Virology's broken as fuck, damnifino why Poojawa 2019-08-21 03:36:40 -05:00
  • b29607c019 It's working again, I guess. wtf Poojawa 2019-08-21 01:36:59 -05:00
  • 2617f4f4a3 Automatic changelog generation for PR #9162 [ci skip] CitadelStationBot 2019-08-21 00:04:00 -05:00
  • bfe7854992 Merge pull request #9162 from Sishen1542/beefcase kevinz000 2019-08-20 22:03:58 -07:00
  • 2f39bb3d56 Update necropolis_chests.dm kevinz000 2019-08-20 21:59:50 -07:00
  • c694248f5a Update necropolis_chests.dm kevinz000 2019-08-20 21:58:48 -07:00
  • 23333f6ea5 reverts the majority of clean act because it doesn't work properly otherwise Poojawa 2019-08-20 23:03:31 -05:00
  • 1adc70bc81 Hope it's ready this time! EmeraldSundisk 2019-08-20 20:48:56 -07:00
  • 044ef51dfa Relies on a PR TrilbySpaceClone 2019-08-20 18:32:39 -04:00
  • b180f105f6 Merge pull request #1 from Citadel-Station-13/master EmeraldSundisk 2019-08-20 14:48:22 -07:00
  • 5b4565276d Driver. Chaz 2019-08-20 07:43:11 -07:00
  • bda3ac8745 blood dna is fixed, your ERP code is too Poojawa 2019-08-20 07:41:50 -05:00
  • 96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods Poojawa 2019-08-20 03:36:17 -05:00
  • 4fbbed3a43 adds looc hotkey Seris02 2019-08-20 14:32:48 +08:00
  • 7c23b45fba Update suit.dmi Sishen 2019-08-20 00:46:43 -04:00
  • 4ae0051b30 Update suit.dmi Sishen 2019-08-20 00:45:47 -04:00
  • f4affb36b4 Merge pull request #4 from Citadel-Station-13/master kappa-sama 2019-08-19 22:58:27 -04:00
  • 518eeb9dbe fixes tgui I guess lol Poojawa 2019-08-19 21:11:36 -05:00
  • 8811164b0a ssssssEEEEEEEEEEEEEEEE lolman360 2019-08-20 10:20:31 +10:00
  • c586ef56bc SLEEP BAD lolman360 2019-08-20 10:15:20 +10:00
  • a83dea7bd0 eeeeeeeeeeeeeeeeepic lolman360 2019-08-20 10:01:53 +10:00
  • 9cf17372a9 digi ones left lolman360 2019-08-20 09:58:49 +10:00
  • ceddd83e63 ddddddddd lolman360 2019-08-20 09:55:16 +10:00
  • 846d70fe27 eeeeeeeeeeee lolman360 2019-08-20 09:48:58 +10:00
  • 5f00cc61b8 GMER lolman360 2019-08-20 09:46:03 +10:00
  • 7ce942e69a actual retard lolman360 2019-08-20 09:32:01 +10:00
  • f78fc3ea65 AAAAAAAAAAAAAAAAAAAAAAA lolman360 2019-08-20 09:15:10 +10:00
  • 7a8e2c3f50 rebalances the lawyer heirloom briefcase while giving it a fancy new sprite Sishen 2019-08-19 17:54:16 -04:00
  • d6c9daa4eb Update drinks_recipes.dm Code-Cygnet 2019-08-19 16:04:16 -04:00
  • e7d08d1fed Update drinks_recipes.dm Code-Cygnet 2019-08-19 15:53:13 -04:00
  • 167b18d045 Update code/modules/reagents/chemistry/reagents/alcohol_reagents.dm Code-Cygnet 2019-08-19 15:28:51 -04:00
  • 8cf423b899 fixed merge issues Sishen 2019-08-19 14:36:40 -04:00
  • ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor Sishen 2019-08-19 13:53:05 -04:00
  • c10c78eb27 readds cotten sprites TrilbySpaceClone 2019-08-19 07:56:20 -04:00
  • 6c6391b4c4 Merge branch 'master' into fruit TrilbySpaceClone 2019-08-19 07:37:12 -04:00
  • cce33ec7e5 Update drink_reagents.dm Trilbyspaceclone 2019-08-19 07:17:57 -04:00