cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,159 Commits 61 Branches 14 Tags
2d4e63370e2968b0730c5d0efb6cd5ee043a5948
Commit Graph

13760 Commits

Author SHA1 Message Date
tkdrg
2d4e63370e Merge pull request #15254 from PKPenguin321/patch-13 
Halves most tablecrafting times
 2016-02-10 15:58:52 -03:00
tkdrg
6369e5cb67 Merge pull request #15299 from PKPenguin321/patch-14 
Makes armor of various sec headgear consistent
 2016-02-10 13:20:37 -03:00
tkdrg
2547e8dc32 Merge pull request #15300 from Buggy123/patch-16 
Makes the explosion size of BS artillery a configurable variable
 2016-02-10 13:18:05 -03:00
tkdrg
d2efa2d89f Merge pull request #15353 from AnturK/buildmode_rebuild 
Buildmode Refactor
 2016-02-10 12:53:56 -03:00
tkdrg
22d90b6d04 Merge pull request #15350 from Shadowlight213/radioMMI 
Removes Radio MMI sybtype and adds a toggleable  radio to normal MMIs.
 2016-02-10 12:53:35 -03:00
tkdrg
ef61d73de8 Merge pull request #15358 from AnturK/quickfix 
Makes preloader not gc needlessly
 2016-02-10 12:31:16 -03:00
AnturK
e93fbcd2a0 Cleanup 2016-02-10 16:30:43 +01:00
AnturK
a1583f24ae Buildmode Refactor 
Adds generic click intercept to clients
 2016-02-10 16:29:47 +01:00
AnturK
559ab8fa6f Merge pull request #15354 from neersighted/call_me_cratezy 
Allow horizontal mobs to fit into crates
 2016-02-10 16:17:19 +01:00
Bjorn Neergaard
e4f3045487 Add spacecat 
Fixes a revert in my last crate PR, spacecat added to asteroid
secret room (previously included a cat critter crate)
 2016-02-10 09:15:03 -06:00
AnturK
b2268b30ad Merge pull request #14851 from MrStonedOne/patch-130 
[Ready]Tesla balance and code cleanup
 2016-02-10 11:36:32 +01:00
Shadowlight213
ec6fcc057d Removes Radio mmi subtype and adds radio to regular MMI 2016-02-10 00:32:41 -08:00
tkdrg
892fc67e67 Merge pull request #15335 from ChangelingRain/dronechatter 
Fixes doubled drone messages
 2016-02-10 01:33:03 -03:00
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
AnturK
d9a8268fce Makes preloader not gc needlessly 2016-02-09 17:35:48 +01: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
Shadowlight213
b1ffb4625e Gives round start cyborgs Radio enabled MMIs 2016-02-09 00:12:01 -08: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
Nerd Lord
fb46ce9231 SPEED NERDS ARE HOUNDING ME 2016-02-08 18:17:23 -05:00
Bjorn Neergaard
eaa6bc7b18 Implement better jetpack action button 2016-02-08 17:09:12 -06:00
Nerd Lord
20a22e9389 Fixes doubled drone messages. 2016-02-08 18:00:46 -05: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