 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 |
|
|
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 |
|
|
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
|
ae6c388510
|
Merge pull request #11214 from Citadel-Station-13/Ghommie-patch-3
Fixing pAI radios inability to be toggled on/off
|
2020-02-24 02:23:30 -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
|
e76eff6966
|
Update plushes.dm
|
2020-02-24 02:21:51 -07:00 |
|
|
kevinz000
|
424eb48d9e
|
fixes
|
2020-02-24 01:59:45 -07:00 |
|
|
kevinz000
|
27b7cd560c
|
Update plushes.dm
|
2020-02-24 01:32:04 -07:00 |
|
|
Putnam
|
f7e0eb43f8
|
Adds rename logging
|
2020-02-23 22:53:20 -08:00 |
|
|
BlackMajor
|
ca6341aac4
|
Merge branch 'master' into SpaceRuins
|
2020-02-24 19:47:52 +13:00 |
|
|
Hatterhat
|
19ae30ea5b
|
alright ghom i hope this works
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-02-23 21:20:57 -06: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 |
|
|
Ghom
|
f5dbb0b20d
|
Merge pull request #11187 from Trilbyspaceclone/sweet
New bar sign, The Hive
|
2020-02-23 22:47:37 +01:00 |
|
|
Ghom
|
3e232f93d9
|
Update barsigns.dm
|
2020-02-23 22:47:21 +01:00 |
|
|
Ghom
|
825beb41c1
|
Update paicard.dm
|
2020-02-23 22:44:38 +01:00 |
|
|
Winter Flare
|
4c03d552ee
|
Gettin Salty. Fish is now Seafood.
|
2020-02-23 16:22:19 -05:00 |
|
|
Ghom
|
b3149d930f
|
Fixing pAI radios inability to be toggled on/off
|
2020-02-23 21:31:53 +01:00 |
|
|
Hatterhat
|
31a93d9f32
|
you'd think i'd have remembered to change paths
|
2020-02-23 14:27:40 -06:00 |
|
|
Hatterhat
|
094b92e58b
|
silk, time, rods
|
2020-02-23 13:12:25 -06: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
|
485241a361
|
cleanup detail
|
2020-02-23 13:32:46 +01:00 |
|