Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
kevinz000
|
05f304f9c0
|
Merge pull request #8692 from Ghommie/Ghommie-cit69
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
|
2019-06-23 06:56:17 -07:00 |
|
kevinz000
|
c9d67ecd49
|
Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
|
2019-06-23 06:54:43 -07:00 |
|
kevinz000
|
294e1e48d2
|
Merge pull request #8659 from Ghommie/Ghommie-cit57
ports "Componentizes orbiting"
|
2019-06-23 06:50:32 -07:00 |
|
Fermi
|
713d849c03
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-19 21:02:30 +01:00 |
|
Ghommie
|
55795355fd
|
Ports "[s] Fixes pride mirror exploit"
|
2019-06-19 03:31:36 +02:00 |
|
Ghom
|
95dc8084f1
|
Moving some tablecrafting recipes to the appropriate categories (#8658)
* Moving some recipes to the appropriate categories
* Fixes the not-a-sandwich recipe being M.I.A.
|
2019-06-17 11:18:49 -07:00 |
|
Ghommie
|
50dd512be7
|
Ports system for randomized semi-persistent chem reactions.
|
2019-06-17 10:50:40 +02:00 |
|
Ghommie
|
b782226900
|
ports "Componentizes orbiting"
|
2019-06-17 00:19:57 +02:00 |
|
Thalpy
|
98fc55e9f8
|
Merge branch 'master' into Wheelchairs
|
2019-06-16 17:33:57 +01:00 |
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
Fermi
|
378af882d3
|
Ramping up to logging and a few more fixes.
|
2019-06-13 05:51:28 +01:00 |
|
Thalpy
|
0fa194575a
|
Update DNA.dm
|
2019-06-13 00:42:27 +01:00 |
|
Thalpy
|
628482e53b
|
Merge branch 'master' into FriendlyEmpathy
|
2019-06-08 23:45:37 +01:00 |
|
kevinz000
|
658f14275b
|
Merge pull request #8559 from Ghommie/Ghommie-cit36
Ports in the get_area conversion to define.
|
2019-06-08 01:26:45 -07:00 |
|
kevinz000
|
2f2885f1d6
|
Merge pull request #8558 from Ghommie/Ghommie-cit35
Ports in the container_type to reagents flags refactor.
|
2019-06-08 01:26:28 -07:00 |
|
kevinz000
|
ab565d2483
|
Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
|
2019-06-08 01:22:16 -07:00 |
|
kevinz000
|
a866ceb8a2
|
Merge pull request #8543 from Trilbyspaceclone/patch-165
Makes SNOWCONES!
|
2019-06-08 01:15:58 -07:00 |
|
deathride58
|
aa53cc9ea9
|
Merge branch 'master' into fuckatmos
|
2019-06-07 04:38:47 -04:00 |
|
Ghommie
|
b6f35435ec
|
Ports the get_area conversion to define.
|
2019-06-07 06:50:26 +02:00 |
|
Ghommie
|
7aac9e6280
|
Updates reagents a bit.
|
2019-06-07 06:27:04 +02:00 |
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
Ghommie
|
44358e054a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29
|
2019-06-06 15:24:31 +02:00 |
|
Ghommie
|
0e630680ba
|
forgot to pull from upstream. One second.
|
2019-06-06 15:20:27 +02:00 |
|
Trilbyspaceclone
|
7f8886f6e9
|
Update construction.dm
|
2019-06-05 20:06:37 -04:00 |
|
kevinz000
|
980c48180c
|
Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
|
2019-06-05 01:55:19 -07:00 |
|
kevinz000
|
adbbb2944a
|
Merge pull request #8517 from Poojawa/shitcode-is-so-bad-and-people-like-it-I-guess
Adds visible balls and multi-breasts
|
2019-06-05 01:42:48 -07:00 |
|
kevinz000
|
102d68a243
|
Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
|
2019-06-05 01:41:23 -07:00 |
|
Fermi
|
228ab5b7c9
|
+Acute hepatic pharmacokinesis. (untested, will test with alterations)CC
|
2019-06-05 00:23:42 +01:00 |
|
BurgerLua
|
ed7d0575b2
|
Ass Blast USA
|
2019-06-03 14:40:57 -07:00 |
|
Fermi
|
4513dd9815
|
MINUTE define changes.
|
2019-06-02 22:26:53 +01:00 |
|
Fermi
|
59e5372abd
|
Made it so prosthetics can't replace legs. Compiled and tested.
|
2019-06-02 18:40:56 +01:00 |
|
Ghommie
|
472d7ef8cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27
|
2019-06-02 19:03:34 +02:00 |
|
Ghommie
|
d6e54bf237
|
Fixes and updates pod's emergency suits storage.
|
2019-06-02 18:28:30 +02:00 |
|
Poojawa
|
17ad519f24
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into shitcode-is-so-bad-and-people-like-it-I-guess
|
2019-06-02 03:00:46 -05:00 |
|
Fermi
|
f8586c9699
|
Adds Friendly and empahty quirk from tg.
|
2019-06-01 18:51:25 +01:00 |
|
Fermi
|
44d13818f0
|
Inital paralysis. (https://github.com/tgstation/tgstation/pull/41140)
|
2019-06-01 16:52:58 +01:00 |
|
Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|
Thalpy
|
6117e3a6aa
|
Fixes to the hypnoflash,
|
2019-05-29 19:09:40 +01:00 |
|
Thalpy
|
af80bf3204
|
MINUTE defines.
|
2019-05-29 18:41:51 +01:00 |
|
Fermi
|
01a38479fa
|
Why did I fiddle with things I shouldn't have.
|
2019-05-29 03:16:11 +01:00 |
|
Sishen
|
8771ae5822
|
masochism and buttslap fixes
|
2019-05-27 18:51:52 -04:00 |
|
Poojawa
|
2aa86157e1
|
Fixes rendering issues. Adds balls to be rendered
|
2019-05-26 04:52:31 -05:00 |
|
Fermi
|
91f10442cf
|
Merge branch 'pr/12'
|
2019-05-26 02:05:48 +01:00 |
|
deathride58
|
4fc31f6322
|
Merge branch 'master' into fuckatmos
|
2019-05-25 15:34:06 -04:00 |
|
kevinz000
|
d0819246bc
|
Merge pull request #8384 from nero1024/footstepB
Ports new footstep sounds from base /tg/
|
2019-05-25 11:30:57 -07:00 |
|
kevinz000
|
deffcb3226
|
Merge pull request #8398 from BurgerLUA/AntiAssSlap
Nerfs Ass Slapping, or how a meme PR made me butthurt, or how I'm now resorting to making degenerate PRs such as this since my permaban from Aurora
|
2019-05-25 11:28:39 -07:00 |
|
Fermi
|
faf6585b69
|
Winding down to the final commits.
|
2019-05-25 01:04:00 +01:00 |
|
BlackMajor
|
f94cbe94f6
|
Ports TG firebots
|
2019-05-24 23:58:39 +12:00 |
|
Fermi
|
a480ccb9fa
|
Changes
|
2019-05-23 05:26:38 +01:00 |
|