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
11,991 Commits 61 Branches 14 Tags
c7fc7f48118e8650e4db9cc45fac6328f02e1fa4
Commit Graph

5142 Commits

Author SHA1 Message Date
Cheridan
86e36fb934 Merge pull request #3598 from phil235/ConstructHitFix 
Stops constructs from hitting themselves
 2014-05-15 12:56:38 -05:00
Cheridan
a016d1463a Merge pull request #3608 from hornygranny/lookmanohands 
Fixes #3157
 2014-05-15 12:50:22 -05:00
Alex
503fa19098 Merge pull request #3695 from Menshin/powernets_alternative_refactoring 
Updated Powernets Refactoring
 2014-05-15 13:55:01 +01:00
Alex
e87d84fbe4 Merge pull request #3694 from Rolan7/Issue2883-medal 
Medal of Captaincy is no longer twice as large.
 2014-05-15 11:55:57 +01:00
Alex
758d9a38d7 Merge pull request #3649 from Cheridan/vitallyimportant 
Less Hydro Trash
 2014-05-14 16:11:34 +01:00
ikarrus
01c28c7afc Fixed indentations. 2014-05-14 09:02:53 -06:00
Cheridan
ea3d4b35c4 fixing conflict 2014-05-14 10:01:29 -05:00
ikarrus
8496ec8dd1 Should be auto-mergable again 2014-05-14 08:57:52 -06:00
Cheridan
3073d284ba Merge branch 'master' of https://github.com/tgstation/-tg-station into vitallyimportant 2014-05-14 09:52:47 -05:00
Alex
8aaa5a4b19 Merge pull request #3602 from GunHog/Advanced_HUDs 
Adds Nightvision Medical and Security HUDs!
 2014-05-14 11:06:03 +01:00
Alex
f66253020e Merge pull request #3651 from Cheridan/areaSounds 
Area Ambiance Refactor
 2014-05-14 11:04:02 +01:00
Alex
3247358c6d Merge pull request #3480 from AstralSerpent/master 
"NAR-SIE HAS RISEN" gets accompanied by an "I'M HERE" sound.
 2014-05-14 10:39:10 +01:00
Alex
b35097ae83 Merge pull request #3633 from Menshin/powernets_refactoring 
[RFC] Powernets refactoring
 2014-05-14 10:21:21 +01:00
Alex
e2878e2e0e Merge pull request #3624 from phil235/SyringeDrawFix 
Adds a timer when drawing blood from other people.
 2014-05-14 10:20:13 +01:00
Alex
9b660c9461 Merge pull request #3663 from Rolan7/Issue146-CyborgHandoffs 
Fixes issue #146, borgs placing modules on people
 2014-05-14 10:18:31 +01:00
Alex
0ea1361175 Merge pull request #3674 from Ikarrus/rangeinst 
[MAP] Firing Range Instructions
 2014-05-14 09:59:06 +01:00
Alex
3468c832a1 Merge pull request #3667 from MrStonedOne/adminpermfix 
Minor fixes to admin permissions
 2014-05-14 09:57:00 +01:00
Alex
6686b2ec7c Merge pull request #3687 from Jordie0608/removerelativepathsfromtheeverythingplz 
Fixes #3681: suicide messages when crit
 2014-05-14 09:24:29 +01:00
Rolan7
ab1dd6fc0d Medal of Captaincy is no longer twice as large. 
Fixes issue #2883 and a minor bug where set-equipment wasn't properly equipping "assassins" with waistcoats.  Both cases now use the existing attachTie method, which exists for this reason.
 2014-05-14 02:14:28 -04:00
Miauw62
789dcf52bb Merge pull request #3557 from Ikarrus/thermitescale 
Thermite Effectiveness Scaling with Volume and Wall Type
 2014-05-13 20:14:01 +02:00
fleure
e13ab9422d Merge pull request #3610 from Aranclanos/washingmachine 
Washing machine fixes
 2014-05-13 16:55:26 +01:00
Jordie0608
4761e02904 Maybe i should make sure the code complies before pushing it next time 2014-05-13 02:32:56 +10:00
Jordie0608
4078973a5c Unidentinization 2014-05-13 02:18:21 +10:00
Jordie0608
dfd2cc4b60 Changed suicide messages to visible_messages and fixed relative pathing 2014-05-13 01:44:29 +10:00
ikarrus
593c95cc4f [MAP] Firing Range Instructions 
-Added instructions to the firing range.
-Set a default path for the controls
-Controls are no longer dense
 2014-05-10 19:53:48 -06:00
