Commit Graph

308 Commits

Author SHA1 Message Date
TZK13
109076dc63 Updates labcoats in the preferences setup screen to appear closed and changes the lawyer's shoes to be lace ups instead of brown. 2014-11-09 19:30:33 -06:00
hornygranny
38b4f50e3e Merge pull request #5630 from GunHog/Soft_Silky_Hair
Adds three new hairstyles by Mandurrrh!
2014-11-03 17:37:55 -08:00
GunHog
a9c5667ab6 Adds three new hairstyles!
-Adds the High Ponytail, Long Ponytail, and Long Side Part hairstyles!
2014-11-02 18:06:53 -06:00
tkdrg
8a93247ef8 Creates the "Always use random body" config option 2014-11-01 16:48:42 -03:00
TZK13
4c5dcb4ae9 Changes the preview satchel for the CMO, MD and virologist from norm to med. 2014-10-18 04:55:40 -05:00
TZK13
3cff2fcbdd Fixes the previews in the character setup screen. 2014-10-18 04:30:10 -05:00
paprka
c83592263b Revert removal of kinky underwears
w/e
2014-10-15 12:30:36 -07:00
paprka
69bbeb6815 underwear updates 2014-10-14 15:02:06 -07:00
paprka
67dd029fe0 updated sprites, grey stuff 2014-10-08 10:38:24 -07:00
paprka
b8eb9e3587 general code optimizations 2014-10-08 10:10:03 -07:00
paprka
18108257ae Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2
Conflicts:
	code/__HELPERS/mobs.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/sprite_accessories.dm
2014-10-08 09:48:49 -07:00
Remie Richards
cc85f44ccb Merge pull request #4900 from MrStonedOne/erroageinjudgement
Fixes some "erros" in the database system
2014-09-26 23:41:37 +01:00
MrStonedOne
e21ed011af Fixes some erros in the database system
Replaces erro_ with a configurable table prefix system
Defaults to erro_ if not configured, but configuation files default to SS13_
2014-09-19 13:37:58 -07:00
Aranclanos
891a9d0568 Fixed the overeye hair, now it should display properly instead of an 'error' message. 2014-09-17 02:37:51 -03:00
ikarrus
399d2844e5 ENFORCE_HUMAN_AUTHORITY now only applies to Command positions
- Non-humans can join as security again while ENFORCE_HUMAN_AUTHORITY is on
2014-09-07 22:33:56 -06:00
ikarrus
bae6578055 Config Option to Bar Lizards from Authority Roles
aka formalizing Human Supremacy

- Adds a config option ENFORCE_HUMAN_AUTHORITY which prevents lizard players from joining Command and Security roles

