Commit Graph

2076 Commits

Author SHA1 Message Date
Fox McCloud
dd3ee12fd9 Merge pull request #6786 from FlattestGuitar/memetor
Makes msay be enabled by default 💬
2017-05-15 19:22:12 -04:00
Fox-McCloud
31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Fox McCloud
9a43700e5d Makes All Instances of Implanting Use Proper Procs (#7224) 2017-05-05 15:45:37 -07:00
Crazylemon64
1840074921 Refactors "organs" to be "bodyparts" to end confusion once and for all 2017-04-29 23:23:09 -07:00
Crazy Lemon
be6ab5dc67 Merge pull request #6857 from FlattestGuitar/announcements-fix
More announcement tweaks 🔈
2017-04-26 18:54:45 -07:00
Fox-McCloud
a6ee6b35e3 Fixes a few more Destroys 2017-04-25 04:13:02 -04:00
Crazy Lemon
fc1e84f042 Merge branch 'master' into make_paradise_great_again 2017-04-21 11:32:47 -07:00
Markolie
d9653c79f5 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
# Conflicts:
#	code/game/machinery/recharger.dm
#	code/game/objects/items/devices/autopsy.dm
#	code/game/objects/items/devices/modkit.dm
#	code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Sam
932cae0224 Loyalty implant -> Mindshield Implant 2017-04-09 16:50:51 +01:00
Fox-McCloud
0578dc56de More GC Fixes and Logging 2017-04-02 03:38:18 -04:00
Mark van Alphen
2d1c04c112 Merge branch 'master' into findnreplace 2017-04-01 23:51:58 +02:00
Fox McCloud
f7f127042c Merge pull request #6679 from Kyep/terrorspiders-PR5
Terror Spiders 5 - Fixes & Tweaks II
2017-03-27 02:27:19 -04:00
Mark van Alphen
cd78336ab8 Merge branch 'master' into findnreplace 2017-03-25 00:11:39 +01:00
Fox McCloud
b8ac385e48 Merge pull request #6798 from Spacemanspark/master
Adds a cancel button to the drop bomb command.
2017-03-24 03:49:53 -04:00
Tom Heeren
3dcf322115 Removes the cancel bit
Don't need this
2017-03-23 21:55:16 -05:00
Tom Heeren
879a8507e4 Makes code better and shit
reeeeeeeeeeeeeeeeeee
2017-03-23 16:04:12 -05:00
FlattestGuitar
e31d2c3c98 Simplifies admin announcements 2017-03-22 08:59:03 +01:00
Fox McCloud
a7138189ce Merge pull request #6816 from Kyep/ahelp_PP_fix
Removes duplicate (PP) from ahelps/mhelps
2017-03-21 15:01:07 -04:00
Kyep
e05357d291 Fixes TS category in CS showing with only mindless spiders 2017-03-19 22:18:50 -07:00
Kyep
8780933f84 Removes duplicate (PP) from ahelps/mhelps 2017-03-18 23:36:43 -07:00
Fox McCloud
7011cee0fb Merge pull request #6794 from FlattestGuitar/doot-doot
Admins can now stop global sounds played by other admins 🎶
2017-03-18 09:57:49 -04:00
Tom Heeren
fb4a3b0500 Makes the cancel option not forge a log. 2017-03-17 12:45:52 -05:00
Tom Heeren
1ef86a0aab Adds a cancel button to the drop bomb command.
why was this not a thing before
2017-03-17 12:34:10 -05:00
FlattestGuitar
50460043e0 Admins can now stop global sounds played by other admins 2017-03-17 12:57:25 +01:00
FlattestGuitar
60b9552637 Makes msay be enabled by default 2017-03-16 13:51:03 +01:00
FlattestGuitar
0e4c51d6fe Easier communications report cancelling 2017-03-15 19:49:27 +01:00
Mark van Alphen
06b3460d6e Merge branch 'master' into findnreplace 2017-03-15 16:02:14 +01:00
Krausus
a803500489 Fixes admin bwoink preference
Non-admin players no longer get the (unusable) verb to toggle it, nor is
its setting respected when PMing them
2017-03-10 19:46:35 -05:00
Mark van Alphen
b26d50d9f9 Merge branch 'master' into findnreplace 2017-03-08 10:37:10 +01:00
uraniummeltdown
dc6f9f5506 rename all hardsuits (called rig in multiple places) to hardsuit, rename rig.dm to hardsuit.dm, adjust icon states from rig to hardsuit, move paranormal hardsuit mob sprites out of own file, add wiz hardsuit helm and suit inhands 2017-03-07 20:55:43 +04:00
Mark van Alphen
b0ded4b821 Merge branch 'master' into findnreplace 2017-03-05 12:09:52 +00:00
Krausus
2373aa6194 Makes notes table always use ckeys
This replaces several sanitizeSQL calls with ckey calls, which
effectively sanitizes on its own.

Admin ckeys are not ckeyized if they don't actually match the admin's
ckey, which only really happens with specific automated notes.
2017-02-28 00:49:54 -05:00
Crazy Lemon
3f36c99bad Merge pull request #6606 from Kyep/mentor_verb_bugfix
Fixes spam when mentors check playtime/playerage
2017-02-25 22:38:13 -08:00
Kyep
92e21bffcc Fixes spam when mentors check playtime/playerage 2017-02-25 18:47:02 -08:00
monster860
f23cf99031 Remove the commented out code 2017-02-25 18:56:58 -05:00
monster860
c044f0aa44 Player Polls Revamp 2017-02-25 18:54:06 -05:00
Tigercat2000
fe5fb2c0f8 Merge remote-tracking branch 'upstream/master' into job_refactor_tg 2017-02-25 05:42:47 -08:00
Crazy Lemon
4c14385b67 Merge pull request #6534 from Kyep/bless_smite_logging
Adds logging to admin use of Smite/Bless
2017-02-24 12:06:09 -08:00
Crazy Lemon
bc3e785586 Merge pull request #6564 from Markolie/fixxxxx
Fix station goals runtime and increase meteor shield satellite goal tenfold
2017-02-23 03:20:37 -08:00
Kyep
b0a6ad2241 Removes "src." 2017-02-21 22:06:06 -08:00
Markolie
9cde629caf Fix station goals runtime and increase goal tenfold 2017-02-21 22:52:16 +01:00
Markolie
6982014a6e Replace all BYOND text macros 2017-02-21 15:41:37 +01:00
Kyep
cae061dcf0 Tigercat request 2017-02-20 17:54:43 -08:00
Kyep
5a5a8b6c36 [M] -> [key_name_admin(M)] 2017-02-20 17:03:37 -08:00
KasparoVy
11d759550c Moves Species-Specific Object Icons into their own Files, Fixes Armalis Equipment Bug
All species-specific clothing icons (obj and worn) are now in their own files instead of cluttering up the main ones. I didn't do the Skrell helmets/whatevers because Humans can wear them too.

Fixes a bug where the 'select equipment' debug verb wouldn't correctly equip Armalis if you selected the 'Vox' option. Also corrects an issue where it gave the Armalis two uniforms. Adds a placeholder invisible uniform icon state for the Armalis so Admins can use 'em for events and do uniform-related things without having to deal with terribly awkward icons.
2017-02-20 07:08:19 -05:00
Kyep
c562e4304c Adds logging to admin use of SMITE/BLESS
Admin usage of smite/bless is now logged. All other admins (plus
adminlog) can see it.
2017-02-20 03:35:21 -08:00
Mark van Alphen
f42b9cf383 Merge branch 'master' into admin_interact 2017-02-18 15:41:16 +01:00
Fox McCloud
8503211af8 Merge pull request #6410 from Kyep/ahelp_take
Adds 'take ahelp' option on ahelp/mhelp
2017-02-18 08:30:14 -05:00
Fox McCloud
ce50279b73 Merge pull request #6436 from Kyep/playtime_for_mentors
Lets mentors see playtime
2017-02-18 08:29:25 -05:00
Tigercat2000
e7023fd032 Refactored 'select equipment' to use outfit datums
Also moved outfit datum files to code/datum/outfits/, because I had
nowhere better to put all of the admin equipment- job stuff is still
with jobs
2017-02-17 16:17:59 -08:00