Commit Graph

286 Commits

Author SHA1 Message Date
Jordie
73fa75873c Merge pull request #10908 from Jordie0608/sqlstandsforseriouslyquestionablelogic
Memo update
2015-07-29 21:35:28 +10:00
Jordie0608
f9b6dfcefe login memo fix 2015-07-28 23:24:25 +10:00
phil235
dac815d698 Fixes the lizard gender issue.(updated version of SvartaSvansen's PR. 2015-07-27 15:30:06 +02:00
Jordie0608
f7b66edb17 migrates admin memos to use database 2015-07-19 17:01:38 +10:00
phil235
3a93eeabba Merge branch 'master' of https://github.com/tgstation/-tg-station into DrinkingGlassPourFix
Conflicts:
	code/game/jobs/job/cargo_service.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/job.dm
2015-07-16 14:19:29 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
ce101208a9 Fixes Satchel preference not working.
Also some simplification of the equip_backpack() proc.
2015-07-15 17:38:03 +02:00
MrStonedOne
bdb264acdf Removes topic limiter.
Topics are no longer limited to once per 2ds per client.

This massively improves responsiveness by no dropping clicks when trying to browse thru menus.

Anything that could cause lag or otherwise be limited should do that in its own topic, not blog down the rest

Please let me know if you can think of anything that should be limited in this PR otherwise, i say we find out by field testing.
2015-07-11 23:09:04 -07:00
Jordie
db8655d878 Merge pull request #10439 from Incoming5643/takethatracism
Fixes Mutantrace Color Selection
2015-07-09 20:44:56 +10:00
Incoming
f136bf19a5 today I learned something new about in and how it interacts with logical operators 2015-07-07 18:56:35 -04:00
Incoming
36e9d976c5 removes some yet unneeded code to make mutant race color selection work again 2015-07-07 02:26:28 -04:00
Ikarrus
b1d8d049c1 Renames duplicate random_name() proc 2015-07-06 20:15:47 -06:00
Ikarrus
5e50b2b982 Update and Changelog
Lizard names are now "name1-name2"
2015-07-05 22:20:00 -06:00
Ikarrus
b0cfaf401f Random Names for Lizards
Lizards now have their own list of names to pull from when randomizing their names.
2015-07-05 18:35:56 -06:00
Cheridan
798f05e4a6 Merge pull request #10272 from Razharas/DarkClick
Fixes clicks in darkness
2015-07-04 12:17:10 -05:00
Ricotez
6299b714f8 -Used Incoming's suggestion to fix the issue instead, by adding a default value to the sanitize_inlist call for tail_human and ears. 2015-07-03 20:55:26 +02:00
Ricotez
f546d13c83 -Fixes pre-existing savegames randomly spawning with cat ears and/or tails.
-Fixes the new mutantparts not saving.
2015-07-03 20:18:50 +02:00
Razharas
b1bf4d04fe Merge pull request #10209 from Ricotez/human_mutantparts
Gives humans two types of mutant accessories: ears and (human-specific) tails.
2015-07-03 08:36:36 +03:00
Ricotez
79a41996f5 - Added new confic option: JOIN_WITH_MUTANT_HUMANS
- Uncommented all stuff that was commented in the last commit.
- Added a check in front of it that blocks them from showing up in the setup window if JOIN_WITH_MUTANT_HUMANS is not set.
- Included new game_options.txt as an example.

The tgstation server has never used the example game_options.txt so the new config option will not be enabled on it. Even if it did, the option starts commented out in the file.
2015-06-30 23:53:13 +02:00
Ricotez
acd297e7f5 -Added new option to the VV menu drop-down list: Toggle Purrbation.
-Putting a human on purrbation gives them cat ears and a cat tail, and sends them the message 'You suddenly feel valid.'
-Removing a human from purrbation reverses the effects, and sends them the message 'You suddenly don't feel valid anymore.'
-Renamed "Long and Smooth" tail to "Cat" tail. I wasn't kitten anyone with the old name.
-Updated changelog.
Forgot to include these two in the last commit:
-Cat ears and tail now use your hair colour instead of your mutant colour.
-Added changelog.
2015-06-30 20:17:55 +02:00
Ricotez
3ea2eae81b -Removed roundstart access to ears and human tails. They are an admin only thing now.
-You can now set which colour an accessory should use: HAIR, FACEHAIR, EYECOLOR, MUTCOLORS or its own (0). Right now only mutantparts use this.
-Consequently, humans lost their ability to change mutant colours, although the special flag MUTCOLORS_PARTSONLY still exists.
2015-06-29 23:49:55 +02:00
Razharas
3705c6182a Removes autoclick for real this time 2015-06-29 23:27:20 +03:00
Razharas
1b793f89c8 Merge branch 'master' of https://github.com/tgstation/-tg-station into DarkClick
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/client/client defines.dm

Fixes conflicts
2015-06-29 23:15:06 +03:00
Ricotez
44b795138c -Adds new proc-based job check for species. If enforce_human_authority is set, the various pieces of code that deal with roundstart job stuff will call this proc on your preferred species with 2 arguments: the name of the job and the list of mutantparts you have currently set.
-The proc is defined as proc/qualifies_for_rank(var/rank, var/list/features), and by default defined to always return 1. You must override it locally in your species definition to set special job properties.
-Lizards will fail the check for jobs in command_positions and pass it for any other job. Just like before.
-Humans will always pass the check if they don't have ears or tails. If they do have ears or tails, they will fail the check if the job is in command_positions, engineering_positions, science_positions, medical_positions, security_positions or equal to "Quartermaster", effectively limiting their job selection to civlian, lower supply and silicon jobs.
2015-06-29 22:13:25 +02:00
NullQuery
c694febb77 Minimap support for the crew monitoring computer. 2015-06-28 23:00:39 +02:00
Razharas
1a5be75225 Merge pull request #10196 from MrStonedOne/thisshouldhavebeendonesooner
Admin help tweaks.
2015-06-28 02:55:53 +03:00
Ricotez
84231643c5 -Humans with tails and/or ears are considered not entirely human, and locked out of important positions. 2015-06-27 22:51:07 +02:00
Ricotez
b8811f23e0 -Added two new types of mutant accessories for humans: tail_human and ears. These ears are considered mutant parts and don't override normal human ears.
-Added one ear and one tail accessory to these categories, obtained from the kitty ears. The ears are obviously cat ears, but the tail can pass for a monkey tail without ears.
-Humans can now also edit alien/mutant colours. They have access to the full range of colours, but if the player switches back to lizard and the colour is too dark, it'll be reset to the default.
-Renamed the original tail to tail_lizard. All references are properly updated and nothing has to be changed.
-Could not solve an annoying bug with the setup window, where a lizard tail is rendered whenever a human tail is set. This problem only exists in the setup window and does not affect the sprite in-game.
2015-06-27 20:57:54 +02:00
nullquery
1aac98a52a Merge pull request #3 from tgstation/master
Merge with upstream
2015-06-27 05:01:13 +02:00
MrStonedOne
0aeffb3c0f Admin help tweaks.
The keyword scanner (thing that adds (?) links to player names in admin helps) has been moved to its own proc.
This has been added to all admin pms.
It has been added to asays as well, with the (FLW) link removed to avoid it being distracting.

Replying to an admin help (but not other forms of admin pms nor admin pm replies) by clicking on the name of the ahelper will now send a message to all admins letting them know you are typing up a reply to it. (this should avoid mutiple people replying to the same ahelp) (It also sends a message if you escape out of the ahelp reply as well)
2015-06-26 16:30:37 -07:00
NullQuery
15cdf9bfca Merge from upstream. 2015-06-25 20:30:19 +02:00
Jordie0608
d079104e05 fixes schema and send2irc message 2015-06-24 16:54:59 +10:00
Cheridan
7b6fdbc8ce Merge pull request #9556 from Jordie0608/thisisnothebeginningoftotalatarinismthathappenedearlier
Ports watchlist flagging for ckeys
2015-06-22 23:36:06 -05:00
Boggart
ffbba1eb10 Removes a couple of debug messages from adminpm. 2015-06-20 21:30:14 -06:00
Jordie0608
0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
Conflicts:
	code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
Incoming
9ac391d780 hotfix for character save compatibility with the features system (aka custom lizards)
I thought you could store a list in a save file

Nooooooooope
2015-06-15 19:20:50 -04:00
phil235
ae8c69f9a7 Merge pull request #9955 from kingofkosmos/spanspaceremoval
Unnecessary space removal from spans and messages
2015-06-15 18:20:04 +02:00
Cheridan
ec8cd61d4c Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
Jordie0608
a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10:00
kingofkosmos
c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Razharas
ac7da92f5b Merge branch 'master' of https://github.com/tgstation/-tg-station into TrueAuto 2015-06-13 05:30:05 +03:00
Incoming
595bb0c8e4 Generalizes lizard parts to "features" for future non-lizard fields, at the same time merging mutant color into this list
Random lizard bodies will finally have color!

Pushes features almost all the way to the DNA side of thing, the mob side is only needed during character creation.

Note that changes to the save file will invoke a one time per character runtime for legacy characters as the save file purges mutant_color, this is as far as I can tell harmless, has no effect on the player, and is self correcting.
2015-06-12 00:43:35 -04:00
Razharas
6f624b79df Merge pull request #9139 from Xhuis/pray_4_fun
Adds prayer sounds to admins + prioritizes chaplain prayers
2015-06-11 02:58:46 +03:00
Razharas
82829ef619 Fixing merge conflicts
Fixing merge conflicts
2015-06-10 00:42:10 +03:00
NullQuery
1b364c0e82 HTML interface module + playing cards (ported from Baystation12 with modifications) using the new module 2015-06-08 22:13:25 +02:00
Incoming
bff351c555 Intergrates lizard parts into dna stuff so changelings can properly steal them.
Turns all the lizard options into one associated list instead of their own vars, for tidiness

Shuffles horns behind frills in terms of layering
2015-06-07 21:05:34 -04:00
bananacreampie
d35c55dffd Adds several sprites for ghostform 2015-06-07 03:31:40 -04:00
Razharas
cdc32a50c3 Made special object instead of using blindscreen
Made special object instead of using blindscreen
2015-06-06 07:10:46 +03:00
Incoming
007b2bf580 All of WJohn's Lizard Sprites are finally in game!
Each portion individually selectable upon character creation, the number of lizard combinations is bordering on absurdist with six customizable fields.

36,864 unique combinations!
(309,237,645,312 If you count color variations)

Never feel like you can't be unique again! Have fun looking fabulous as the crew beats your special little skull in!
2015-06-05 20:18:56 -04:00
Razharas
a4bbc865ac Merge branch 'master' of https://github.com/tgstation/-tg-station into TrueAuto 2015-06-04 08:21:08 +03:00