Commit Graph
9240 Commits
Author SHA1 Message Date
Amunak faf9d34895 Renamed the .admin class to .log_message, which better describes its purpose 2014-11-28 10:26:10 +01:00
Amunak b21067596c The say verb will try to detect some simple errors (say msay) and warn the sender.
The sender is allowed to just send, edit or cancel their message.
2014-11-28 10:22:40 +01: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
Amunak 3e6ebe5d4c Main menu should now be big enough to not display a scrollbar. 2014-11-28 10:12:52 +01:00
Amunak 9103b98982 Cosmetic changes to the menu ready button.
It works like a toggle switch now.
2014-11-28 10:11:32 +01:00
Amunak 9eccf15d00 Ghosts can now follow other ghosts
and playing admins can JMP to ghosts. Also did some minor refactoring of the dead saycode.
2014-11-26 22:52:26 +01:00
Chinsky a570d2c446 Merge pull request #7146 from PsiOmegaDelta/dev
Dev
2014-11-27 00:12:53 +03:00
PsiOmega 23bb747364 Merge remote-tracking branch 'upstream/master' into dev 2014-11-26 22:10:09 +01:00
PsiOmegaDelta fae43793a4 Merge pull request #7142 from PsiOmegaDelta/Singularity
Syndicate beacon power consumption and objective.
2014-11-26 22:08:48 +01:00
Chinsky 5cc4d3490c Merge pull request #7141 from Amunak/chat-shenanigans
OOC and LOOC colors now use stylesheet; also LOOC rewrite
2014-11-27 00:03:06 +03:00
Chinsky ee815b719e Merge pull request #7129 from PsiOmegaDelta/Wires
Wires
2014-11-27 00:02:39 +03:00
Chinsky 34d8298c53 Merge pull request #7143 from Amunak/paper-fix
The stars() proc doesn't break formatting, improved papers
2014-11-26 23:58:03 +03:00
Chinsky 879b70f709 Merge pull request #7110 from PsiOmegaDelta/Disposals
AI disposal interaction.
2014-11-26 23:57:49 +03:00
Amunak 245a4f142d Whitespace changed by saving in DreamMaker 2014-11-26 16:24:51 +01:00
Amunak a104c199a7 Renaming paper to its original value will now revert it to initial, not just 'paper' 2014-11-26 16:24:10 +01:00
Amunak bfe738cf8d Ghosts can view paper from anywhere, improved the 'far' message 2014-11-26 16:21:38 +01:00
Amunak 319e3abd27 Papers will now have a nice description like every other item 2014-11-26 16:20:32 +01:00
Amunak 0ccf63bc2a The stars() helper proc no longer breaks HTML tags 2014-11-26 16:09:48 +01:00
PsiOmegaDelta eb679ea713 Merge pull request #7134 from Segrain/dev
Bugfix.
2014-11-26 14:10:03 +01:00
PsiOmegaDelta d2a5689d61 Merge pull request #7131 from GinjaNinja32/nullspace
Fixes most nullspace items, rewrites floor tiles not to del() so much
2014-11-26 14:09:36 +01:00
PsiOmega d6c0ebf138 Syndicate beacon power consumption and objective.
Cleans up syndicate beacon power consumption.
Objectives are now only given if not disabled.
Relative-proc cleanup.
2014-11-26 09:56:15 +01:00
Amunak 24798bdc9f Updated my comment to make more sense 2014-11-26 04:26:56 +01:00
Amunak 5a65c85cb0 Moved OOC color definitions to stylesheet:
Removes the unused (and abused) set-player-OOC-colour verb.
Adds definitions for each rank to the stylesheet, moving it from the OOC file.
Updates the OOC-text-color verb accordingly.
Made the custom OOC text color resetable.
Cleaned up hardcoded values, old code and comments.
2014-11-26 04:04:32 +01:00
mwerezak 3246a57875 Fixes #7095 2014-11-25 18:18:39 -05:00
PsiOmega 31fc696026 Merge remote-tracking branch 'upstream/dev' into Wires
Conflicts:
	code/game/machinery/autolathe.dm
