cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 17:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,468 Commits 61 Branches 14 Tags
6d6711facb4e5d95cd03eae3d55b898bd7f8cdce
Commit Graph

15961 Commits

Author SHA1 Message Date
Cheridan
6d6711facb Merge pull request #17822 from optimumtact/keepphilfromkillinme 
MakeSlippery proc made more readable with named arguments
 2016-05-24 11:59:24 -05:00
AnturK
7041152a37 Merge pull request #17846 from Incoming5643/patch-7 
Flips the bird
 2016-05-24 17:47:15 +02:00
AnturK
802cdf9f5c Merge pull request #17839 from optimumtact/watisgoinon 
Fix an antipattern when using canUseTopic
 2016-05-24 17:46:11 +02:00
AnturK
895406cd36 Merge pull request #17428 from Dahka/New_Syringes 
Adds three new syringes
 2016-05-24 17:37:40 +02:00
Jordie
fa19b3a985 Merge pull request #17853 from ChangelingRain/suicidalshade 
Shades cannot suicide inside soulstones
 2016-05-24 10:47:47 +10:00
oranges
e7d5b506ee Merge pull request #17522 from Bobylein/chem_master-tgui 
Converted chemmaster to TGUI
 2016-05-24 09:39:17 +12:00
oranges
ed80a9d1fd Merge pull request #17816 from Core0verload/fix_pack 
Humble Fix Bundle
 2016-05-24 09:26:03 +12:00
Cheridan
47f6d58a2a Merge pull request #17886 from coiax/fix-spraaaaa 
Fixes some last minute spraycan bugs
 2016-05-23 15:26:49 -05:00
Kevin
540300939f Merge remote-tracking branch 'refs/remotes/tgstation/master' into chem_master-tgui 
# Conflicts:
#	tgui/assets/tgui.js
 2016-05-23 21:33:35 +02:00
Cheridan
603e7be1c8 Merge pull request #17868 from tgstation/SpaceFix 
Makes space 250 times less potent
 2016-05-23 14:28:44 -05:00
Jack Edge
1c92b17e3d Fixes some last minute spraycan bugs 
- Cyborgs can now use their spraycans
- Spraycans are different colours
 2016-05-23 20:26:40 +01:00
Cheridan
7f3cb0de5a Merge pull request #17815 from coiax/spraycan-of-doom 
Refactors crayons and spraycans
 2016-05-23 13:49:44 -05:00
