Commit Graph

483 Commits

Author SHA1 Message Date
KasparoVy
ab3f71b359 Conflict resolution again 2016-08-19 01:08:08 -04:00
KasparoVy
e0bfbd0af6 Keeping up to date. 2016-08-17 02:56:34 -04:00
Mieszko Jędrzejczak
7ebf5ba6c1 Typos, kids. 2016-08-16 10:57:00 +02:00
Mieszko Jędrzejczak
b9da024bc0 Floofs. 2016-08-15 23:13:48 +02:00
KasparoVy
a5722fdfc4 Overhaul, adds color2R/G/B helper procs, adds marking/head accessory/body accessory (colours included) randomization in char prefs.
Color2R/G/B helper procs and PR overhaul suggested/co-authored by Krausus.
2016-08-12 22:37:40 -04:00
KasparoVy
9554428c59 Adds Tiger-stripe Tattoo, Tattoo-gun Species handling and Jacket-friendly Version of Existing Vox Hairstyle.
Adds allowed species list to the Campbell circuitry tattoo. The tattoo sprite only fit the bodies of Species in the list anyway.

Adds Jacket-friendly Version of Existing Vox Hairstyle
2016-08-11 02:56:17 -04:00
KasparoVy
3610cfd4ea Markings refactor, body/marking/head accessory/hair sprite darkening, adds tail markings, more hair styles...
Tajara ears are on their head now, fixes a crash bug with tail wagging
with body accessories that are split-rendered, adds secondary
hair/facial hair themes, fixes issues with human/skrell arm/lower body
sprites etc.
2016-08-09 22:01:45 -04:00
Mieszko Jędrzejczak
f4a2e9df7d Goshdurn catbeets. 2016-08-09 20:22:15 +02:00
Fox McCloud
607642d4ef Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..." 2016-08-08 23:26:51 -04:00
Mieszko Jędrzejczak
5320bed0af *sigh* 2016-08-09 02:05:52 +02:00
Mieszko Jędrzejczak
859608be54 Let's get drunk. 2016-08-09 01:42:49 +02:00
Mieszko Jędrzejczak
76b4ca307c Stumpy's hat. 2016-08-09 01:33:10 +02:00
KasparoVy
0232a7a427 Keeping up to date. 2016-07-21 11:57:15 -04:00
Fox-McCloud
eaf82cd423 Fixes Slow Action Buttons, Removes Verbs 2016-07-20 02:44:34 -04:00
Fox McCloud
ceced8c832 Merge pull request #5095 from tigercat2000/ACTION_BUTTONS
Action Button Update
2016-07-19 23:40:51 -04:00
TheDZD
4897e8c20a Shadeykins fluff item 2016-07-19 20:53:34 -04:00
Tigercat2000
56a09db739 Action Button Update
- Refactors action button backend
   - Action buttons are no longer checked on Life(), items are responsible
     for adding/removing/updating them.
   - Item action buttons are no longer a static action_button_name define,
     items define actions_types, which is a list of paths.
   - Items can now have multiple action buttons.
     - This is handled by new arguments to ui_action_click, the first
       parameter is the user, the second is the path of the action datum
       that was invoked.
 - Refactored how internals function
   - You may now directly switch internals without breaking anything.
   - The internals icon has been updated to be more consistent.
 - Added action buttons for jetpacks
 - Added action buttons for oxygen tanks
 - Uses-based implants now qdel() themselves when they run out of uses.
   This is somewhat a buff to traitor implants, but it's such a minor
   change. The actual reasoning is so that the action buttons are properly
   removed.
 - Fixed a bug with the "Boo" spell which resulted in IsAvailable failing
   for certain ghosts.
 - You can now shift-click on movable HUD elements to reset them to the
   proper position (thank fucking christ)
2016-07-18 13:23:01 -07:00
KasparoVy
766245091b Back up to date. 2016-07-15 13:00:35 -04:00
SamCroswell
bb6b7bbf30 Minor Fix 2016-07-13 23:06:35 -04:00
SamCroswell
fb0e72cc84 Quick Fix 2016-07-13 23:01:01 -04:00
SamCroswell
f5f6817a44 Inane Optimizations And General Pedantry 2016-07-11 02:42:28 -04:00
SamCroswell
e84ebcbca7 Jay Wingler Fluff Item 2016-07-11 01:53:52 -04:00
monster860
009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860
3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Fox-McCloud
2e3d8bbbc6 Merge remote-tracking branch 'upstream/master' into hit-reactions 2016-07-07 22:50:53 -04:00
Tigercat2000
71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Fox-McCloud
14cfc90ff9 TG Hit Reaction Port+Armor Fixes 2016-07-07 21:17:03 -04:00
KasparoVy
55b138ff57 kill more conflicts. 2016-07-05 21:48:27 -04:00
Fox-McCloud
b57391aba6 Minor Flag Refactor 2016-07-03 23:43:12 -04:00
KasparoVy
d476516f88 Vox-compatibility for Most Suits, Fixes Reactive Armour Icon Update Bug
Also adds hiding tails by-species. Updates captain space-suit helmet hair-hiding code.
Fixes a bug where Reactive Armour's sprite wouldn't update when you turned it on or off.
Adds species-fitting for clothing accessories.
Adds the ability to open and close the Clown Officer and Soldier coats.

