cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-18 21:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,143 Commits 61 Branches 14 Tags
dc4c4ea90beff7be7b0177cb945d725eeccf8450
Commit Graph

8030 Commits

Author SHA1 Message Date
hornygranny
0cd74ff882 Merge pull request #7717 from phil235/sechailerAdjustFix 
Fixes the cyborg sechailer being adjustable.
 2015-02-18 21:50:12 -08:00
hornygranny
9b91896897 Merge pull request #7769 from phil235/rapidDupeProcFix 
Fixes bugs with experimentor relics with rapidDupe proc.
 2015-02-18 21:49:48 -08:00
hornygranny
c99ee72b55 Merge pull request #7788 from phil235/NeurotoxinReactionFix 
Fixes neurotoxin reaction's required temperature.
 2015-02-18 21:49:01 -08:00
hornygranny
dbee9709d1 Merge pull request #7790 from phil235/CryoStingExploitFix 
Fixes cryosting detection exploit
 2015-02-18 21:48:45 -08:00
hornygranny
90e0a00298 Merge pull request #7786 from phil235/SiliconGrabFix 
No more silicon grabbing.
 2015-02-18 21:48:30 -08:00
hornygranny
da4f8e74d8 Merge pull request #7733 from Cheridan/reagent_foam 
Reagent Foam
 2015-02-18 21:43:50 -08:00
MrStonedOne
dda1bd3b2d Merge branch 'lib-sucks-no-homo' of https://github.com/MrStonedOne/-tg-station into lib-sucks-no-homo 
Conflicts:
	code/modules/library/lib_machines.dm
 2015-02-18 18:26:39 -08:00
MrStonedOne
c0af9cc320 Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo 
Conflicts:
	code/modules/library/lib_machines.dm
 2015-02-18 18:23:05 -08:00
MrStonedOne
5addddb1d4 Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo 
Conflicts:
	code/modules/library/lib_machines.dm
 2015-02-18 18:20:16 -08:00
MrStonedOne
6a9ea4c9ec Ports tkdrg's library computer caching system. 
This helps mitigate lag caused by the computer grabbing meta information about almost **two thousand books** over sql on EVERY load of the library computer interface
 2015-02-18 18:03:39 -08:00
phil235
30eb4e342a Merge pull request #7652 from Incoming5643/Circumstantial_Dickpixel 
Tactical dickpixel™ removal
 2015-02-18 21:07:08 +01:00
TheVekter
fa00cee00c Fixes that damn typo FOR REAL THIS TIME 2015-02-18 11:53:20 -06:00
Cheridan
1ac0c26655 Merge pull request #7770 from phil235/AnimationsFix 
Floating animation and life() fixes.
 2015-02-18 02:27:28 -06:00
phil235
dcf99380b6 Merge pull request #7653 from GunHog/IonCarbinesFor-k-ommandos 
Introducing the Ion Carbine!
 2015-02-18 00:16:33 +01:00
GunHog
9d7b7a34ae Fixes my merge error. 2015-02-17 14:47:26 -06:00
phil235
cc3402f0bb No more bubbling sound when reaction happens inside a mob. 2015-02-17 20:43:26 +01:00
phil235
6e938b5cd7 Fixes cryosting exploit by removing ice reagent from cryosting, removing the beer+frostoil= icedbeer (ice+beer=iced beer already exists), and buffing frostoil effect to compensate. 2015-02-17 19:54:14 +01:00
phil235
b887774b3f Fixes neurotoxin reaction's required temperature. 2015-02-17 19:29:24 +01:00
phil235
dcd20969a7 Merge pull request #7730 from Incoming5643/mediborg_tools 
Mediborg Improvement Drive: Tool Time
 2015-02-17 19:11:28 +01:00
phil235
6ebd5976f5 Merge pull request #7729 from Incoming5643/mediborg_gauze 
Mediborg Improvement Drive: The man in gauze
 2015-02-17 18:17:59 +01:00
phil235
e09dd08054 Remove aliens grabbing silicons. 2015-02-17 18:03:24 +01:00
phil235
7a40b51d4a Merge pull request #7731 from Incoming5643/mediborg_drugs 
Mediborg Improvement Drive: Reefer Madness
 2015-02-17 15:37:39 +01:00
phil235
df107499d1 No more silicon grabbing. 2015-02-17 14:59:12 +01:00
phil235
ce1ae70d1a Merge pull request #7723 from Miauw62/welpwelp 
Fixes walls becoming nondense due to adminteleport.
 2015-02-17 14:28:03 +01:00
