Commit Graph
1165 Commits
Author SHA1 Message Date
Fermi 110f0cbb83 Fixes and making a message clearer so people don't think it's admins. 2019-07-13 19:17:19 +01:00
Fermi 8f555b0fdd Reworked Astral, doubled lung damage, fixed lung damage oopsie. 2019-07-10 21:35:47 +01:00
Fermi ce390fb595 Tweaks to MK 2019-07-09 23:27:37 +01:00
Fermi c12c5be2b6 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-07-09 20:36:19 +01:00
Fermi 3a2192ec2e Hotfix for captain. 2019-07-09 20:36:16 +01:00
ThalpyandGitHub c418312cc6 Merge branch 'master' into master 2019-07-09 05:33:09 +01:00
Fermi 1b3de620f9 BM requests. 2019-07-09 02:44:17 +01:00
Fermi e7224991b7 Few fixes 2019-07-08 23:06:01 +01:00
deathride58andGitHub 82d527b760 Merge pull request #8765 from Ghommie/Ghommie-cit91
Merging the end-of-shift and its shuttle autocall announcements into one.
2019-07-08 18:04:27 -04:00
deathride58andGitHub df02b0b9ae Merge pull request #8817 from Poojawa/copy-vorpasta
[s] Adjusts some bad copy/pasta code with vore mobs
2019-07-08 17:53:28 -04:00
Fermi c3ac34158a Fixed shock command. 2019-07-08 19:51:10 +01:00
Fermi 2c5839480c AT LAST, SALVATION. 2019-07-07 18:05:57 +01:00
Fermi b163f56eb3 Guess what it didn't work. 2019-07-07 16:16:02 +01:00
Fermi 30322f1163 TO BE TESTED 2019-07-07 06:29:55 +01:00
Fermi 9f843f299d BUFFERSSSSSS ARGH 2019-07-07 06:02:34 +01:00
Fermi e84fc73bed Fixed buffers, SDGF, icons and spelling. 2019-07-07 05:59:21 +01:00
Fermi 6db1a1576d Rewrote explosion code. 2019-07-06 18:08:07 +01:00
Fermi e1b565cd56 Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-07-06 17:04:38 +01:00
Fermi d7ac87c99b Tweaks 2019-07-06 17:04:24 +01:00
ThalpyandGitHub cc39c9f896 Merge branch 'master' into master 2019-07-06 16:03:17 +01:00
LetterJayandGitHub a17b4ff953 Merge branch 'master' into singerydonator 2019-07-05 14:31:31 -05:00
Fermi a915821d1a Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13 2019-07-04 23:24:39 +01:00
Fermi ad37ec08b2 Removing slimejelly req from feedback. 2019-07-04 23:24:18 +01:00
678a08e883 Update modular_citadel/code/modules/client/loadout/__donator.dm
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
2019-07-04 14:23:37 -05:00
ThalpyandGitHub 8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
Fermi bccd3e42b6 Mild tweak 2019-07-03 19:53:38 +01:00
Poojawa 52f48c9294 let's keep them feedable at least, because that's a thing 2019-07-03 01:36:16 -05:00
Poojawa c974fa1f63 Adjusts some bad copy/pasta code
Oops
2019-07-03 01:33:43 -05:00
Fermi 42edafc3e6 OOPS 2019-07-03 02:13:18 +01:00
Fermi cd645626c0 expasion OD increase, corrected names and inverted listing of fermichems 2019-07-03 02:11:18 +01:00
Fermi e34c6265e7 Tidying. 2019-07-02 23:46:58 +01:00
Fermi e940cc7ab7 Mild concern over strength of chem. 2019-07-02 23:45:32 +01:00
Fermi 5f72277549 Succumb tweak. Ready to merge. 2019-07-02 23:24:35 +01:00
Fermi 161c5955f2 Removed tastes in buffers. 2019-07-02 23:06:46 +01:00
Fermi 381e12f04a Fixing message_admins. 2019-07-02 22:52:45 +01:00
Fermi 27aad8f117 Quick in case. 2019-07-02 22:42:07 +01:00
Fermi 946fbff999 +Yamerol, tweaked PE, tweaked CM3000, tweaked medpH. 2019-07-02 22:15:32 +01:00
Jay e4ecb2894a bedsheet for donator 2019-07-02 09:41:04 -05:00
Fermi d83fe49556 +lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo 2019-07-02 15:03:19 +01:00
Jay ad9ba89d34 Yellow out for donator 2019-07-01 12:20:52 -05:00
Fermi 0f2978d7fd Updated Analysis meter's Analysis. 2019-07-01 14:47:32 +01:00
Fermi 04c3b0e66e Oops. 2019-07-01 14:13:31 +01:00
Fermi 779830e6c7 Compile check. Ready for update. 2019-07-01 14:13:22 +01:00
Thalpy 3c8025c477 Moving computers 2019-07-01 13:56:37 +01:00
Thalpy 48ce61580e Fixes viro oversight. 2019-07-01 12:36:24 +01:00
Thalpy 937d6467e6 Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_ 2019-06-30 19:16:27 +01:00
Thalpy e09f189895 WELCOME TO PH'S HELL RIDE 2019-06-30 01:56:10 +01:00
TrilbySpaceClone 5087b97e18 Trending spriter 2019-06-29 20:18:32 -04:00
kevinz000andGitHub bf6811b981 Merge pull request #8742 from Trilbyspaceclone/MW2_suit
[DF] Adds MW2 Para Trooper Jumpsuit for AWOO aka investigator77 - Donner item
2019-06-29 15:18:01 -07:00
ThalpyandGitHub 696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00