Commit Graph

24890 Commits

Author SHA1 Message Date
KorPhaeron 9df93ced27 Attack animation for simple animal attacks 2016-02-08 13:58:53 -06:00
KorPhaeron aea7134ab3 Fixes instagib EMP act 2016-02-08 13:56:05 -06:00
phil235 8943315686 Fixes radiation never going down when above 100. 2016-02-08 20:03:05 +01:00
phil235 4562f423ce Fixes small errors 2016-02-08 19:55:10 +01:00
phil235 16a5441379 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionFixes2
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-02-08 19:35:01 +01:00
phil235 b9bba3a501 Fixes unconscious mob standing still when removed from cryo cell, closet, containers.
Fixes mobs inside cryo cells getting pipes overlay(ventcrawl). Ventcrawler can no longer move in or out of
the cryo cell, which fixes ventcrawler going into cryo cell and getting stuck in it.
Being inside a cryo cell now give you a nearsight overlay (same as closet).
Brains no longer get the red circles overlay when damaged.
MMI now properly updates its icon when the brain mob dies.
Fixes getting stuck with a grab inside you when grabbing someone buckled.
Silicon stunned, weakened and paralysis is now properly updated.
2016-02-08 19:22:45 +01:00
Bjorn Neergaard b54f8918a7 Make canisters use passive_gates
Not a huge change but means that canisters have a pressure resistance on the valve
2016-02-08 11:25:55 -06:00
KorPhaeron d25e113ecc Removes unused defines 2016-02-08 11:15:45 -06:00
KorPhaeron c2b77be84b Better list/choosing of holy weapons 2016-02-08 11:12:33 -06:00
AnturK f6f7943189 Adds C4 bag to uplink 2016-02-08 16:10:34 +01:00
GunHog 0bab26452b Merge remote-tracking branch 'remotes/upstream/master' into The_Mech_Every_CMO_Will_Want
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
2016-02-08 08:50:44 -06:00
tkdrg 6e9441b81e Merge pull request #15269 from AnturK/fixerinio
Fixes crayon/spraycan buffer mode.
2016-02-08 11:42:46 -03:00
tkdrg a8c20cb575 Merge pull request #15265 from Incoming5643/he_is_breaking_free
"Bugged Parrot Mechanics"
2016-02-08 11:38:09 -03:00
tkdrg 3bd79ccadb Merge pull request #15262 from neersighted/damnshuttle
Rework crates, supply packs, and supply orders
2016-02-08 11:36:26 -03:00
Bjorn Neergaard 39421efeb3 Address feedback 2016-02-08 07:22:18 -06:00
Bjorn Neergaard 41772873aa Mutes now inform the mutee who muted them 2016-02-08 06:05:36 -06:00
Bjorn Neergaard fd5b61a156 Implement robust cargo logging 2016-02-08 04:28:19 -06:00
KorPhaeron 4cc1697721 Fixes bot factions for real 2016-02-08 01:51:17 -06:00
Bjorn Neergaard f19feb4505 Remove dupe file, remove colon cancer and add prespawned stacks 2016-02-08 01:16:30 -06:00
Bjorn Neergaard 209fa5ffe6 Add internals to critter crates; factor more crate code into closets 2016-02-08 01:01:49 -06:00
Kyle Spier-Swenson 3b849aa499 Fixes pai don't ask me again
The way it did it here was weird and i think it caused the bug because it would check the ask time + 600 and that would wrap around.

I don't know for sure if that's the cause of the bug, but this is an improvement none the less.
2016-02-07 22:55:13 -08:00
Bjorn Neergaard 401fe06e1c Fix two small errors 2016-02-08 00:01:54 -06:00
Kyle Spier-Swenson 35f07a7361 Removes the access restriction from wall mounted nano meds
This doesn't make sense to have, the full ones should, but not the smaller ones.
2016-02-07 21:19:31 -08:00
KorPhaeron aecf08655d Nerf LSG 2016-02-07 22:41:08 -06:00
Buggy123 a2b0d47250 Makes explosion of BS artillery configurable 2016-02-07 22:32:38 -05:00
PKPenguin321 eefeb813a4 gives caps bomb armor 2016-02-07 18:21:09 -08:00
PKPenguin321 6f660075a7 bumps beret armor up 2016-02-07 18:20:01 -08:00
tkdrg 2a0935d238 Merge pull request #15224 from MrStonedOne/patch-146
MC: tweaks, midnight rollover fix, and some 510 work
2016-02-07 23:16:59 -03:00
PKPenguin321 c920ae1f15 bumps helmet armor up 2016-02-07 18:15:42 -08:00
MrStonedOne c91c592f04 MC: tweaks, midnight rollover fix, and some 510 work
Fixes the mc getting all fucked up during midnight rollover