phil235
f95dd77509 Merge pull request #7740 from Menshin/nano_solars 
NanoUIzed Solar Control Computers
 2015-02-17 13:53:37 +01:00
Swag McYolosteinen
18a344e66b Update adminjump.dm 2015-02-17 13:44:21 +01:00
phil235
a62c0333d6 Merge pull request #7685 from optimumtact/destructnuke 
Nuclear self destruct option with added centcomm fun
 2015-02-16 23:09:29 +01:00
Swag McYolosteinen
6914fb0ecc Merge pull request #7756 from dannno/ohnoimlate 
Oh no! I'm running late!
 2015-02-16 20:43:42 +01:00
phil235
05e3c305ef Fixes floating animation not updating correctly. 
Makes life() procs more object oriented.
 2015-02-16 18:56:57 +01:00
phil235
ab3b588ad7 Fixes rapidDupe proc not deleting all the dupe it creates 
Fixes dupes always being thrown in the same direction.
Fixes being able to spam click the relic to avoid the cooldown limitation.
 2015-02-16 14:03:57 +01:00
dannno
bef844fb89 i hope senpai isnt mad at me 2015-02-15 14:15:02 -05:00
Incoming
c2c015a91a Fixes conflicts, fixes casually worn uniforms looking weird 2015-02-15 13:07:06 -05:00
Cheridan
85ff51b3f7 Merge pull request #7753 from Cheridan/master 
Manual Merge of #7724
 2015-02-15 10:34:26 -06:00
Cheridan
15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix 
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
 2015-02-15 10:27:50 -06:00
Cheridan
71dd648fc1 Merge pull request #7749 from Cheridan/master 
Manual Merge of #7057
 2015-02-14 23:21:12 -06:00
Cheridan
1ad51c8201 Merge branch 'qoladv' of git://github.com/tkdrg/-tg-station into tkdrg-qoladv 
Conflicts:
	code/modules/admin/admin_verbs.dm
 2015-02-14 23:16:02 -06:00
Cheridan
287a0147a4 Merge pull request #7744 from Cheridan/master 
Manual Merge of #7005
 2015-02-14 22:48:40 -06:00
Cheridan
c0d286ca72 Merge branch 'chem_synth' of git://github.com/lolnon/-tg-station into lolnon-chem_synth 
Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
 2015-02-14 22:42:42 -06:00
Cheridan
9c53764675 Merge pull request #7680 from Deantwo/ReadySpam 
Fixes ready spam
 2015-02-14 22:21:06 -06:00
Menshin
a264b85cb3 Sneaky scroll bars 2015-02-15 02:57:27 +01:00
Menshin
26213d59aa * Converted solar control computers interfaces to NanoUI 
* Removed some now unused code
 2015-02-15 02:39:48 +01:00
Cheridan
2817785936 Merge pull request #7718 from TheVekter/shotglasseshowdotheywork 
Re-adds Toxins Special and B-52 to glasses.
 2015-02-14 18:33:00 -06:00
oranges
bae27bc40b Allow station self destruct with captains identity card 2015-02-15 12:09:09 +13:00
Cheridan
d3df7d6240 Merge pull request #7708 from phil235/GrabProcessorAdjacencyFix 
Fixes being able to stuff slime/monkey in processors even through closed windoors.
 2015-02-14 17:00:06 -06:00
Cheridan
6de520bbb2 Merge pull request #7710 from phil235/JitterFix 
Add a do_jitter_animation proc
 2015-02-14 16:23:18 -06:00
Cheridan
b046d73772 Merge pull request #7702 from Sometinyprick/adminthing 
Allows admins to back out of blanking tcomms and reloading admins.
 2015-02-14 16:14:25 -06:00
Cheridan
cc46590ed7 Merge pull request #7712 from Menshin/R&D_search_screen_fix 
R&D search function minor fix
 2015-02-14 16:08:15 -06:00
Cheridan
47a631b1c7 Merge pull request #7713 from paprka/wotdefuk 
fixes improvised shotgun back slot invisible shit
 2015-02-14 16:01:39 -06:00
Cheridan
6064f34b68 Merge pull request #7683 from phil235/CookFix 
Small Cooking fix
 2015-02-14 15:48:34 -06:00
dannno
ddd86a5655 oh no i'm running late 2015-02-14 16:23:02 -05:00