 Fermi
|
a5fcb918aa
|
Astrogen tweaks and cat fixes.
|
2019-07-19 04:11:26 +01:00 |
|
|
kevinz000
|
a28d6b2b5a
|
Update cit_emotes.dm
|
2019-07-18 13:22:44 -07:00 |
|
|
deathride58
|
7b39c0935c
|
Merge pull request #8415 from Citadel-Station-13/sprint_stamina
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
|
2019-07-17 18:07:57 -04:00 |
|
|
kevinz000
|
b134d23ea3
|
Merge pull request #8882 from Trilbyspaceclone/slaggy
Adds discount plushies and a way to get random plushies at shift start
|
2019-07-17 00:50:21 -07:00 |
|
|
Fermi
|
69725a902b
|
Tweak
|
2019-07-17 01:10:36 +01:00 |
|
|
Ghommie
|
927baaa333
|
Fk mdlr ctdl
|
2019-07-17 01:05:09 +02:00 |
|
|
Ghommie
|
b6f10c96a7
|
Modularity was a mistake.
|
2019-07-16 21:05:12 +02:00 |
|
|
Ghommie
|
acaf628d89
|
Sweaters now cover groin too.
|
2019-07-16 10:23:02 +02:00 |
|
|
Fermi
|
f343ea24db
|
Ugh fine
|
2019-07-16 02:06:17 +01:00 |
|
|
Fermi
|
ff41020b6f
|
aaaa No I like it like this....
|
2019-07-15 23:34:55 +01:00 |
|
|
Fermi
|
bb17af0f30
|
Better limit it a lil.
|
2019-07-15 23:30:29 +01:00 |
|
|
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 |
|
|
Ghommie
|
1e1f8e627f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-15 17:33:41 +02:00 |
|
|
Ghommie
|
4df4cbd721
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-15 17:23:01 +02: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 |
|
|
kevinz000
|
28072a31dc
|
Update magweapon.dm
|
2019-07-13 20:03:39 -07: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 |
|
|
Trilbyspaceclone
|
ea77d524e6
|
guess ill fuck up
|
2019-07-12 21:48:03 -04:00 |
|
|
CameronWoof
|
067ec1ac92
|
Removes forced climax from hexacrocin overdose
|
2019-07-12 18:33:13 -07:00 |
|
|
TrilbySpaceClone
|
f68501b101
|
rng
|
2019-07-12 21:24:44 -04: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 |
|
|
kevinz000
|
69f06444e6
|
smgs
|
2019-07-09 08:20:45 -07:00 |
|
|
kevinz000
|
a2d52c0ed9
|
HERE WE GO AGAIN.
|
2019-07-09 07:55: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 |
|