Commit Graph

21922 Commits

Author SHA1 Message Date
SteelSlayer
06ef8c94de Restores mentors ability to PM people
This reverts commit 246daa0db12f56a320cdae6edf7b076b3f318f03.
2020-08-17 10:00:49 -05: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
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
954c76774d Refactor Smart Fridges 2020-08-12 01:16:12 +02:00
AffectedArc07
09ef06a7ec Merge pull request #13896 from Kyep/sleeper_teleport_fix
Fixes issues with machines/mechs when a person is teleported out of them
2020-08-11 14:29:41 +01:00
AffectedArc07
d06a4612da Merge pull request #13988 from SteelSlayer/anchored-push-fix
You can no longer push/swap places with anchored mobs
2020-08-11 14:28:17 +01:00
AffectedArc07
1d4924aace Merge pull request #14014 from SteelSlayer/no-transfer-verb
Hides the "Set transfer amount" verb on certain items like syringes
2020-08-11 14:27:26 +01:00
Kyep
e647433537 Fixes #13823 - blob mouse splatting 2020-08-10 16:06:18 -07:00
Kyep
3018e1109e verb simplification 2020-08-10 14:59:29 -07:00
AffectedArc07
3a749e77d1 Merge pull request #13946 from xProlithium/adminfreeze-clickprevention
Click prevention for admin frozen players
2020-08-10 09:45:25 +01:00
mochi
a7741a980a Merge branch 'admin-additions' of https://github.com/dearmochi/Paradise into admin-additions 2020-08-10 09:31:56 +02:00
mochi
9db7f63082 Refreshing, adjust column widths 2020-08-10 09:31:17 +02:00
mochi
7efaaa68ee Merge branch 'master' into admin-additions 2020-08-10 09:09:15 +02:00
Kyep
898a23fa15 Fixes #14051 2020-08-09 12:44:36 -07:00
AffectedArc07
de08c23451 Merge pull request #14050 from Bizzonium/fixAdminDenyShuttle
Fix absence of Toggle Deny Shuttle button
2020-08-09 20:01:25 +01:00
Bizzonium
4a191de1b9 Fix absence of Admin Deny Shuttle button 2020-08-09 21:24:34 +03:00
AffectedArc07
cdd7d0bd51 Merge pull request #13887 from Mitchs98/flashout
Correctly names the SGL-6 and SOB-3 Launchers
2020-08-09 18:36:06 +01:00
AffectedArc07
110db94ce0 Merge pull request #13512 from trololiver112/hijack-hud
Adds a custom antag hud icon to traitor hijackers
2020-08-09 18:29:27 +01:00
AffectedArc07
0aa89bd3de Merge pull request #13748 from Fox-McCloud/rig-purge
Purges Rigs
2020-08-09 18:21:39 +01:00
mochi
a37dc85fc5 Medical Fridge accepts auto-menders 2020-08-09 10:22:18 +02:00
AffectedArc07
96840368d4 Merge pull request #13674 from Fox-McCloud/remove-atc
Removes Excessive Automated Yakking
2020-08-08 21:18:44 +01:00
SteelSlayer
04740436b2 hides the verb for automenders too 2020-08-08 13:18:17 -05:00
SteelSlayer
e18c3ec598 Merge branch 'master' into no-transfer-verb 2020-08-08 13:11:51 -05:00
AffectedArc07
601a5db433 Merge pull request #13378 from Fox-McCloud/applicator-tweaks
Applicator QoL Tweaks
2020-08-08 16:53:18 +01:00
AffectedArc07
c99c56411d Merge pull request #14034 from farie82/throw-and-fruit-logging
Improves botany fruit logging. Makes throws not spam admins when the item does no damage
2020-08-08 16:34:47 +01:00
joep van der velden
c430b6e1e6 Merge remote-tracking branch 'upstream/master' into logging-improvements-V2 2020-08-08 17:30:09 +02:00
AffectedArc07
fcd6f900b9 Merge pull request #13175 from farie82/logging-improvements
Logging view improvements
2020-08-08 16:23:06 +01:00
Kyep
4bcbb65b37 disables dragon transformation because it freezes the server 2020-08-08 07:43:35 -07:00
joep van der velden
d89572afee review changes 2020-08-08 07:39:25 +02:00
joep van der velden
f4910dcc79 Makes grown/On_Consume actually work properly 2020-08-08 00:03:16 +02:00
joep van der velden
0cccd0ebf0 Improves botany fruit logging. Make throw logging more logical 2020-08-07 23:55:11 +02:00
AffectedArc07
6794efe582 Merge pull request #14029 from Kyep/mass_hallucination_fix
Fixes mass hallucination event affecting other zlevels
2020-08-07 20:02:30 +01:00
Kyep
acaa8db9df fix spacing 2020-08-07 08:26:55 -07:00
Kyep
6d346ad6b6 Update code/modules/admin/topic.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-08-07 14:46:09 +00:00