Lin
|
7f271157c3
|
Merge pull request #11929 from Ghommie/Ghommie-cit692
Shielded Component
|
2020-04-22 20:33:12 +00:00 |
|
Ghom
|
63362f74c9
|
Merge pull request #11912 from Seris02/betteruipref
toggle for tetris bags
|
2020-04-22 22:26:40 +02:00 |
|
Ghommie
|
824904844c
|
Componentized for sanity.
|
2020-04-21 19:51:44 +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
|
79eb0f5838
|
Merge pull request #11956 from Trilbyspaceclone/crafting_menu
Fixes Crafting menu
|
2020-04-21 01:25:46 +02:00 |
|
TrilbySpaceClone
|
c3fc133282
|
*crys*
|
2020-04-20 18:28:57 -04:00 |
|
TrilbySpaceClone
|
58cb5e391e
|
*scream*
|
2020-04-20 18:22:13 -04:00 |
|
TrilbySpaceClone
|
747e27007f
|
***ahhhh***
|
2020-04-20 17:26:22 -04:00 |
|
TrilbySpaceClone
|
4d55f169d5
|
oh god oh fuck
|
2020-04-20 17:05:03 -04:00 |
|
Timothy Teakettle
|
c5b8c45bf0
|
Merge branch 'master' into food-quality
|
2020-04-20 19:53:39 +01: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
|
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 |
|
necromanceranne
|
9919a23966
|
This fixes everyone being a pugilist holy fuck
|
2020-04-21 00:36:54 +10:00 |
|
Ghom
|
2cf8dad8ae
|
Merge pull request #11928 from Putnam3145/traitor-class-reroll
Made traitor classes rerollable, reassignable by admins
|
2020-04-20 02:30:33 +02:00 |
|
kevinz000
|
792af56b67
|
Update riding.dm
|
2020-04-19 00:48:51 -07:00 |
|
Ghom
|
f714403d6e
|
Merge pull request #11895 from Seris02/piggybackfix
fixes piggyback merging
|
2020-04-19 04:56:04 +02:00 |
|
kevinz000
|
24370db5eb
|
Merge pull request #11930 from Ghommie/Ghommie-cit693
More ToS Compliance.
|
2020-04-18 19:33:10 -07:00 |
|
kevinz000
|
b65ad491b4
|
Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2
Revert "Makes so turning in place updates riders when riding someone's back"
|
2020-04-18 19:32:34 -07:00 |
|
Ghommie
|
39aef14924
|
More ToS Compliance.
|
2020-04-19 02:40:58 +02:00 |
|
Ghommie
|
9c8f6cd00f
|
peeves.
|
2020-04-19 02:03:05 +02:00 |
|
Ghommie
|
e3fb978465
|
Shielded element.
|
2020-04-19 01:48:51 +02:00 |
|
Ghom
|
7e57a3410e
|
Merge pull request #11905 from Putnam3145/fix-rads-again
Fixes a divide-by-zero
|
2020-04-19 00:32:41 +02:00 |
|
Putnam
|
9976fab42b
|
Made traitor classes rerollable, reassignable by admins
|
2020-04-18 14:40:41 -07:00 |
|
necromanceranne
|
97bd52f03e
|
haha me too
|
2020-04-19 04:49:11 +10:00 |
|
necromanceranne
|
cb39ba3491
|
Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps
|
2020-04-19 04:25:41 +10:00 |
|
TrilbySpaceClone
|
42bb01057f
|
now with working code!
|
2020-04-18 10:09:15 -04:00 |
|
TrilbySpaceClone
|
8ca7bb7535
|
Right...
|
2020-04-18 09:46:56 -04:00 |
|
Ghom
|
bd03d2a362
|
Merge pull request #11908 from Putnam3145/fix-tactical-destroy
Makes tactical component destroy() work properly.
|
2020-04-18 13:32:49 +02:00 |
|
Ghom
|
9b981d0749
|
Merge pull request #11888 from Citadel-Station-13/kevinz000-patch-9
fixes closer extending too many rows up
|
2020-04-18 13:28:34 +02:00 |
|
Artur
|
edb7b1d61c
|
Fixes catstuffs
|
2020-04-18 13:52:27 +03:00 |
|
Artur
|
85c5548d1a
|
Ports https://github.com/tgstation/tgstation/pull/50521/
|
2020-04-18 13:49:06 +03:00 |
|
Seris02
|
cc82f08ebc
|
weh
|
2020-04-18 18:28:35 +08:00 |
|
Putnam
|
d361a8d6ae
|
Makes tactical destroy() work properly.
|
2020-04-17 22:33:11 -07:00 |
|
Ghom
|
2659459233
|
web-editor played me a good prank.
|
2020-04-18 03:48:57 +02:00 |
|
Ghom
|
9c4d10a19c
|
Update code/datums/radiation_wave.dm
|
2020-04-18 03:48:03 +02:00 |
|
Putnam
|
cbc02a8f0b
|
fixes a divide-by-zero whoops
|
2020-04-17 18:28:15 -07:00 |
|
Ghom
|
2676d663d6
|
Revert "Makes so turning in place updates riders when riding someone's back"
|
2020-04-18 03:09:49 +02:00 |
|
Timothy Teakettle
|
cd25a7c145
|
Merge branch 'master' into food-quality
|
2020-04-17 15:03:44 +01:00 |
|
Artur
|
eafc69aa65
|
Reviewer suggestion, reduces paralyze
And ports that commit that ghommie said
|
2020-04-17 16:22:15 +03:00 |
|
kevinz000
|
3c4c67b6c5
|
Merge pull request #11869 from necromanceranne/pawnch_updaties
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
|
2020-04-17 05:43:49 -07:00 |
|
kevinz000
|
e84e6bface
|
Merge pull request #11857 from Trilbyspaceclone/race_drinks
Race drinks!
|
2020-04-17 05:20:53 -07:00 |
|
kevinz000
|
61f833b953
|
Merge pull request #11852 from Ghommie/Ghommie-cit681
Custom skin tone preferences.
|
2020-04-17 05:16:04 -07:00 |
|
Seris02
|
e30bd1f8ea
|
FIXES IT FINALLY OHHHH MY FUCKING GOD WHY IT WAS SO SIMPLE BUT SO HIDDEN FUCK
|
2020-04-17 17:17:50 +08:00 |
|
kevinz000
|
121b9f0d92
|
Update ui.dm
|
2020-04-16 22:57:27 -07:00 |
|
timothyteakettle
|
a4cc54781f
|
implements isfood helper
|
2020-04-17 01:45:15 +01:00 |
|
Ghom
|
e511deabcf
|
Merge pull request #11844 from Arturlang/crafting_fixes
Its no longer possible to craft multiple things at a time
|
2020-04-16 19:08:09 +02:00 |
|
Ghom
|
19f79f8843
|
Merge pull request #11611 from monster860/patch-2
Makes so turning in place updates riders when riding someone's back
|
2020-04-16 19:06:10 +02:00 |
|
necromanceranne
|
4d1abaad3a
|
fecc
|
2020-04-15 19:59:55 +10:00 |
|
necromanceranne
|
80ce9b70af
|
hecc
|
2020-04-15 19:48:18 +10:00 |
|
Artur
|
2134515d5c
|
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
|
2020-04-15 12:19:37 +03:00 |
|