cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 04:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,890 Commits 61 Branches 14 Tags
29fdf73cc67a5232dd3b87f9b4cc57786ce001cb
Commit Graph

13593 Commits

Author SHA1 Message Date
Bjorn Neergaard
29fdf73cc6 tgui power monitor; linegraph component 2016-02-05 17:06:04 -06:00
Bjorn Neergaard
c5e6a922ca Cache canister updates and make huge scrubbers use power; add movable version 2016-02-05 17:06:03 -06:00
Bjorn Neergaard
796cca2753 tgui scrubbers 
removes area atmos computer
 2016-02-05 17:06:02 -06:00
Bjorn Neergaard
c9f61fd7da Rework portable atmos; tgui portable pump 2016-02-05 17:06:00 -06:00
Bjorn Neergaard
af19bff008 tgui sleepers and uplink search 
Fix some state logic
Fix SVGs
display: based filtering
input component

Update syndicate colors

@ChangelingRain
 2016-02-05 17:05:59 -06:00
tkdrg
6154334fbc Merge pull request #15201 from KorPhaeron/turret_fixes 
Fixes AI core turrets shooting at pingsky
 2016-02-05 14:58:38 -03:00
tkdrg
01b1ed7cc0 Merge pull request #15193 from xxalpha/putin 
Fixes var edited SMES starting with no charge.
 2016-02-05 14:56:53 -03:00
tkdrg
0f38d829b5 Merge pull request #15191 from KorPhaeron/chaplain 
Theatre Access for Chaplain
 2016-02-05 14:54:15 -03:00
tkdrg
d188447041 Merge pull request #15121 from neersighted/hotkeys 
Add hotkey preferences
 2016-02-05 14:52:34 -03:00
Remie Richards
10f725d216 Merge pull request #15119 from lordpidey/pipe_suicide 
Added a new suicide act for pipe valves.
 2016-02-05 15:53:24 +00:00
tkdrg
a129b1fdaf Merge pull request #15182 from ChangelingRain/complexanimals 
Simple animal force threshold no longer converts damage to brute
 2016-02-05 01:03:21 -03:00
tkdrg
70a69ae1e7 Merge pull request #15141 from KorPhaeron/practice 
Makes practice lasers scarier
 2016-02-05 00:58:16 -03:00
tkdrg
b3daf4be22 Merge pull request #14981 from neersighted/510 
BYOND 510
 2016-02-05 00:04:59 -03:00
Bjorn Neergaard
ac03d5f617 Fix flashlights actually stunning 
Also make clear_fullscreen() waitfor = 0 to be safe,
and bump travis version
 2016-02-04 20:50:26 -06:00
KorPhaeron
7ed46468f5 preserves name 2016-02-04 19:41:12 -06:00
xxalpha
68dedb9ee2 Reverts #15187 2016-02-05 01:28:44 +00:00
xxalpha
3316070ac0 Merge remote-tracking branch 'upstream/master' into putin 2016-02-05 01:27:26 +00:00
tkdrg
058f93a052 Merge pull request #14911 from MMMiracles/L6butbetter 
local man rebalances bulldog and SAW, ruins everything
 2016-02-04 21:59:28 -03:00
duncathan salt
d9672fa638 Merge pull request #15176 from ChangelingRain/fixedblobchemicals 
Blob tweaks and a new blob chemical
 2016-02-04 18:02:45 -06:00
Nerd Lord
f96290ff81 weakens death EMP 2016-02-04 18:54:01 -05:00
Bjorn Neergaard
5fc59f53a1 Fix lizard hissing 2016-02-04 17:19:47 -06:00
Bjorn Neergaard
a5f09e103e Remove eroneous code; click catcher define; bygex path fix 2016-02-04 17:19:47 -06:00
Bjorn Neergaard
ef19e7904f Support Regex in replaceall, re-implement lizard hiss limits 2016-02-04 17:19:46 -06:00
Bjorn Neergaard
e3bd22b481 Stub regex.Replace, re-implement SQL note conversion 2016-02-04 17:19:46 -06:00
Bjorn Neergaard
4a3da5d77a Properly layer and set/clear fullscreen overlays 
This fixes ordering issues and admin ghosting
 2016-02-04 17:19:45 -06:00