Menshin
2269a2f168 Alternative version of the powernets refactoring (cables connects if they have matching ends) 2014-05-11 00:04:49 +02:00
Rolan7
d871779432 Replaced the isRobot() check with two new functions, one of which is overloaded for robots. Object oriented programming intensifies! 2014-05-09 18:03:49 -04:00
ikarrus
b3d1e87b1f Merge branch 'master' of https://github.com/tgstation/-tg-station into documents 2014-05-08 20:18:57 -06:00
MrStonedOne
a4e4e2bcce Admins without +admin can use jmp herfs while ghosted 
They already have access to jump to mob and follow, so no reason to deny them this.

Only allows access to jmp herfs while ghosted.
 2014-05-08 13:19:26 -07:00
MrStonedOne
b607d50e7a Admins lacking +admin get admin pm stuff 
They can use like 50 herf links to do this already, including rightclick mob -> view vars -> player panel -> pm
 2014-05-08 13:17:23 -07:00
Rolan7
5b219ea119 Fixes issue #146, borgs placing modules on people 
Simple fix for this one...
 2014-05-07 14:54:35 -04:00
Miauw62
a0279416f1 Merge pull request #3647 from Jordie0608/msoisatheifhalthalthalthalt 
Changed mining equipment locker to mining equipment vendor
 2014-05-07 17:25:22 +02:00
Cheridan
a392da16b0 Area Ambiance Refactor 2014-05-06 21:40:28 -05:00
Cheridan
e2a2b15706 2-unit setting 2014-05-06 19:16:17 -05:00
Cheridan
ab226de343 Makes nutrient bottles larger, reduces amount in vendor/generator to compensate. 2014-05-06 18:55:38 -05:00
Alex
1848e619cd Merge pull request #3642 from Zelacks/empiconfix 
Emp backpack Icon fix
 2014-05-06 20:11:49 +01:00
Alex
7091c012e9 Merge pull request #3625 from Giacom/gravity_layer 
You can now walk behind the three top parts of the gravity generator, to...
 2014-05-06 20:08:00 +01:00
Alex
8a731f3bdc Merge pull request #3568 from Giacom/rip_cyborg_inventory_bugs 
Fixes #3565. Added a "put_in_hand_check" which returns 1 if the item can be equipped ...
 2014-05-06 20:07:49 +01:00
Alex
5098d78a48 Merge pull request #3603 from hornygranny/jesuschristhowhorrifying 
increases narsie spooky level
 2014-05-06 19:49:29 +01:00
Hornygranny
f615b60c2a dust now uses spawn_dust() 2014-05-06 11:46:25 -07:00
Hornygranny
1d981b9173 flavor text removed 2014-05-06 11:44:03 -07:00
ikarrus
47fbd14f57 Glory to absolute pathing 2014-05-06 09:02:19 -06:00
Jordie0608
6530150120 Changed mining equipment locker to mining equipment vendor 2014-05-06 20:01:01 +10:00
Alex
38b56975f5 Merge pull request #3591 from Aranclanos/ghostize 
Mindless ghosts fix
 2014-05-06 08:14:46 +01:00
Zelacks
d79cc315bf Emp Icon fix Commit 2014-05-06 02:55:58 +08:00
Cheridan
034fd18020 Merge pull request #3589 from Aranclanos/LightsBrightness 
Light tubes and bulbs brightness
 2014-05-05 12:29:40 -05:00
Razharas
282a5d3a2b Merge pull request #3379 from Cheridan/sliceofpai 
Refactors pAI law code...
 2014-05-05 07:33:17 -07:00
ikarrus
82639d14a6 Secret Document Objectives 
Adds new steal objective "Secret Documents"
-A set of secret documents spawn in the vault's filing cabinet, but even syndicate documents qualify as valid steals

Adds the exchange objective for traitors
-If there are at least 6 traitors, two of them will be selected to make an exchange of secret documents
-There is a low (20%) chance that one of them will have an additional backstab objective, where they will require both sets of documents to win
 2014-05-04 15:00:47 -06:00
Menshin
d42c7114c1 * cleaned, organized and commented a large part of the power code, 
* new procs handling : powernets creation/destruction, cable adding/removing, machines adding/removing,
* new cable laying possibility : if you click in the turf you're standing on, you'll try to lay a node cable in the direction you're facing,
* cleaned oversights that could (and would) leaved an empty powernet in the powernets global list
* rewrote the cut_cable and propagate_network procs to correctly updates every connected cables and machines (fix, at last, #1455)
* others fixes and polish...
 2014-05-04 00:19:55 +02:00
Alex
923802cd71 Merge pull request #3619 from Ikarrus/fix3590 
Runtime fix for putting someone in a human mob before the round starts
 2014-05-03 23:10:00 +01:00