Commit Graph

  • eefba5ce00 Removes lag Putnam 2020-03-02 11:24:46 -08:00
  • 6c8154e8e1 Update damage_procs.dm kevinz000 2020-03-02 12:13:36 -07:00
  • 3c7a9f068e downvoted kappa-sama 2020-03-02 13:51:26 -05:00
  • f08d79767b Removes makeshift switchblades Ghommie 2020-03-02 19:33:31 +01:00
  • 50a1feeb89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties Kraseo 2020-03-02 17:38:08 +01:00
  • 797e96d985 Automatic changelog generation for PR #11296 [ci skip] CitadelStationBot 2020-03-02 09:37:03 -06:00
  • 00bc635d27 Merge pull request #11296 from Putnam3145/supermatter-hardcap Ghom 2020-03-02 16:36:58 +01:00
  • cc7234c177 Automatic changelog generation for PR #11041 [ci skip] CitadelStationBot 2020-03-02 09:36:25 -06:00
  • 9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ Ghom 2020-03-02 16:36:22 +01:00
  • ee9e9878fe Automatic changelog generation for PR #11271 [ci skip] CitadelStationBot 2020-03-02 09:34:21 -06:00
  • 782f992c8c Merge pull request #11271 from Citadel-Station-13/kevinz000-patch-19 Ghom 2020-03-02 16:34:18 +01:00
  • 23cbb05578 Merge branch 'Ghommie-cit597' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit597 Ghommie 2020-03-02 16:33:56 +01:00
  • f915d14a58 Also cell chargers and cloning pods. Ghommie 2020-03-02 16:28:31 +01:00
  • 4d00dfda3f Automatic changelog generation for PR #11283 [ci skip] CitadelStationBot 2020-03-02 09:18:50 -06:00
  • 4ed92ff03a Merge pull request #11283 from Trilbyspaceclone/patch-299 Ghom 2020-03-02 16:18:47 +01:00
  • fca911b74f Merge pull request #11281 from Ragolution/master Ghom 2020-03-02 16:17:37 +01:00
  • bb7d5d3502 Automatic changelog generation for PR #11291 [ci skip] CitadelStationBot 2020-03-02 09:13:38 -06:00
  • 98cd2f0635 Merge pull request #11291 from YakumoChen/miningbase-chemo Ghom 2020-03-02 16:13:35 +01:00
  • b00b359ca6 Automatic changelog generation for PR #11302 [ci skip] CitadelStationBot 2020-03-02 09:11:58 -06:00
  • 7479ff2f02 Merge pull request #11302 from Citadel-Station-13/kevinz000-patch-21 Ghom 2020-03-02 16:11:55 +01:00
  • 1a87a9d051 Update damage_procs.dm kevinz000 2020-03-02 07:24:02 -07:00
  • e1f3985309 Update musician.dm kevinz000 2020-03-02 05:33:48 -07:00
  • 92e95f816a Update defib.dm kevinz000 2020-03-02 03:49:21 -07:00
  • e5e05d5d61 handles cases where stripping plasmamen would not give them what they need to not die Kraseo 2020-03-02 11:47:44 +01:00
  • 7ade79ce80 small fix kevinz000 2020-03-02 03:05:51 -07:00
  • 9540c47adf Update recipes_clothing.dm Trilbyspaceclone 2020-03-02 00:24:36 -05:00
  • c6be46c6bd Update recipes_clothing.dm Trilbyspaceclone 2020-03-02 00:22:46 -05:00
  • da48f95de7 Update hud.dm Trilbyspaceclone 2020-03-02 00:11:54 -05:00
  • ec3e2ddb24 no more laptop slowdown kappa-sama 2020-03-01 21:17:48 -05:00
  • 41e4de9287 fixes telebatons runtiming and not being able to be extended Kraseo 2020-03-02 02:47:21 +01:00
  • 508511cb86 actually makes contractor pinpointer do things Kraseo 2020-03-02 01:36:11 +01:00
  • 4d4708a6ae Update cloning.dm Ghom 2020-03-02 01:28:20 +01:00
  • bb05b47ead fix flypeople nutrition Lin 2020-03-01 23:35:16 +00:00
  • a78d95c866 Automatic changelog generation for PR #11287 [ci skip] CitadelStationBot 2020-03-01 17:13:31 -06:00
  • 28c2d27860 Merge pull request #11287 from monster860/patch-1 Ghom 2020-03-02 00:13:27 +01:00
  • ab1c62f9ac SIGH Kraseo 2020-03-02 00:02:48 +01:00
  • 648f7793d3 proving to the world i'm retarded one commit line at a time Kraseo 2020-03-01 23:56:34 +01:00
  • ad8013d839 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties Kraseo 2020-03-01 23:39:16 +01:00
  • 7206e5ee6e nearly forgot these as well Kraseo 2020-03-01 23:31:14 +01:00
  • aba8828fd4 Proper supermatter tweaks. Putnam 2020-03-01 14:20:15 -08:00
  • efaa99ae27 some dozens lines about PDA/update_overlays and cryopods/MMIs. Ghommie 2020-03-01 23:17:35 +01:00
  • 5da4e5fbcd parte 5: tgui and javascript torture Kraseo 2020-03-01 22:57:39 +01:00
  • e3034720c6 forgot to add these lol Kraseo 2020-03-01 22:08:11 +01:00
  • e3c77f2f5a part 4: the one where i slowly go insane Kraseo 2020-03-01 22:05:35 +01:00
  • 8a647f8a8c happy now? Seris02 2020-03-02 04:22:40 +08:00
  • 56ba8ef127 requested changes ancientpower 2020-03-01 12:45:00 -06:00
  • ab48a6fa16 part 3: do people even read commit logs Kraseo 2020-03-01 19:14:05 +01:00
  • d93ade7e03 part 2: bloody tendency Kraseo 2020-03-01 17:37:18 +01:00
  • 38f7821dd6 part 1: battle stream Kraseo 2020-03-01 16:56:13 +01:00
  • c0ff43f827 ofc, New arguments. Ghommie 2020-03-01 16:34:43 +01:00
  • b0922dd70d Actually.. Ghommie 2020-03-01 16:02:58 +01:00
  • 893cca97a3 An old oversight with disease/var/viable_mobtypes. Ghommie 2020-03-01 15:59:42 +01:00
  • 97c5aa1e24 Maintainer suggestions Arturlang 2020-03-01 16:48:49 +02:00
  • aa79b9853b Update living.dm Ghom 2020-03-01 15:42:41 +01:00
  • e464d3ba1a Merge pull request #11293 from Citadel-Station-13/kevinz000-patch-21 Ghom 2020-03-01 15:40:55 +01:00
  • 185a0b092e I hate this. Ghommie 2020-03-01 15:33:46 +01:00
  • 9a3ddaaf7b Update logging.dm kevinz000 2020-03-01 07:08:04 -07:00
  • ee4f446a59 better backrounds TrilbySpaceClone 2020-03-01 08:47:23 -05:00
  • d817442f02 It works! KathrinBailey 2020-03-01 13:42:14 +00:00
  • 769662394f Automatic changelog generation for PR #11268 [ci skip] CitadelStationBot 2020-03-01 07:39:06 -06:00
  • 20a5ab895f Merge pull request #11268 from raspyosu/vamp-revamp Ghom 2020-03-01 14:39:03 +01:00
  • 684b7714db Update hud.dm Trilbyspaceclone 2020-03-01 08:21:25 -05:00
  • 787edfb2a7 Update recipes_clothing.dm Trilbyspaceclone 2020-03-01 08:16:39 -05:00
  • 77fcd7f804 Automatic changelog generation for PR #11279 [ci skip] CitadelStationBot 2020-03-01 06:55:07 -06:00
  • 3ec80872f0 Merge pull request #11279 from Hatterhat/tg-45232-lavariver Ghom 2020-03-01 13:55:03 +01:00
  • 8774b59fc6 tgstation.dme is being a shit KathrinBailey 2020-03-01 12:18:29 +00:00
  • 72d3572ec3 New sofas added, need to be added to sheet_types.dm still KathrinBailey 2020-03-01 11:58:59 +00:00
  • 1e34e3d081 Add files via upload YakumoChen 2020-03-01 05:19:27 -05:00
  • cc2e0a6440 makes mining base less ugly YakumoChen 2020-03-01 03:45:03 -05:00
  • a20253a860 Merge pull request #26 from Citadel-Station-13/master YakumoChen 2020-03-01 03:43:28 -05:00
  • 7a5366f5dd come to think of it a "cooperative", huh Putnam 2020-03-01 00:03:12 -08:00
  • 6e7406a51a what Putnam 2020-03-01 00:03:00 -08:00
  • 56ab702fa5 but how Putnam 2020-03-01 00:02:16 -08:00
  • 51c675603e ??? TrilbySpaceClone 2020-03-01 02:48:13 -05:00
  • 31b9dbd4ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types Putnam 2020-02-29 23:30:36 -08:00
  • f344af633f finalized. Putnam 2020-02-29 23:29:24 -08:00
  • 71c26c287e Update sheet_types.dm Trilbyspaceclone 2020-03-01 01:55:03 -05:00
  • 5c2bf70fe7 Update code/game/objects/items/shields.dm Trilbyspaceclone 2020-03-01 00:48:45 -05:00
  • 12ea1132c4 Apply suggestions from code review Trilbyspaceclone 2020-03-01 00:43:34 -05:00
  • 65b03d3a4e Update recipes_clothing.dm Trilbyspaceclone 2020-03-01 00:32:48 -05:00
  • d00596b49d fix cloak not restoring initial move intent sometimes (maybe) raspyosu 2020-03-01 00:24:56 -05:00
  • d0d8bfe0ac Update Lavaland.dmm Trilbyspaceclone 2020-03-01 00:21:12 -05:00
  • cdd97e8547 she Trilbyspaceclone 2020-03-01 00:12:45 -05:00
  • e2b706961a Turns out this is Rag's PR and not mine Trilbyspaceclone 2020-03-01 00:11:32 -05:00
  • 899f1bbd88 Allow moaning while in soft crit monster860 2020-02-29 21:02:37 -05:00
  • 3224391079 Automatic changelog generation for PR #11242 [ci skip] CitadelStationBot 2020-02-29 16:03:56 -06:00
  • 609dc0e792 Merge pull request #11242 from Kraseo/green-thumb Ghom 2020-02-29 23:03:53 +01:00
  • eeb8ec0b90 Merge pull request #11276 from kevinz000/gc_debug Ghom 2020-02-29 22:53:58 +01:00
  • 41d36691bf Automatic changelog generation for PR #11227 [ci skip] CitadelStationBot 2020-02-29 13:42:05 -06:00
  • 295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter Ghom 2020-02-29 20:42:03 +01:00
  • 3c9d592b8a Update miscellaneous.dm Trilbyspaceclone 2020-02-29 09:51:40 -05:00
  • 31bde973e0 Bad. Ghommie 2020-02-29 15:44:05 +01:00
  • bcc1c954c8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595 Ghommie 2020-02-29 15:16:43 +01:00
  • bd87d46ce6 Deletes the preferences_vore datum and migrates its contents to preferences. Ghommie 2020-02-29 15:07:44 +01:00
  • dd36688e9a Update watercloset.dm Trilbyspaceclone 2020-02-29 03:31:42 -05:00
  • 612f8d97d5 Update sheet_types.dm Trilbyspaceclone 2020-02-29 03:29:08 -05:00
  • f44908dc2e forgot icon state changes ancientpower 2020-02-29 02:03:25 -06:00
  • 5c5ec541ae Merge branch 'master' into paramedic-tweaks ancientpower 2020-02-29 01:55:46 -06:00
  • f48e56fe44 thanks mapdiffbot ancientpower 2020-02-29 01:49:42 -06:00
  • 727ec433f3 funny story my byond crashes every compile Hatterhat 2020-02-29 01:47:59 -06:00