Commit Graph

6819 Commits

Author SHA1 Message Date
KasparoVy
b12d33554c Revises Adminbus Body Accessory TAIL_OVERLAPPED flag overrides
Thanks goes to Tigercat2000 for sorting this out
2016-07-23 23:13:03 -04:00
KasparoVy
8da33e1858 Fixes off-coloured sprites in Vulpcanin Fluffy Tail Marking, removes unnecessary SRCs, MORE
Adminbus body accessories (currently only the snake body) will override
TAIL_OVERLAPPED and avoid circumstances where the body/unform and such
would cover the snake body on mobs that were adminbussed but their
species had the TAIL_OVERLAPPED flag.
2016-07-23 22:41:08 -04:00
KasparoVy
7e4cd8ca41 Splits Vulpkanin muzzle into two markings, removing ears from one and adding south-dir ear fluff to the other. 2016-07-23 18:04:49 -04:00
KasparoVy
43c8fdbc71 Last couple Vulpkanin Markings.
A tail marking for the new alt tail and a second edition of the first
points marking.
2016-07-23 12:58:05 -04:00
KasparoVy
5d86f19c92 Vulp Nose Duped to Head Accs. + A Few More Tail Markings
Fade to both, tip to the VBST
2016-07-23 09:19:37 -04:00
KasparoVy
02226d42c4 Fixes Bug Reading Secondary Hair Theme Colour, Adds A Bunch of Body and Head Markings
All marking sprites courtesy of @Fullofskittles, commit idea courtesy of
@Fox-McCloud

Swaps trashy Unathi Belly sprite with new ace sprite.

Adds points and banded head/body markings for Unathi, accommodating the
alt head they get.
Adds points, patches and another belly marking for Tajara including
companion head markings.
Adds two points and a second belly marking for Vulpkanin including
companion head markings.
Adds 3 tattoos.

Breaks tiger body markings apart. The head markings are now separate
from the body.
Darkens tiger markings.
2016-07-22 13:25:16 -04:00
KasparoVy
0232a7a427 Keeping up to date. 2016-07-21 11:57:15 -04:00
KasparoVy
ef358f026d Accommodates the new Vulpkanin tail. 2016-07-21 11:49:29 -04:00
TheDZD
6d095d50f5 Merge pull request #5102 from Fox-McCloud/reagent-refactors-continued
More Reagent Refactoring and Cleanup
2016-07-21 10:12:14 -04:00
TheDZD
977aa93e44 Merge pull request #5089 from Fox-McCloud/clothing-restrictions
Removes Tajaran and Unathi Glove+Shoe Restriction: Loadout Change
2016-07-21 10:09:36 -04:00
TheDZD
eb2aec4db7 Merge pull request #5090 from Fox-McCloud/mob-death-refactor
Refactors Simple Animal Death and Implements Spawners
2016-07-21 10:08:25 -04:00
TheDZD
544e8e2e30 Merge pull request #5107 from Fox-McCloud/buttonssss
Fixes Performance Issue with Action buttons, removes redundant verbs
2016-07-21 09:23:54 -04:00
Fox McCloud
dc741e837e Merge pull request #5113 from Allfd/Vulptail6
Adds a 6th Vulpkanin tail option v2
2016-07-21 09:18:02 -04:00
Fox-McCloud
5fdad7355b more OOP 2016-07-21 06:33:39 -04:00
Fox-McCloud
d37ba22851 oops, forgot this 2016-07-21 04:33:41 -04:00
Fox-McCloud
0a8dca713c proper ear damage proc 2016-07-21 04:24:12 -04:00
Fox-McCloud
00a470fd6d removes stupid sdisabilities 2016-07-21 02:24:54 -04:00
Fox-McCloud
1ac09a962c Cleans up Vars 2016-07-21 01:43:16 -04:00
Tigercat2000
df08681281 Fix radios not suppressing messages or whatever 2016-07-20 18:31:35 -07:00
KasparoVy
eb4a14cdfb Adds secondary hair themes, darkens Tajara, fixes Skrell/human sprite issues, Skrell secondary hair-themes, CMA and Morph support and more.. 2016-07-20 15:35:29 -04:00
TheDZD
904fbd824c Merge pull request #5099 from tigercat2000/LOOK_MA_TWO_EARS
Saycode refactor/improvements
2016-07-20 14:58:55 -04:00
Allfd
229cd8b064 Adds a 6th Vulpkanin tail option 2016-07-20 08:22:09 -04:00
Fox-McCloud
c07b6d5812 performance 2016-07-20 03:55:59 -04:00
Fox McCloud
ceced8c832 Merge pull request #5095 from tigercat2000/ACTION_BUTTONS
Action Button Update
2016-07-19 23:40:51 -04:00
Krausus
44938178ce Fixes doubled attack calls on simple animals
These weren't actually causing double damage, but were doubling sounds
and attack logs

