Commit Graph

3402 Commits

Author SHA1 Message Date
silicons
72bc00bc22 Merge pull request #13993 from Arturlang/cursed_heart_tweaks
Makes cursed heart more tolerable
2021-01-10 01:36:43 -07:00
silicons
121104ca6c Merge pull request #14014 from necromanceranne/bokken_fixes_2
Bokken Fixes 2: Missing sprites and stuff
2021-01-09 19:49:10 -07:00
silicons
656691912e Merge pull request #13965 from Xantholne/GoodNightDisky
Good Night Disky
2021-01-09 15:39:06 -07:00
necromanceranne
6d10ca9efa Fixes missing sprites on the steelwood bokkens, fixes further problems with crafting bokken parts 2021-01-10 05:43:33 +11:00
Artur
f5dc7d5c01 Makes cursed heart more tolerable 2021-01-07 22:27:13 +02:00
timothyteakettle
a375448a54 fixes 2021-01-05 23:18:52 +00:00
Xantholne
18a336cec5 Adds bed tucking element 2021-01-05 02:47:21 -07:00
necromanceranne
0fda694a52 A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused. 2021-01-04 15:30:28 +11:00
silicons
4c6cc24343 Merge pull request #13948 from necromanceranne/sheath_stuff
Bokken and Bokken Accessories: Bonkvengeance
2021-01-03 18:18:29 -07:00
silicons
b164d6e75b Merge pull request #13936 from BlueWildrose/hoodyhoodu
Fixes loadout specific polychromic hoodies not having their hoods polychromable
2021-01-03 18:10:44 -07:00
necromanceranne
6a247e2a68 Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites 2021-01-02 04:26:39 +11:00
DeltaFire
38565e0027 Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-01 04:14:26 +01:00
necromanceranne
0aa5338f9b Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays 2021-01-01 05:42:28 +11:00
Blue Wildrose
0e5b2c60ee Fixes loadout specific polychromic hoodies 2020-12-31 03:42:29 -07:00
DeltaFire
1e3c2f802f Merge pull request #13913 from keronshb/scarpparrytweak
Local Martial Artist forgets one line of code (fixes Scarp Parrying)
2020-12-30 17:53:41 +01:00
silicons
97deaf3482 Update twitch_plays.dm 2020-12-29 15:56:10 -07:00
silicons
95c420ccba Update twitch_plays.dm 2020-12-29 15:55:14 -07:00
keronshb
99a890b355 Adds block_parry_data
Ooops forgot one line of code
2020-12-29 09:30:29 -05:00
silicons
042c7d9b8b wew 2020-12-28 21:07:55 -08:00
silicons
d338d7a14b auto 2020-12-28 21:03:50 -08:00
silicons
964b60c9ca ok 2020-12-28 17:50:16 -08:00
silicons
ee9cc135f1 fix 2020-12-28 17:43:50 -08:00
silicons
a8bc98aa40 ok 2020-12-28 17:29:55 -08:00
silicons
6e86cc7758 wew 2020-12-28 17:27:16 -08:00
silicons
1af00db4c1 Merge pull request #13869 from timothyteakettle/powergame-puddle
removes slime layering and stops puddle tackling
2020-12-28 13:15:30 -07:00
Timothy Teakettle
b1e5888ce0 Update tackle.dm 2020-12-28 17:40:04 +00:00
DeltaFire
999b4c403b Merge pull request #13883 from silicons/temporary_flavortext
Set Pose from RP server is now a thing (in reality this just modifies existing temporary flavor text to be better but no one here understands enough code so I'll spare the explanation)
2020-12-28 17:53:32 +01:00
DeltaFire
312f3410a1 Merge pull request #13887 from HeroWithYay/Fix_Necrotizing_Fasciitis_description
Fix for Necrotizing Fasciitis
2020-12-28 17:43:39 +01:00
Putnam
fd8f5c4afd Makes coma more precedent. 2020-12-27 17:54:53 -08:00
Putnam
33358776ec Makes regen coma properly work at 25% when sleeping 2020-12-27 17:49:15 -08:00
silicons
1c0e3fcd12 Merge pull request #13873 from BlueWildrose/FasterThanTheSpeedOfLight
Nyctophobia quirk now triggers in 0.2 seconds instead of instantly
2020-12-27 10:24:10 -07:00
HeroWithYay
d06c82ae64 It has the wrong description, fixing it. 2020-12-28 03:21:41 +13:00
silicons
ec2df686c3 maybe 2020-12-27 05:31:58 -08:00
silicons
3535916fd8 fix 2020-12-26 22:02:56 -08:00
silicons
1c06dd92c2 fix 2020-12-26 21:55:17 -08:00
silicons
fa6537a092 fix 2020-12-26 21:53:38 -08:00
silicons
5bd20acc1d fix 2020-12-26 21:44:37 -08:00
silicons
0cd0770549 fix 2020-12-26 21:32:12 -08:00
Blue Wildrose
1d296e2816 addtimer proc instead of sleep 2020-12-25 20:18:02 -07:00
Blue Wildrose
147f148c78 Nyctophobia quirk: Effect now triggers in 0.2 seconds instead of instantly 2020-12-25 19:05:13 -07:00
Timothy Teakettle
05e5c80dce runtime 2020-12-26 00:17:29 +00:00
Timothy Teakettle
8c8be2b92e tackle and puddle 2020-12-25 21:45:07 +00:00
DeltaFire
48cbe2ce46 snap 2020-12-22 19:15:52 +01:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
silicons
ea21151462 LF 2020-12-20 18:55:45 -07:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
DeltaFire
1d604d489c Merge pull request #13763 from Hatterhat/rped-qol
RPED drops lowest tier parts
2020-12-16 05:17:44 +01:00
keronshb
3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
Hatterhat
263a75ec45 how moment 2020-12-14 16:24:08 -06:00
silicons
13bb064302 Merge pull request #13758 from timothyteakettle/better-holoforms
replaces custom holoform verb with an action, lets holoform AIs emote
2020-12-13 23:09:34 -07:00