Commit Graph

6793 Commits

Author SHA1 Message Date
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 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
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
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
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
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
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
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
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
SamCroswell 0466499f86 Personal Crafting - Initial Commit 2016-07-15 16:25:37 -04:00
SamCroswell e139f81412 PDA Slot Removal + PDA ID Changes 2016-07-15 00:54:14 -04:00
Fox McCloud dfce4b5d16 Merge pull request #5049 from Krausus/GottaLogEmAll
Improves Logging of Caught Runtimes
2016-07-14 23:59:18 -04:00
KasparoVy 33347deb98 Fixes collar runtime by adding fexists checks.
Collars still fully function (tested by wearing a Sec bombsuit as a Vox
and as a Human, the correct collars rendered) and wearing a hardsuit as
a Vulp (the situation provided in the bug report) didn't cause a
runtime.
2016-07-14 22:49:43 -04:00
Krausus 0535765ba4 Improves caught exception logging
Also refactors away "log_runtime" config var to use its name for a
helper proc
2016-07-14 15:44:28 -04:00
Fox-McCloud 5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
SamCroswell cf90405f56 Plastic Explosives Update 2016-07-13 22:04:23 -04:00
Fox McCloud c03aebaed9 Merge pull request #5002 from Chakirski/holograms
Ahh yes, "Reapers"
2016-07-13 21:50:14 -04:00
Chakirski 2911c89733 Fox you're krilling me! 2016-07-13 11:53:54 -05:00
TheDZD dd2390d9bb Merge pull request #4987 from Fox-McCloud/cyborg-tweaks
Cyborg Upgrade Additions and Refactor
2016-07-12 21:22:57 -04:00
Chakirski 304b861fd4 height 2016-07-12 11:19:48 -05:00
Chakirski f8ce4ed19d Ahh yes, "Reapers" 2016-07-11 23:17:17 -05:00
Fox McCloud 3934b9f841 Merge pull request #4841 from DaveTheHeadcrab/grey_speech_fix
Grey Update
2016-07-11 23:13:38 -04:00
SamCroswell 46954091e6 Minor Tweaks 2016-07-11 22:28:35 -04:00
Fox McCloud b787af15f8 Merge pull request #4934 from Chakirski/BACON!
Adds AUTHENTIC, JUICY, AMAZING BACON!
2016-07-11 21:23:41 -04:00
TheDZD 2b5e36b296 Merge pull request #4935 from Twinmold93/martialartsvampire
The Sleeping Carp Vampires
2016-07-11 21:10:57 -04:00
TheDZD 813f6f3778 Merge pull request #4962 from Fox-McCloud/ipc-change
Removes IPC Firesuit Cheese
2016-07-11 21:01:31 -04:00
TheDZD 960676d53b Merge pull request #4964 from Kyep/cryo_ghost
Improves Cryoing
2016-07-11 21:01:04 -04:00
TheDZD 66c8eb899e Merge pull request #4966 from Fox-McCloud/ntrep-cane
Nanotrasen Rep Cane Tweak
2016-07-11 20:59:34 -04:00
TheDZD ca7530f58d Merge pull request #4968 from Fox-McCloud/blood-refactor
Blood Refactor+Fixes
2016-07-11 20:57:25 -04:00
TheDZD 2f9dab5f1e Merge pull request #4978 from Krausus/UhOhImSlowingDownAlternateAppearanceCodeAgain
Actually Fixes Those Stupid Plants (By Fixing Alternate Appearances)
2016-07-11 20:52:40 -04:00
Fox McCloud 595297fb6e Merge pull request #4991 from Krausus/ThereCanOnlyBeOneHookSystem
Fixes Morgue Updating and Eliminates VG-style Hooks
2016-07-11 20:41:32 -04:00
Krausus 355fb3c080 Fixes morgue updating and removes VGhooks 2016-07-11 17:39:21 -04:00
SamCroswell d79302ede6 Merge Conflict Resolution 2016-07-11 13:04:30 -04:00