 Ghommie
|
30292c385b
|
moving files.
|
2019-07-24 02:07:59 +02:00 |
|
|
Ghommie
|
6000f96dbc
|
deleted some boolean variables in favor of bitflags.
|
2019-07-24 02:00:30 +02:00 |
|
|
Ghommie
|
376f6e8b4a
|
arousal states won't persist after death anymore.
|
2019-07-23 23:54:11 +02:00 |
|
|
Ghommie
|
fd2f2ae1af
|
update, bitflags.
|
2019-07-23 07:21:03 +02:00 |
|
|
Trilbyspaceclone
|
6db3502294
|
Update trek_under.dm
|
2019-07-23 01:09:58 -04:00 |
|
|
Ghommie
|
3bd0ba0275
|
Cleaning up Arousal code & co.
|
2019-07-23 06:39:53 +02:00 |
|
|
kevinz000
|
1028fe458a
|
Merge pull request #8909 from Ghommie/Ghommie-cit143
Fixes named arg Knockdown calls.
|
2019-07-22 20:17:30 -07:00 |
|
|
Jay
|
ad036ac36d
|
adds for donator
|
2019-07-21 12:37:43 -05:00 |
|
|
TrilbySpaceClone
|
f315696937
|
fix n stuff
|
2019-07-20 22:19:03 -04:00 |
|
|
Thalpy
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
|
kevinz000
|
08fd6af7fc
|
Merge pull request #8830 from Ghommie/Ghommie-cit114
Ports the toggleable dark mode to the game!
|
2019-07-20 11:57:13 -07:00 |
|
|
kevinz000
|
fc7a305c46
|
Merge pull request #8906 from Ghommie/Ghommie-cit141
Sweaters now cover the groins too.
|
2019-07-20 11:49:58 -07:00 |
|
|
Ghommie
|
7065a86841
|
Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""
|
2019-07-19 22:02:22 +02:00 |
|
|
Ghommie
|
7e99dd205a
|
Fixing Shredder guns not accepting standard flechette mags, and magpistol mag sprites.
|
2019-07-19 21:54:48 +02:00 |
|
|
Ghommie
|
b87442e633
|
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-07-19 20:09:16 +02:00 |
|
|
Fermi
|
7a0afda173
|
Cat patially, MK partially.
|
2019-07-19 16:19:42 +01:00 |
|
|
Fermi
|
d73fabffff
|
.
|
2019-07-19 05:18:56 +01:00 |
|
|
Fermi
|
fbf542134a
|
Cidadel makes me want to hurt myself.
|
2019-07-19 05:18:35 +01:00 |
|
|
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 |
|