Commit Graph

13677 Commits

Author SHA1 Message Date
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 fd5b61a156 Implement robust cargo logging 2016-02-08 04:28:19 -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 401fe06e1c Fix two small errors 2016-02-08 00:01:54 -06: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
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
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 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 f1f3bcd1d6 Merge pull request #15245 from neersighted/portamos
Fix missing parent calls in portable atmos
2016-02-07 17:50:10 -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
duncathan salt 94b91bcf57 Merge pull request #14947 from KorPhaeron/xenomorph
Adds the Lusty Xenomorph Maid
2016-02-07 10:08:12 -06:00
duncathan salt 56a4b89400 Merge pull request #15237 from AnturK/botfixfix
Fixes bot fixing
2016-02-07 10:06:53 -06:00
Bjorn Neergaard 4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Incoming5643 1c62b22cc7 4 am missing commit for the extra space 2016-02-07 04:25:00 -05:00
Incoming b5a7c2c19c Moves how poly tracks his lifetimes out of Write_Memory() to avoid some weird edge cases where poly could be accidentally credited with living while dead.
The only in game side effect of this pull is that if poly dies in a round and later is revived somehow his streak will still be broken.

Fixes a spacing error I missed.

Changes the savefile names of the round survival mechanics, as the existing ones are somewhat spoiled by the bug I'm fixing.
2016-02-07 04:21:07 -05:00
Bjorn Neergaard ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard ede93b63a6 Put shuttles in their proper place, split out secure crates 2016-02-07 01:18:56 -06:00
Cheridan 1449640867 Merge pull request #15247 from ChangelingRain/revert-15182-complexanimals
Revert "Simple animal force threshold no longer converts damage to brute"
2016-02-06 20:32:21 -06:00
tkdrg 90b5a5bfa5 Merge pull request #15154 from AnturK/brig_timers
Brig door timer tgui
2016-02-06 23:13:13 -03:00
KorPhaeron 143ae442d6 Sprites 2016-02-06 20:06:48 -06:00
bgobandit cca610f1e4 Adds shots of wine and other things. 2016-02-06 20:54:09 -05:00
tkdrg ed014be6f2 Merge pull request #15183 from Incoming5643/everybodys_heard_about_the_bird
Edict from the bird: "I've run out of jokes"
2016-02-06 22:49:06 -03:00
KorPhaeron 37c0b23483 New CTF gear 2016-02-06 19:38:47 -06:00
bgobandit 8ae0bbab89 Beepsky now drops an actual whiskey shot upon death. 2016-02-06 19:23:18 -05:00
Incoming5643 b897507e73 Roll back the shuffle chance for the speech buffer
I wasn't aware this code ran every life tick!
2016-02-06 18:53:27 -05:00
Incoming 7939d069dc Feeding poly crackers (existing mechanic) will now boost his speak chance permanently
Some arbitrary renaming of the new savefile vars

makes what was essentially a prob call a prob call.
2016-02-06 18:50:23 -05:00
Nerd Lord 86f7b98baf Revert "Simple animal force threshold no longer converts damage to brute" 2016-02-06 17:25:44 -05:00
Bjorn Neergaard 6c4d749599 Fix missing parent calls in portable atmos 2016-02-06 15:26:16 -06:00
phil235 95d279a4a4 Removing the true_changeling.dm file that I added by mistake.
renamed "nearsight" fullscreen to "nearsighted"
2016-02-06 22:23:13 +01:00
KorPhaeron ce53241cf3 But this time it actually compiles 2016-02-06 14:46:14 -06:00
KorPhaeron 688276008d Updated desc 2016-02-06 14:37:11 -06:00
KorPhaeron 9daab124b2 Merge remote-tracking branch 'refs/remotes/tgstation/master' into instagib 2016-02-06 14:25:43 -06:00
phil235 99653ed152 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/modules/reagents/chemistry/holder.dm
2016-02-06 20:38:16 +01:00
tkdrg f00e9588fd Merge pull request #14992 from KorPhaeron/flashlights
Adds laserguns with rechargeable, swappable magazines
2016-02-06 16:36:03 -03:00
phil235 20bf41a05d Fixes fullscreen overlay not appearing on login. 2016-02-06 20:35:43 +01:00
phil235 aed7794f50 Made changes to adjust with neersighted's fullscreen overlays pr.
Fixed Xray users getting vision impairment overlays when inside a container.
Fixes mob inside mecha getting the mech sight flags despite not being the pilot.
"get_vision_impairments" is renamed to "get_remote_view_fullscreens".
Fixes AI blindness.
2016-02-06 20:35:15 +01:00
tkdrg 4e34ca775e Merge pull request #15219 from neersighted/reagents_aaaaaaa
Speed reagent reaction code
2016-02-06 16:15:50 -03:00
Bjorn Neergaard d1f748b09c comment style is important 2016-02-06 12:15:21 -06:00
tkdrg 7b602a35b5 Merge pull request #15217 from neersighted/flashy
Fix flashlights flashing
2016-02-06 14:21:14 -03:00
tkdrg 0dbbcce675 Merge pull request #15216 from KorPhaeron/fixes_bulldogs
Fixes bulldogs being unable to load special ammo
2016-02-06 14:19:35 -03:00
KorPhaeron 9f659fd0d0 Adds an easy way for admins to enable instagib mode 2016-02-06 08:55:59 -06:00
phil235 fdec37b76f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor
Conflicts:
	code/_onclick/hud/alien.dm
	code/_onclick/hud/alien_larva.dm
	code/_onclick/hud/hud.dm
	code/_onclick/hud/human.dm
	code/_onclick/hud/monkey.dm
	code/_onclick/hud/other_mobs.dm
	code/_onclick/hud/robot.dm
	code/game/machinery/Sleeper.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_defines.dm
2016-02-06 15:42:13 +01:00
AnturK 7075b1f161 Fixes bot repair 2016-02-06 14:27:49 +01:00
KorPhaeron 6cef32be12 Adds instagib mode to CTF 2016-02-06 07:11:51 -06:00