Commit Graph

13925 Commits

Author SHA1 Message Date
Twinmold
99f857fd6a Fixes Laptop ID Card Removal
Fixes a bug with the removal of an ID card from laptops when you use the
Eject ID verb. Now, it will actually remove the ID card, not just say it
did.

🆑 Twinmold
Fix: Fixes removing ID cards from laptops with the Eject ID verb.
/🆑
2016-07-20 01:14:09 -05:00
Fox McCloud
ceced8c832 Merge pull request #5095 from tigercat2000/ACTION_BUTTONS
Action Button Update
2016-07-19 23:40:51 -04:00
Fox-McCloud
517f294beb more tweaks 2016-07-19 23:09:34 -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
TheDZD
4897e8c20a Shadeykins fluff item 2016-07-19 20:53:34 -04:00
Fox-McCloud
0fd1c94315 oops 2016-07-19 17:58:39 -04:00
Fox-McCloud
a58c85941b More Reagent Refactoring 2016-07-19 14:06:41 -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
TheDZD
5c29bf3a64 Merge pull request #5074 from Fox-McCloud/adminbus-reagent
Tweaks Adminordrazine, Cleans up Reagents, Fixes body temperature adjustments, and makes a few tweaks
2016-07-18 14:41:45 -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
00558bd109 Adds Vox-fitted Hydroponic HUD (nightvision version incl.) (#5082) 2016-07-18 01:57:53 -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
Fox McCloud
f2010d590b Merge pull request #5044 from Kyep/select_equipment_improvements
Improves the admin 'select equipment' verb
2016-07-17 21:45:06 -04:00
LittleBigKid2000
d268c1d6d0 Stethoscope fixes and additions (#5015)
* Stethoscope fixes and additions

Now with less ❄️. At least, the species ❄️ kind.

- Stethoscopes now check for a heart and lungs. If the target doesn't
have either, the user won't hear anything. Sure, this means the user
will still hear a pulse if the target just has lungs and vice versa, but
you'll probably be dead or have microbattery or something if you don't
have both.
- Using the stethoscope on yourself will display a message that uses
'your' instead of 'his' or 'her'.
- Using a stethoscope on someone will tell the user if the target is
having a heart attack ("hear an irregular pulse and respiration")
- The messages displayed will properly use 'the'. ("[user] places the
stethoscope" instead of "[user] places stethoscope")

I don't know why I'm bothering with this, no one uses stethoscopes for a
good reason.

* (Hopefully) fixes the same message for lungs but no heart. Also reduces the oxyloss threshold thing. I probably did this very wrong.

* Tully got salty because I stole his PR, so we collaborated

* Rewrites the code to be less shit, probably
2016-07-17 21:43:51 -04:00
TheDZD
ab84df2934 Merge pull request #5071 from Fox-McCloud/sleeper-changes
Sleeper Changes
2016-07-17 13:23:51 -04:00
TheDZD
5cab6375db Merge pull request #5084 from Fox-McCloud/rig-fix
Fixes Shielded, HoS, and Syndi Rig Sprites
2016-07-17 13:23:09 -04:00
Krausus
84e0bf3a12 Fixes admin log runtime
message_admins is sometimes used for warnings during creation of a
client's preferences datum, which means it can get called while an
admin's prefs doesn't exist
2016-07-17 08:12:41 -04:00
Fox-McCloud
4d40c32f70 more tweaks and optimizations 2016-07-17 07:07:58 -04:00
Fox-McCloud
54f3f9d207 Fixes Shields and Syndi Rigs 2016-07-17 06:14:26 -04:00
Fox-McCloud
2710eeff5f less copy-pasta, better sprinkles, and vitamins 2016-07-17 04:06:23 -04:00
Fox-McCloud
db297e027f more cleanup 2016-07-17 02:24:14 -04:00
Fox-McCloud
7bdf89e37c Merge remote-tracking branch 'upstream/master' into sleeper-changes 2016-07-17 01:34:43 -04:00
Fox-McCloud
f0b8d3b097 more cleanup 2016-07-17 00:44:58 -04:00
Fox McCloud
d8b975e18a Merge pull request #5065 from Krausus/AdminLogTweaks
Admin Log Tweaks: Trialmin Visibility, Toggling, Spam Reduction
2016-07-16 23:42:43 -04:00
Fox McCloud
9c2bce6cbb Merge pull request #5079 from LittleBigKid2000/don't-cry-don't-raise-your-eye-it's-only-nuclear-wasteland
Fixes nucleation eyes not having health and always being dead
2016-07-16 23:41:42 -04:00
Fox-McCloud
7dccd3cedc fixes 2016-07-16 23:40:43 -04:00
Fox-McCloud
a4619fbd38 clean up 2016-07-16 23:11:32 -04:00
SamCroswell
15a8b1d7d6 Merge Conflict Resolution 2016-07-16 18:47:18 -04:00
Isaac Erwin
0447c747c8 Fixes nucleation eyes not having health and always being dead 2016-07-16 17:50:09 -04:00
Fox-McCloud
d9d933224b tweaks and fixes 2016-07-16 14:09:46 -04:00
TheDZD
68e26f3176 Merge pull request #5045 from Fox-McCloud/tg-weather
Ports TG's Weather System
2016-07-16 12:04:17 -04:00
Fox-McCloud
e98c8978bd aesthetic lava 2016-07-16 11:54:43 -04:00
Fox McCloud
cb0973346b Merge pull request #4766 from Kyep/parole
Parole
2016-07-16 11:35:37 -04:00
Fox-McCloud
fc6514f5ba Merge remote-tracking branch 'upstream/master' into tg-weather 2016-07-16 11:07:43 -04:00
TheDZD
9bf946b5b6 Merge pull request #5054 from Fox-McCloud/mining-tweaks
Various Mining Tweaks
2016-07-16 10:57:54 -04:00
Fox McCloud
ac9a94bcb1 Merge pull request #5063 from FlattestGuitar/coats
Fixes some problems with the loadout system, changes costs a bit.
2016-07-16 10:46:52 -04:00
Fox McCloud
744777a944 Merge pull request #4971 from monster860/datum_browserify
Makes a bunch of UI's use /datum/browser
2016-07-16 08:52:18 -04:00
monster860
e32418956e open(0) 2016-07-16 08:27:37 -04:00
Kyep
ab06e73fdf Fixes conflict with explosives PR 2016-07-16 02:59:19 -07:00
Mieszko Jędrzejczak
9cfb9c780d Removes errors, errors. 2016-07-16 10:54:41 +02:00
Fox McCloud
b76e2d19e0 Merge pull request #5041 from DaveTheHeadcrab/plastique_is_fun
Plastic Explosives Update
2016-07-16 04:07:12 -04:00
Fox-McCloud
b8f13dd693 Tweaks Adminordrazine 2016-07-16 02:50:32 -04:00
Fox-McCloud
a1341f02af Sleeper Changes 2016-07-16 01:31:34 -04:00
Tom Heeren
19c6b9b591 Fixes the surgeon borg sprite being impossible to select. 2016-07-15 22:42:04 -05:00