Hawk_v3
6b935d64ec
Merge remote-tracking branch 'upstream/master'
2019-12-21 21:57:49 +00:00
Unknown
2e584ce3d0
Minor bug fixes
...
- Ahelps sent by admins are no longer sent to discord
2019-12-13 19:50:36 -05:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Atermonera
1a15bb765d
Merge pull request #6387 from Heroman3003/ahelp-feedback
...
Makes ahelping on existing ticket give proper feedback
2019-08-08 16:09:05 -04:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Spades
fcff9205e6
Eliminates vorestation edit
2019-01-13 12:27:21 -05:00
Neerti
e28adbfe75
Makes IC ticket response less rude
2019-01-13 02:27:56 -05:00
Hawk_v3
f317802ada
Merge remote-tracking branch 'upstream/master'
2018-12-07 00:57:12 +00:00
ArgobargSoup
a7139093b3
Adds a VStation Edit.
2018-12-04 14:11:00 -08:00
ArgobargSoup
7fea35c246
Fixes a little grammar/spelling error.
2018-12-04 13:57:01 -08:00
ArgobargSoup
d68ba3ae23
Changes IC Issue response to be a bit less snippy.
2018-12-04 13:52:45 -08:00
Hawk_v3
30d6ee7801
Merge remote-tracking branch 'upstream/master' into updates
2018-11-01 23:15:58 +00:00
Neerti
8333f3cd0b
Merge pull request #5705 from VOREStation/aro-bwoink
...
Fix adminhelp sound toggle respect
2018-10-30 18:38:59 -04:00
Hawk_v3
83446f6fdf
Merge remote-tracking branch 'upstream/master'
2018-10-17 05:27:00 +01:00
Repede
f7a1de120a
Readds DMAPI for adminhelp tickets
2018-10-16 21:21:58 -04:00
Neerti
972777fd94
Adds Mods/Dev perms to ticket permission checks ( #5683 )
2018-10-16 18:28:14 -04:00
Aronai Sieyes
9dc2f288a0
Clean up two-way merge
2018-10-16 12:08:31 -04:00
Anewbe
6e5a5f5edc
Fix a couple of ticket bugs
2018-10-15 15:49:58 -04:00
Arokha Sieyes
164c72267c
Vorestation specific tweaks for tickets
2018-10-10 18:17:13 -04:00
Anewbe
e4660c5838
Admin ticket system (for real this time)
2018-10-09 16:31:01 -04:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Anewbe
7963f539db
Hopefully fixes ahelps
2017-10-21 23:27:24 -05:00
Anewbe
cad5ef12e7
Does work on the event manager role again
2017-10-18 20:00:01 -05:00
Anewbe
4459d7087a
Revert "Does more prep for the Event Manager role"
2017-10-04 18:33:34 -05:00
Anewbe
c2c6b5949a
Does more prep for the Event Manager role
2017-10-02 21:51:48 -05:00
killer653
cafac8efae
Polaris Sync
2017-08-28 20:52:11 -04:00
killer653
b82012e55e
This seems to work.
2017-08-12 18:15:49 -04:00
killer653
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
Cameron653
e158fcd3cc
Macro Replacements. ( #3574 )
...
* A preface to my madness
Travis failed one of my PR's because I copied old code
that used /red /blue /green.
Because of this, I am going to find and replace every
instance of it that I find.
Also this is a test commit to make sure I'm comitting
to the correct branch.
* /blue /green /red replacements
Dear god.
A slow and painful death from acid is more fun than this.
I wouldn't wish this torture on my worst enemy.
And this is only the beginning
* Replace part 2.
Time to fix the human error.
* Fixes mismatches
* Sets macro count to 220
One above the current number of macros in the code.
* Fixes last of the mismatches.
* Removes spaces, replaces \black
Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen
* Updating macro count again
* More fixes!
* Issues fixed! For real this time!
I swear!
* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Arokha Sieyes
85a489b9b6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-04-04 20:25:00 -04:00
Anewbe
1e7bf50a4c
Automute shouldn't go off if you didn't type anything
2017-04-03 14:14:52 -05:00
Leshana
654a6bae03
Implemented adminhelp relay to discord.
...
* Adminhelp messages get sent to discord via the chat webhook.
2017-02-04 17:54:07 -05:00
Neerti
82ad098e33
Adds Automuting
...
Adds a system adapted from Aurora that will automatically mute someone if they say things too quickly in IC, OOC, Deadchat, Ahelp, or Pray.
2017-01-07 16:27:35 -05:00
Yoshax
77ee2215e7
Removes unused and unnecessary spam prevention
2016-05-26 04:24:18 +01:00
Yoshax
5d9596a72d
Makes it possible to have more than 16 preferences
2016-03-21 18:56:27 +00:00
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
Datraen
3506e0861c
Fixes jumping, adds dev access to msay and ahelps.
2015-11-29 22:34:00 -05:00
volas
855755f808
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
ccomp5950
a07e0a044f
Added buttons back to Mentors
...
Before: Mentors see ahelps they only see ckeys, no links no character names, etc.
Now: Character names shows up and I've added a mentor specific link bar so mentors can use the buttons they already have easily.
2015-02-07 00:04:50 -05:00
ccomp5950
b23b5b5d41
Removes categorization of Ahelps.
2015-01-31 21:13:05 -05:00
GinjaNinja32
a4f1c617b8
Allow typing all arguments to adminhelp
2014-12-05 17:06:16 +00:00
Amunak
bf6a8c5aa5
Adminhelp refactoring, you can now type adminhelp in command box.
...
Formatted some code, also added a confirmation for the sender if their adminhelp looks fine.
2014-11-28 10:16:56 +01:00
DJSnapshot
b6463cf772
fixes adminhelp to support mods as well.
2014-11-23 16:17:26 -08:00
DJSnapshot
8c5639c720
sanity checks and other cleanliness things.
2014-11-17 14:35:24 -08:00
DJSnapshot
abd3551754
headmin requested updates to adminhelps. Makes players select between three different types of help to narrow down what players are needing help for. That way mentors get only those relating to needing mentor help.
2014-11-17 01:30:21 -08:00
Ccomp5950
36cf4bd41e
Mentors will no longer see highlighed names in ahelps / msay for players with special roles (Antags, etc.).
2014-07-07 21:37:28 -05:00
Ccomp5950
f0a75407b8
Rights check instead of holder check? Sure why not.
...
Mentors can now see ahelps.
2014-06-03 15:28:14 -05:00
Zuhayr
0d597fe8db
Merge pull request #4912 from Ccomp5950/mentors
...
Adds Mentors.
2014-05-07 10:00:27 +09:30
Intercross21
cef243188a
AH with link
2014-05-05 19:25:50 +04:00
Ccomp5950
fe4f9b0df9
Adds Mentors.
...
Adds a config option MENTORS which sets the variable config.mods_are_mentors
Adds a rights level of R_MENTOR which gets msay, private message, aghost, notes, and a new proc for checking for new players (requires database support).
If the confic option for mentors is set then
the ckeys listed in moderators.txt file will instead be set as mentors, you can still make moderators by adding them in admins.txt
staffwho will show Mentors instead of Moderators as the heading above the listing of non-admins.
Also: Players now get a message gently reminding them to click the name of the staff member to reply instead of ahelping over and over.
2014-05-04 23:12:06 -05:00