[Lizard subjugation intensifies]
2014-09-05 22:44:05 -06:00
quiltyquilty
62d62a28cd fixes what aran told me to fix 2014-09-04 17:36:27 -05:00
quiltyquilty
ae7f0cb6fa returns glorious ponytail 2 2014-09-03 19:14:21 -05:00
quiltyquilty
8286e70c20 more epic fixes 2014-09-03 18:53:36 -05:00
quiltyquilty
4c079bf65b more epic fixing 2014-09-02 17:26:39 -05:00
Cheridan
e25affe12e Merge pull request #4337 from Miauw62/say()
[READY] Saycode rewrite
2014-08-31 10:59:04 -05:00
Tokiko1
4ef3beb454 Testing 2014-08-31 14:25:32 +02:00
Tokiko1
ba20a875a0 Should fix merge conflicts 2014-08-31 14:22:56 +02:00
Miauw
78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say()
Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm
2014-08-31 13:40:16 +02:00
Alex
15c6e99801 Merge pull request #4607 from Ikarrus/removelobbymeta
Only Admins can see Ready Players in Lobby
2014-08-31 12:29:16 +01:00
Alex
14b03b5db5 Merge pull request #4569 from quiltyquilty/hairs
organizes various hairstyles
2014-08-30 20:01:55 +01:00
ikarrus
6d79ac49d1 Only Admins can see Ready Players in Lobby
Removes a lot of potential metagaming by stopping players from counting or remembering who readied up during the lobby.
2014-08-29 21:49:44 -06:00
quiltyquilty
b344431648 enforces consistency 2014-08-27 18:08:08 -05:00
quiltyquilty
0739769acb does what giacom told me to do
renames some hairs
adds a few more that snapwalk made
2014-08-27 17:46:47 -05:00
Firecage
6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
quiltyquilty
b575eb93bf organizes various hairstyles
this organizes several of the 25 hairstyles goof added. additionally, it changes the names of Bun Head and Twin Buns to Bun Head 1 and Bun Head 2. the Ramona haircut (that i made, so it's ok :)) has been modified because it did not fully work in game, and its name has been changed to Pixie Cut to avoid the spvtw reference.
2014-08-25 06:51:41 -05:00
Tokiko1
e62e541860 Adds two new hairstyles, both variations of the himecut. 2014-08-23 11:47:41 +02:00
iamgoofball
6fc3974228 fixes 2014-08-19 15:58:13 -07:00
iamgoofball
013cf24842 we can now translate the hairstyle names without being a doritos munching mtn dew chugging 4chan pass owner 2014-08-19 15:43:05 -07:00
iamgoofball
5711f4a917 fixes 2014-08-17 14:37:30 -07:00
iamgoofball
eb66b49b70 Adds 25 new hairstyles. 2014-08-17 14:13:42 -07:00
Firecage
35af394b9a Absolute paths for files in the mob folder 2014-08-17 02:45:35 +02:00
paprka
5210419a87 undershirts 2014-08-11 22:41:07 -07:00
MrPerson
c813d9df46 Make new_players GC when observing
When observing, that observer would be given their original new_player's mind, but that mind would still have the new_player as its current. This caused the new_player to fail to GC and resulted in the observer's mind's current becoming null.

Fix: Just delete the new_player mind when the player observes. If an admin turns them into a human or whatever, a new mind will be created automatically then.
2014-08-05 18:50:09 -07:00
Miauw
891546aa56 More work on saycode. 2014-08-05 16:02:21 +02:00
Alex
1410641259 Merge pull request #4152 from paprka/fugfix
Fixes security 'preview' sprites in setup
2014-07-22 15:17:05 +01:00
Kyle Franz
7036ff7735 Fix pressing ready button multiple times when connecting causing the button state to flip back and forth 2014-07-19 21:55:38 -07:00
paprka
a2845f7cb9 revert thing 2014-07-13 14:00:28 -07:00
paprka
d541b109a8 fixes sec setup sprites 2014-07-13 13:58:52 -07:00
CollenN
2aab5fa71c Finalizes Mutantrace Datum Update
https://github.com/tgstation/-tg-station/pull/3609

Squashes the commits from the above pull request. Should hopefully be a
lot less cluttered.
2014-06-19 17:42:14 -04:00
ikarrus
35463ad9c0 Minor adjustments 2014-04-24 21:17:19 -06:00
ikarrus
f1b55e706d Ported New Hairs from NTS
-A collection of new hairs from NTS
-Organized new hairs into the list instead of putting them all on the bottom
-Removes gendered head hair (Facial hair is still gendered)
-Tones down the severity of contrast for lighter hair colors
2014-04-24 21:12:08 -06:00
Firecage
6610b1677a Signed-off-by: Firecage <firecage@hotmail.com> 2014-04-21 18:54:44 +02:00
Firecage
dff7ebc0a4 Signed-off-by: Firecage <firecage@hotmail.com> 2014-04-19 21:42:31 +02:00
Cheridan
75919440d6 Merge pull request #3412 from Giacom/someone_was_lazy
Fixed the lazy "fix" which caused mobs that Login or Logout to lose their hotkey mode.
2014-04-15 11:24:07 -05:00