Steelpoint
3f50399bda Red Security Sprites (#17784) 
* InitalCommit

* MergeConflict
 2016-05-23 11:04:52 -05:00
oranges
ccf693ae44 Merge pull request #17819 from Core0verload/toolbox_arm 
[#17310 Re-Open] "Toolbox Arm" printable at exosuit fabricators and protolathes
 2016-05-23 20:06:34 +12:00
oranges
1f6c9e34a4 Merge pull request #17830 from Bawhoppen/ertfix 
Fixes ERTs not spawning with correct stuff
 2016-05-23 18:45:07 +12:00
Cheridan
c94492664f MMmiracles away mission cleanup (#17873) 
* MMmiracles away mission cleanup

* tomb ruin fix
 2016-05-23 00:46:04 -05:00
oranges
aa873306ea Merge pull request #17824 from coiax/fix-17556 
Lone Operative event now works
 2016-05-23 16:40:09 +12:00
Razharas
f4a82e7054 Makes space 250 times less potent 
Fix https://github.com/tgstation/-tg-station/issues/17814
 2016-05-23 05:03:50 +03:00
oranges
4dd328a9fa Merge pull request #17355 from kevinz000/KeepersOfThePeace 
Peacekeeper Borgs
 2016-05-23 12:32:06 +12:00
Joan Lung
42d262093a Merge pull request #17761 from KorPhaeron/death_message 
Changes simple animal death message
 2016-05-22 11:48:48 -04:00
KorPhaeron
d8f8458718 Nobody in this codebase can spell collapse 2016-05-22 10:35:00 -05:00
oranges
478b198810 Fixes hellwater reagent id (#17837) 2016-05-22 10:28:11 -05:00
Nerd Lord
96f3b6df6f Shades cannot suicide inside soulstones 2016-05-22 11:16:39 -04:00
Incoming5643
920ba3142a finishes the badminproofing of speech_buffer 2016-05-22 01:51:54 -04:00
Incoming5643
7d43330be4 Unbreaks the parrot 2016-05-22 01:35:14 -04:00
KorPhaeron
1130be3c1b Fixes weather killing everyone 2016-05-22 00:07:53 -05:00
oranges
a2223c25c3 Merge pull request #17801 from bgobandit/gibberagain 
The gibber produces properly named monkey meat.
 2016-05-22 13:11:22 +12:00
oranges
f2bf80843f MakeSlippery made more understandable by named args tweak 
Also used a max check to reduce lines of code slightly
 2016-05-22 00:42:11 +00:00
oranges
947e2c5c19 Fix an antipattern when using canUseTopic 
remove redundant range checks that are checked in the fixed canUseTopic
 2016-05-22 00:23:47 +00:00
bgobandit
e96a09a801 clarifies name 2016-05-21 19:29:20 -04:00
oranges
2bbc778899 Merge pull request #17759 from KorPhaeron/weather_immunity 
Weather Immunity Refactor
 2016-05-22 11:17:04 +12:00
pudl
2c468783af buffs bees 2016-05-21 14:48:41 -05:00
coiax
982a0a76b6 Removes monster spawning from ruin areas (#17688) 
- Specifically, this is a post-template selection, pre-template
placement deletion. So templates can continue to have simple animals,
it'll only clash if they overlap.

🆑 coiax
rscdel: Lavaland monsters have started giving the ruins a wide berth
recently.
/🆑
 2016-05-21 20:15:27 +01:00
Lularian
19eae8c0aa ert medbeammemes 2016-05-21 13:55:25 -05:00
Jack Edge
0ce5f8582c Lone Operative event now works 
Fixes #17556.

Also, a bug where the lone op would spawn with the combat mode on the
sapce helmet has been fixed.
 2016-05-21 15:18:52 +01:00
oranges
5a800f970b Merge pull request #17623 from RemieRichards/ItsAlive!ITSALIVE! 
Enables Frankensteins
 2016-05-22 01:54:02 +12:00
oranges
0b4488f8b8 Merge pull request #17553 from coiax/be-still-my-beating-heart 
Legion hearts renamed and reskinned to legion's soul
 2016-05-22 00:59:43 +12:00
Jack Edge
82252c1843 Legion heart is now legion soul 2016-05-21 13:50:11 +01:00
Jordie0608
a11b6f53da yes way 2016-05-21 22:34:17 +10:00
oranges
37d5d0251e Merge pull request #17797 from NicholasM10/testing 
Added two new foods - Khinkali and Khachapuri
 2016-05-22 00:24:17 +12:00
Jack Edge
dc5c609cf5 Legion hearts stop beating when becoming inert 
Also readded the statistical tracking that got taken out during the
dismemberment merge, I assume accidentally.
 2016-05-21 13:23:58 +01:00
Nick M
b7eb553c8a Fixed spacing 2016-05-21 15:22:10 +04:00
Nick M
ea0e2b1812 Placed reagent at top in list 2016-05-21 15:03:14 +04:00
oranges
1344474fb5 Merge pull request #17637 from Razharas/Minigun 
Makes miniguns overheat on action
 2016-05-21 22:58:45 +12: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
1bb4465ac7 Merge pull request #17767 from lordpidey/ninja_fix 
Fixes antaghud for ninjas
 2016-05-21 22:55:02 +12:00
oranges
b3acc5999d Merge pull request #17773 from Shadowlight213/safetycat 
Makes runtime not save family if killed
 2016-05-21 22:52:26 +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
oranges
ce0dbf8f85 Merge pull request #17653 from coiax/fix-dragon 
Dragon gibbing fix, host sword checks more
 2016-05-21 22:46:20 +12:00
oranges
c23fa08d5b Merge pull request #17591 from Iamgoofball/patch-29 
Heads of Staff now have basic Maint access
 2016-05-21 22:43:21 +12:00