kappa-sama
|
3c7a9f068e
|
downvoted
|
2020-03-02 13:51:26 -05:00 |
|
Ghommie
|
f08d79767b
|
Removes makeshift switchblades
|
2020-03-02 19:33:31 +01:00 |
|
Kraseo
|
50a1feeb89
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
|
2020-03-02 17:38:08 +01:00 |
|
Ghom
|
9375113426
|
Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ
Bloodsucker external blood gain rebalancing
|
2020-03-02 16:36:22 +01:00 |
|
Trilbyspaceclone
|
9540c47adf
|
Update recipes_clothing.dm
|
2020-03-02 00:24:36 -05:00 |
|
Trilbyspaceclone
|
c6be46c6bd
|
Update recipes_clothing.dm
|
2020-03-02 00:22:46 -05:00 |
|
Kraseo
|
5da4e5fbcd
|
parte 5: tgui and javascript torture
|
2020-03-01 22:57:39 +01:00 |
|
Kraseo
|
e3c77f2f5a
|
part 4: the one where i slowly go insane
|
2020-03-01 22:05:35 +01:00 |
|
Seris02
|
8a647f8a8c
|
happy now?
|
2020-03-02 04:22:40 +08:00 |
|
Ghommie
|
c0ff43f827
|
ofc, New arguments.
|
2020-03-01 16:34:43 +01:00 |
|
Ghommie
|
b0922dd70d
|
Actually..
|
2020-03-01 16:02:58 +01:00 |
|
Ghommie
|
893cca97a3
|
An old oversight with disease/var/viable_mobtypes.
|
2020-03-01 15:59:42 +01:00 |
|
Trilbyspaceclone
|
787edfb2a7
|
Update recipes_clothing.dm
|
2020-03-01 08:16:39 -05:00 |
|
TrilbySpaceClone
|
51c675603e
|
???
|
2020-03-01 02:48:13 -05:00 |
|
Putnam
|
31b9dbd4ab
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types
|
2020-02-29 23:30:36 -08:00 |
|
Putnam
|
f344af633f
|
finalized.
|
2020-02-29 23:29:24 -08:00 |
|
Trilbyspaceclone
|
65b03d3a4e
|
Update recipes_clothing.dm
|
2020-03-01 00:32:48 -05:00 |
|
Lin
|
70e2563579
|
Merge pull request #11266 from Ghommie/Ghommie-cit593
Fixing another couple mob holder oversights.
|
2020-02-29 00:13:58 -06:00 |
|
kevinz000
|
93d91b1808
|
Merge remote-tracking branch 'citadel/master' into sword_point
|
2020-02-28 13:39:56 -07:00 |
|
kevinz000
|
8ef68fa36b
|
En garde!
|
2020-02-28 13:35:41 -07:00 |
|
kevinz000
|
e39d7fa49d
|
Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
|
2020-02-28 04:30:12 -07:00 |
|
Seris02
|
b195783dfb
|
yeet 6
|
2020-02-28 14:31:47 +08:00 |
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
BlackMajor
|
fc4f9e7800
|
How about a few more roids.
|
2020-02-28 16:07:57 +13:00 |
|
Ghommie
|
11f767d412
|
A couple mob holder oversights. Again?
|
2020-02-27 16:16:21 +01:00 |
|
Seris02
|
8140962275
|
yeet 4
|
2020-02-27 21:05:27 +08:00 |
|
Seris02
|
d3385fb8c8
|
yeet 3
|
2020-02-27 21:03:50 +08:00 |
|
Seris02
|
a14fe06241
|
probably fixes it
|
2020-02-27 20:51:19 +08:00 |
|
Seris02
|
6e6b8fbd8a
|
yeet 2
|
2020-02-27 20:35:53 +08:00 |
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
Ghom
|
954f03f4e0
|
Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
|
2020-02-27 00:54:41 +01:00 |
|
Seris02
|
de6e8012f3
|
balances yee
|
2020-02-26 17:49:37 +08:00 |
|
BlackMajor
|
be740ba690
|
Merge branch 'master' into SpaceRuins
|
2020-02-26 20:58:46 +13:00 |
|
Putnam
|
ebac066b2f
|
lets add traitor classes
|
2020-02-25 16:10:23 -08:00 |
|
Ghom
|
5bd62d129f
|
Merge pull request #10877 from kevinz000/staves
Riot Electrostaves
|
2020-02-25 20:32:36 +01:00 |
|
Ghom
|
5ee2f0dcd8
|
Merge pull request #11169 from PersianXerxes/ohHeyKilo
Ports Kilo Station from Skyrat
|
2020-02-25 14:48:37 +01:00 |
|
Ghom
|
ea5774e713
|
Merge pull request #11225 from r4d6/Random-Mining
Make the mining base's placement random
|
2020-02-25 14:41:40 +01:00 |
|
BlackMajor
|
fc85f62546
|
Merge branch 'master' into SpaceRuins
|
2020-02-25 16:51:39 +13: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 |
|
r4d6
|
f76a1c15f3
|
Port random mining base
|
2020-02-24 13:27:54 -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 |
|
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 |
|
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 |
|
BlackMajor
|
ca6341aac4
|
Merge branch 'master' into SpaceRuins
|
2020-02-24 19:47:52 +13:00 |
|
Winter Flare
|
4c03d552ee
|
Gettin Salty. Fish is now Seafood.
|
2020-02-23 16:22:19 -05:00 |
|
Hatterhat
|
094b92e58b
|
silk, time, rods
|
2020-02-23 13:12:25 -06:00 |
|
Persi
|
4af2eee9dd
|
Haha, okay... this will break Kilo
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ohHeyKilo
|
2020-02-23 02:28:18 -05:00 |
|
Winter Flare
|
60b4c10215
|
Fish Category, Misc Moves
|
2020-02-22 19:02:43 -05:00 |
|