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

27431 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
Cheridan
e4755a8d4b Merge pull request #17859 from Iamgoofball/patch-45 
SNPC's now have a much lower chance of being able to talk
 2016-05-24 00:48:43 -05:00
Jordie
92f9f375c1 Merge pull request #17864 from ChangelingRain/stopcuckingthecult 
Makes the cult less likely to accidentally cuck itself
 2016-05-24 10:48:00 +10:00
Jordie
fa19b3a985 Merge pull request #17853 from ChangelingRain/suicidalshade 
Shades cannot suicide inside soulstones
 2016-05-24 10:47:47 +10:00
Joan Lung
e84f0ca865 Merge pull request #17895 from GunHog/It_Was_Probably_My_Fault_Anyway 
[s] Fixes Antag status showing for Diagnostic HUD mobs.
 2016-05-23 19:06:40 -04:00
GunHog
38c9084150 Fixes Antag status showing for Diagnostic HUD mobs 
ANTAG_HUD and DIAG_BOT_HUD were set to the same define.
 2016-05-23 17:54:27 -05:00
oranges
e7d5b506ee Merge pull request #17522 from Bobylein/chem_master-tgui 
Converted chemmaster to TGUI
 2016-05-24 09:39:17 +12:00
Joan Lung
80774c0408 Merge pull request #17847 from lordpidey/demonbomb 
Removes devil immunity to explosions.
 2016-05-23 17:31:08 -04: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
Jack Edge
6914282b9f Code review 2016-05-23 19:35:01 +01:00
Cheridan
657ff5664e Merge pull request #17874 from optimumtact/hashbrown 
Allow handlewet to queue ticks properly
 2016-05-23 13:33:16 -05:00
Steelpoint
3f50399bda Red Security Sprites (#17784) 
* InitalCommit

* MergeConflict
 2016-05-23 11:04:52 -05:00
oranges
ee9443e2c2 Merge pull request #17826 from xxalpha/bebebebenukesandshit 
Clean up plutonium core a bit
 2016-05-23 21:01:24 +12:00
oranges
bc3bdfce2e Allow handlewet to queue ticks properly 
hash check is working by obj name, not reference, so most handle_wet doesn't get queued
 2016-05-23 08:19:51 +00: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
a18af978e8 Revert "Remove the unique hash check for HandleWet" 
Yeah great job github, just arbitrairly change how a UI works just because I got a maintainer bit

This reverts commit 39abb77bac.
 2016-05-23 07:32:40 +00:00
oranges
39abb77bac Remove the unique hash check for HandleWet 
I don't believe it was functioning as expected.
 2016-05-23 19:29:38 +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
oranges
2add4b8459 Merge pull request #17840 from Shadowlight213/pollfix 
Fixes pollcandidates not respecting prefs.
 2016-05-23 17:52:16 +12:00
oranges
b82e4652d7 Merge pull request #17791 from coiax/fix-17790 
Fixes #17790, and cleans up drone dispenser code
 2016-05-23 17:49:33 +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
Joan Lung
0ea41bb5ef Makes blob slightly more finite (#17866) 2016-05-22 20:55:31 -05:00
oranges
4dd328a9fa Merge pull request #17355 from kevinz000/KeepersOfThePeace 
Peacekeeper Borgs
 2016-05-23 12:32:06 +12:00
Nerd Lord
c84849c2c6 as compensation, remove the now-uneeded code 2016-05-22 20:14:21 -04:00
Nerd Lord
70f5da14bc Makes the cult less likely to accidentally cuck itself 
ticker checks augh
 2016-05-22 20:10:41 -04:00
Iamgoofball
eab6fae021 The average player now has a much lower chance of being able to talk 
Requested by HBL
 2016-05-22 12:47:11 -07:00
Mike Long
d3e3218347 refactors code, and removes extra ex_act() 2016-05-22 14:53:04 -04:00
Cheridan
fe5efea9c0 Merge pull request #17825 from tgstation/RemieRichards-is_type_in_fixes 
is_type_in_list() fixes
 2016-05-22 13:32:57 -05: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
Mike Long
2331e4acb3 Removes redundant flash_eyes() 2016-05-22 03:21:56 -04:00
Mike Long
1038e88fe8 True devils now take damage from bombs. 
Arch devils still shrug them off.

Very minor refactor to flashing code for true devils.
 2016-05-22 03:02:49 -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
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
Shadowlight213
b3eeb0d63e Fixes pollcandidates not respecting prefs. 2016-05-21 17:58:02 -07:00