cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-01 20:42:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,355 Commits 60 Branches 14 Tags
fa62cefaacca6fa96c74aaceebadebc2a6fb2851
Commit Graph

14386 Commits

Author SHA1 Message Date
duncathan salt
fa62cefaac Merge pull request #15958 from Impisi/ImprovisedShellChanges 
Improvised Shell Rework Attempt 2
 2016-03-12 15:16:08 -06:00
KorPhaeron
1609775c2c Merge pull request #15928 from AnturK/abductor_update 
Minor Abductor update
 2016-03-12 15:13:53 -06:00
AnturK
8701541d20 Fixes not being able to unbuckle from surgery tables 2016-03-12 21:44:45 +01:00
AnturK
cc034af9d4 Merge pull request #15999 from ChangelingRain/placesplease 
Goon-style blob placement
 2016-03-12 21:17:57 +01:00
duncathan salt
d1f8562c04 Merge pull request #16043 from Jordie0608/ifitwasneverusedisitreallybroken 
Fixes broken regex
 2016-03-12 13:55:20 -06:00
KorPhaeron
ee61367807 Merge pull request #16040 from Boredone/master 
Replaces Mediborg Acid Spray with Poison Hypospray
 2016-03-12 13:54:54 -06:00
duncathan salt
1692d5a01d Merge pull request #16022 from AnturK/ruin_fix 
Fixes ruins repeating
 2016-03-12 13:50:12 -06:00
duncathan salt
eccc4aba88 Merge pull request #16006 from Core0verload/alienalloys 
Alien Alloys
 2016-03-12 13:49:30 -06:00
duncathan salt
deb3a1ac85 Merge pull request #16005 from optimumtact/patch-1 
Don't damage eyes if flash intensity is zero
 2016-03-12 13:47:10 -06:00
duncathan salt
8deb644e48 Merge pull request #15915 from Menshin/PA_code_cleaning 
Cleaning of the Particule Accelerator code
 2016-03-12 13:37:33 -06:00
duncathan salt
42247779e9 Merge pull request #15803 from bgobandit/roadkill 
Shuttle collisions no longer run into limb damage caps on mobs
 2016-03-12 13:22:28 -06:00
c0
8dfef3b793 fix 2016-03-12 15:07:33 +03:00
c0
9a3276c784 Alien Alloys in RnD 2016-03-12 15:07:32 +03:00
c0
52d91c0cf9 Abductor Tech added to RnD 2016-03-12 15:07:30 +03:00
Cheridan
ba77895a5b Merge pull request #15992 from sawu-tg/master 
Clown SNPC Spam hotfix
 2016-03-11 22:34:44 -06:00
Joan Lung
e469a4d35e Merge pull request #16018 from PKPenguin321/tactical-bola 
Bolas update: Traitor items edition
 2016-03-11 21:01:24 -05:00
Razharas
9d6752ad78 Merge pull request #16024 from ChangelingRain/notsostellargate 
All of the bottom gateway parts are passable
 2016-03-12 02:28:45 +03:00
Boredone
198e81d82f Switched out Teslium for Lexorin 2016-03-11 14:38:14 -07:00
KorPhaeron
b204c2f333 Merge pull request #15825 from tkdrg/am_i_hg_yet 
Nerfs the detective's revolver
 2016-03-11 12:52:50 -06:00
KorPhaeron
5420596dd0 Merge pull request #15819 from xxalpha/october_12th_2555 
Detective can be a traitor/double agent.
 2016-03-11 12:50:32 -06:00
Cheridan
713dc3ebf5 Merge pull request #15988 from Core0verload/plantrefactor3 
Plant Refactor: Genesis
 2016-03-11 12:37:57 -06:00
Cheridan
af0575cf8b Merge pull request #16016 from KorPhaeron/communications 
Responding to a centcomm message resets the machines cooldown
 2016-03-11 11:58:17 -06:00
Boredone
189c06b21b Removed Proc 2016-03-11 10:06:31 -07:00
AnturK
1f2a9811ff Merge pull request #16020 from ChangelingRain/bonuschemtweaks 
Tweaks Boiling Oil and Flammable Goo
 2016-03-11 17:34:52 +01:00
AnturK
0df3e55d04 Merge pull request #16019 from ChangelingRain/unactionable 
The gravity generator is no longer permanently destroyed by the blob
 2016-03-11 17:33:25 +01:00
