cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,014 Commits 61 Branches 14 Tags
a8c20cb575ec04c1946e06df0060d078b355751f
Commit Graph

6193 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
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
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
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
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
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
KorPhaeron
143ae442d6 Sprites 2016-02-06 20:06:48 -06: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
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
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
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
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
7b602a35b5 Merge pull request #15217 from neersighted/flashy 
Fix flashlights flashing
 2016-02-06 14:21:14 -03: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
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
Bjorn Neergaard
c9f61fd7da Rework portable atmos; tgui portable pump 2016-02-05 17:06:00 -06:00
Bjorn Neergaard
289f0c19e1 Fix flashlights flashing 2016-02-05 12:06:44 -06:00
tkdrg
6154334fbc Merge pull request #15201 from KorPhaeron/turret_fixes 
Fixes AI core turrets shooting at pingsky
 2016-02-05 14:58:38 -03:00
tkdrg
d188447041 Merge pull request #15121 from neersighted/hotkeys 
Add hotkey preferences
 2016-02-05 14:52:34 -03:00
Remie Richards
10f725d216 Merge pull request #15119 from lordpidey/pipe_suicide 
Added a new suicide act for pipe valves.
 2016-02-05 15:53:24 +00:00
tkdrg
a129b1fdaf Merge pull request #15182 from ChangelingRain/complexanimals 
Simple animal force threshold no longer converts damage to brute
 2016-02-05 01:03:21 -03:00
Bjorn Neergaard
ac03d5f617 Fix flashlights actually stunning 
Also make clear_fullscreen() waitfor = 0 to be safe,
and bump travis version
 2016-02-04 20:50:26 -06:00
phil235
5728358b6b Some errors and merge conflicts fixing mistakes. 2016-02-05 01:12:39 +01:00
Bjorn Neergaard
5fc59f53a1 Fix lizard hissing 2016-02-04 17:19:47 -06:00
Bjorn Neergaard
a5f09e103e Remove eroneous code; click catcher define; bygex path fix 2016-02-04 17:19:47 -06:00
Bjorn Neergaard
ef19e7904f Support Regex in replaceall, re-implement lizard hiss limits 2016-02-04 17:19:46 -06:00
Bjorn Neergaard
4a3da5d77a Properly layer and set/clear fullscreen overlays 
This fixes ordering issues and admin ghosting
 2016-02-04 17:19:45 -06:00
Bjorn Neergaard
7a47b43c53 Re-implement screen overlays 
This fixes 510 showing all overlays in the rightclick menu
 2016-02-04 17:19:44 -06:00
Bjorn Neergaard
2500e241ca Re-implement lizard hissing 
Note that this reverts #13656, due to this bug (http://www.byond.com/forum/?post=2027070)
 2016-02-04 17:19:44 -06:00
Bjorn Neergaard
063dd9fb84 Get the code running on 510 
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
 2016-02-04 17:19:40 -06:00
phil235
4d63a481dd Fixes merge conflict erro (readd datum/hud/Destroy()) 
Fixes cyborg sight not updating when equiping/unequiping sight modules.
 2016-02-04 20:43:28 +01:00
KorPhaeron
744b0946a2 Bot turret fix 2016-02-04 12:06:49 -06:00
phil235
16d0154d9f Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 2016-02-04 17:04:10 +01:00
phil235
0daa87f9be More merge conflict fixes. 2016-02-04 15:48:33 +01:00
phil235
8b11d87b1d Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdateRefactor 
Conflicts:
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/_onclick/hud/alert.dm
	code/_onclick/hud/hud.dm
	code/datums/mutations.dm
	code/datums/wires/robot.dm
	code/game/atoms.dm
	code/game/gamemodes/blob/overmind.dm
	code/game/machinery/alarm.dm
	code/game/machinery/machinery.dm
	code/game/machinery/suit_storage_unit.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/morgue.dm
	code/modules/admin/verbs/adminjump.dm
	code/modules/atmospherics/machinery/atmosmachinery.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/carbon/alien/humanoid/death.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/human/species_types.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/ai/death.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/robot/death.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/login.dm
	code/modules/mob/mob.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/chemistry/reagents/blob_reagents.dm
	tgstation.dme
 2016-02-04 14:34:45 +01:00
Incoming
995352b818 Poly will now speak a line or emote when pet. 
Poly is now much more likely to drop a line from active recall after saying a line. This doesn't actually impact how often poly says something, just how stale his "short term memory" is. Keep in mind that due to the wonders of saycode the line poly drops isn't the same necessarily as the one he said, so the "poly might say this line twice" factor is still higher than the 20% this pull implies. Also this mechanic means it's entirely possible to have roundstart lines be dropped having never been said.

speak_chance is now a proper percentage chance, before it was actually out of 200 for some strange reason. Animals with high speak chances have had their chance halved to preserve their level of chatter (except for poly).

Poly will now keep track of if he died last round and how many rounds in a row he's lived. While he's building on his record he'll have a few special lines he might say at some point near the beginning of the round and also talks FAR more often (to be annoying).

Adds a dumb monty python joke to dead parrots because we literally don't have any
 2016-02-03 21:37:50 -05:00
Nerd Lord
20b61a351c shitcoder no shitcoding 2016-02-03 21:16:56 -05:00
Nerd Lord
d412c90ba8 If we let the threshold be on by default, we cuck blob chemicals. 
Let's not do that.
 2016-02-03 21:10:33 -05:00
Nerd Lord
96b276cd8c not so simple now, holy shit 2016-02-03 20:43:14 -05:00
tkdrg
0e7578fcea Merge pull request #15132 from octareenroon91/patch-35 
Improve player medbot
 2016-02-03 22:03:30 -03:00