 Ghom
|
a2c796f943
|
Update legs_and_taurs.dm
|
2020-04-21 18:53:53 +02: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
|
a475355c93
|
Update humanform.dm
|
2020-04-21 15:28:12 +02:00 |
|
|
kevinz000
|
055606b81b
|
Revert "Update SDQL_2_wrappers.dm"
This reverts commit 685546551c.
|
2020-04-20 20:27:18 -07:00 |
|
|
kevinz000
|
685546551c
|
Update SDQL_2_wrappers.dm
|
2020-04-20 20:26:50 -07:00 |
|
|
Lin
|
560cf8749b
|
Merge pull request #11943 from Citadel-Station-13/Ghommie-patch-2
Ports text formatted round timer from skyrat.
|
2020-04-21 02:13:31 +00:00 |
|
|
Ghommie
|
1659e2804e
|
Deletes lots of autoylathe copypasta.
|
2020-04-21 04:04:10 +02:00 |
|
|
Trilbyspaceclone
|
6dd89ec1e0
|
Update pockets.dm
|
2020-04-20 21:50:25 -04:00 |
|
|
Ghommie
|
c93f028a97
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685
|
2020-04-21 01:53:41 +02:00 |
|
|
Ghommie
|
e0d219650f
|
Ready for testing.
|
2020-04-21 01:26:34 +02:00 |
|
|
Ghom
|
79eb0f5838
|
Merge pull request #11956 from Trilbyspaceclone/crafting_menu
Fixes Crafting menu
|
2020-04-21 01:25:46 +02:00 |
|
|
Trilbyspaceclone
|
e769d28a2d
|
Update weaponry.dm
|
2020-04-20 18:47:18 -04:00 |
|
|
TrilbySpaceClone
|
c3fc133282
|
*crys*
|
2020-04-20 18:28:57 -04:00 |
|
|
TrilbySpaceClone
|
58cb5e391e
|
*scream*
|
2020-04-20 18:22:13 -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 |
|
|
Ghom
|
6679d13509
|
Merge pull request #11939 from Owai-Seek/weight-class-4-19-20
Reduces weight classes of several items.
|
2020-04-20 23:53:07 +02:00 |
|
|
Ghom
|
0dc489e8de
|
Merge pull request #11798 from timothyteakettle/food-quality
adds a new feature to cooking: food quality
|
2020-04-20 23:48:35 +02:00 |
|
|
Putnam
|
75ef1c3731
|
Makes ling kill objectives kill-once
|
2020-04-20 14:39:43 -07:00 |
|
|
TrilbySpaceClone
|
747e27007f
|
***ahhhh***
|
2020-04-20 17:26:22 -04:00 |
|
|
Ghommie
|
03e873478c
|
Fixing CE jump suit/skirt and accessory overlays.
|
2020-04-20 23:11:58 +02:00 |
|
|
Ghom
|
a40f213325
|
Merge pull request #11951 from Putnam3145/fix-liver-runtime
Fixes a runtime in livers.
|
2020-04-20 23:11:31 +02:00 |
|
|
TrilbySpaceClone
|
4d55f169d5
|
oh god oh fuck
|
2020-04-20 17:05:03 -04:00 |
|
|
kevinz000
|
3e9b1a6875
|
Update shields.dm
|
2020-04-20 14:02:39 -07:00 |
|
|
Ghom
|
c7780bde9e
|
Merge pull request #11865 from Citadel-Station-13/kevinz000-patch-5
Shuffles resist embed higher up on the resist chain
|
2020-04-20 22:34:03 +02:00 |
|
|
Trilbyspaceclone
|
047bb6c162
|
Update hardsuit.dm
|
2020-04-20 16:19:30 -04: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 |
|
|
Timothy Teakettle
|
c5b8c45bf0
|
Merge branch 'master' into food-quality
|
2020-04-20 19:53:39 +01:00 |
|
|
kevinz000
|
a984fc5e3d
|
Update living.dm
|
2020-04-20 11:45:22 -07:00 |
|
|
kevinz000
|
096a182a84
|
Update living.dm
|
2020-04-20 11:44:59 -07:00 |
|
|
kevinz000
|
791c3029a8
|
Merge pull request #11897 from DeltaFire15/gang-decon-message
Snitches now get stitches
|
2020-04-20 11:43:37 -07:00 |
|
|
kevinz000
|
62418d3fb8
|
Merge pull request #11909 from Putnam3145/owai-broom-mop
Adds more service stuff to lathes.
|
2020-04-20 11:43:30 -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
|
893f57cb63
|
Merge pull request #11919 from Ghommie/Ghommie-cit690
Nerfing the bonus reagents from higher tier microwaves.
|
2020-04-20 11:34:53 -07:00 |
|
|
kevinz000
|
33cfb9a566
|
Merge pull request #11920 from Ghommie/Ghommie-cit691
Removing troublesome and filler uplink items.
|
2020-04-20 11:34:44 -07:00 |
|
|
kevinz000
|
cbc9f325f4
|
Merge pull request #11921 from necromanceranne/minor_fix_scarp_stammod
Sleeping Carp has a Stamina Mod again, gets Taser resistance, various fixes (no more universal pugilism)
|
2020-04-20 11:34:06 -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 |
|
|
Putnam
|
5df4287c8d
|
Fixes a runtime in livers.
|
2020-04-20 11:10:43 -07:00 |
|
|
Ghom
|
af620582b1
|
Merge pull request #11924 from Trilbyspaceclone/patch-346
Moves barkeeps cryo fluid to emag only in the Soda Dispender
|
2020-04-20 19:35:31 +02:00 |
|
|
Ghommie
|
5a4fecdeb8
|
tested and it works now, I'm glad.
|
2020-04-20 19:22:42 +02:00 |
|
|
Ghom
|
9df0982da3
|
Update mirror.dm
|
2020-04-20 17:57:08 +02:00 |
|
|
Ghom
|
4cf80cb277
|
Update preferences_savefile.dm
|
2020-04-20 17:56:48 +02:00 |
|
|
Ghom
|
e870830a72
|
Update preferences.dm
|
2020-04-20 17:52:10 +02:00 |
|
|
necromanceranne
|
9919a23966
|
This fixes everyone being a pugilist holy fuck
|
2020-04-21 00:36:54 +10:00 |
|
|
Ghommie
|
e703e12c88
|
WIP
|
2020-04-20 16:25:08 +02:00 |
|
|
Ghom
|
7c6c20ec7a
|
Update game_options.dm
|
2020-04-20 16:04:55 +02:00 |
|
|
Ghommie
|
0bef955806
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682
|
2020-04-20 15:14:30 +02:00 |
|
|
Ghom
|
10ae9bb51d
|
Merge pull request #11944 from Trilbyspaceclone/patch-349
Corrects shield implants being invisable
|
2020-04-20 13:39:07 +02:00 |
|