cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-25 16:45:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,098 Commits 61 Branches 14 Tags
0c0f4e90069cfb9998c73245fffcb467240dc686
Commit Graph

13727 Commits

Author SHA1 Message Date
tkdrg
0c0f4e9006 Merge pull request #15148 from KazeEspada/gunfixes2theelectricboogaloo 
Fixes issue #15131. Guns will now fire point blank correctly.
 2016-02-10 01:27:34 -03:00
Joan Lung
e77bac15af Merge pull request #15323 from neersighted/canister_fix 
Make canisters use passive_gates
 2016-02-09 16:53:37 -05:00
AnturK
9a4bf35bda Merge pull request #15329 from KorPhaeron/instagib3 
Fixes instagib EMP act
 2016-02-09 22:18:48 +01:00
KazeEspada
6cabed1641 updates code to match new selecting. 2016-02-09 13:51:53 -07:00
KazeEspada
7afa8a625d Merge branch 'master' of https://github.com/tgstation/-tg-station into Gunfixeselecticboogaloo 2016-02-09 13:44:18 -07:00
AnturK
03890d2ea4 Merge pull request #15250 from ChangelingRain/blobtooweak 
Adds five new blob chemicals and some blob tweaks
 2016-02-09 18:04:55 +01:00
Nerd Lord
a020ae37a4 Merge pull request #15328 from phil235/VisionFixes3 
Fixes radiation never going down when above 100.
 2016-02-09 12:04:16 -05:00
Cheridan
649ef7c2b3 Merge pull request #15252 from PKPenguin321/armorchameleon 
Gives chameleon jumpsuits armor
 2016-02-09 10:27:52 -06:00
tkdrg
1409e4f38b Merge pull request #15318 from neersighted/mute 
Mutes now inform the mutee who muted them
 2016-02-09 11:49:09 -03:00
Incoming
0b54a68e22 fixes some kaze demands and fixes "conflicts" due to file moves. 2016-02-08 22:34:44 -05:00
Incoming
6ef82fd642 Merge branch 'master' of https://github.com/tgstation/-tg-station into animorphs_speedrun 2016-02-08 22:26:00 -05:00
Nerd Lord
6483723c50 Removes unneeded if(M)s. 
At least, ones that I *hope* are unneeded.
 2016-02-08 22:10:11 -05:00
tkdrg
ba2e629525 Merge pull request #15286 from AnturK/bagofboom 
Adds C4 bag to uplink
 2016-02-08 21:39:31 -03:00
tkdrg
fc545a09e1 Merge pull request #15283 from tgstation/duncathan-patch-1 
hopefully speeds up share()
 2016-02-08 20:53:39 -03:00
tkdrg
5d8051ad4a Merge pull request #15314 from KorPhaeron/botfix 
Fixes bot factions (for real this time)
 2016-02-08 20:23:01 -03:00
AnturK
203b965078 Merge pull request #15292 from neersighted/flood 
Fix flood mode on air alarms incorrectly setting pressure bounds
 2016-02-09 00:21:00 +01:00
Bjorn Neergaard
eaa6bc7b18 Implement better jetpack action button 2016-02-08 17:09:12 -06:00
phil235
2b46e8253f Merge pull request #15287 from lzimann/voice 
Fix voice analyzers not being attachable
 2016-02-08 23:55:19 +01:00
tkdrg
e554077458 Merge pull request #15327 from phil235/VisionFixes2 
Some vision fixes
 2016-02-08 19:34:37 -03:00
Leo
b5fa0bd014 Make it an else instead 2016-02-08 20:31:15 -02:00
Nerd Lord
d6b7ed4c06 Merge pull request #15277 from KorPhaeron/lusty_xeno 
Adds a missing \ to xenomaid attack message
 2016-02-08 17:27:06 -05:00
Cheridan
65d9d10ca6 Merge pull request #15276 from tkdrg/droneage 
Adds a minimum account age for drones
 2016-02-08 16:25:39 -06:00
Cheridan
23d3ba7844 Merge pull request #15285 from KorPhaeron/carrot 
Fixes carrot/biobag interaction
 2016-02-08 15:56:22 -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
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
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
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
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