Butchering was refactored into a separate proc for convenience
2016-07-19 22:40:56 -04:00
KasparoVy
b497aafb90 Darkens Unathi Horns/Spines/Frills, Adds Secondary Facial Hair Colours/Support, Further Adjustment to Tigerhead/TigerheadFace Sprites
You can now colour the webbing of webbed Unathi frills independently.
Morph and CMA support has been included.
Splits tigerhead sprites into 3 versions in order to better fit the
different ears of the three species that can use it.
2016-07-19 05:58:50 -04:00
Tigercat2000
503ee69a8c FIX 2016-07-18 22:10:37 -07:00
Tigercat2000
9f8ba253c9 Saycode refactor/improvements
- Refactored multiple bits of saycode to be less eyeburning code
 - Radios now properly report special channel messages (binary, hivemind)
 - Animals with no speak list no longer show unfiltered messages to
   everyone.

 - Fun part:
   - Improves handling of headsets for the two ear system.
     - The right headset will now be talked into if the left headset
       reports that it is unable to send the message on the chosen
       channel/mode.
     - This means that instead of having to swap headsets around, wearing
       a headset on either ear will grant you access to all of it's
       channels.
     - The left headset will take priority, which really only affects when
       it's set to a non-standard frequency.
2016-07-18 19:17:11 -07:00
KasparoVy
b38e8ea190 Removes Redundant "None" Vulpkanin Hairstyle
Going to need the following query run on the SQL database:

UPDATE `characters` SET `hair_style_name` = "Bald" WHERE
`hair_style_name` = "None";
2016-07-18 20:23:27 -04:00
KasparoVy
b84a941488 Adds Tajaran Nose marking, Doubles up Ear Stuff for added Customization, Fixes Alt Head Prefs Bug + More Sanity, Refactors Morph Again, ....
Adds 5 more Tajaran hair styles, sprites from Polaris and fixes an issue
where Tajara and Vulpkanin couldn't be bald in character preferences.

