cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 17:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,265 Commits 61 Branches 14 Tags
14606bea5e59e33c9e8aee671b2cedf1007dd0ef
Commit Graph

13819 Commits

Author SHA1 Message Date
Cheridan
c78f327100 Merge pull request #15432 from phil235/ChaplainHoodFix 
Fixes masks appearing above the chaplain hood.
 2016-02-12 12:38:35 -06:00
tkdrg
a9cb902368 Merge pull request #15413 from phil235/CryoResistFix 
Fixes resisting out of cryo not working
 2016-02-12 14:35:43 -03:00
tkdrg
e0979bd010 Merge pull request #15394 from AnturK/rnd_opt 
RnD Optimization
 2016-02-12 14:33:09 -03:00
phil235
c507036408 no need to stand still. 2016-02-12 02:20:22 +01:00
AnturK
7d30ceb425 Merge pull request #15404 from phil235/AlienWeakenedFix 
Fixes alien's weakened var never decreasing.
 2016-02-11 23:27:24 +01:00
AnturK
d47b43107d Merge pull request #15405 from phil235/VisionDisposalFix 
Fixes vision bug with disposal.
 2016-02-11 23:25:44 +01:00
AnturK
b62988b284 Switches known_designs/tech to associative list. 2016-02-11 20:25:23 +01:00
phil235
43962ef288 Fixes masks appearing above the chaplain hood. 
Fixes pirate captain coat hiding the jumpsuit despite having an opening in its center.
I removed the hood part appearing on the icon of the suits that have toggleable hoods, so there's no more confusion between the suit layer and the head layer.
 2016-02-11 19:52:33 +01:00
Cheridan
c782baa86c Merge pull request #15125 from bgobandit/clownmemes 
Poking a clown mob produces the proper response.
 2016-02-11 01:52:04 -06:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc 
Fix a number of runtimes
 2016-02-10 23:50:38 -06:00
duncathan salt
9258f042c9 Merge pull request #15374 from neersighted/put_it_in_me 
Add autoimplanter to cybernetic implants in the uplink
 2016-02-10 23:50:23 -06:00
Bjorn Neergaard
4089d850cc Address feedback 
Canisters mixtures can no longer be null thanks to accepting
one in New()

Just forget assert_gas in objectives
 2016-02-10 23:42:15 -06:00
duncathan salt
759a95f974 Merge pull request #15372 from optimumtact/patch-8 
Don't sleep life for 30 ticks with slimetoxin
 2016-02-10 22:51:41 -06:00
duncathan salt
a27a0a1e33 Merge pull request #15303 from KorPhaeron/Lesser 
Nerfs lesser summon guns
 2016-02-10 21:36:30 -06:00
duncathan salt
933baf5943 Merge pull request #15229 from Shadowlight213/Muteall 
Adds a preference to mute Centcom, alert level, and VOX sounds
 2016-02-10 21:34:30 -06:00
duncathan salt
ca8e3c6a0a Merge pull request #15157 from LanCartwright/nomorehardsuit 
Removes hardsuit from bulldog bundle
 2016-02-10 21:21:42 -06:00
duncathan salt
c77a9f6cb5 Merge pull request #14543 from StormAGeddonz/patch-1 
Buffs medical, research, engi, and atmos hardsuits
 2016-02-10 20:39:54 -06:00
Razharas
4e84fc7fe9 Merge pull request #15338 from tkdrg/whoa 
[s]Fixes server crash by abusing containment fields
 2016-02-11 04:23:46 +03:00
phil235
4376477c5b named argument for better readability. 2016-02-11 01:31:23 +01:00
phil235
5fcf29fd24 Fixes resisting out of cryo not working when you use moving instead of the resist button. 
Also changes addtimer into a do_after().
 2016-02-11 01:25:48 +01:00
phil235
181e632420 Merge pull request #15408 from neersighted/check_yourself_before_you_wreck_yourself 
Properly don't process embeded atmos machinery
 2016-02-11 01:21:23 +01:00
Cheridan
eeb96cb7a5 Merge pull request #15360 from neersighted/ionsomething 
Remove borg jetpack, give them ion thrusters instead
 2016-02-10 18:19:13 -06:00
Bjorn Neergaard
e41a092f16 Properly don't process embeded atmos machinery 
Fixes weird atmos bugs of all sorts
 2016-02-10 18:04:20 -06:00
Bjorn Neergaard
27a838c17f Fix crate access; fix locker item-to-lock 2016-02-10 17:40:10 -06:00
AnturK
2c0dcb17de Merge pull request #15280 from phil235/VisionUpdatesChanges 
Some adjustments to the new vision code
 2016-02-10 23:20:20 +01:00
tkdrg
41901027db Merge pull request #15362 from lzimann/table 
Some table fixing
 2016-02-10 19:18:32 -03:00
phil235
34214d321a Fixes revenant not seeing itself and not having his action buttons. 
Fixes many mobs having a null hud_used.
Fixes fullscreen overlay disappearing when toggling the hud.
Fixes our vision when being ejected by a delivery chute and when inside a disposal unit that is being destroyed.
 2016-02-10 23:17:44 +01:00
phil235
062fc929ba Fixes alien's weakened var never decreasing. 2016-02-10 22:52:36 +01:00
phil235
0291f450d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into VisionUpdatesChanges 
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/death.dm
	code/modules/mob/living/login.dm
	code/modules/mob/mob.dm
 2016-02-10 22:35:19 +01:00
tkdrg
58c91656a2 Merge pull request #15361 from neersighted/always_null_yourself 
Null portable atmos airs
 2016-02-10 16:49:30 -03:00
tkdrg
2609e8bf04 Merge pull request #15344 from Shadowlight213/Mulesky 
Restores client controlled mulebots running people over. Greatly nerfs mulebot health to compensate.
 2016-02-10 16:42:06 -03:00
tkdrg
38a4ca4168 Merge pull request #15349 from octareenroon91/autolathe-buff 
Enables design transfer to autolathe by disk.
 2016-02-10 16:39:31 -03:00
tkdrg
2d4e63370e Merge pull request #15254 from PKPenguin321/patch-13 
Halves most tablecrafting times
 2016-02-10 15:58:52 -03:00
octareenroon91
38b97120dd Enables design transfer to autolathe by disk. 
You can now save a metal-and/or-glass-only design to disk and load it onto an autolathe.
 2016-02-10 12:40:41 -06:00
Shadowlight213
91c73e9663 Re-adds mulebot running over for sentient mulebots. Greatly nerfs mulebot health. 2016-02-10 09:33:21 -08: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
Bjorn Neergaard
265b8d2d20 Fix an air alarm runtime 
Don't store hard refs to an area which can cause race condtions
Instead, get our area only when we need it

The following runtime has occured 4426 time(s).
runtime error: Cannot read null.atmosalm
proc name: update icon (/obj/machinery/airalarm/update_icon)
  source file: airalarm.dm,535
  usr: null
  src: the alarm (/obj/machinery/airalarm)
 2016-02-10 07:01:24 -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
Bjorn Neergaard
5975449a31 Fix gravity gen logging during init 2016-02-09 23:45:02 -06:00
Leo
57aa7a8521 Ghost Mekhi no longer in the table 2016-02-10 03:43:07 -02:00
Bjorn Neergaard
f4c33332fe istypeless meme 2016-02-09 23:23:39 -06:00