BlackMajor
|
fc85f62546
|
Merge branch 'master' into SpaceRuins
|
2020-02-25 16:51:39 +13:00 |
|
kevinz000
|
2eae147e93
|
ok
|
2020-02-24 16:51:35 -07:00 |
|
bunny232
|
53d5328c0c
|
Update sentience.dm
|
2020-02-24 18:49:34 -05:00 |
|
Detective Google
|
569ea6bd61
|
unfucks paramedics access + PDA
|
2020-02-24 16:36:45 -06:00 |
|
kevinz000
|
5144e45ba9
|
it works now :D
|
2020-02-24 15:32:46 -07:00 |
|
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 |
|
kevinz000
|
00c70acee9
|
Target wew
|
2020-02-24 13:20:12 -07:00 |
|
kevinz000
|
26b908f53d
|
thonk
|
2020-02-24 13:19:38 -07:00 |
|
kevinz000
|
90d7fd81b1
|
k
|
2020-02-24 13:17:08 -07:00 |
|
kevinz000
|
fa9e275237
|
k
|
2020-02-24 13:16:12 -07:00 |
|
kevinz000
|
59e95555bb
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-24 13:09:45 -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 |
|
r4d6
|
f76a1c15f3
|
Port random mining base
|
2020-02-24 13:27:54 -05:00 |
|
TrilbySpaceClone
|
d138878e03
|
peace is an option
stops unneeded well violence
|
2020-02-24 12:18:49 -05:00 |
|
TrilbySpaceClone
|
bc94cf25ee
|
it didnt
|
2020-02-24 11:49:27 -05:00 |
|
TrilbySpaceClone
|
a3917a1bbc
|
huh that worked?
|
2020-02-24 11:47:06 -05:00 |
|
TrilbySpaceClone
|
525cedf16a
|
this just works
|
2020-02-24 11:45:47 -05:00 |
|
Ghom
|
213a406568
|
Merge pull request #11167 from Citadel-Station-13/kevinz000-patch-11
hand teles uses a (slightly) less atrocious sprite for the beam
|
2020-02-24 16:40:17 +01: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 |
|
BlackMajor
|
6624155e3d
|
Hey you know this is probably a smarter way to go about ruin spawning in station space.
|
2020-02-25 02:21:28 +13:00 |
|
Kraseo
|
80ebdc44c7
|
moral of the story is doublecheck your code
|
2020-02-24 14:13:52 +01:00 |
|
Kraseo
|
08829fe535
|
why don't they get a powersink by default
|
2020-02-24 14:03:18 +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 |
|
Persi
|
f23f347d99
|
More minor fixes, TODO: sleepers white screen, chem master can't make containers
|
2020-02-24 04:33:37 -05:00 |
|
kevinz000
|
0cfa6699b1
|
yeah ok fine
|
2020-02-24 02:31:14 -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 |
|