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
39,650 Commits 61 Branches 14 Tags
22ab7d6a4fe6b19e0d94de8076a13521c2c75a74
Commit Graph

39650 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fox McCloud
22ab7d6a4f Fixes Resist Fire Stuns (#21374) 2016-11-06 21:41:45 +01:00
tgstation-server
49575a94e8 Automatic changelog generation for PR #21201 [ci skip] 2016-11-06 20:01:43 +00:00
Militaires
889c82a247 CQC tweaks, improvements and fixes [and adds and utilizes martial art blocks) (#21201) 
fixes an abusive exploit and makes 2 combos easier to use, increases cqc harm damage, adds martial art block_chance var which is only activated if you have your throw_mode on for active defense.

baton blocks stun the person attempting the attack too, you can now block batons and then throw or chokehold.

makes tc cost for CQC 13 with all the buffs.
 2016-11-07 09:01:41 +13:00
tgstation-server
cedc5d6365 Automatic changelog generation for PR #21369 [ci skip] 2016-11-06 15:32:10 +00:00
Cheridan
53f869b6e3 Merge pull request #21369 from ChangelingRain/clockdrones 
Standard drones will be converted to Cogscarabs by Ratvar
 2016-11-06 09:32:09 -06:00
Joan Lung
04a9292de2 Merge pull request #21376 from kevinz000/seclitestovendorsrightbranch 
Gives the mining lockers a seclite.
 2016-11-06 08:57:27 -05:00
tgstation-server
33e3f78565 Automatic changelog generation for PR #21372 [ci skip] 2016-11-06 05:12:24 +00:00
Cheridan
5d5e4de951 Merge pull request #21372 from phil235/pdapenshit 
Pda overlays and pAi fix
 2016-11-06 00:12:23 -05:00
Joan Lung
bf5905866a the dir change! 2016-11-05 21:07:32 -04:00
kevinz000
5bf5426f4a Update mine_items.dm 2016-11-05 17:22:01 -07:00
kevinz000
bda1dda20e Update mine_items.dm 2016-11-05 17:21:49 -07:00
sybil-tgstation13
8a930825ba Automatic changelog compile, [ci skip] 2016-11-06 00:02:15 +00:00
tgstation-server
7bd762b6c3 Automatic changelog generation for PR #21354 [ci skip] 2016-11-05 23:49:47 +00:00
Cheridan
27165d2748 Merge pull request #21354 from ChangelingRain/noncolormatrices 
You can now actually drag people over Vitality Matrices
 2016-11-05 18:49:46 -05:00
tgstation-server
bfb3013a86 Automatic changelog generation for PR #21368 [ci skip] 2016-11-05 23:41:28 +00:00
Joan Lung
0c82fb0770 Merge pull request #21368 from phil235/fixbundleshit 
Easy fix bundle
 2016-11-05 19:41:27 -04:00
Joan Lung
12f1d09ab2 Merge pull request #21380 from phil235/RuntimeStationFix 
fixes runtimestation compile error.
 2016-11-05 19:38:13 -04:00
phil235
419ef7cc91 fixes runtimestation compile error. 2016-11-06 00:36:14 +01:00
Joan Lung
241e6e75b8 Merge pull request #21359 from phil235/WindowExplosionBlockFix 
reinforced window and telehulk bugfixes
 2016-11-05 19:33:15 -04:00
Cheridan
3dd35cc0b1 Merge pull request #21365 from ChangelingRain/glowfixes 
You can now proselytize false walls + glow fixes
 2016-11-05 18:30:59 -05:00
oranges
b8e2efe097 Merge pull request #21347 from Mervill/master 
Runtime Station - Quick loading developer sandbox
 2016-11-06 12:10:24 +13:00
tgstation-server
7ab2e7f662 Automatic changelog generation for PR #21342 [ci skip] 2016-11-05 22:21:25 +00:00
Cheridan
6a885d9500 Merge pull request #21342 from phil235/TransitShit 
Fixes transit tubes
 2016-11-05 17:21:24 -05:00
sybil-tgstation13
1c29dea267 Automatic changelog compile, [ci skip] 2016-11-05 16:44:36 +00:00
Cheridan
52f72a6fe9 Merge pull request #21335 from Tacolizard/patch-16 
By request, added some more clothing to the biker crate
 2016-11-05 11:06:04 -05:00
kevinz000
c98d1d3b21 Update packs.dm (#21362) 2016-11-05 11:53:43 -04:00
Joan Lung
25341f1e1d Merge pull request #21364 from lzimann/mix 
Fix the atmos mix tank control console
 2016-11-05 10:45:01 -04:00
Joan Lung
ab286bd2d8 The spawn animation for the Ark of the Clockwork Justicar will now only play once (#21349) 
* The spawn animation for the Ark of the Clockwork Justicar will now only play once

* screaming

* i knoooow

* clang noise
 2016-11-05 09:44:10 -05:00
PKPenguin321
43692c6bad buffs whetstones (#21339) 
makes it so anything sharpened with them becomes is_sharp_accurate
 2016-11-05 14:12:20 +01:00
kevinz000
f1ee75b18b Update mine_items.dm 2016-11-05 03:05:29 -07:00
phil235
93ac302a2e Fixes pAI face not being updated when killed by EMP (or any non wipe/suicide death). 2016-11-05 03:22:20 +01:00
phil235
59f2a4e10e Adds some image overlays on PDAs when they had an id (bottomleft corner green light), when their light is on (bottom right corner), when they have an item inserted (top), when they have a pai inserted (screen changes). 
Also, altclicking a PDA without an ID now removed the inserted item.
Fixes some bugs. Simplifies id_check() proc.
 2016-11-05 03:15:04 +01:00
Joan Lung
f330bc3e7e ah, yes, that's not a constant 2016-11-04 20:58:31 -04:00
Joan Lung
3c2eb852a2 Standard drones will be converted to cogscarabs by Ratvar 2016-11-04 20:36:54 -04:00
phil235
b8e5bb22bc Moves bodybag closet into the closet folder where they should be. 
Fixes large crate, critter crate, cardboard and metal boxes showing a nonfitting sprite when wrapped. I added two new sprite for those wrapped box-like closet, one for wrapped and one for giftwrapped.

You can now use tabs when writing on paper, by using "[tab]".

Fixes clone damage not being transfered when humanizing/monkeyizing with a dna injector.

Fixes chaplain's camera obscura showing invisible things other than ghosts.

Fixes typo in carbon/examine.dm().
 2016-11-05 00:00:28 +01:00
tgstation-server
c5211a6ed2 Automatic changelog generation for PR #21357 [ci skip] 2016-11-04 20:58:25 +00:00
Leo
d1aaed5943 Fix fix fix fix (#21357) 2016-11-04 21:58:24 +01:00
tgstation-server
9ddfa06d9d Automatic changelog generation for PR #21344 [ci skip] 2016-11-04 16:14:03 +00:00
Razharas
e68d1c99ab Merge pull request #21344 from ChangelingRain/fluffmessages 
Adds some fluff messages to clockcult
 2016-11-04 20:14:02 +04:00
Joan Lung
990942481f You can now proselytize false walls + glow fixes 2016-11-04 11:53:48 -04:00
tgstation-server
0957d6f7cd Automatic changelog generation for PR #21334 [ci skip] 2016-11-04 14:35:01 +00:00
Joan Lung
d4643f032c Proselytizer conversion now accounts for existing materials better (#21334) 
* Proselytizer conversion now accounts for existing materials better

* shitfuck.

* move the god damn defines
 2016-11-04 15:35:00 +01:00
Lzimann
07178227dd Fix the mix tank in three maps. 2016-11-04 11:11:56 -02:00
PKPenguin321
44594790a9 krav maga touchup (#21337) 
* krav maga touchup

Fixes a bad check for when to play the kick hitsound

* clamps losebreath/silence on lung punch/neck chop to 10

also tweaks leg sweep desc

* hopefully fixes the clamps
 2016-11-04 13:29:42 +01:00
Cheridan
7e8267c58e Merge pull request #21338 from tgstation/optimumtact-patch-1 
Remove 509 specific instructions for linux
 2016-11-04 05:30:33 -05:00
kevinz000
721c2676d9 Merge pull request #6 from tgstation/master 
updates master
 2016-11-04 01:34:26 -07:00
Joan Lung
1a26cf9aa5 Ratvar will now proselytize stuff that happens to be in space (#21340) 
* Ratvar will now proselytize stuff that happens to be in space

* do you hear ratvar singing

* no narsie in ooc

* "

* don't need that

* heir

* bigger stronger more filled with brass
 2016-11-04 09:06:57 +01:00
phil235
8cb3736221 Fixes turf having two contents_explosion() 
Fixes hulk plus telekinesis being able to hulk smash things from a distance.
 2016-11-04 00:33:51 +01:00
sybil-tgstation13
0e5b69fa1f Automatic changelog compile, [ci skip] 2016-11-03 19:27:07 +00:00
Joan Lung
e163090dd3 this.. could be better 2016-11-03 15:08:49 -04:00