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 |
|
Trilbyspaceclone
|
511692a7cb
|
Update medical_designs.dm
|
2020-02-22 18:30:32 -05:00 |
|
Trilbyspaceclone
|
18bfde5a0a
|
Update augments_arms.dm
|
2020-02-22 17:58:50 -05:00 |
|
Hatterhat
|
b89a2314a2
|
mmm that's compiling i don't like that
|
2020-02-22 16:17:51 -06:00 |
|
Ghom
|
0c558f53d9
|
Merge pull request #11179 from Trilbyspaceclone/patch-290
AIs now understand dwarf
|
2020-02-22 22:49:08 +01:00 |
|
Hatterhat
|
99475488d3
|
mistake
|
2020-02-22 15:45:06 -06:00 |
|
Hatterhat
|
accc4ce776
|
grammar shit, silkstring buff, arrow costs, yikes
|
2020-02-22 15:33:07 -06:00 |
|
Ghom
|
520f5eab83
|
Merge pull request #11191 from YakumoChen/beelord
Beegions
|
2020-02-22 22:24:20 +01:00 |
|
Ghom
|
6f181365c2
|
Merge pull request #11172 from Trilbyspaceclone/bows!
Bow corrections.
|
2020-02-22 15:53:27 +01:00 |
|
Ghom
|
b7fab93209
|
Merge pull request #11186 from Putnam3145/fixed-flavor
Fixed temp flavor text (for real)
|
2020-02-22 15:09:58 +01:00 |
|
Putnam
|
d328d554ba
|
Reduced copypasta
|
2020-02-22 02:38:57 -08:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -07:00 |
|
kevinz000
|
b8d60a33bd
|
partial fix
|
2020-02-21 23:29:13 -07:00 |
|
kevinz000
|
856af1f182
|
Merge pull request #10848 from Ghommie/Ghommie-cit229
Porting Floyd Materials: Trying again edition
|
2020-02-21 23:28:44 -07:00 |
|
Detective Google
|
ca29246878
|
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
|
2020-02-22 00:02:49 -06:00 |
|
kevinz000
|
5a580dda20
|
Update suppression.dm
|
2020-02-21 18:18:37 -07:00 |
|
kevinz000
|
24ba8b4d04
|
Update haste.dm
|
2020-02-21 18:17:54 -07:00 |
|
kevinz000
|
f2a17b8b35
|
Update robot_mobility.dm
|
2020-02-21 18:17:07 -07:00 |
|
Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
kevinz000
|
665e95d827
|
compile
|
2020-02-21 15:03:22 -07:00 |
|
kevinz000
|
e85699df50
|
compile fix
|
2020-02-21 14:18:45 -07:00 |
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|