Adds Vox sprites for the following suits and accessories:
Unathi robe, unathi mantle, all ERT armour (not the spacesuits), armour vest, reflective armour vest,
Security armour vest, bulletproof armour vest, Detective armour vest, blueshield armour vest, combat armour vest,
laser tag vests, ian shirt, suspenders, waistcoat, vest, first responder jacket, bomber jacket, security bomber jacket,
black suit jacket, blue suit jacket, purple suit jacket, IAA jacket, NT Rep jacket, forensics jackets, overalls,
captain's carapace, Blueshield coat, trenchcoats, pirate and old pirate coats, HoS coat, HoS trenchcoat, Warden's jackets,
leather jacket, all military jackets, all ponchos, hazard vest, brigphys vest, reactive armour, riot/swat armour,
heavy armour, thunderdome armour, all knight armour, all bombsuits, regular and atmos firesuits, all biosuits, webbing,
clown officer coat, clown soldier coat.
2016-07-03 19:39:15 -04:00
KasparoVy
38717e3b03 Fragments Markings, Adds Tail and some Body Markings, Tajara Heads now have Ears
Adds Tajara inner ear and muzzle colouration as head markings, adds muzzle colouration for Unathi (sharp and round) as head markings, adds belly colouration for Tajara and Unathi as body markings.
Fixes issue where the Unathi stripe marking name in sprite_accessories was incorrect.
Also fixes a bug where setting your IPC's head to 'normal' gave it a random screen style that was often not compatible with the monitor head.
Does a bit of tidying up in tail generation mainly, but also in icon skin-tone handling and just about everywhere else I ended up working.
Adds ears to Tajara heads. Removes ears from tajara hairstyles.
Removes the now pointless Tajaran Ears hairstyle and renames the Tajaran hair objects appropriately.
Adds a Vulpkanin Body Marking and some Tail Markings.
2016-06-27 05:29:01 -04:00
DaveTheHeadcrab
128bb4deb1 Fluff Item Adjustments (#4630)
* scanner icon

* Revert "scanner icon"

This reverts commit 86a7b5cf4f.

* Fluff Item Tweaks

* Removes the stat check

* Windbreaker Starts Open
2016-06-10 00:29:51 -04:00
Isaac Erwin
eca41351cd MrBarrelrolll Fluff Item
Adds in a fluff item for MrBarrelrolll, the Viridi Protegat. It's
functionally identical to the roman armor.
2016-06-07 00:16:00 -04:00
Fox-McCloud
78437d5e46 Ports TG's Holy Weapons 2016-05-26 23:38:31 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tigercat2000
519992b5a9 Merge branch 'byond510'
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
2016-04-01 14:15:44 -07:00
Fox-McCloud
280eb626f1 Custom Pink Guitar--Antcolon3 2016-03-21 07:26:51 -04:00
Fox McCloud
ba24d3309a Merge pull request #3881 from DaveTheHeadcrab/snowflaekShit
DaveTheHeadcrab - Fluff items
2016-03-16 21:36:30 -04:00
SamCroswell
86a568cc05 Removes dupe definiton (Derp) 2016-03-14 18:10:39 -04:00
SamCroswell
c1f26fac4e Fixes the tat gun 2016-03-14 17:51:27 -04:00
SamCroswell
cee1be8bed Remove's Atani's define 2016-03-14 16:18:21 -04:00
SamCroswell
8a5e293af0 Fluff-O-Rama 2016-03-14 16:15:50 -04:00
Tastyfish
96e0d10f8e flavor tweaks 2016-03-14 05:26:05 -04:00
Tastyfish
a65fe9db00 isliving use fix 2016-03-08 23:59:41 -05:00
Tastyfish
959b71ca37 Adds fluff items for chronx100 2016-03-08 23:15:13 -05:00
KasparoVy
b921c9a6c4 Redoes Redoing Suit Adjustment
@Regens1 for the special hulk joke. Haha?

Hulks can destroy jackets by trying to adjust them. In the case of labcoats, when you destroy it items in the pockets (not just the suit storage slot) will be dumped on the ground below you. Stuff in the suit storage slot already got dumped on the ground, so it didn't need any special treatment.

Fixes all known issues with any adjustable jackets using the wrong sprites, including the HoS jacket

Fixes #3707 and #3703. You can now adjust breath masks while buckled into beds or chairs.

Adds Missing Red Labcoat Sprites (found copies @ the Polaris repository).

Adds Blueshield coat in_hand icons
2016-03-02 03:08:05 -05:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
KasparoVy
447c3ea779 Default states and cull 2016-02-25 00:48:52 -05:00
KasparoVy
f769c9b23b Fixes Vox Robes + Sec Preferences Beret Icon Generation + Sigholt's Beret @ Issue #3364
Does what it says on the tin
2016-01-24 02:22:55 -05:00