Mc now tracks the tick_usage of every subsystem, and will skip running an expensive subsystem if we are too close to overrunning in a tick, waiting until next tick, unless that subsystem is excessively past due (because we kept skipping it).

It now assumes that 20% of a tick should be saved for byond to do it's things, and stops running all subsystems once we get to 80% tick usage.

Dynamic wait will only smooth out wait changes over 8 fires if the new wait is lower than the old wait, before it would smooth out wait increases as well as decreases.

The fps throttle system is now 509 only.

The mc will now run every 1ds, no GCD bullshit, as we want to spread things out more.

Offline subsystems will still show their stat message

DS is now rounded to 2 digits, not 3, to make room for the tick percentage bit, and because the 3rd digit was useless and all MoE
2016-02-07 18:03:19 -08:00
tkdrg 1a7cbda99f Merge pull request #15253 from bgobandit/cravenoaf
Adds shots of wine, blood and liquid gibs.
2016-02-07 23:02:46 -03:00
MrStonedOne 60d068e6fa Merge remote-tracking branch 'upstream/master' into patch-130
Conflicts:
	code/__HELPERS/unsorted.dm
	code/game/objects/objs.dm
	code/modules/reagents/reagent_dispenser.dm
2016-02-07 17:41:42 -08:00
MrStonedOne eef4f4d534 Optimizes tesla_zap, adds fuel tank tesla_act, misc tesla changes 2016-02-07 17:34:52 -08:00
tkdrg 6141c62c80 Merge pull request #15223 from MrStonedOne/patch-145
Makes the qdel/GC system delay soft deletion until the next garbage controller tick
2016-02-07 21:57:50 -03:00
tkdrg 8eccaa7ab2 Merge pull request #15248 from bgobandit/beepskysmash
Beepsky now drops an actual whiskey shot upon death.
2016-02-07 21:19:11 -03:00
tkdrg 22e2f0d81e Merge pull request #15243 from KorPhaeron/laser_rifle_tweaks
Better laser rifle magazine description
2016-02-07 21:18:45 -03:00
tkdrg 7dc0de7a87 Merge pull request #15239 from TrustyGun/janikeys
The janitor's belt can now hold his janicart keys.
2016-02-07 21:18:21 -03:00
tkdrg 643d386b2e Merge pull request #15238 from KorPhaeron/instagib
Adds instagib mode to CTF
2016-02-07 21:17:33 -03:00
tkdrg 76986b82be Merge pull request #15226 from lzimann/pipedispenserharsuit
Allows hardsuits to carry RPDs in their suit slots
2016-02-07 21:12:09 -03:00
duncathan salt 6ab94b5003 silly dunc this is a much better idea 2016-02-07 17:55:10 -06:00
duncathan salt f1f3bcd1d6 Merge pull request #15245 from neersighted/portamos
Fix missing parent calls in portable atmos
2016-02-07 17:50:10 -06:00
Bjorn Neergaard edd89aeef3 Fix flood mode on air alarms incorrectly setting pressure bounds 2016-02-07 17:21:52 -06:00
KorPhaeron 8383552ef8 Carrot fix 2016-02-07 15:36:37 -06:00
Lzimann 3cceb1e379 Fix voice analyzers 2016-02-07 19:03:41 -02:00
KorPhaeron e26dd3eb39 Fixes carrot/biobag interaction 2016-02-07 14:40:10 -06:00
duncathan salt 6261120ad4 hopefully speeds up share() 2016-02-07 13:57:42 -06:00
phil235 a785d71e7e Fixes staminaloss going too high.
Fixes hud internals not updating correctly.
2016-02-07 20:12:23 +01:00
phil235 fc8c1f93b7 Fixes vision not being correctly updated in some cases when ghosting. 2016-02-07 19:01:09 +01:00
phil235 83633edfed - I renamed some of the new adjust procs and create new ones for eye_blind,eye_blurry and eye_stat so they get three procs just like weakened/sleeping/etc.. (Sleeping, AdjustSleeping, SetSleeping)
- renamed the eye_stat var to eye_damage.
- mob/on_varedit() added. Manually var editing a mob's eye_blind var properly updates his vision.
- I removed update_vision_overlays(), we now just update the relevant fullscreens instead of all fullscreens whenever one needs to be updated.
- fixed climbing into mecha not giving you mecha sight.
- simplified and removed copypasta from update_tinttotal() (now update_tint() )
2016-02-07 18:50:18 +01:00
KorPhaeron 867eefc240 Adds a second missing \ 2016-02-07 11:32:40 -06:00