Commit Graph

56 Commits

Author SHA1 Message Date
Fox-McCloud 95a06fa165 updates and tweaks 2015-05-24 20:17:17 -04:00
Fox-McCloud 791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
ZomgPonies 95b1c1d87c Adds two new event species 2015-05-14 22:30:38 -04:00
Sawu d038a0710c Adds spraycans, fixes lipstick, modifies scleaner
This commit does the following:
 - Adds spraycans as a subtype of crayons.
   - Slight crayon overhaul to make room for this
   - Can spray graffiti, runes, and letters on floors & walls
   - Can spray mobs and paint their face

 - Fixes & overhauls lipstick
   - Lipstick is now overlay and Blend() based.
   - Also fixes a few bugs with the system.
   - Updates paper code to accomodate for wiping off spraypaint as well

 - Slight modification to space cleaner
   - Space cleaner now cleans your face of lipstick and spraypaint
2015-04-15 17:19:08 -07:00
VelardAmakar 4dc73ce9af Added ~15~ 12 new hair options courtesy of Fury McFlurry 2015-04-05 04:20:26 +02:00
ZomgPonies 79064d8ce1 Fix Vox quills icon states 2015-02-27 14:39:27 -05:00
ZomgPonies 4fdd31f0da 5 new Vox quill styles, thanks to FullofSkittles 2015-02-26 20:08:20 -05:00
suethecake 7c91770314 Better contrast with Tajaran base sprites for better color overall.
Conflicts:
	icons/mob/human_face.dmi
2014-04-29 14:12:15 -04:00
suethecake aa33563ba7 Few bugfixes - namely species hair still having do coloration = 0 and the tail rendering over equipment. Tajaran and Unathi sprites are also now black to facilitate more vibrant colors.
Trying to color them while dark green and brown-grey ended up in odd colorations. Quality of life change.

Conflicts:
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/human_face.dmi
	icons/mob/human_races/r_def_tajaran.dmi
	icons/mob/human_races/r_tajaran.dmi
2014-04-29 14:08:32 -04:00
SparklySheep 1acab2a20a Adds a few new hairstyles and adds a fix for the red IPC hairstyle as well. Please check to see if this doesn't break anything.
Conflicts:
	baystation12.int
	icons/mob/human_face.dmi
2014-03-11 06:04:10 -04:00
Zuhayr f2f9616f2b IPC hairstyles.
Conflicts:
	code/modules/mob/new_player/sprite_accessories.dm
	icons/mob/human_face.dmi
2014-01-28 15:14:55 -05:00
ZomgPonies 1a3dc5ab2f 5 New Hairstyles 2013-12-20 22:21:01 -05:00
ZomgPonies 242a400ef8 Laying down is now a transform, so cleaning out unused icons 2013-11-06 16:30:37 -05:00
ZomgPonies 8a4ae68fc3 Update icon fixes 2013-11-03 04:07:45 -05:00
Erthilo 6281c11f22 Advmedkit now has green cross. Hime cut looks less derp from the side. 2013-08-12 12:33:02 +01:00
NicholasDV fb5b853ca2 Fixes a spriting issue
Specifically, the sprite for laying down with clean tajaran
cut didn't have the correct icon_state name. I changed it
to the correct one.
2013-06-09 03:20:58 -04:00
Zuhayr 114e04ee9f Icons for vox. 2013-06-05 17:33:52 +09:30
Cael_Aislinn 43e58aacbb new unathi hair styles
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-23 00:46:33 +10:00
Cael_Aislinn b310da9bb9 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	html/changelog.html
	icons/mob/human_face.dmi

