Fermi
|
55cc4f45f2
|
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
|
2019-07-15 22:13:45 +01:00 |
|
Fermi
|
f08e34cde6
|
Sigh.
|
2019-07-15 22:13:34 +01:00 |
|
Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
kevinz000
|
0c658ba41a
|
Merge pull request #8796 from Trilbyspaceclone/patch-190
Russian Paratrooper Jumper Uniform fix
|
2019-07-14 14:44:01 -07:00 |
|
Thalpy
|
f77bcc9765
|
Merge branch 'master' into master
|
2019-07-14 15:10:32 +01:00 |
|
kevinz000
|
735fc5fab6
|
Merge pull request #8845 from Ghommie/Ghommie-cit121
Tweaking the 🅱️ emoji icon.
|
2019-07-14 03:35:33 -07:00 |
|
kevinz000
|
44e9721d37
|
Merge pull request #8883 from CameronWoof/codifying-mrp
Hexacrocin overdose no longer forces climax
|
2019-07-14 03:34:37 -07:00 |
|
Fermi
|
7161870c8b
|
Astral Tweak.
|
2019-07-14 04:06:06 +01:00 |
|
deathride58
|
a27222fba7
|
Merge pull request #8752 from Sishen1542/uhhhhh
Slimepeople can now morph the shape and size of their genitalia.
|
2019-07-13 20:15:28 -04:00 |
|
Fermi
|
8d12d0f017
|
I am very smart
|
2019-07-13 20:02:53 +01:00 |
|
Fermi
|
6c9f37790b
|
Fixing bugs from merge conflicts.
|
2019-07-13 20:02:27 +01:00 |
|
Thalpy
|
4c4dbd0e17
|
Merge branch 'master' into master
|
2019-07-13 19:33:46 +01:00 |
|
Fermi
|
6a5d5fe494
|
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
|
2019-07-13 19:18:46 +01:00 |
|
Fermi
|
f2076ba276
|
Weird pushing error.
|
2019-07-13 19:18:42 +01:00 |
|
Fermi
|
110f0cbb83
|
Fixes and making a message clearer so people don't think it's admins.
|
2019-07-13 19:17:19 +01:00 |
|
CameronWoof
|
68c6aa4fa9
|
ghommie's suggestions
|
2019-07-12 22:34:25 -07:00 |
|
CameronWoof
|
067ec1ac92
|
Removes forced climax from hexacrocin overdose
|
2019-07-12 18:33:13 -07:00 |
|
Thalpy
|
751736ac09
|
Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13
|
2019-07-12 16:39:14 +01:00 |
|
Thalpy
|
63eb375b74
|
Decreased impossibility of catchem
|
2019-07-12 16:39:10 +01:00 |
|
kevinz000
|
1eaddd3ebf
|
Merge pull request #8853 from Ghommie/Ghommie-cit125
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
|
2019-07-12 07:34:19 -07:00 |
|
kevinz000
|
bb568d633b
|
Merge pull request #8852 from Tupinambis/CursedPlush
Removes a plush representing the character of an underage player.
|
2019-07-12 07:32:29 -07:00 |
|
Fermi
|
8f555b0fdd
|
Reworked Astral, doubled lung damage, fixed lung damage oopsie.
|
2019-07-10 21:35:47 +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 |
|
kevinz000
|
b5cb68fc68
|
Merge pull request #8844 from Ghommie/Ghommie-cit120
Fixes rocket launchers, buffing their accuracy etc.
|
2019-07-09 08:30:44 -07:00 |
|
Ghommie
|
490ae9daf2
|
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
|
2019-07-09 07:58:22 +02:00 |
|
Tupinambis
|
8c0c80fc39
|
Removes references to the character of another underage player.
|
2019-07-09 00:02:16 -05:00 |
|
Thalpy
|
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 |
|
deathride58
|
f2976caa59
|
Merge branch 'master' into patch-190
|
2019-07-08 17:58:41 -04:00 |
|
deathride58
|
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 |
|
Ghommie
|
9081b5b773
|
Revert "Fixes rocket launchers, buffing their accuracy etc."
This reverts commit 1c6156dd0e.
|
2019-07-08 07:17:49 +02:00 |
|
Ghommie
|
1c6156dd0e
|
Fixes rocket launchers, buffing their accuracy etc.
|
2019-07-08 06:56:20 +02: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 |
|
Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
LetterJay
|
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 |
|
LetterJay
|
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 |
|
Thalpy
|
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 |
|