Bjorn Neergaard
7a47b43c53 Re-implement screen overlays 
This fixes 510 showing all overlays in the rightclick menu
 2016-02-04 17:19:44 -06:00
Bjorn Neergaard
2500e241ca Re-implement lizard hissing 
Note that this reverts #13656, due to this bug (http://www.byond.com/forum/?post=2027070)
 2016-02-04 17:19:44 -06:00
Bjorn Neergaard
063dd9fb84 Get the code running on 510 
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
 2016-02-04 17:19:40 -06:00
tkdrg
ba699024ab Merge pull request #15204 from neersighted/hrefs 
[s]Fix bad checks in holodeck
 2016-02-04 20:03:30 -03:00
Bjorn Neergaard
ccc229a157 Fix bad checks in holodeck 2016-02-04 16:29:23 -06:00
KorPhaeron
744b0946a2 Bot turret fix 2016-02-04 12:06:49 -06:00
xxalpha
cdef1324d3 Fixes var edited SMES starting with no charge. 2016-02-04 08:52:26 +00:00
KorPhaeron
a638e1ab37 Theatre Access for Chaplain 2016-02-04 01:21:45 -06:00
KorPhaeron
8d4351fd04 Revert "Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue" 2016-02-03 22:03:22 -06:00
Nerd Lord
20b61a351c shitcoder no shitcoding 2016-02-03 21:16:56 -05:00
Nerd Lord
d412c90ba8 If we let the threshold be on by default, we cuck blob chemicals. 
Let's not do that.
 2016-02-03 21:10:33 -05:00
Nerd Lord
96b276cd8c not so simple now, holy shit 2016-02-03 20:43:14 -05:00
tkdrg
8b10c648e5 Merge pull request #15144 from lzimann/debugverbs 
Makes debug verbs toggleable
 2016-02-03 22:12:56 -03:00
tkdrg
6cf4feb348 Merge pull request #15137 from tgstation/Again-and-again-and-again-and-again-do-it-again-do-it-again-again-and-again 
Fixes https://github.com/tgstation/-tg-station/issues/15127 smes issue
 2016-02-03 22:10:01 -03:00
tkdrg
1c2727d765 Merge pull request #15133 from Firecage/Moremodulemoves 
Moves some more files to the modules section.
 2016-02-03 22:09:12 -03:00
tkdrg
0e7578fcea Merge pull request #15132 from octareenroon91/patch-35 
Improve player medbot
 2016-02-03 22:03:30 -03:00
tkdrg
b1d431f243 Merge pull request #15129 from bgobandit/morevalentines 
Adds more Valentine messages.
 2016-02-03 22:01:46 -03:00
tkdrg
6f00a5d53f Merge pull request #15147 from KorPhaeron/control_point 
Fixes king of the hill not resetting properly
 2016-02-03 21:49:51 -03:00
Nerd Lord
74bfcb02f6 Merge branch 'master' of https://github.com/tgstation/-tg-station into fixedblobchemicals 2016-02-03 19:43:50 -05:00
Nerd Lord
af2e2da7cc correct arg and var names, ho 2016-02-03 18:01:38 -05:00
Nerd Lord
7e372d65c3 Tweaks blob expansion to be faster near the expanding blob but slower near the edges of the blob 
Blob spores now produce a slightly larger cloud of smoke when dying. Fragile spores and blob zombies produce the current, smaller cloud.

Replicating Foam will try to expand when damaged much more often.
Adds Electromagnetic Web, which does burn damage and EMPs targets, as well as causing a small EMP when dying, but takes more damage; a normal blob that hasn't been near a node or the core for 6~ seconds can be oneshotted by a laser.
 2016-02-03 17:15:43 -05:00
Cheridan
213d324d5f Merge pull request #15136 from Incoming5643/nonhumanunlessprovenotherwise 
Command Roles are properly restricted to just humans
 2016-02-02 22:28:18 -06:00
duncathan salt
0915bcf78c Merge pull request #15068 from PKPenguin321/fuckgitwithacarrot 
carrot shivs strike back
 2016-02-02 19:04:20 -06:00
MMMiracles
58c2972047 made AP rounds actually capable of denting people in bulletproof armor 2016-02-02 18:28:23 -05:00
KorPhaeron
0f39a20d4a Machines are apparently not anchored by default 2016-02-01 22:40:22 -06:00