Commit Graph

21997 Commits

Author SHA1 Message Date
AffectedArc07
ec595f9bbe Merge pull request #14214 from RedWolfie/glass
[Bugfix] Fixes shotglasses
2020-09-02 10:05:35 +01:00
Certhic
ca82d79d87 fixes shotglass burning 2020-09-02 10:04:23 +02:00
AffectedArc07
5b87692c19 Merge pull request #14157 from Qwertytoforty/Salt-is-a-way-of-life
Makes human meats flavor more accurate to the feelings of the owner
2020-08-31 23:06:00 +01:00
Oyu-De
52a17762fd Fixed "Equipement" to "Equipment" 2020-08-31 20:40:27 +03:00
variableundefined
ec9e32e739 Merge pull request #14121 from AffectedArc07/restores-glass-transfer
Restores ability to set transfer amount on glasses
2020-08-28 14:14:42 -04:00
SabreML
2cc57af65e Moved 'no_wrap' to object 2020-08-28 12:52:39 +01:00
SabreML
0ff9a51ba4 Adds 'no_wrap' list, including twohanded items. 2020-08-28 06:23:10 +01:00
AffectedArc07
ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor
TG Flying+Floating Refactor
2020-08-27 20:08:35 +01:00
Qwertytoforty
e3768e8ac5 Makes human meat more accurate to the feelings of the owner 2020-08-27 12:02:15 -04:00
AffectedArc07
b081cce749 Merge pull request #14108 from ExusA/small-clothing
Reclassifies most clothing as Small
2020-08-26 20:42:42 +01:00
AffectedArc07
04a02eaed4 Merge pull request #14137 from dearmochi/ghost-spawns-fixes
Adds chat message when polling for candidates, fixes blob offspring alert and preferences being ignored
2020-08-26 20:38:29 +01:00
Dovixx
eb2f5c03f2 Cancel now cancels 2020-08-25 15:54:45 +03:00
AffectedArc07
4615f540d9 Merge pull request #14110 from SabreML/AI-Voice-Format
Separates the AI Announcement noises from the words
2020-08-24 10:52:03 +01:00
AffectedArc07
58e1f0d55c Merge pull request #14030 from SabreML/Tourist-Suit
Adds the Tourist Outfit as a wearable shirt.
2020-08-24 10:48:25 +01:00
Kyep
5b205d2a34 fix #14095 - invisible sea carp, broken honk koi 2020-08-24 00:30:21 -07:00
mochi
a0278345f0 Fix missing poll icons, chage holopara icons 2020-08-24 08:45:20 +02:00
AffectedArc07
801bfea049 Merge pull request #14115 from Deelite34/Night-mode-tweak
Dark chat tweaks
2020-08-22 19:33:38 +01:00
SteelSlayer
43c873adb8 Anchors the ticket machine 2020-08-22 01:21:58 -05:00
AffectedArc07
edd455e656 Merge pull request #14117 from TDSSS/wizcrash-fix
Fixes #14116
2020-08-20 13:58:14 +01:00
TDSSS
6b19caa08f Now with one less slash 2020-08-20 13:07:40 +02:00
AffectedArc07
7e2546827f Restores ability to set transfer amount on glasses 2020-08-20 12:06:18 +01:00
TDSSS
1e895b374b derp in description 2020-08-20 01:12:46 +02:00
TDSSS
94e50ca22b Fixes my stupid mistake 2020-08-20 01:06:21 +02:00
Deelite34
8655b62125 Span instead of copypaste 2020-08-19 22:28:51 +02:00
Deelite34
bdc013b288 Player name in ahelp is no longer black with dark background 2020-08-19 20:51:35 +02:00
Deelite34
45ce7b378c Tweaks the night mode chat 2020-08-19 20:34:31 +02:00
AffectedArc07
ce0eb1fbdc Merge pull request #14003 from dearmochi/fix-lipsticks-draw-order
Fix colored lips drawing over masks and random lipstick colouring
2020-08-19 10:46:04 +01:00
ExusA
ffb374d39a more armor items are NORMAL 2020-08-19 16:18:27 +08:00
ExusA
6a6a456b40 storage clothes are NORMAL 2020-08-19 16:18:16 +08:00
Fox McCloud
86909abcbe Merge pull request #14084 from AffectedArc07/pixel-offset-points
Pixel Offset Points
2020-08-18 15:31:18 -04:00
Fox McCloud
ad05757a20 tweak 2020-08-18 15:27:16 -04:00
SabreML
c404ddd1e2 Changed vox_alerts to global list 2020-08-18 15:45:55 +01:00
SabreML
4a4c93e110 Separates announcement noises from words. 2020-08-18 14:46:28 +01:00
ExusA
cedde91ad4 adds exceptions 2020-08-18 19:57:31 +08:00
ExusA
5efc13e5f3 Reclassifies clothing as small 2020-08-18 19:57:18 +08:00
AffectedArc07
233c60058d Merge pull request #13710 from dearmochi/overhaul-event-mob-selection
Overhaul event mob selection
2020-08-18 10:55:24 +01:00
mochi
c1d3d164fa Kyet stuff 2020-08-18 10:28:47 +02:00
mochi
44ea5ffaca Remove used-once var 2020-08-18 09:56:08 +02:00
Kyep
e635c84e70 queens, too 2020-08-17 22:45:32 -07:00
Kyep
c4f21d4da2 fixes green eggs bug 2020-08-17 22:37:10 -07:00
joep van der velden
ab853bed7c Merge remote-tracking branch 'upstream/master' into pull-move-rework 2020-08-17 21:35:35 +02:00
AffectedArc07
160e6ed198 Merge pull request #14097 from SteelSlayer/mentor-pm
Restores mentor's ability to PM people
2020-08-17 16:08:54 +01:00
SteelSlayer
06ef8c94de Restores mentors ability to PM people
This reverts commit 246daa0db12f56a320cdae6edf7b076b3f318f03.
2020-08-17 10:00:49 -05:00
AffectedArc07
69cd58c1df Merge pull request #13934 from SabreML/Maint-Drone-Stuff
Maintenance Drone Tweaks
2020-08-17 13:35:59 +01:00
SabreML
814a1f9a4b Fix 2020-08-17 11:55:40 +01:00
SabreML
4203171739 Adds range check for drone shutdown. 2020-08-17 11:47:08 +01:00
AffectedArc07
a79724207d Merge pull request #12916 from farie82/pickle-whisperer
Makes whispering hide your voice. And deaf people now can't see your voice
2020-08-17 09:44:05 +01:00
AffectedArc07
5a463d22de Merge pull request #14019 from CornMyCob/gluttony
Makes it so you can no longer synth the Gluttony's Blessing reagent
2020-08-16 19:52:50 +01:00
AffectedArc07
af8d14e1ee Merge pull request #14045 from dearmochi/auto-menders-fit-in-fridges
Refactor Smart Fridges, allow auto-menders to be put in Medical Fridges
2020-08-16 19:08:48 +01:00
mochi
7dac6c1391 Rename seed smartfridge, use access constants 2020-08-16 15:13:10 +02:00