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

18208 Commits

Author SHA1 Message Date
Fox McCloud
22ab7d6a4f Fixes Resist Fire Stuns (#21374) 2016-11-06 21:41:45 +01: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
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
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
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
6a885d9500 Merge pull request #21342 from phil235/TransitShit 
Fixes transit tubes
 2016-11-05 17:21:24 -05: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
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
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
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
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
oranges
04a6fc47f2 Merge pull request #21319 from ExcessiveUseOfCobblestone/geishaoncemore 
GeishAgain!
 2016-11-03 10:10:51 +13:00
oranges
8ebf0c0ea3 Merge pull request #21320 from Mervill/master 
Late joining won't runtime if the emergency shuttle does not exist (dev QoL)
 2016-11-03 10:00:17 +13:00
oranges
dc6c51086f Merge pull request #21312 from JJRcop/chronofixyetagain 
Fixes chronosuit not checking if held items are chronosafe
 2016-11-03 09:50:08 +13:00
Tacolizard
90c1f32b25 Update packs.dm 2016-11-02 08:46:59 -07:00
oranges
2feb302b2d Fix duplicate species id's (#21287) 
Unique id's for both krokodil humans and infectious zombies
Unique id for the ashwalker lizard subspecies

Uses the correct limbs_id var to ensure their icons reuse the
appropriate icons of correct species
 2016-11-02 08:51:02 -04:00
Cheridan
19c6919e88 Merge pull request #21309 from phil235/ClonePodRuntimeFix 
Fixes two runtime from clonepod.
 2016-11-02 06:05:11 -05:00
Cheridan
1ff1dc1542 Merge pull request #21307 from tgstation/AnturK-patch-1 
Fixes a typo.
 2016-11-02 03:25:57 -05:00
oranges
e2e0400a91 Merge pull request #21292 from XDTM/WhosThere 
Makes ninja stealth make you mostly transparent instead of 100% invisible
 2016-11-02 16:20:23 +13: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
Cheridan
72e08593f1 Merge pull request #21295 from Iamgoofball/patch-142 
You can cauterize with a laser gun now.
 2016-11-01 09:12:24 -05:00
Mervill
fbf85c3a1b Merge branch 'shuttlefix' 2016-10-31 21:36:25 -07:00
Mervill
acfd3004a0 Avoid runtimes in late joining, throw warnings at startup if the emergency shuttle does not exist 2016-10-31 21:26:39 -07: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
Tacolizard
8a57efc8ab very minor atv crate tweaks (#21244) 
the atv crate has been changed from a plain crate to a large one because realism.
the price has been lowered from 3000 to 2000 
the crate includes a leather overcoat and skull bandana so you can make a biker gang
it's been renamed the Biker Gang Kit
 2016-11-01 11:35:24 +13:00
oranges
687967a685 Merge pull request #21271 from JJRcop/youarekiddingmerightwheredidmycodebabbygoyoukilledityoumonster 
Readds the day the world ended
 2016-11-01 11:32:16 +13:00
oranges
6a411a5a97 Merge pull request #21266 from kevinz000/revert1 
Reverts Hardlight Bows
 2016-11-01 11:31:40 +13:00
duncathan salt
6f909d3748 Merge pull request #21261 from Xhuis/fix_bundle 
Fix bundle
 2016-10-31 13:58:27 -06:00
phil235
2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing 
# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm
 2016-10-31 19:59:00 +01:00
AnturK
373cfd8303 Fixes dental implant runtime (#21256) 
* Fixes dental implant runtime

* oranges is right
 2016-10-31 19:51:54 +01:00
ExcessiveUseOfCobblestone
059a900e3f Removes Stray Space in Species_type in an effort to save the world. (#21286) 
* Fixes Zombies / Flags for Species

* GO BACK

* Reverts Defines
 2016-10-31 19:45:34 +01:00
JJRcop
8d871d0777 Fixes chronosuit not checking if held items are chronosafe 2016-10-31 13:01:08 -04:00
phil235
e2c5cbb334 Fixes two runtime from clonepod. 
Moves countdown effects into the effect folder instead of being in their own module.
 2016-10-31 14:34:25 +01:00
AnturK
64a2753ce9 And the other one 2016-10-31 12:52:47 +01:00
AnturK
b6e2d67098 Fixes a typo. 2016-10-31 12:21:15 +01:00
Iamgoofball
2885eab9f3 You can cauterize with a laser gun now. 
it's a laser it makes sense
 2016-10-30 17:21:39 -07:00
XDTM
66a7fde82d ALMOST invisible 2016-10-31 00:35:49 +01:00