cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-28 10:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,650 Commits 61 Branches 14 Tags
22ab7d6a4fe6b19e0d94de8076a13521c2c75a74
Commit Graph

17049 Commits

Author SHA1 Message Date
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
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
Cheridan
5d5e4de951 Merge pull request #21372 from phil235/pdapenshit 
Pda overlays and pAi fix
 2016-11-06 00:12:23 -05: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
Joan Lung
0c82fb0770 Merge pull request #21368 from phil235/fixbundleshit 
Easy fix bundle
 2016-11-05 19:41:27 -04: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
Cheridan
6a885d9500 Merge pull request #21342 from phil235/TransitShit 
Fixes transit tubes
 2016-11-05 17:21:24 -05: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
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
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
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
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
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
Joan Lung
e163090dd3 this.. could be better 2016-11-03 15:08:49 -04:00
Joan Lung
76f262a542 if it never activated, don't deactivate 2016-11-03 14:41:08 -04:00
Joan Lung
c3b8fb302d You can now actually drag corpses over Vitality Matrices 2016-11-03 14:31:36 -04:00
phil235
48af5e5927 Removed another outdated comment 2016-11-03 19:19:32 +01:00
phil235
b0b5a90bd7 Requested changes 2016-11-03 19:03:04 +01:00
Joan Lung
5ae9bd84b4 no message 2016-11-03 09:49:49 -04:00
Joan Lung
0f6aa36b2c no message 2016-11-03 09:48:27 -04:00
Joan Lung
05fade395e Adds some fluff messages to clockcult 2016-11-02 22:14:51 -04:00
phil235
5178084325 Merge branch 'master' of https://github.com/tgstation/-tg-station into TransitShit 2016-11-03 02:53:15 +01:00
oranges
57673a9daa Merge pull request #21323 from ChangelingRain/weakfixes 
Some small clockcult fixes
 2016-11-03 11:08:30 +13:00
Jordie
f1e293504c Merge pull request #21315 from ChangelingRain/siliconapplication 
Clockcult "Convert All Silicons" objective now also requires that Application scripture is unlocked
 2016-11-03 09:06:44 +11:00
phil235
26b8d03b2f Merge branch 'master' of https://github.com/tgstation/-tg-station into TransitShit 2016-11-02 22:57:51 +01:00
phil235
51d1319ed1 Make transit tube code less shit. 2016-11-02 22:55:36 +01:00
Joan Lung
25dc7d25c5 Proselytizing a window will automatically proselytize the grille under it (#21314) 
* Proselytizing a window will proselytize the grille under it

* fancy
 2016-11-03 10:19:49 +13:00
oranges
f57357a049 Merge pull request #21316 from ChangelingRain/unflappable 
Plastic flaps are once again immune to being hit in melee
 2016-11-03 10:11:17 +13:00
oranges
04a6fc47f2 Merge pull request #21319 from ExcessiveUseOfCobblestone/geishaoncemore 
GeishAgain!
 2016-11-03 10:10:51 +13:00
Cheridan
19c6919e88 Merge pull request #21309 from phil235/ClonePodRuntimeFix 
Fixes two runtime from clonepod.
 2016-11-02 06:05:11 -05:00
Joan Lung
02e54446d8 Hulks no longer oneshot literally every clockwork structure (#21283) 
* Hulks no longer oneshot literally every clockwork structure

* rrrrr

* why the fuck did you ask me to make this a proc????

* hulks, why.
 2016-11-02 22:52:42 +13:00
Joan Lung
ff69c5c631 Mending Motors are overall more powerful (#21281) 
* Mending Motors are overall more powerful

* that fucking capitalization always gets me
 2016-11-02 22:52:15 +13:00
Cheridan
a72658206a Merge pull request #21282 from ChangelingRain/helptheocularwardenisbeatingme 
Ocular Wardens no longer attack restrained targets
 2016-11-02 03:27:54 -05:00
phil235
b7efc2cef4 Make energy guns able to use burst fire. (#21005) 
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
 2016-11-02 16:16:21 +13:00
Joan Lung
d63d6149c9 Some small clockcult fixes 2016-11-01 15:05:27 -04:00
Joan Lung
4c7ecda6b8 good code 2016-11-01 13:33:27 -04:00
Cheridan
c30441148e Merge pull request #21308 from phil235/AlienAcidFix 
Fixes alien acid not melting turfs.
 2016-11-01 09:16:22 -05:00
Cheridan
37c6f1e1ae Merge pull request #21310 from ChangelingRain/gearbits 
Brass windows and windoors no longer drop full sheets of brass when destroyed
 2016-11-01 09:09:51 -05:00
Joan Lung
ee76078d16 Merge pull request #21060 from phil235/Color_washing 
Adding var/list/atom_colours to /atom .
 2016-10-31 21:12:29 -04:00
phil235
0876b424a7 Tiny fixes and suggested changes. 
Blight ability will still color your hair, and will be cleared when cured.
 2016-11-01 01:59:23 +01:00
ExcessiveUseOfCobblestone
67b14be455 no merge conflicts pls 2016-10-31 20:00:27 -04:00
oranges
6a411a5a97 Merge pull request #21266 from kevinz000/revert1 
Reverts Hardlight Bows
 2016-11-01 11:31:40 +13:00
Joan Lung
80c8c23b91 only if ai 2016-10-31 18:18:58 -04:00
Joan Lung
883e7f745b Plastic flaps are once again immune to being hit in melee 2016-10-31 18:06:33 -04:00