tkdrg
45904bb8a2
Merge pull request #6425 from JJRcop/OOCemoji
...
Adds emoji to OOC chat [Now with in-house sprites!]
2014-12-27 03:01:36 -03:00
Cheridan
71385308de
Merge pull request #6387 from Incoming5643/goodbye_my_children
...
Magic Mania 1.8: Summon Spells Rework and The Challenge System
2014-12-26 16:29:36 -06:00
phil235
b6e35278e3
Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
...
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
tkdrg
9d7567f46d
Adds cfg option to let players see their own notes
...
This lets players see the admin notes that have been added to their
ckey, by using a verb in the OOC tab.
This is a config option and is off by default.
2014-12-19 22:42:18 -03:00
tkdrg
d7e05d4387
Adds Supermatter logging and tweaks the power gen
...
Now includes an admin_investigate entry, plus three message_admins():
when first powered, when first reaching critical point, and when a mob
is dusted. Also tweaks the power generation formula a bit.
2014-12-19 18:19:48 -03:00
JJRcop
fa18eaa164
Renames game_options.txt OOC_EMOJIS to EMOJIS
...
Moves config check into emoji_parse proc, so the config affects all emoji use
2014-12-17 12:48:41 -05:00
JJRcop
4755198a75
Made emoji parsing much cheaper
...
AdminPM now follows OOC_EMOJIS rule
2014-12-17 11:14:37 -05:00
JJRcop
1f064e5312
Adds emoji to adminPMs
...
as requested by supreme overlord scaredofshadows
2014-12-17 00:41:18 -05:00
Incoming
b5f48f8343
Merge branch 'master' of https://github.com/tgstation/-tg-station into goodbye_my_children
...
Conflicts:
code/game/gamemodes/wizard/rightandwrong.dm
2014-12-14 22:34:05 -05:00
Incoming
0dd71178c4
Magic Mania 1.8: Summon Spells Rework and The Challenge System
...
Summon Guns and Summon Magic are no longer traditional spells.
When cast by the wizard, he gains a charge for his spell book but no antagonists are created, essentially making his life harder for more power. Both spells can only be cast once like this for a maximum of 2 extra charges.
When cast by very rare chance in summon events, no charages are gained, and there's a 10% chance of someone becoming a survivor, down from 25%. No charges are gained if this happens.
When cast by a badmin they will be given a choice of not creating antags, creating antags at the old chance, or just going in stupid and giving everyone antag.
2014-12-14 22:07:00 -05:00
Razharas
0b26a71a71
Merge pull request #6333 from tkdrg/singulobj
...
The singularity/narsie are no longer machines
2014-12-14 10:02:39 +03:00
paprka
40943d5684
reverts some sechailer and other feature things
2014-12-13 00:09:58 -08:00
tkdrg
79e8ad4142
The singularity/narsie are no longer machines
2014-12-12 19:42:37 -03:00
paprka
3240cbea99
Tactical armor, etc
2014-12-12 00:23:16 -08:00
paprka
e9477cfe9d
initial commit for better security clothing
2014-12-11 11:50:52 -08:00
paprka
9e9b8b440d
adds winter coats and changes labcoat toggling
2014-12-04 21:29:21 -08:00
Swag McYolosteinen
879f67d834
Merge pull request #6142 from CorruptComputer/dropinacancel
...
Adds a cancel button to the drop bomb verb
2014-12-03 18:12:45 +01:00
Swag McYolosteinen
5863d2f5e8
Merge pull request #6075 from Jordie0608/spaceisalivewiththesoundofmidis
...
Stop Sounds usable by any holder
2014-12-03 17:49:51 +01:00
CorruptComputer
ae37dc1013
Allows 0
2014-11-29 14:55:57 -06:00
CorruptComputer
fe3e3e8ecc
Adds a cancel button to the drop bomb verb
2014-11-29 12:39:57 -06:00
Intigracy
8a1baad03b
forgot the var / proc
2014-11-27 14:50:21 -08:00
Jordie0608
1172851b0e
Stop Sounds usable by any holder
2014-11-26 15:29:30 +11:00
hornygranny
21b8df82d5
Merge pull request #5908 from tkdrg/hud
...
Makes data and antag huds passive and creates /datum/atom_hud
2014-11-25 12:53:03 -08:00
Cheridan
51b6253315
Merge pull request #5964 from phil235/ViroFix1
...
Fixing viruses not working.
2014-11-23 00:56:29 -06:00
phil235
3a97e8d878
Fixes not being able to have more than one virus. (two typos fixed)
2014-11-22 18:30:19 +01:00
tkdrg
3bb478f12f
Includes antag HUDs in the datum hud overhaul
...
Makes hud_list associative, and introduces the /atom list hud_possible,
which lists all the possible hud images a certain atom can provide.
Replaces all the awful procs in the gamemodes with their new
/datum/atom_hud versions, which are much shorter, simpler and faster.
2014-11-20 15:43:51 -03:00
Jordie0608
ce6a1d0d89
Fixes select job equipment cancel
2014-11-18 22:50:33 +11:00
tkdrg
608dec814e
Removes old/unused code from the tree. Use version control if you need it for some reason.
2014-11-16 16:53:18 -03:00
hornygranny
509c07650f
Merge pull request #5802 from paprka/EATITFATTY
...
Clothing sprite/file path changes
2014-11-15 20:28:43 -08:00
paprka
ec6b2424d2
purge the unused
2014-11-13 21:10:53 -08:00
paprka
40cdf3ffec
swat mask overhauls and such
2014-11-13 18:36:30 -08:00
Miauw
3f53f6863c
Moves up a */ to make respawn_character work a liiiitle bit better.
2014-11-09 15:02:32 +01:00
Miauw
f491d9dfe1
Fixes some AI traitorize runtimes. Fixed #4605
2014-11-09 14:51:26 +01:00
hornygranny
3f979d3aa1
Merge pull request #5695 from Aranclanos/lelerrocode
...
more VV logging and mass-modify proper admin-rights
2014-11-08 15:09:21 -08:00
Remie Richards
2054cbda08
Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/human_attackpaw.dm
code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
Cheridan
594fd9d3e2
Merge pull request #5271 from Menshin/html_sanitization
...
Text input sanitization (take 1)
2014-11-07 13:56:20 -06:00
hornygranny
8a329bac6f
Merge pull request #5699 from MrStonedOne/MutiTask
...
Fixes player panel only allowing one window to be open at a time.
2014-11-07 10:46:55 -08:00
MrStonedOne
3b40d6a20d
Fixes inconsistencies with the player panel
...
Every other admin window that deals with singular things (vv, traitorpanel, etc) lets you have more then one open (as long as its not about the same thing), But not pp, the central point of all of them.
This fixes that and allows you have a window open for each mob.
2014-11-05 13:53:05 -08:00
Aranclanos
a8dc2711ce
Swapped the admin panel override alert message from all players to only asay.
2014-11-05 18:16:05 -03:00
Aranclanos
957c4d3f7c
Small works with VV:
...
Fixes issues with skipping admin rights with mass modify when editing icons.
Added a check for mass-edit of ckeys, no admin can mass-modify them now.
Added logs for list values modifications, additions and deletions.
Fixes issue #3840
2014-11-05 17:34:33 -03:00
Menshin
b77e2fc46a
Conflicts solving
2014-11-04 20:24:52 +01:00
hornygranny
268dc0deed
Merge pull request #5502 from tkdrg/ifitwasntforthosemeddlingadmins
...
Creates the "Reset Telecomms Scripts" adminverb
2014-11-03 18:01:10 -08:00
tkdrg
5019876316
Uses the machines list instead of world
2014-11-03 22:51:17 -03:00
tkdrg
56c3f61e35
Merge remote-tracking branch 'upstream/master' into upboat
...
Conflicts:
code/__HELPERS/_logging.dm
2014-11-03 22:38:21 -03:00
hornygranny
b4cc33e64e
Merge pull request #5593 from tkdrg/investment
...
Adds cargo and secrecords to admin_investigate
2014-11-03 17:14:23 -08:00
hornygranny
fa8fcbba00
Merge pull request #5535 from Perakp/onlyOne
...
Highlander fix
2014-11-03 17:12:26 -08:00
tkdrg
f8260a9a84
Adds logging and moderation to newscaster comments
2014-11-01 20:01:52 -03:00
tkdrg
b030d0b432
admin_investigate will now log sec/med records deletion as well.
2014-11-01 13:25:09 -03:00
tkdrg
f995b2e94b
Adds cargo and secrecords to admin_investigate
2014-10-31 23:20:33 -03:00
Swag McYolosteinen
4e7cb0eb01
Merge pull request #5530 from MrStonedOne/fukkinreallyerro
...
[MSO] Minor sql improvements.
2014-10-30 21:00:42 +01:00
