cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-27 09:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,394 Commits 61 Branches 14 Tags
bc3bdfce2ec218cd0da9416eceb0def5eeca8166
Commit Graph

7764 Commits

Author SHA1 Message Date
oranges
4dd328a9fa Merge pull request #17355 from kevinz000/KeepersOfThePeace 
Peacekeeper Borgs
 2016-05-23 12:32:06 +12:00
Joan Lung
64e850f38b Merge pull request #17775 from coiax/fix-17480 
Fixes #17480; tabling not breaking glass tables
 2016-05-21 21:00:47 -04:00
oranges
8d6da5d01f Merge pull request #17796 from bgobandit/sofuckingmetal 
Runed metal no longer deletes girders when used on them.
 2016-05-21 22:56:45 +12:00
oranges
4348a9fb54 Merge pull request #17789 from coiax/fix-17782 
Fixes #17782 and #17807; KA now can't be spam reloaded, spam improved
 2016-05-21 22:50:26 +12:00
Mercenaryblue
7603b900c4 [s] Golden Bike Horn Fix (#17679) 
* Golden Bike Horn 1.0.5

Fixing code returning before flipping mobs.

* Fix 2

Return ..()
Fully tested.
Works perfectly now.
 2016-05-21 22:42:07 +12:00
Jack Edge
8ff4486ab7 Fixes #17480; tabling not breaking glass tables 
Fixes #17480.

Also catches a rare case where people would be thrown onto the tables
from afar by checking whether there are any mobs on the table with
a spawn call.

- Glass tables are now coloured by Nar'sie.
- Glass tables pregenerate and store their shatter debris.

🆑 coiax
fix: Glass tables now break when people are pushed onto them.
/🆑
 2016-05-21 10:48:04 +01:00
oranges
6486b588c6 Merge pull request #17333 from nullbear/less-wetness-updates.-Ice-sliding-in-no-slips- 
Wetness stuff.
 2016-05-21 14:46:09 +12:00
Jack Edge
490dacf586 Fixes the other thing 2016-05-20 17:10:38 +01:00
Cheridan
328a69ebf2 Merge pull request #17396 from KorPhaeron/security 
Gives the HoS a pinpointer
 2016-05-20 06:35:30 -05:00
Cheridan
23d8de67c9 Merge pull request #17445 from bgobandit/ayygentb 
Adds BZ, a hallucinogenic gas. [MAP EDIT]
 2016-05-19 18:14:18 -05:00
bgobandit
b2ea93323d Runed metal no longer deletes girders when used on them. 2016-05-19 16:46:57 -04:00
Cheridan
a8d893be47 Merge pull request #17758 from KorPhaeron/rocks 
Removes some old rock sprites
 2016-05-19 04:49:28 -05:00
bgobandit
d430ca29ab fixes the bugs of the jordie 2016-05-18 14:27:26 -04:00
AnturK
429daede34 Merge pull request #17757 from KorPhaeron/exploring 
New mining gear sprites
 2016-05-18 18:22:53 +02:00
AnturK
4b426eccd1 Merge pull request #17698 from coiax/mehki-did-it 
KA rebalance; brings back holding a satchel
 2016-05-18 18:03:12 +02:00
bgobandit
b94ce1968b Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
 2016-05-18 03:13:37 -04:00
KorPhaeron
8aabf3d5f5 Removes some old sprites 2016-05-18 00:50:07 -05:00
KorPhaeron
0cf94ad6b0 Explorer Gear 2016-05-18 00:31:48 -05:00
RandomMarine
8b3a4a1570 Makes map placed broken grilles act normally. (#17678) 
* Adds proper mapstart broken grilles

* Adds proper mapstart broken grilles
 2016-05-16 22:10:01 -05:00
Jack Edge
462aa7782a KA rebalance; brings back holding a satchel 
Fixes #17203.

🆑 coiax
rscadd: Kinetic accelerators only require one hand to be fired, as before
rscdel: Kinetic accelerators recharge time is multiplied by the number of KAs that person is carrying.
rscdel: Kinetic accelerators lose their charge quickly if not equipped or being held
rscadd: Kinetic accelerator modkits (made at R&D or your local Free Golem
ship) overcome these flaws
/🆑

Effects on people who just use one kinetic accelerator: *They can now
carry a mining satchel in the off hand again.*
Effects on people who want to dual wield them both at once: They can do
this, but they recharge twice as slow, so no increase in DPS.
Effects on people who quasi-dual wielded by swapping them in and out of
the backpack: Now treated the same as dual wielders.

And as before, modkits mean you can properly dual wield KAs.
Mining cyborgs are unaffected.
 2016-05-17 00:38:29 +01:00
PKPenguin321
5cce6a6d50 eliminates a hard tell in microlaser desc (#17669) 2016-05-16 09:48:40 -05:00
bgobandit
eaf93e34cd Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2016-05-15 17:19:14 -04:00
oranges
c0fc836e3e Readd pick to generate_messages for skeleton 
This causes it to pick a list instead of a message
 2016-05-15 20:17:47 +12:00
Cheridan
4c89a3a863 Merge pull request #17639 from Iamgoofball/patch-40 
Removes shitty shoehorned references.
 2016-05-14 18:45:32 -05:00
TehZombehz
076fc0df79 Adds Bone Weaponry (#17672) 
* Adds Bone Weaponry

Adds Bone Spears, Axes, and Daggers, all craftable.

* '''Balance'''

I listen to the suggestions of others.

* Fixes
 2016-05-14 18:31:36 -05:00
Mercenaryblue
72ff107481 Clown Update - Golden Bike Horn (#17530) 
* Golden Bike Horn 1.0.0

Adds the golden bike horn to the game.

* Golden Bike Horn 1.0.1

Adds a deaf check

* Golden Bike Horn 1.0.2

Removed the extra bike horn sound when hitting yourself.

* Golden Bike Horn 1.0.3

flip_mobs() proc optimize the code.

* Golden Bike Horn 1.0.4

Fixes

* Golden Bike Horn 1.0.4.b

mob/user

* Golden Bike Horn 1.0.4.c

Last change

* Golden Bike Horn 1.0.4.d

No longer responsible for the lack of returns
Honk

* Golden Bike Horn 1.0.4.f

Fudge
 2016-05-14 16:11:45 -05:00
AnturK
fc924abd2d Merge pull request #17601 from Bawhoppen/medicalbelt 
Lets medical belts hold more types of stuff
 2016-05-14 14:03:01 +02:00
kevinz000
95ca999d44 FixesGrammer+otherstuff 2016-05-13 23:31:38 -07:00
kevinz000
5f93cc5af1 NoMessageSpam 
Harm Alarm no longer spams multiple lines of text!
 2016-05-13 23:03:14 -07:00
kevinz000
85e88b3d6c stunarmnerf 
Stun arms now have a cooldown of 3 seconds.
 2016-05-13 22:54:25 -07:00
Cheridan
d5c70bc5f2 Merge pull request #17613 from coiax/morphling-holodeck 
Removes materials from holodeck chairs and windows (Fixes #17612)
 2016-05-13 23:35:00 -05:00
kevinz000
c02a354298 bugfixes 2016-05-13 21:28:45 -07:00
kevinz000
0940816bcc cooldowns 2016-05-13 16:47:39 -07:00
kevinz000
f19544b08f hugshockshonkhonk 2016-05-13 16:45:01 -07:00
Iamgoofball
38e38ca3da Update toys.dm 2016-05-13 14:05:35 -07:00
Jack Edge
611e19e49a Window debris on creation, release on destruction 2016-05-13 21:50:03 +01:00
Iamgoofball
c0ea29ad9a Removes shitty shoehorned references. 2016-05-13 13:12:19 -07:00
Joan Lung
b0a0063a86 Merge pull request #17425 from coiax/voiced-skeletons 
Some talking toys now audibly chatter
 2016-05-13 14:45:12 -04:00
Jack Edge
41c3af76e3 MORE SKELETON JOKES 2016-05-13 19:30:18 +01:00
Razharas
b46de70537 Makes dismemberment more adjustable (#17587) 
* Makes dismemberment more adjustable

Makes dismemberment more adjustable
Items now return chance for dismemberment
Bodyparts now decide if they are dismemberable or not by the specific
item
Items now decide what sound to play on dismemberment
No balance changes here

* Owner into H

Owner into H
 2016-05-13 20:27:06 +02:00
Annie Acosta
ec90f1d23f gives security their normal headsets back (#17467) 2016-05-13 12:47:15 -05:00
Jack Edge
889c7240f0 Merge branch 'master' into voiced-skeletons 2016-05-13 18:37:23 +01:00
AnturK
2372330eef Merge pull request #17611 from Crushtoe/grammar-fix 
Fixes a grammar issue with lockers
 2016-05-13 19:33:49 +02:00
AnturK
17861f3395 Merge pull request #17569 from MrPerson/come_up_with_joke_later 
Close the UI when you lock a lockbox
 2016-05-13 19:32:15 +02:00
AnturK
7ab038d627 Merge pull request #17579 from phil235/FixHeaterSign 
Fix bundle: space heater & signs
 2016-05-13 19:29:33 +02:00
Joan Lung
a1db58ed75 Merge pull request #17610 from coiax/birdboat-clean 
Merges Birdboat misc.dm into mainline
 2016-05-13 13:20:03 -04:00
Joan Lung
1313d45aff Merge pull request #17565 from KorPhaeron/cakehat3 
Nerfs cakehat
 2016-05-13 11:52:32 -04:00
kevinz000
a4961f2e4d Tryingtofixhypoandhugs 2016-05-13 05:49:39 -07:00
bawhoppen
b7a7f7c470 2 small changes (#17543) 
Survival Knife sprite and sandbag layer fix
 2016-05-12 21:53:59 -05:00
Jack Edge
049d23cde9 Merges birdboat survival boxes into mainline 
- Made new survival+radio boxes, and set Birdboat jobs to use them.
- Also deleted some unneeded lines in boxes.dm
 2016-05-12 16:36:25 +01:00