Commit Graph

  • e07854f3c3 Merge pull request #14605 from DeltaFire15/tank-dispensers Lin 2021-04-14 21:39:33 -05:00
  • 1450bd4092 Automatic changelog generation for PR #14602 [ci skip] CitadelStationBot 2021-04-14 21:39:09 -05:00
  • f3ea2d58dc Merge pull request #14602 from BlueWildrose/YoHoYoHofuckoff Lin 2021-04-14 21:39:06 -05:00
  • 96d154a618 Automatic changelog compile [ci skip] Changelogs 2021-04-15 00:26:22 +00:00
  • 306cf696ea Automatic changelog compile [ci skip] Changelogs 2021-04-15 00:06:58 +00:00
  • 475a7d2499 Icon fixes keronshb 2021-04-14 18:01:17 -04:00
  • 20c190c17d Merge remote-tracking branch 'upstream/master' into motivation keronshb 2021-04-14 17:55:24 -04:00
  • bb047bd57e dunno why this is here keronshb 2021-04-14 17:54:33 -04:00
  • 65d6be40fb Botttle HeroWithYay 2021-04-15 06:01:26 +12:00
  • 7a472c16eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 HeroWithYay 2021-04-15 05:42:26 +12:00
  • 4d797ab694 Automatic changelog generation for PR #14609 [ci skip] CitadelStationBot 2021-04-14 08:10:07 -05:00
  • 72c377d72c Fixes pods not returning to Centcomm (#14609) BlueWildrose 2021-04-14 06:10:04 -07:00
  • 20ac90a9db Automatic changelog generation for PR #14601 [ci skip] CitadelStationBot 2021-04-14 07:06:03 -05:00
  • 275a946031 Update food.dmi (#14601) skodai 2021-04-14 09:06:00 -03:00
  • 10b00932a3 This space left intentionally blank The0bserver 2021-04-14 02:10:12 -04:00
  • 6be351ecb6 I will try this. The0bserver 2021-04-14 01:48:18 -04:00
  • c313ba38b8 adds the .38 The0bserver 2021-04-14 01:26:24 -04:00
  • f16c6931e2 Fixes, removes the functionality after confering. The0bserver 2021-04-13 23:50:11 -04:00
  • 27c49b3f34 fox fix The0bserver 2021-04-13 23:38:50 -04:00
  • 64a3cd9404 T. Derringer has twin calibers, Station gets .38 The0bserver 2021-04-13 23:22:35 -04:00
  • d7140741f6 Automatic changelog compile [ci skip] Changelogs 2021-04-14 00:06:19 +00:00
  • bcbccd864f I'm going monkey The0bserver 2021-04-13 19:46:07 -04:00
  • 2046ca2eb2 a test The0bserver 2021-04-13 19:42:07 -04:00
  • 2e65dbf07f Mandrill Maze The0bserver 2021-04-13 18:45:01 -04:00
  • 4b888fe715 Emag Crate The0bserver 2021-04-13 18:28:58 -04:00
  • 5bb3933d55 indentation part 5 SandPoot 2021-04-13 17:56:49 -03:00
  • be8cf11b69 indentation part 4 SandPoot 2021-04-13 17:53:35 -03:00
  • 1f049edb10 indentation part 3 SandPoot 2021-04-13 17:46:32 -03:00
  • d0afa223bc indentation part 2 SandPoot 2021-04-13 17:41:20 -03:00
  • 91ae125ac4 indentation part 1 SandPoot 2021-04-13 17:34:32 -03:00
  • a745431155 better this SandPoot 2021-04-13 17:26:46 -03:00
  • 330a3b8c9a upload files SandPoot 2021-04-13 17:25:08 -03:00
  • f1e1169e85 dispenser moment DeltaFire 2021-04-13 17:33:04 +02:00
  • 4811216f07 Activity tracking; traitor class tweaks Putnam 2021-04-13 06:42:32 -07:00
  • ef2482c6b0 renders storage objects independently per user (#14545) silicons 2021-04-13 07:16:21 -06:00
  • 62bebf1261 Automatic changelog generation for PR #14581 [ci skip] CitadelStationBot 2021-04-13 08:13:56 -05:00
  • 32bbbecc39 pirate payoff minimum from 20k to 1k (#14581) Hatterhat 2021-04-13 08:13:53 -05:00
  • a62d942bee telescopic batons now have a message when being toggled. you can now threateningly point extended telebatons at people. (#14580) silicons 2021-04-13 02:22:01 -06:00
  • 8b47786556 Pirate stuff and comm console fixes Blue Wildrose 2021-04-13 00:53:55 -07:00
  • 133f3d55d2 Merge pull request #77 from Citadel-Station-13/master EmeraldSundisk 2021-04-12 22:26:26 -07:00
  • d04f3dd4d4 Automatic changelog compile [ci skip] Changelogs 2021-04-13 00:28:39 +00:00
  • d4d3eea5aa Automatic changelog compile [ci skip] Changelogs 2021-04-13 00:07:44 +00:00
  • f4b3a4c2d1 Automatic changelog generation for PR #14600 [ci skip] CitadelStationBot 2021-04-12 11:39:26 -05:00
  • 2b2dc88d6f viro symptom typo fix (#14600) rossark 2021-04-12 19:39:24 +03:00
  • b1fd4a33a2 funny gold sound The0bserver 2021-04-11 20:30:10 -04:00
  • c390b5b6e4 a fix for a fox The0bserver 2021-04-11 20:27:48 -04:00
  • 506e27e14a Automatic changelog compile [ci skip] Changelogs 2021-04-12 00:07:28 +00:00
  • 1d31fb084f More concealment, fixes a problem with the .45-70 The0bserver 2021-04-11 19:40:54 -04:00
  • 416a1a346c Automatic changelog generation for PR #14267 [ci skip] CitadelStationBot 2021-04-11 13:54:55 -05:00
  • 3fc5dc5d36 Merge pull request #14267 from Citadel-Station-13/silicons-patch-15 Lin 2021-04-11 13:54:52 -05:00
  • 9fb06884b1 Automatic changelog generation for PR #14597 [ci skip] CitadelStationBot 2021-04-11 13:44:26 -05:00
  • 93e4bfc75c Merge pull request #14597 from BlueWildrose/slimespriteoffsets Lin 2021-04-11 13:44:24 -05:00
  • 9fe8fb7671 More work The0bserver 2021-04-11 07:20:06 -04:00
  • ee961ce417 PLEASE LET ME RELOAD I BEG YOU The0bserver 2021-04-11 06:18:56 -04:00
  • 4d27b91745 Maybe now you will reload. The0bserver 2021-04-11 05:59:46 -04:00
  • bdaf0987e4 im going insane The0bserver 2021-04-11 05:31:23 -04:00
  • 1569709d53 Soundfix The0bserver 2021-04-11 04:43:35 -04:00
  • e75088420d Error fixing. The0bserver 2021-04-11 04:38:46 -04:00
  • 55eb445a07 Adds Derringers (Code) Initial Commit The0bserver 2021-04-11 04:20:12 -04:00
  • 5a917ce578 Automatic changelog generation for PR #14596 [ci skip] CitadelStationBot 2021-04-10 21:49:02 -05:00
  • 1c7c56b66e Update config.txt (#14596) Timothy Teakettle 2021-04-11 03:48:59 +01:00
  • 4f426f071f Revenant changes port from TG Blue Wildrose 2021-04-10 19:04:06 -07:00
  • 82e5276a60 Automatic changelog generation for PR #14586 [ci skip] CitadelStationBot 2021-04-10 20:04:02 -05:00
  • ae6c7a660c Merge pull request #14586 from BlueWildrose/whattheheckdrones Lin 2021-04-10 20:03:59 -05:00
  • 5bf3fbf45e Automatic changelog generation for PR #14593 [ci skip] CitadelStationBot 2021-04-10 20:02:06 -05:00
  • 7c55e8a6f7 Merge pull request #14593 from BlueWildrose/corgiflail Lin 2021-04-10 20:02:03 -05:00
  • 40edd39c25 Automatic changelog compile [ci skip] Changelogs 2021-04-11 00:29:44 +00:00
  • 9b1b9f849a Automatic changelog compile [ci skip] Changelogs 2021-04-11 00:07:40 +00:00
  • db9c538c97 Fixed female slimesubspecies left/right sprites being flipped Blue Wildrose 2021-04-09 22:35:59 -07:00
  • 624b5a9707 Merge pull request #75 from Citadel-Station-13/master EmeraldSundisk 2021-04-09 16:40:36 -07:00
  • b6b9619f2d Merge pull request #14536 from Citadel-Station-13/silicons-patch-13 Lin 2021-04-09 14:14:03 -05:00
  • 31a71bc9ee Merge remote-tracking branch 'upstream/master' keronshb 2021-04-09 12:44:49 -04:00
  • 055c191e7e replaces diarrhea with mustard DrPainis 2021-04-09 00:55:08 -04:00
  • 610dd41cb9 Fixes phantom mob-holder items Blue Wildrose 2021-04-08 21:12:30 -07:00
  • c392d6e888 fix issue qweq12yt 2021-04-08 21:40:51 -03:00
  • a216eeaf6a Automatic changelog compile [ci skip] Changelogs 2021-04-09 00:26:10 +00:00
  • 9849fa0e22 Automatic changelog compile [ci skip] Changelogs 2021-04-09 00:07:07 +00:00
  • dccdb6cf56 Update revenant.dm zeroisthebiggay 2021-04-08 20:05:03 -04:00
  • 7ca46715d7 Merge branch 'master' into cargo-bugfixes qweq12yt 2021-04-08 19:15:55 -03:00
  • a7c061392b i hate tg code zerothebigboy 2021-04-08 18:05:36 -04:00
  • 08cd9b1bfd Merge pull request #14576 from SandPoot/another-locker-change-thing silicons 2021-04-08 03:24:59 -06:00
  • 70da051afb Automatic changelog generation for PR #14577 [ci skip] CitadelStationBot 2021-04-08 04:24:53 -05:00
  • b2fcded98d Merge pull request #14577 from SandPoot/fixes-machines silicons 2021-04-08 03:24:51 -06:00
  • 3dea60a26b Automatic changelog generation for PR #14574 [ci skip] CitadelStationBot 2021-04-08 04:24:38 -05:00
  • 9105413f69 Merge pull request #14574 from BlueWildrose/swippityswap silicons 2021-04-08 03:24:36 -06:00
  • 3d29b3b1cb Automatic changelog generation for PR #14570 [ci skip] CitadelStationBot 2021-04-08 04:24:26 -05:00
  • 42589fc55d Merge pull request #14570 from BlueWildrose/tellmeabouttheelves silicons 2021-04-08 03:24:24 -06:00
  • 58da2a26f1 Automatic changelog generation for PR #14551 [ci skip] CitadelStationBot 2021-04-08 04:24:00 -05:00
  • f998efa7bc Merge pull request #14551 from BlueWildrose/ThePuddler2 silicons 2021-04-08 03:23:57 -06:00
  • 788cfbe14f Automatic changelog generation for PR #14552 [ci skip] CitadelStationBot 2021-04-08 04:23:35 -05:00
  • 3416989b7c Merge pull request #14552 from BlueWildrose/PillsHere silicons 2021-04-08 03:23:32 -06:00
  • 7d16544131 Automatic changelog generation for PR #14562 [ci skip] CitadelStationBot 2021-04-08 04:23:24 -05:00
  • a367a057e4 Merge pull request #14562 from BlueWildrose/poppinoff silicons 2021-04-08 03:23:22 -06:00
  • e617064921 Automatic changelog generation for PR #14535 [ci skip] CitadelStationBot 2021-04-08 04:22:58 -05:00
  • f1de2d37aa Merge pull request #14535 from brokenOculus/adds-Telescopic-Baseball-bat silicons 2021-04-08 03:22:56 -06:00
  • c106b9b218 Automatic changelog generation for PR #14540 [ci skip] CitadelStationBot 2021-04-08 04:22:49 -05:00
  • bda9f2ac76 Merge pull request #14540 from SandPoot/fixing-lizzies silicons 2021-04-08 03:22:46 -06:00
  • a625b1d770 Fixed drones nullspacing things they place on tables and in closets Blue Wildrose 2021-04-07 21:45:04 -07:00
  • cd81345e9f Polishing up the new slimeperson organs also WHY IS THE SLIMEBRAIN SPRITE GONE Blue Wildrose 2021-04-07 15:00:09 -07:00
  • f06f54b75d Merge remote-tracking branch 'Upstream/master' The0bserver 2021-04-07 04:57:35 -04:00