 kevinz000
|
cf61795101
|
Merge pull request #11941 from kiwedespars/punch-bundle
re-adds north star gloves to traitors for 20 tc
|
2020-04-23 11:45:04 -07:00 |
|
|
TrilbySpaceClone
|
c8b3032087
|
Merge branch 'master' into cube-world
|
2020-04-23 02:04:56 -04:00 |
|
|
kevinz000
|
1236e11eca
|
Merge pull request #11950 from Citadel-Station-13/Ghommie-patch-3
Fixing a little mistake with a config.
|
2020-04-22 18:41:21 -07:00 |
|
|
kevinz000
|
411622430f
|
Merge pull request #11985 from Ghommie/Ghommie-cit701
Removal of backward 512 compatibility.
|
2020-04-22 18:40:41 -07:00 |
|
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
|
Trilbyspaceclone
|
511465ed7b
|
Update shields.dm
|
2020-04-22 18:13:09 -04:00 |
|
|
Lin
|
4c83af2cc2
|
Merge pull request #11953 from kevinz000/shieldbash2
Fixes shield bashing
|
2020-04-22 01:51:57 +00:00 |
|
|
Ghom
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
|
Ghom
|
50eae569eb
|
Merge pull request #11940 from Detective-Google/null-roddies
Turns chaplain null rod selection into a radial function(port TG#50512)
|
2020-04-20 23:53:24 +02:00 |
|
|
kevinz000
|
3e9b1a6875
|
Update shields.dm
|
2020-04-20 14:02:39 -07:00 |
|
|
kevinz000
|
7e2a54d5d6
|
fix
|
2020-04-20 12:30:20 -07:00 |
|
|
kevinz000
|
6428f4a0c2
|
ok
|
2020-04-20 12:18:09 -07:00 |
|
|
kevinz000
|
90f6904f44
|
fix
|
2020-04-20 12:16:42 -07:00 |
|
|
kevinz000
|
85fcdbf673
|
Merge pull request #11916 from Trilbyspaceclone/crafting_menu
Cleans up misc tab in the crafting menu
|
2020-04-20 11:37:13 -07:00 |
|
|
kevinz000
|
ff651ac881
|
Merge pull request #11931 from Ghommie/Ghommie-cit694
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-20 11:31:31 -07:00 |
|
|
Ghom
|
9df0982da3
|
Update mirror.dm
|
2020-04-20 17:57:08 +02:00 |
|
|
Trilbyspaceclone
|
6fcec77e9b
|
Update shields.dm
|
2020-04-19 23:18:17 -04:00 |
|
|
kiwedespars
|
842483190a
|
Update code/game/objects/items/storage/uplink_kits.dm
my brain is small when working git.
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
|
2020-04-19 17:18:14 -07:00 |
|
|
kiwedespars
|
b21ee932cf
|
maybe this is travis's issue?
|
2020-04-19 17:06:21 -07:00 |
|
|
kiwedespars
|
42fac43807
|
Merge branch 'master' into punch-bundle
|
2020-04-19 16:50:01 -07:00 |
|
|
kiwedespars
|
25e0c47225
|
oops
|
2020-04-19 16:48:37 -07:00 |
|
|
kevinz000
|
ae27bf90e4
|
Merge pull request #11846 from Putnam3145/vore-optimization
Optimizing vore + commenting out simplemob vore (sorry)
|
2020-04-19 16:45:44 -07:00 |
|
|
TrilbySpaceClone
|
25b1b889dc
|
amazing truely amazing
|
2020-04-19 19:09:20 -04:00 |
|
|
kiwedespars
|
c3905c8c2b
|
Update uplink_kits.dm
|
2020-04-19 15:56:31 -07:00 |
|
|
Detective Google
|
0c2f0a99d5
|
fixes the fact that some citadel null rods aren't null rod subtypes
|
2020-04-19 17:18:40 -05:00 |
|
|
Detective Google
|
5376ca81b5
|
Turns chaplain null rod selection into a radial function(port TG#50512)
|
2020-04-19 16:57:02 -05:00 |
|
|
CitadelStationBot
|
22dd41925f
|
Merge pull request #11937 from Citadel-Station-13/Ghommie-patch-3
Fixing critter crates having an invalid icon state when opened.
|
2020-04-19 15:11:28 -05:00 |
|
|
Lin
|
d75e3f79bd
|
Merge pull request #11917 from Ghommie/Ghommie-cit688
Makes warm donk pockets cooling after 7 minutes canon again.
|
2020-04-19 16:52:33 +00:00 |
|
|
Ghom
|
8551998833
|
Update critter.dm
|
2020-04-19 14:07:13 +02:00 |
|
|
Trilbyspaceclone
|
2039fb80e6
|
Update fancy.dm
|
2020-04-18 22:37:05 -04:00 |
|
|
kevinz000
|
5fd862e19d
|
Merge pull request #11860 from Trilbyspaceclone/shields!
Adds more shields and tweaks a few!
|
2020-04-18 19:32:09 -07:00 |
|
|
Ghommie
|
d5a43be181
|
Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart.
|
2020-04-19 03:07:45 +02:00 |
|
|
Ghom
|
6e62f7a2a3
|
Merge pull request #11878 from Arturlang/fixes_zipties_being_red
Makes zipties white again
|
2020-04-19 02:45:31 +02:00 |
|
|
TrilbySpaceClone
|
8ca7bb7535
|
Right...
|
2020-04-18 09:46:56 -04:00 |
|
|
Ghommie
|
8d4a67fedc
|
Makes warm donk pockets cooling after 7 minutes canon again.
|
2020-04-18 15:40:18 +02:00 |
|
|
Trilbyspaceclone
|
d26ba86660
|
Update shields.dm
|
2020-04-17 23:30:58 -04:00 |
|
|
Putnam
|
33039f9962
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vore-optimization
|
2020-04-17 18:56:26 -07:00 |
|
|
Trilbyspaceclone
|
7756a80beb
|
Merge branch 'master' into shields!
|
2020-04-17 19:32:39 -04:00 |
|
|
Lin
|
7cc7d6884a
|
Merge pull request #11820 from kevinz000/shield_bashing
Shield bashing
|
2020-04-17 20:45:40 +00:00 |
|
|
Trilbyspaceclone
|
0f7bc55755
|
le sigh
|
2020-04-17 10:25:48 -04:00 |
|
|
Trilbyspaceclone
|
8d4782290c
|
Update shields.dm
|
2020-04-17 10:25:20 -04:00 |
|
|
kevinz000
|
7756682362
|
Merge pull request #11774 from Trilbyspaceclone/tools_andstuff
More mapping Loot tables and code improvements + Maints/Locker loot changes
|
2020-04-17 05:51:26 -07:00 |
|
|
kevinz000
|
09f459a369
|
Merge pull request #11730 from Ghommie/Ghommie-cit667
Minor snowflakes clothing variations refactor. Removal of copypasted states.
|
2020-04-17 05:49:09 -07:00 |
|
|
kevinz000
|
61f833b953
|
Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
|
2020-04-17 05:16:04 -07:00 |
|
|
jjpark-kb
|
4a38b2870a
|
fix youtool
|
2020-04-17 01:02:52 -04:00 |
|
|
Ghommie
|
2200c690f7
|
configs
|
2020-04-16 18:44:05 +02:00 |
|
|
Ghommie
|
fe43581d31
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit667
|
2020-04-16 15:09:52 +02:00 |
|
|
Artur
|
75dab9fa57
|
And some other fixes
|
2020-04-16 10:51:17 +03:00 |
|
|
Artur
|
b023a0976b
|
Makes zipties red again
|
2020-04-16 10:10:39 +03:00 |
|
|
kevinz000
|
e533103ed2
|
Merge branch 'master' into shield_bashing
|
2020-04-15 19:34:08 -07:00 |
|