2014-11-25 11:19:39 +01:00
PsiOmegaDelta af579e0e25 Merge pull request #7132 from GinjaNinja32/987e7
Fix ultra-rich people crashing the server, cashstack fixes
2014-11-25 10:43:44 +01:00
PsiOmegaDelta 8af4c93694 Merge pull request #7124 from mwerezak/whisper
Updates whispering messages
2014-11-25 10:42:31 +01:00
PsiOmega 7386a881d7 Merge remote-tracking branch 'upstream/master' into dev 2014-11-25 10:33:47 +01:00
Segrain 6e3afeac5f Bugfix. 2014-11-25 10:29:39 +03:00
PsiOmegaDelta d98bf2f84d Merge pull request #7121 from GinjaNinja32/monkey
Fix for runtiming neaera cubes
2014-11-25 06:44:11 +01:00
PsiOmegaDelta 1c10dc6a05 Merge pull request #7120 from mwerezak/init
Cleans up monkey initialization
2014-11-25 06:37:26 +01:00
GinjaNinja32 a543d557b9 Fix sub-1 thaler piles being invisible, disallow subdivision below 0.01 2014-11-24 18:56:41 +00:00
GinjaNinja32 20779aac33 Fix ultra-rich people crashing the server 2014-11-24 18:11:09 +00:00
PsiOmegaDelta 75993f2ef5 Merge pull request #7123 from DJSnapshot/adminfeatures
fixes adminhelp to support mods as well
2014-11-24 18:33:16 +01:00
GinjaNinja32 48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00:00
PsiOmega bf24d288ea Particle acceleration wiring. 2014-11-24 10:12:57 +01:00
mwerezak 7174cca74a Updates whispering messages
Certain languages can specify a certain verb for whispering and the
message seen when someone whispers outside of hearing range now hints at
the language.
2014-11-23 19:46:10 -05:00
DJSnapshot b6463cf772 fixes adminhelp to support mods as well. 2014-11-23 16:17:26 -08:00
Zuhayr a63ec86871 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-24 08:58:30 +10:30
GinjaNinja32 fbce3cba4b Fix neaera cubes, change monkeycube eat varfind method to not create nullspace monkeys 2014-11-23 18:57:42 +00:00
mwerezak feaa27fff1 Cleans up monkey initialization 2014-11-23 13:44:59 -05:00
PsiOmegaDelta 7dd5da6793 Merge pull request #6896 from Hubblenaut/dev
Context-based Combat Part 1
2014-11-23 19:13:52 +01:00
PsiOmegaDelta c8e00f3e20 Merge pull request #7089 from sabiram/dev
Moves my (sabirm)'s custom item to common loadout pool
2014-11-23 18:08:16 +01:00
PsiOmegaDelta 8e50a32ba8 Merge pull request #7103 from Segrain/dev
Robotic appearances.
2014-11-23 12:05:51 +01:00
PsiOmegaDelta 46a1a7c320 Merge pull request #7101 from MagmaRam/sprites
Adds inhand sprites for the captain's tunic and jacket
2014-11-23 12:05:45 +01:00
Zuhayr f722d570fa Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-23 12:52:55 +10:30
Zuhayr 66c6c0f270 Amendment to the previous. 2014-11-23 10:15:31 +10:30
Zuhayr 5568ed15c1 Randomizes strange seed icons, fixes poppies. 2014-11-23 10:15:15 +10:30
PsiOmegaDelta 6db8680406 Merge pull request #7097 from GinjaNinja32/sensors
Crew Monitoring Computer improvements, wallets working with computers
2014-11-22 22:36:40 +01:00
PsiOmega de5c059a01 AI disposal interaction.
The AI can now interact with disposal units and turn the pump on/off.
2014-11-22 11:46:51 +01:00