also a sneaky issue resolution caused in spiky taj hair

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-01 23:25:45 +10:00
cib 83dcef11f9 Tajaran ear stuff, originally by chinsky
https://github.com/Baystation12/Baystation12/commit/79b17d0c1d2bcf3bd02ac17df027efe3be43d169
2013-01-31 19:28:07 +01:00
Cael_Aislinn e6c70937e5 Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/game.dm
	code/__HELPERS/type2type.dm
	code/datums/helper_datums/getrev.dm
	code/game/atoms.dm
	code/game/gamemodes/events.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/objs.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mint.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/mob.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/gravitygenerator.dm
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/human_face.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-12-28 01:07:36 +10:00
Cael_Aislinn addb95137c made autoinjectors visible again, fixed medibot construction, fixed tajaran ears while lying down
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-11-15 21:02:04 +10:00
petethegoat@gmail.com 2063c3715d Added Flashkirby's new hair styles- http://baystation12.net/forums/viewtopic.php?f=44&t=5395.
Updated the changelog.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4957 316c924e-a436-60f5-8080-3fe189b3f50e
2012-10-25 19:11:13 +00:00
Chinsky 357f42028e Forgot one hairstyle. 2012-10-17 13:50:47 +04:00
Cael_Aislinn 7ab7b989f2 added searif's new skrell hairstyles (missing lying icon states)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-09-26 19:01:47 +10:00
petethegoat@gmail.com c016c10bfa Fixes issue 955. (Signalers don't update bomb overlays)
Fixes issue 957. (Sexy mime costume causes incorrectly coloured cleavage)

Adds lipstick~
There are four colours to choose from, and they can be found in contraband crates. You can wipe off lipstick with paper.

Adds some feedback for when the invisimin verb is used.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4739 316c924e-a436-60f5-8080-3fe189b3f50e
2012-09-23 15:31:01 +00:00
ericgfwong@hotmail.com 0f5b2f5a15 -Added Captain's Backpack & Satchel: https://dl.dropbox.com/u/831776/comdoms.png
-A few minor improvements to my own sprites

-Map changes to the Kitchen so the chef is more visible to his patrons
-Arrivals airlocks are no longer airless when shuttles dock

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4094 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-17 08:25:29 +00:00
ericgfwong@hotmail.com 5e1b09665c Added three new hairstyles by Sly: Gelled, Flat Top, and Pigtails
See: http://nanotrasen.com/phpBB3/viewtopic.php?f=10&t=8665

Did a little sorting of the hair list by grouping similar styles.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4084 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-16 06:03:13 +00:00
ericgfwong@hotmail.com 32fc346acd Finally added department satchels to the game!
-Any instance where dept backpacks would spawn would have a 50% chance of spawning a dept satchel instead
-brown satchels have been replaced with grey ones, although the classic brown ones are still available in the luxury dorms
-Satchels have in-hands now, so you can't run around with backpacks full of bombs unnoticed anymore

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4079 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-15 19:55:53 +00:00
ericgfwong@hotmail.com 6ed19f8bf5 -Slightly reduced genome cost for paralysis sting. 5 points for a 10-tick stun is far too overpriced.
-Removed sleepypen from nuke shuttle (Why is this still here? Penning the captain is already awfully boring)
-Added mirrors to nuke shuttle and wizard's den

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4067 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-14 09:57:55 +00:00
ericgfwong@hotmail.com d0303801bb -Cleaned up the very long hairstyle a bit
-Made it clearer which styles were added in the changelog

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4066 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-14 05:53:03 +00:00
ericgfwong@hotmail.com 80d62eab7c Moved the thick eyebrows from dwarf hair to dwarf facial
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4061 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-13 21:05:51 +00:00
ericgfwong@hotmail.com 6440cf7eee Added a couple new hairstyles
-Credit to SuperCrayon for Dwarf beard and hairstyle
-Updated names of long hairstyles, to be a little more descript
-Fixed braid hairstyle sharing the same path as spikey

Also slightly changed piping and wiring on telecoms.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4060 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-13 20:01:55 +00:00
elly1989@rocketmail.com 22c2725256 FLOORLENGTH HAIR !!!!!!! *gasps*
Fixed Error messages showing when randomising names.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4057 316c924e-a436-60f5-8080-3fe189b3f50e
2012-07-13 01:51:40 +00:00
ericgfwong@hotmail.com ff9edb9bec -Remapped Theatre, Bar, and Hydroponics. Bar and Kitchen are now more integrated
-Added Pete's mirrors. Lacking in features at the moment, but still lets you change hairstyles

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3952 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-30 19:26:02 +00:00
ericgfwong@hotmail.com d5af86e79a -Removed fringe from ponytail 3 by request
-Removed windoors from cargo and locker room
-Replaced light tubes with spotlights on telecoms

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3873 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-19 20:18:39 +00:00
ericgfwong@hotmail.com cb3c2fb2c5 -Small fix to hair sprites
-Removed duplicate holodeck control computer

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3860 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-18 11:45:13 +00:00
ericgfwong@hotmail.com 850abafb33 -Fixed up Telecoms turrets. Readded stun turrets.
-New afro hairstyles. Big Afro by Intigracy.
-Prettier ponytail sprites by Intigracy.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3859 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-18 11:36:02 +00:00
ericgfwong@hotmail.com fa0a3efa34 Ported over a couple of very nice ponytail sprites from Baystation
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3838 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-16 05:09:13 +00:00
elly1989@rocketmail.com 51ed49d4f7 Derp SVN didn't commit any of the iconfiles for the update_icons commit.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3816 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-14 02:14:53 +00:00
elly1989@rocketmail.com 784b3d8838 Committing Hair-styles from Baystation and WJohnston's detective hair.
There's now also a profile preview of your character in the character setup screen.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3288 316c924e-a436-60f5-8080-3fe189b3f50e
2012-03-14 11:47:24 +00:00
petethegoat@gmail.com 6b7d4efb03 VEY VEY VEY VEY.
Added the "Surgeon" mediborg sprite.
Laser gun inhands! Woooooaoaaahah.
Fixed up some hair and shit, added alt half-bang hair.
Some fixes for the Bloodhound.
MOTHERFUCKING WIRES! Almost no one will appreciate this, I have no doubt. But -I- appreciate it.
New tinted window sprites.
VEY VEY VEY VEY.

Oh, and I gave the laser cannon a new description.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2478 316c924e-a436-60f5-8080-3fe189b3f50e
2011-11-04 01:30:10 +00:00
vageyenaman@gmail.com d93f83e593 Hair and Facial Hair Overhaul:
○ Hairs are now defined in /datum classes located in the new file sprite_accessories.dm. Further explanation and documentation can be located in this file.
   ○ As a result of the above change, some new_player preferences code had be reworked. Savefile versions have also been updated, and a small conversion proc has been placed to prevent file corruption and mis-matched variable data.
   ○ The final result of all of these changes is a simpler, pain-free way to add in new hairs. It also makes the code much more readable.


Other stuff:
   ○ Three new hairstyles (mostly female), one new beard.
   ○ Updated the changelog.

Final bugfixes:

   ○ Fixed xray superpower preventing you from using any kind of HUD eyewear.
   ○ You can no longer strangle metroids - instead, attempting to strangle them will result in you "squeezing" them.



The new hair system, while thoroughly tested by myself, is very prone to bugs given its very prototype state. Any bugs are to be reported via Issues.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2444 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-29 17:06:37 +00:00
vageyenaman@gmail.com 64887ce41c Small bugfixes including a fix for skinhead hair.
Made the "you are about to be cloned" message bigger: <font size = 3>.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2412 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-21 23:03:04 +00:00
vageyenaman@gmail.com 3b40c90488 ◦ 2 new hairstyles, 1 new beard style. Includes the luxurious ADAM JENSEN beard/hair set. YOU NEVER ASKED FOR THIS.
◦ As a result of the previous change, a substantial overhaul of the order in which clothing and hairs are displayed has been put into effect. From what I've playtested, it works mostly fine. Keep an eye out for small little oddities, though.

◦ Masks and head wear have been given a new flag, BLOCKHAIR. If turned on, this flag will force to the hair to not display. Intended for space suits, rig helmets, etc.

◦ (Committed for Zudrag) Added in the circuit boards for clone pods and cloning scanners and making them produceable from the circuit imprinter.




git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2368 316c924e-a436-60f5-8080-3fe189b3f50e
2011-10-15 22:12:06 +00:00
bizarre.babel@gmail.com 35b671fe76 Please don't overwrite this change this time. :(
Fag style floating pixel fixed.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@955 316c924e-a436-60f5-8080-3fe189b3f50e
2011-02-04 04:17:28 +00:00
bizarre.babel@gmail.com d2a52e8215 Fixed a floating white dot
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@915 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-25 07:34:06 +00:00
bizarre.babel@gmail.com de91dafa13 Fixed a floating white dot
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@914 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-25 07:32:59 +00:00
bizarre.babel@gmail.com bdcfa4593e hair again, minor change
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@906 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-23 20:28:29 +00:00
bizarre.babel@gmail.com 259d32354b Drastic change to long hair east/west
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@800 316c924e-a436-60f5-8080-3fe189b3f50e
2011-01-07 12:32:27 +00:00