Commit Graph

35841 Commits

Author SHA1 Message Date
silicons db3f9b4549 woops 2020-07-23 11:48:46 -07:00
silicons 95cd7c6571 fix 2020-07-23 11:46:46 -07:00
silicons aaa536b8fc ok 2020-07-23 11:38:15 -07:00
silicons cd67be32e0 Update wishgranter.dm 2020-07-23 11:12:09 -07:00
silicons 21143ade21 eyeroll 2020-07-23 11:01:33 -07:00
silicons da4e208f94 ok 2020-07-23 10:40:12 -07:00
silicons db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07:00
CitadelStationBot 4917fe378a Automatic changelog generation for PR #12828 [ci skip] 2020-07-23 12:35:33 -05:00
silicons 9f66163d4f Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
Ports several food sprites/foods from Baystation/Citadel RP
2020-07-23 10:35:30 -07:00
silicons ec72015f4f Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
2020-07-23 10:35:16 -07:00
CitadelStationBot 278c913976 Automatic changelog generation for PR #12869 [ci skip] 2020-07-23 12:29:46 -05:00
silicons dad3d38933 Merge pull request #12869 from timothyteakettle/zombies-rework
the very much needed zombie buffs
2020-07-23 10:29:43 -07:00
CitadelStationBot b623fb1699 Automatic changelog generation for PR #12867 [ci skip] 2020-07-23 12:29:33 -05:00
silicons 3c5aa67eef Merge pull request #12867 from EmeraldSundisk/omega717
Expands OmegaStation's medical wing.
2020-07-23 10:29:29 -07:00
CitadelStationBot b9ab8d0347 Automatic changelog generation for PR #12866 [ci skip] 2020-07-23 12:29:22 -05:00
silicons 9392eb3bb1 Merge pull request #12866 from Sneakyrat6/snaxiTypo
Fixes Snaxi DMM Typos
2020-07-23 10:29:19 -07:00
CitadelStationBot bb1056b8fd Automatic changelog generation for PR #12860 [ci skip] 2020-07-23 12:29:13 -05:00
silicons aeb6688bc7 Merge pull request #12860 from Sneakyrat6/burnablePhoto
Allows Photos to be Burned
2020-07-23 10:29:10 -07:00
CitadelStationBot 8231d2fbf1 Automatic changelog generation for PR #12861 [ci skip] 2020-07-23 12:28:56 -05:00
silicons 11a4dfd20b Merge pull request #12861 from Sneakyrat6/dresserFix
Fixes dressers not giving you undies
2020-07-23 10:28:54 -07:00
CitadelStationBot f0986c915c Automatic changelog generation for PR #12856 [ci skip] 2020-07-23 12:28:47 -05:00
silicons ce87d3e8c5 Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly
ports tg radiation suits and also makes syndiekrav gloves actually visually distinct
2020-07-23 10:28:44 -07:00
CitadelStationBot 3f31f5f65c Automatic changelog generation for PR #12854 [ci skip] 2020-07-23 12:26:58 -05:00
silicons d520eaa0ad Merge pull request #12854 from Zandario/tipes
tipes
2020-07-23 10:26:55 -07:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
CitadelStationBot 678a1d0a49 Automatic changelog generation for PR #12816 [ci skip] 2020-07-23 12:25:29 -05:00
silicons 9222933d77 Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
2020-07-23 10:25:25 -07:00
silicons 4373e2b452 done 2020-07-23 10:18:10 -07:00
silicons 89a1fa544e fixes 2020-07-23 10:12:34 -07:00
Timothy Teakettle f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
silicons 2eb6f0467d fix guns 2020-07-23 09:56:38 -07:00
silicons 38a9e89687 ok bet 2020-07-23 09:49:56 -07:00
silicons 0858af4b85 ok 2020-07-23 09:43:43 -07:00
silicons e425ef7d68 fix 2020-07-23 09:33:32 -07:00
silicons 99eb77c052 fix 2020-07-23 09:32:28 -07:00
silicons 703afec454 ok 2020-07-23 08:57:15 -07:00
silicons 65898bb7f6 inf loop 2020-07-23 00:32:05 -07:00
silicons 21d57eeeac sigh 2020-07-23 00:27:45 -07:00
silicons 3a38344a04 fix 2020-07-23 00:25:06 -07:00
silicons 910290edcf buffers 2020-07-23 00:22:33 -07:00
silicons 76f885e1a6 ok 2020-07-23 00:16:43 -07:00
Changelogs ed25929fec Automatic changelog compile [ci skip] 2020-07-23 00:10:46 +00:00
timothyteakettle a5945d3dc2 slight zombie tweaking 2020-07-23 01:09:09 +01:00
EmeraldSundisk 29023f9522 Add files via upload 2020-07-22 16:49:40 -07:00
EmeraldSundisk f422ffb998 Update OmegaStation.dmm 2020-07-22 15:24:20 -07:00
Sneakyrat6 1a641231a9 Fixes Snaxi DMM Typos 2020-07-22 16:20:32 -05:00
CitadelStationBot cf91303290 Automatic changelog generation for PR #12855 [ci skip] 2020-07-22 13:41:52 -05:00
silicons efb4d19a40 Merge pull request #12855 from DeltaFire15/AAAAAAAA
Unfucks the monophobia traits (Aswell as traits in general) with this one simple trick
2020-07-22 11:41:48 -07:00
timothyteakettle 0ccbe0b793 it works 2020-07-22 14:49:22 +01:00
CitadelStationBot f9e7d9dd6f Automatic changelog generation for PR #12835 [ci skip] 2020-07-22 04:31:25 -05:00