Commit Graph

987 Commits

Author SHA1 Message Date
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
Remie Richards
fa184f5487 Cuts /disease variables from 28 to 23 (includes new ones)
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
Perakp
30544dad08 Fixes #5525 2014-10-29 20:19:12 +02:00
MrStonedOne
8a064ee545 Removes extra sql sanitize procs in favor of sanitizeSQL() 2014-10-29 04:12:07 -07:00
tkdrg
ef2472f099 Replaces one world in the blank telecomms script adminverb with telecomms_list 2014-10-28 12:42:44 -03:00
tkdrg
5f1098dd3c Creates the "Reset Telecomms Scripts" adminverb 2014-10-27 18:29:54 -03:00
tkdrg
57c723692a The permissions panel now checks if the holder has superior rights before allowing a permission change. 2014-10-26 17:24:57 -03:00
hornygranny
6a918f98c5 Merge pull request #5454 from MrStonedOne/t-t-t-tadaydb
Adds admin verb to reestablish connection to the database
2014-10-25 18:41:24 -07:00
MrStonedOne
de06436320 Makes re-establish db connection verb logic better 2014-10-24 12:34:07 -07:00
MrStonedOne
3ebd53b7c7 Adds new admin verb to reconnect to the database when the connection dies. 2014-10-24 11:21:15 -07:00
hornygranny
20329a3bdb Merge pull request #5240 from paprka/assantag
Assistant antagonist config option
2014-10-20 20:19:08 -07:00
hornygranny
8553f8765b Merge pull request #5280 from Jordie0608/increasingquizzicality
Adds adminmoreinfo to Syndicate and Centcomm messages
2014-10-20 20:05:22 -07:00
hornygranny
45b2ed0d0e Merge pull request #5248 from Jordie0608/helpimbeingoppressedbycode
Remove del-alls list of safes
2014-10-20 19:34:29 -07:00
Remie Richards
b7de714fa7 Merge pull request #5257 from Incoming5643/WhatAJobber
Manage Free Slots
2014-10-20 14:35:18 +01:00
Jordie0608
eabca3e9a4 Adds adminmoreinfo to Syndicate and Centcomm messages 2014-10-16 15:14:53 +11:00
Incoming
31099161d9 Renames the proc 2014-10-15 16:38:41 -04:00
Menshin
26f70fd9aa * Completed the _strip_html_properly_ proc to also limit the length of the text
* Removed uses of _strip_html_simple_
* Replaced input or redondant trimming/text_copying with the new unified _stripped_input_
2014-10-15 16:00:22 +02:00
Incoming
54106349e1 Manage Free Slots
Converts the nearly useless List Free Slots command to Manage Free Slots

From here you can painlessly add and remove job slots to your hearts content because the HoP is Dead/Shit/AFK/In Hiding

It can't be used before round start to make rounds with only clowns because of jobs.txt being applied at round start. Alas.
2014-10-14 20:30:14 -04:00
Aranclanos
2a338abd58 Added NOTICE() for world.log messages that aren't errors or warnings.
The message that SDQL2 query outputs will now properly state the ckey of the user.
2014-10-14 20:06:37 -03:00
Jordie0608
9ea09e78e5 Removes comment 2014-10-15 00:40:22 +11:00
Jordie0608
bb7cf63f88 Remove del-alls list of safes 2014-10-15 00:14:26 +11:00
paprka
c0425bc06e initial commit of assistant antag option 2014-10-13 17:21:02 -07:00
hornygranny
a2c3d58fea Merge pull request #5144 from Jordie0608/partsofbancodearesougly
Removes geneticist from sci and pAI from silicon jobbans
2014-10-10 13:53:22 -07:00
Jordie0608
7c2d991c74 Removes geneticist from sci and pAI from silicon jobbans 2014-10-09 18:46:18 +11:00
MrStonedOne
a11eacc8b8 fixes issue preventing admins from using hotkey mode 2014-10-07 15:30:42 -07:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
Cheridan
66304667cf Merge branch 'dualswordstake3' of https://github.com/Aranclanos/-tg-station into Aranclanos-dualswordstake3
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/datums/uplink_item.dm
2014-10-06 19:27:14 -05:00