 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 |
|
|
Ghommie
|
1659e2804e
|
Deletes lots of autoylathe copypasta.
|
2020-04-21 04:04:10 +02:00 |
|
|
Trilbyspaceclone
|
e769d28a2d
|
Update weaponry.dm
|
2020-04-20 18:47:18 -04: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 |
|
|
Trilbyspaceclone
|
ec9b0573aa
|
even reagents
|
2020-04-20 15:45:37 -04: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 |
|
|
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 |
|
|
TrilbySpaceClone
|
37a0fb558c
|
with fixes and new gauze
|
2020-04-19 15:29:48 -04: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 |
|
|
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 |
|
|
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
|
efdab85261
|
Update crayons.dm
|
2020-04-18 17:10:31 -04: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 |
|
|
jjpark-kb
|
4a38b2870a
|
fix youtool
|
2020-04-17 01:02:52 -04: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 |
|
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|
|
TrilbySpaceClone
|
4419dc13f5
|
changes and additons
|
2020-04-14 22:17:53 -04:00 |
|
|
Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
|
Trilbyspaceclone
|
e7247c6a60
|
Update wallets.dm
|
2020-04-14 10:11:37 -04:00 |
|
|
Trilbyspaceclone
|
5833ed8029
|
Merge branch 'master' into tools_andstuff
|
2020-04-14 10:10:32 -04:00 |
|
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
|
Putnam
|
1e8fffbf0b
|
Replaced all the extraneous flags with bitflags
|
2020-04-13 16:47:43 -07:00 |
|
|
Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
|
Ghommie
|
db43f53ac4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 16:15:40 +02:00 |
|