Commit Graph

244 Commits

Author SHA1 Message Date
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
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
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
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
Firecage 84e8690ec6 merge conflict fix 2015-05-31 02:45:46 +02:00
Firecage 3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
Aranclanos bfb21553f1 Fixes #1190
Fixes a really strange case where the lobby music will play after you joined the round.
2015-05-23 06:30:28 -03:00
Jordie0608 84eaa17ec9 reset ooc color buttons, changes how default color for admins is handled 2015-05-17 22:10:46 +10:00
Cheridan dfaf90c79e Merge pull request #9264 from phil235/BundleFix6
a group of fixes.
2015-05-04 09:41:01 -05:00
Remie Richards e5f034fc0d Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids
[Review Ready] Positronic Brains!
2015-05-03 06:34:02 +01:00
phil235 4a8e168ff3 - admin revive clears addiction list. 8894
- buffed capsaicin/frost oil temperature effects as well as basilisk temperature effect (to counterbalance the recent change in natural bodytemp stabilization). And slight nerf to ghost chili temp boost when held in hand (for consistency). 8501
- fixes religion name choice window labeled as mime name
- fixes nearly invincible larva 9223
- your health/status now updates immediately after taking damage, we don't wait for the next life(). 7031
- Fixes alien nest overlay not updating when dead mob is gibbed by larva exit. 8523
- fixes flamethrower tablecrafting. 9261
2015-05-01 19:45:36 +02:00
Incoming 7459238065 Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies
Conflicts:
	code/game/machinery/teleporter.dm
2015-04-29 13:37:01 -04:00
GunHog 00a6762838 Ban panel and preferences changes
- Deathsquad moved from Antagonist to Ghost Roles.
- pAI jobbans split into drone, pAI, and posibrains.
- Posibrains back under pAI preference flag (the byte is full)
- Fixed Posibrain sprite if it fails to get a ghost.
2015-04-28 14:45:59 -05:00
GunHog ae1ad22f97 pAI -> Ghost Roles
Changes the BE_PAI and "pAI" flag names to "BE_GHOST_ROLE" and "Ghost
Roles".
Name subject to change.
2015-04-27 11:07:36 -05:00
phil235 c2151180eb Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences
Conflicts:
	code/modules/mob/transform_procs.dm
2015-04-27 00:11:49 +02:00
phil235 236db87ac8 Cyborg and AI names are now also chosen in the preferences window, as well as chaplain religion and deity. 2015-04-25 18:28:29 +02:00
Xhuis 7785351ad6 Adds prayer sound preference 2015-04-23 22:54:58 -04:00
phil235 88fd7c44cc Changes clown/mime naming to use preferences. Player will now choose their mime/clown name in the main preference screen and save it, instead of at roundstart.
Adding a config file for random mime names.
2015-04-23 23:18:35 +02:00
Incoming f59c01e721 sets hardset_dna to clear exotic blood on race changes
sets every instance of race changes to use hardset_dna instead of directly replacing the datum (needs more testing to be sure I didn't break shit)
removes the invisible man race (aka the generic) and shadowlings from the new green slime mutation toxin while I'm in the area
2015-04-23 12:35:37 -04:00
AnturK 6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Swag McYolosteinen 853009f7e0 Merge pull request #8157 from Xhuis/shadowling_gamemode
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
Xhuis c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
Incoming 654a332d21 Removes the Mutant_colors config option because anyone who's apt to turn on mutant races for joining doesn't want them to all look EXACTLY THE SAME (That's racist guys) 2015-04-08 01:24:55 -04:00
kingofkosmos 2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00
Xhuis 932cac081a Separates ship ambience and area ambience 2015-03-29 14:49:59 -04:00
MrPerson 2fa6457130 Added a preference toggle for hearing musical instruments 2015-03-22 01:54:30 -07:00
MrPerson 721b81373a Removed commented out regenerate_icons() 2015-03-19 21:35:24 -07:00
MrPerson e9a36f4d53 Fixes character appearances - no more bald albinos
Fixes #8383

Also removed two defunct comments.
2015-03-18 02:21:56 -07:00
Remie Richards f7be7fb711 Merge pull request #8377 from Miauw62/AAAAA
Fixes #8375
2015-03-16 19:26:26 +00:00
Swag McYolosteinen 670aac5785 Should properly unfuck savefiles 2015-03-16 20:12:09 +01:00
Swag McYolosteinen 5242a08a2b Fixes #8375
UNTESTED I DONT KNOW WHAT IS GOING ON AAAAAAA
2015-03-16 20:03:05 +01:00
phil235 2830325e4e Merge pull request #8173 from AnturK/flagfix
Fixes pref flags
2015-03-15 23:02:58 +01:00
Swag McYolosteinen 579736870c informative commit name
proper, informative extended description
2015-03-13 19:44:09 +01:00
Miauw 6225ed8fb4 Chat toggles are saved to the savefile properly again. Fixes #8318 2015-03-13 16:39:28 +01:00
phil235 1eba7b694b Merge pull request #8134 from Miauw62/ghostradios
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
Cheridan d5ec11b91c Merge pull request #8080 from Incoming5643/Appearance_fix
Tweaks and fixes for the appearance window
2015-03-06 12:20:24 -06:00
AnturK 27c0ea067f Fixes pref flags 2015-03-05 21:35:33 +01:00
Swag McYolosteinen 93a5ba6e16 Merge pull request #8132 from MrStonedOne/wellthen
Fixes irc alerts of adminhelps not showing the ckey
2015-03-05 19:02:15 +01:00
Miauw 82bc75c263 Moves chat toggles into their own variable. 2015-03-05 18:38:07 +01:00
Miauw d6eb8ec1fe Adds a toggle so ghosts can hear radio chatter more easily. 2015-03-03 13:26:45 +01:00
MrStonedOne 90e46f35bb Fixes irc alerts of adminhelps not showing the ckey
Also fixes irc alerts of new players having the source split up in the announcement messages
2015-03-03 04:05:08 -08:00
Jordie0608 e6e2ec2809 Readds changelog popup as a config option 2015-03-03 19:51:35 +11:00