Commit Graph

21976 Commits

Author SHA1 Message Date
TDSSS
ada7ddb605 shotguns come preloaded with buckshot now 2020-08-27 14:49:52 +02: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
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
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
Fox McCloud
86909abcbe Merge pull request #14084 from AffectedArc07/pixel-offset-points
Pixel Offset Points
2020-08-18 15:31:18 -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
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
AffectedArc07
1d9be53101 Merge pull request #14082 from Kyep/destroyer_fix
Fixes destroyer borg lawsync, laws, sound
2020-08-16 13:54:10 +01:00
AffectedArc07
67a5b66c9d Merge pull request #13551 from dearmochi/admin-additions
View Asays, Erase Flavor Text and Use Random Name
2020-08-16 13:50:22 +01:00
AffectedArc07
769bb7b17c Merge pull request #14025 from TDSSS/cows
All cows are now female
2020-08-16 13:47:23 +01:00
AffectedArc07
74741cfa11 Merge pull request #14024 from Kyep/admin_verb_reclassification
Admin Verb Updates
2020-08-16 13:46:49 +01:00
dearmochi
59b8595534 Merge branch 'master' into admin-additions 2020-08-16 14:32:57 +02:00
AffectedArc07
b749fe5687 Merge pull request #13247 from farie82/logging-improvements-V2
Makes logging based on ckeys. Adds dchat/LOOC/OOC logging
2020-08-16 13:18:24 +01:00
AffectedArc07
07301da5d2 Merge pull request #13338 from Kyep/id_computer_demote_terminate_freejob
ID Computer Demotion/Termination Upgrades
2020-08-16 13:14:42 +01:00
AffectedArc07
354016c5cc Merge pull request #13150 from TheSardele/kick-confirmation
Adds confirmation prompt to kicking
2020-08-16 13:08:15 +01:00
AffectedArc07
57decdd4fb Merge pull request #13560 from farie82/convert-tickets
Makes staff able to convert m/ahelp tickets to the other type
2020-08-16 12:46:23 +01:00
Kyep
c660d28b96 squash 2020-08-15 17:04:37 -07:00
AffectedArc07
0be146900d Pixel Offset Points 2020-08-15 10:04:02 +01:00
Kyep
87f0b423df Fixes destroyer borg lawsync, laws, sound 2020-08-15 00:34:04 -07:00
mochi
a7e1cc4830 Smart spans 2020-08-13 11:12:08 +02:00
AffectedArc07
50cd3b9c7d Merge pull request #14057 from Kyep/fixes_13823_blob_mouse_splat
Fixes blob mouse splatting, refactors mice a bit
2020-08-13 09:15:14 +01:00
Kyep
e4bb9d6561 re-adds splatting, but simplified 2020-08-12 20:32:26 -07:00
Kyep
298c4ee86b map template load/unload require R_DEBUG now 2020-08-11 21:45:19 -07:00
mochi
96bf4396a0 Merge branch 'master' into overhaul-event-mob-selection 2020-08-12 01:22:52 +02:00
mochi
954c76774d Refactor Smart Fridges 2020-08-12 01:16:12 +02:00