kevinz000
|
bbcc9cf4e5
|
never ever webeditor
|
2020-02-24 15:15:21 -07:00 |
|
kevinz000
|
febb890c7f
|
Merge pull request #11192 from Putnam3145/supermatter-hardcap
Made supermatter power increase with raw damage
|
2020-02-24 15:12:45 -07:00 |
|
kevinz000
|
672da86c51
|
NEVERWEBEDITORGUYS
|
2020-02-24 15:08:08 -07:00 |
|
kevinz000
|
5ad51758e0
|
fix
|
2020-02-24 15:04:25 -07:00 |
|
kevinz000
|
388a804add
|
Merge remote-tracking branch 'citadel/kevinz000-patch-15' into kevinz000-patch-17
|
2020-02-24 15:03:20 -07:00 |
|
kevinz000
|
c739091285
|
Merge remote-tracking branch 'citadel/kevinz000-patch-11' into kevinz000-patch-17
|
2020-02-24 15:03:05 -07:00 |
|
kevinz000
|
526471510f
|
Merge remote-tracking branch 'citadel/kevinz000-patch-17-1' into kevinz000-patch-17
|
2020-02-24 15:03:02 -07:00 |
|
kevinz000
|
306b711ab1
|
Update reagents.dm
|
2020-02-24 14:30:50 -07:00 |
|
kevinz000
|
2b3e8a64f7
|
Update holder.dm
|
2020-02-24 14:23:44 -07:00 |
|
kevinz000
|
5cece42c1a
|
Update glass.dm
|
2020-02-24 14:20:40 -07:00 |
|
kevinz000
|
23aa38a381
|
Update reagent_containers.dm
|
2020-02-24 14:17:48 -07:00 |
|
kevinz000
|
c6a0418946
|
Update reagent_containers.dm
|
2020-02-24 14:10:53 -07:00 |
|
kevinz000
|
3709992b46
|
Update reagent_containers.dm
|
2020-02-24 14:07:58 -07:00 |
|
kevinz000
|
77edc602dc
|
Update glass.dm
|
2020-02-24 13:59:27 -07:00 |
|
kevinz000
|
d4657df9f5
|
Update glass.dm
|
2020-02-24 13:58:51 -07:00 |
|
kevinz000
|
1668bc598a
|
Update glass.dm
|
2020-02-24 13:55:44 -07:00 |
|
Ghom
|
f86e17d945
|
Merge pull request #11129 from Owai-Seek/movefood-2-16-20
Reorganize Food Recipes, "Balance" Tweaks
|
2020-02-24 20:53:36 +01:00 |
|
Putnam
|
feaadffd93
|
Gave jittering to salbutamol.
|
2020-02-24 11:23:51 -08:00 |
|
TrilbySpaceClone
|
525cedf16a
|
this just works
|
2020-02-24 11:45:47 -05:00 |
|
Ghom
|
9355e9319b
|
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
you kids like extend votes?
|
2020-02-24 16:39:16 +01:00 |
|
Artur
|
528a226dae
|
Done.
|
2020-02-24 13:36:55 +02:00 |
|
YakumoChen
|
6385445fd5
|
ruining the joke
|
2020-02-24 10:31:47 +00:00 |
|
YakumoChen
|
ff10b70ffe
|
2cat heating up
|
2020-02-24 10:20:47 +00:00 |
|
YakumoChen
|
7a759f68aa
|
Merge pull request #24 from YakumoChen/master
k
|
2020-02-24 04:58:07 -05:00 |
|
YakumoChen
|
96bf8d6969
|
Update tails.dm
|
2020-02-24 09:55:39 +00:00 |
|
Seris02
|
c4e9472b85
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into nomoreailipreading
|
2020-02-24 17:48:58 +08:00 |
|
Seris02
|
cbdb12e110
|
yes
|
2020-02-24 17:47:29 +08:00 |
|
kevinz000
|
8cf41997f5
|
Merge pull request #11201 from Hatterhat/bows
really just a lot of shit about bows
|
2020-02-24 02:33:54 -07:00 |
|
kevinz000
|
43c17b4ab3
|
Merge pull request #11180 from Detective-Google/psych+paramedic
Adds epic and also cool paramedics [lazy tg port]
|
2020-02-24 02:30:36 -07:00 |
|
Detective-Google
|
0caed52ca5
|
removes the epic and cool access and makes it less epic and more cool
|
2020-02-24 03:28:33 -06:00 |
|
kevinz000
|
3e77952652
|
Merge pull request #11216 from Putnam3145/rename-logging
[S] Adds rename logging
|
2020-02-24 02:27:27 -07:00 |
|
kevinz000
|
59074d1174
|
Merge pull request #11183 from Trilbyspaceclone/patch-291
Removes more Trek armor.
|
2020-02-24 02:27:05 -07:00 |
|
kevinz000
|
4fc0ef5e74
|
Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N
Makes all IPC organs look robotic!
|
2020-02-24 02:24:06 -07:00 |
|
kevinz000
|
493d62c17e
|
Merge pull request #11184 from Trilbyspaceclone/patch-292
Remember when Kev made IPCs hearts no longer emp? Me ether!
|
2020-02-24 02:23:45 -07:00 |
|
kevinz000
|
73c03adbbb
|
Merge pull request #11199 from Detective-Google/pai.pai.pai.png
Lets pAIs hold encryption keys and play music.
|
2020-02-24 02:23:17 -07:00 |
|
kevinz000
|
424eb48d9e
|
fixes
|
2020-02-24 01:59:45 -07:00 |
|
Putnam
|
f7e0eb43f8
|
Adds rename logging
|
2020-02-23 22:53:20 -08:00 |
|
Ghom
|
565fa77cf9
|
Merge pull request #11162 from Hatterhat/quickpatch-enzyme
biogen enzyme fix, multitool basic tools node fix
|
2020-02-23 22:48:07 +01:00 |
|
Winter Flare
|
4c03d552ee
|
Gettin Salty. Fish is now Seafood.
|
2020-02-23 16:22:19 -05:00 |
|
kevinz000
|
ae42db8674
|
Merge pull request #11210 from Ghommie/Ghommie-cit588
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 06:02:13 -07:00 |
|
Ghom
|
2075147ee9
|
Merge pull request #11206 from Trilbyspaceclone/patch-294
Corn dogs now have a sprite
|
2020-02-23 13:30:23 +01:00 |
|
Ghommie
|
2b740f9bad
|
[s] Fixing an issue with slot machines crashing the server.
|
2020-02-23 13:09:21 +01:00 |
|
TrilbySpaceClone
|
845e719ade
|
But what if we did it right?
|
2020-02-23 01:52:36 -05:00 |
|
Trilbyspaceclone
|
2dea3cf15c
|
Gives ash sandstone
|
2020-02-23 00:53:42 -05:00 |
|
Trilbyspaceclone
|
342f1cd4c1
|
Update snacks_meat.dm
|
2020-02-22 23:17:30 -05:00 |
|
Hatterhat
|
ba81184fef
|
Merge branch 'master' into quickpatch-enzyme
|
2020-02-22 18:06:17 -06:00 |
|
Trilbyspaceclone
|
2cd8adf4da
|
Update medical_designs.dm
|
2020-02-22 19:06:11 -05:00 |
|
Winter Flare
|
60b4c10215
|
Fish Category, Misc Moves
|
2020-02-22 19:02:43 -05:00 |
|
Trilbyspaceclone
|
cf8b41723d
|
Update medical_designs.dm
|
2020-02-22 18:35:40 -05:00 |
|
TrilbySpaceClone
|
c638a83e23
|
Merge branch 'master' into more_implants
|
2020-02-22 18:34:02 -05:00 |
|