The alt head prefs bug became prevalent if you spammed the 'reload slot'
button on certain characters. They'd get an alt head and if you switched
slots it wouldn't go away-- breaking head icon generation. Woops. Not a
problem anymore because the var isn't initialized to null and is
corrected in the prefs screen. Also refactors the morph ability to use
the change_whatever procs from appearance.dm. Removes redundant
update_body from force_update_limbs.
2016-07-18 20:11:01 -04:00
SamCroswell
7fc24c2688 Merge Conflicts Resolution. Again. 2016-07-18 19:43:38 -04:00
FalseIncarnate
299d52e016 Paradise Pop Effects (#5075)
* Paradise Pop Effects

Adds effects to the recently added Paradise Pop reagents.
- This was not included in the initial PR since it affects balance and
shouldn't hold up the base system which does not affect balance.

Effects by reagent:
- Paradise Punch: no effect, purely a flavor drink
- Apple-pocalypse: Very small chance to suck nearby objects towards the
drinker each life tick (weak version of the liquid dark matter effect)
- Berry Banned:
- Good version: Low chance to heal a tiny amount of a RANDOM damage type
each cycle (less than omnizine, as well as less reliable)
- Bad version: 50% chance to inflict toxin damage each cycle (same
strength as the basic toxin reagent, but less frequent), BWOINKS the
victim if they die with it in their system (more on this later)
- Blackeye Brew: Low chance to make the drinker shout a random bit of
"tider talk" each cycle. Will make you sound like an idiot.
- Grape Granade: Low chance of making you burp, even lower chance of
causing nearby objects to fly away from you (weaker version of sorium
effect, same chance as the apple-pocalypse pull)
- Meteor Malt: Low chance to cause a screen shake and sound for only the
drinker as if a meteor hit nearby, as well as a lower chance for a small
amount (1-5 units) of a randomly selected mineral to appear in their
bloodstream (mostly harmless, though there is a chance for it to be
plasma)

CODER FUNTIME:
Adds support for death-triggered chem effects.
- Currently used only by the poisonous Berry Banned, this can be used in
the future to have chems that could transform dead bodies into swarms of
spiders, insta-borg a body, or even possibly revive a person the instant
they die.

🆑
rscadd: Adds effects to the Paradise Pop reagents. Drink them all to
unlock their powers!
/🆑

* why do you always wait until after i commit multiple times to point out something that has been in there since the first commit?
2016-07-18 19:00:49 -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
09ce5808ca Merge remote-tracking branch 'upstream/master' into tail-markings 2016-07-18 16:05:24 -04:00
KasparoVy
35619f62e2 Adds Vulpkanin Markings, Adds Vulp/Unathi/Human Hairstyle, Fixes Vulp Default Colour, Corrects Typos in Sprite_accessories, Darkens Vulpkanin Facial Hair
Expanding on the above: Adds Vulpkanin nose and chest crest markings.
Adds Vulpkanin braided hairstyle (Tajaran Braid ripoff) and hippie braid
for Humans/Unathi (also a Tajaran Braid ripoff).
2016-07-18 04:37:56 -04:00
Fox-McCloud
bb927bb882 fixup 2016-07-18 04:16:34 -04:00
Fox-McCloud
b9489589b4 Refactors Simple Animal Death and Implements Spawners 2016-07-18 04:13:56 -04:00
KasparoVy
0a0627d12d Darkens Vulpkanin 2016-07-18 03:00:14 -04:00
Fox-McCloud
e039d4debe Removes Tajaran and Unathi Glove+Shoe Restriction: Loadout Change 2016-07-18 00:30:50 -04:00
Allfd
77f3dd7953 Add AI hologram fluff (#5067)
* Add AI hologram fluff

Extends custom_sprites.txt to enable custom holograms for the AI by
adding a third entry “Hologram”.  This will enable hologram fluff for
the AI.

:cl:Allfd
rscadd: Added hologram fluff sprites
/🆑

* Removed ;
2016-07-17 22:53:57 -04:00
KasparoVy
005066d891 Merge remote-tracking branch 'upstream/master' into tail-markings 2016-07-17 19:25:03 -04:00
KasparoVy
710c722535 Tidies up and Finalizes Alt Heads, adding Morph + CMA support + more...
Another parameter has been added to the update_body proc that allows you
to force the regeneration of limb icons. Absolutely crucial to alt_heads
as, without this functionality, you would never be able to change the
head after you spawned via Morph or CMA among other issues.
2016-07-17 19:23:41 -04:00
KasparoVy
8f642828ce Alt head tweaks
Todo: CMA/morph support for alt heads.
Known issues: Can't change alt head on the fly, icon won't update
properly
2016-07-17 05:12:37 -04:00
KasparoVy
478b69a183 Tidies up collar code. 2016-07-16 22:23:48 -04:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
Fox-McCloud
fc6514f5ba Merge remote-tracking branch 'upstream/master' into tg-weather 2016-07-16 11:07:43 -04:00
Fox McCloud
b76e2d19e0 Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun
Plastic Explosives Update
2016-07-16 04:07:12 -04:00
KasparoVy
b274703a18 Adds Alt Heads
known issues: no CMA support for changing alt heads
cant change alt head after you spawn in

To do: Finish unathi sharp snout lower marking
2016-07-16 00:10:42 -04:00
Tom Heeren
19c6b9b591 Fixes the surgeon borg sprite being impossible to select. 2016-07-15 22:42:04 -05:00
Fox McCloud
7c790a8b21 Merge pull request #4780 from Crazylemon64/space_ruins
Crazypilot's Space Ruins Port
2016-07-15 22:55:51 -04:00