Commit Graph

  • 84d08fe122 firebreath change + update to tg genetics + calc patch Seris02 2020-02-22 19:42:33 +08:00
  • d328d554ba Reduced copypasta Putnam 2020-02-22 02:38:57 -08:00
  • f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-02-21 23:29:25 -07:00
  • b8d60a33bd partial fix kevinz000 2020-02-21 23:29:13 -07:00
  • d4e1c30597 Automatic changelog generation for PR #10848 [ci skip] CitadelStationBot 2020-02-22 00:28:47 -06:00
  • 856af1f182 Merge pull request #10848 from Ghommie/Ghommie-cit229 kevinz000 2020-02-21 23:28:44 -07:00
  • ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) Detective Google 2020-02-22 00:02:49 -06:00
  • 3d37e69196 Merge pull request #2 from Citadel-Station-13/master dzahlus 2020-02-22 11:15:33 +08:00
  • 5a580dda20 Update suppression.dm kevinz000 2020-02-21 18:18:37 -07:00
  • 24ba8b4d04 Update haste.dm kevinz000 2020-02-21 18:17:54 -07:00
  • f2a17b8b35 Update robot_mobility.dm kevinz000 2020-02-21 18:17:07 -07:00
  • 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 Ghommie 2020-02-22 00:55:32 +01:00
  • 6dbd58b5df i really fucked this up please advise Hatterhat 2020-02-21 16:07:41 -06:00
  • 665e95d827 compile kevinz000 2020-02-21 15:03:22 -07:00
  • e85699df50 compile fix kevinz000 2020-02-21 14:18:45 -07:00
  • a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags kevinz000 2020-02-21 13:35:26 -07:00
  • 9d414bd5a7 Yikes my bad Trilbyspaceclone 2020-02-21 15:29:56 -05:00
  • 9578c69f77 Update hivelord.dm Trilbyspaceclone 2020-02-21 15:24:27 -05:00
  • 0f9bda8f90 wow okay make it do this instead Putnam 2020-02-21 11:53:16 -08:00
  • 8e865a5081 Made power increase with raw damage. Putnam 2020-02-21 11:37:17 -08:00
  • 418374be06 beegion YakumoChen 2020-02-21 17:56:14 +00:00
  • 869fb5e897 Automatic changelog generation for PR #11175 [ci skip] CitadelStationBot 2020-02-21 09:46:22 -06:00
  • 42416483e7 Merge pull request #11175 from keronshb/NaniteFixes Ghom 2020-02-21 16:46:19 +01:00
  • d112556ea3 Fix, New Category, file renames. Winter Flare 2020-02-21 09:34:13 -05:00
  • e08c89ce48 Reverts some Artur 2020-02-21 15:10:39 +02:00
  • 34c8315c2f I forgot to hit save. Winter Flare 2020-02-21 07:26:32 -05:00
  • 79967b0ac5 Resolving some convos. Winter Flare 2020-02-21 07:16:39 -05:00
  • 2f2ddbad5a removes density from skulls YakumoChen 2020-02-21 12:07:58 +00:00
  • 34f1b5d1c8 legion heads now swarm YakumoChen 2020-02-21 10:36:57 +00:00
  • fdee5399d8 Merge pull request #22 from Citadel-Station-13/master YakumoChen 2020-02-21 05:20:19 -05:00
  • c861af1ef3 the chair now looks better TrilbySpaceClone 2020-02-21 04:45:19 -05:00
  • 9ae903187f always abuzz TrilbySpaceClone 2020-02-21 04:18:24 -05:00
  • 146b2a35f2 fixed temp flavor text (for real) Putnam 2020-02-21 00:26:42 -08:00
  • 7d8f1320b3 it looks nicer TrilbySpaceClone 2020-02-21 03:07:42 -05:00
  • 58df6486cb Hey hey people, grammar here. Trilbyspaceclone 2020-02-21 03:06:38 -05:00
  • f35ee95d67 Update heart.dm Trilbyspaceclone 2020-02-21 01:54:23 -05:00
  • 28485ea108 Merge remote-tracking branch 'upstream/master' raspyosu 2020-02-21 01:48:50 -05:00
  • 4de8391ba4 fix filenames zzzz raspyosu 2020-02-21 01:40:35 -05:00
  • 7d769b3984 preemptive lunge buff raspyosu 2020-02-21 01:34:22 -05:00
  • 4542afa537 Update trek.dm Trilbyspaceclone 2020-02-21 01:14:09 -05:00
  • 87f0faba00 0.png Detective-Google 2020-02-21 00:13:04 -06:00
  • 257cc813e2 Armorless TrilbySpaceClone 2020-02-21 01:10:34 -05:00
  • 1c5d8a2c2c changes COCK GIRTH from a measurement of circumference to a measurement of diameter (because who the fuck measures their dick CIRCUMFERENCE); hopefully fixes everyone having a chode. Detective-Google 2020-02-20 23:47:01 -06:00
  • 04f6559b3d fixes the janky jobs panel Detective Google 2020-02-20 23:12:28 -06:00
  • 7889ea0d68 fix + maps Detective Google 2020-02-20 22:58:43 -06:00
  • 35fcf9f016 Update tgstation.dme Detective Google 2020-02-20 22:47:43 -06:00
  • 141bd96430 man FUCK psychs Detective Google 2020-02-20 22:46:37 -06:00
  • b7baa6fad8 sprite changes Detective Google 2020-02-20 22:30:55 -06:00
  • 07222cfd9a *snap Hatterhat 2020-02-20 22:21:25 -06:00
  • 4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic Detective Google 2020-02-20 22:17:55 -06:00
  • a8f863f901 changes - sprites Detective Google 2020-02-20 22:17:47 -06:00
  • 38f243e1c2 Update language_holder.dm Trilbyspaceclone 2020-02-20 22:15:32 -05:00
  • 0cffb2e672 Automatic changelog generation for PR #11176 [ci skip] CitadelStationBot 2020-02-20 20:50:50 -06:00
  • aceb76283f Merge pull request #11176 from Putnam3145/why-what Ghom 2020-02-21 03:50:47 +01:00
  • 9f9881b57e this is so sad Putnam 2020-02-20 18:43:36 -08:00
  • 62ad68f1ef Automatic changelog generation for PR #11156 [ci skip] CitadelStationBot 2020-02-20 19:47:21 -06:00
  • 8395ee53e7 Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh Ghom 2020-02-21 02:47:18 +01:00
  • 1f843e6c4b Automatic changelog generation for PR #11163 [ci skip] CitadelStationBot 2020-02-20 19:43:33 -06:00
  • 91cbc8fb3c Merge pull request #11163 from MrJWhit/update-to-teg-design Ghom 2020-02-21 02:43:30 +01:00
  • f0599e2925 Automatic changelog generation for PR #10541 [ci skip] CitadelStationBot 2020-02-20 19:43:06 -06:00
  • e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l Ghom 2020-02-21 02:43:04 +01:00
  • 0f8f6e417b Merge branch 'master' into Ghommie-cit528 Ghom 2020-02-21 02:40:22 +01:00
  • 503214dee6 Update freezer.dm Ghom 2020-02-21 02:26:52 +01:00
  • d38c2bc6c0 Update twohanded.dm Ghom 2020-02-21 02:20:38 +01:00
  • 7a1bc9d22b Fixes the travis issues keronshb 2020-02-20 19:11:04 -05:00
  • a49260e0ac Revert "maybe this'll work." Putnam 2020-02-20 16:03:00 -08:00
  • 8d00f11fc1 maybe this'll work. Putnam 2020-02-20 16:01:06 -08:00
  • 4ca9eb4171 Fixes healing nanites keronshb 2020-02-20 18:11:54 -05:00
  • a80a770310 Automatic changelog generation for PR #11155 [ci skip] CitadelStationBot 2020-02-20 16:50:11 -06:00
  • 9999e15db9 Merge pull request #11155 from necromanceranne/cham_project_exploities Lin 2020-02-20 16:50:07 -06:00
  • 116d2b190d Automatic changelog generation for PR #11157 [ci skip] CitadelStationBot 2020-02-20 13:53:30 -06:00
  • 613158fe4e Merge pull request #11157 from Putnam3145/lick-pref Ghom 2020-02-20 20:53:27 +01:00
  • 505c93a68b Automatic changelog generation for PR #11154 [ci skip] CitadelStationBot 2020-02-20 13:52:32 -06:00
  • 4649183a47 Merge pull request #11154 from Kraseo/fuck-nightmares Ghom 2020-02-20 20:52:29 +01:00
  • 0892837e5a Automatic changelog generation for PR #10572 [ci skip] CitadelStationBot 2020-02-20 08:33:30 -06:00
  • 7763475b83 Merge pull request #10572 from Tupinambis/SiliconDefault Ghom 2020-02-20 15:33:27 +01:00
  • ee07f1312e Automatic changelog generation for PR #11142 [ci skip] CitadelStationBot 2020-02-20 08:31:42 -06:00
  • 6347dab0a3 Merge pull request #11142 from kevinz000/vampire_haste Ghom 2020-02-20 15:31:39 +01:00
  • 549e3d7fbd Automatic changelog generation for PR #10649 [ci skip] CitadelStationBot 2020-02-20 07:40:11 -06:00
  • 608bb0a04c Merge pull request #10649 from kevinz000/hijack Ghom 2020-02-20 14:40:08 +01:00
  • 6ffde67b78 Automatic changelog generation for PR #11153 [ci skip] CitadelStationBot 2020-02-20 07:17:36 -06:00
  • ca777c6c8b Merge pull request #11153 from Ghommie/Ghommie-cit587 kevinz000 2020-02-20 06:17:33 -07:00
  • 984b57560b Fixes cults being able to summon at ruins. As well as stops the ash storm sound. BlackMajor 2020-02-21 01:39:16 +13:00
  • cf0b1bbac6 Replace ablative bat with spear. Give ruins a max distance from the transit edge, to dissuade spawning too close to the station. BlackMajor 2020-02-21 00:22:50 +13:00
  • 5d76d33683 Merge remote-tracking branch 'Upstream/master' into Solar_updates Artur 2020-02-20 13:15:46 +02:00
  • 35aecac620 Disgust mood for bloodsuckers being disgusted, and blood bag inneficency Artur 2020-02-20 12:50:25 +02:00
  • c5c29faf4b Automatic changelog generation for PR #11136 [ci skip] CitadelStationBot 2020-02-20 04:48:08 -06:00
  • 26bbc64f16 Merge pull request #11136 from Owai-Seek/broomport-2-17-19 Ghom 2020-02-20 11:48:06 +01:00
  • 385cf77c6e Automatic changelog generation for PR #11025 [ci skip] CitadelStationBot 2020-02-20 04:27:51 -06:00
  • d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites Ghom 2020-02-20 11:27:48 +01:00
  • 6cb07e2c90 Automatic changelog generation for PR #11140 [ci skip] CitadelStationBot 2020-02-20 04:26:19 -06:00
  • 32c001f264 Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15 Ghom 2020-02-20 11:26:17 +01:00
  • c39d51465e Automatic changelog generation for PR #11033 [ci skip] CitadelStationBot 2020-02-20 04:24:53 -06:00
  • 89f256866d Merge pull request #11033 from kevinz000/cmo_drapes Ghom 2020-02-20 11:24:50 +01:00
  • e36c5a10b3 Automatic changelog generation for PR #11166 [ci skip] CitadelStationBot 2020-02-20 04:14:17 -06:00
  • 8c7e760f18 Merge pull request #11166 from Putnam3145/why-what Ghom 2020-02-20 11:14:15 +01:00
  • ca7e4de5d4 Automatic changelog generation for PR #11080 [ci skip] CitadelStationBot 2020-02-20 04:09:49 -06:00
  • f94f997cc2 Merge pull request #11080 from kevinz000/surubatons Ghom 2020-02-20 11:09:46 +01:00
  • 1b518b69c4 Automatic changelog generation for PR #11139 [ci skip] CitadelStationBot 2020-02-20 04:09:06 -06:00
  • 7d8ae07fa0 Merge pull request #11139 from Citadel-Station-13/kevinz000-patch-12 Ghom 2020-02-20 11:09:03 +01:00