xxalpha
e5be8c7784 detective has loyalty implant 2016-03-11 16:32:48 +00:00
Jordie0608
5ee92abad3 fixes broken regex 2016-03-11 21:43:32 +11:00
KorPhaeron
fdd368b8bd Merge pull request #15997 from LanCartwright/m90glproperlyremoved 
Do it right first time edition 2. M90GL edition.
 2016-03-11 04:22:24 -06:00
KorPhaeron
2693dedc25 Merge pull request #16002 from KazeEspada/cabinfixes 
Cabin fixes
 2016-03-11 04:21:52 -06:00
Boredone
6bfe0e921a This replaces the FAcid spray on Mediborgs with a Poisonous Hypospray 2016-03-11 01:52:59 -07:00
c0
6b7774a1de fixes 2016-03-11 09:52:20 +03:00
duncathan salt
ed47b418bf Merge pull request #16011 from ChangelingRain/binarybeep 
Dead cyborgs no longer get binary messages twice
 2016-03-10 22:36:23 -06:00
PKPenguin321
3be53bb7a4 changes var for bola stunning 
now instead of a TRUE/FALSE toggle, it's the actual amount of Weaken() applied. default is 0 (no stun)
also fixes small typo in uplink_item.dm
 2016-03-10 19:33:54 -08:00
Nerd Lord
733e157ae7 All of the bottom gateway parts are passable 2016-03-10 16:03:43 -05:00
duncathan salt
3819065beb Merge pull request #15980 from KazeEspada/beach2 
Virgo Orbital Research Establisment Station Port.
 2016-03-10 14:33:48 -06:00
AnturK
9531ff401a Fixes ruins repeating 2016-03-10 18:13:49 +01:00
Joan Lung
d24dd3e8db Merge pull request #15989 from RandomMarine/copysplosion 
De-copypastas explosive reagent reactions.
 2016-03-10 11:06:46 -05:00
Nerd Lord
d5840cdb44 Boiling Oil does slightly more damage, takes slightly less when extinguished 
Flammable Goo applies firestacks to targets, but doesn't ignite them.
 2016-03-10 10:47:21 -05:00
Nerd Lord
3656ca9d40 The gravity generator is no longer permanently destroyed by the blob. 2016-03-10 10:29:40 -05:00
Cheridan
e43b3a891d Merge pull request #15964 from RemieRichards/buckle_many_mobs 
Many Buckled Mobs
 2016-03-10 08:22:27 -06:00
Cheridan
925e0bfeb9 Merge pull request #15984 from ChangelingRain/extinguishblob 
The blob can now be shocked by the tesla
 2016-03-10 07:55:14 -06:00
PKPenguin321
08f78d7db9 adds reinforced bolas, tweaks uplink throwing star bundle 
adds reinforced bolas, they do a Weaken(1) and take twice as long to break out of when compared to normal ones. their sprite has a different color
moves throwing star bundle to uplink_kits.dm from weaponry.dm and makes it use a syndicate box
tweaked the throwing star bundle to be the throwing weapon bundle, updated uplink listing and description accordingly
lowered throwing weapon bundle cost to 5 from 6
 2016-03-09 23:02:18 -08:00
KorPhaeron
1f177d3ab2 Communications 2016-03-09 22:42:03 -06:00
Nerd Lord
bda7404777 Dead cyborgs no longer get binary messages twice 2016-03-09 22:45:24 -05:00
oranges
baf007af4e Don't damage eyes if flash intensity is zero 2016-03-10 15:53:53 +13:00
Nerd Lord
1ead1acbfc Goon-style blob placement 2016-03-09 20:21:19 -05:00
Akke
d9bca07308 @steelpoint you didn't remove the bundles. 2016-03-09 23:18:53 +00:00
Sawu
3607b2e7e3 Clown lube-spam hotfix 
Fixes Clown SNPCs spamming admin logs with lube, as well as their targeting.
 2016-03-10 02:03:59 +11:00
Razharas
f45e52fd20 Merge pull request #15976 from sawu-tg/snpcvree 
SNPC Fixes/Patches v3.14etc
 2016-03-09 14:54:46 +03:00
RandomMarine
fb011a475a Fix my goof 2016-03-09 02:50:14 -08:00