cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-26 00:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,084 Commits 61 Branches 14 Tags
dca72dc916d3dddb0f6d7e47c2e40bc8bba8b684
Commit Graph

5183 Commits

Author SHA1 Message Date
Alex
201d6082e4 Merge pull request #3757 from Rolan7/Bugfixes_5-19-14 
Fortune cookies can be made with blank or "blank" paper.
 2014-05-22 16:48:07 +01:00
Alex
aaec78f754 Merge pull request #3745 from Miauw62/autism_intensifies 
Fixed #3740, slimes now attack simple_animals in retaliation.
 2014-05-22 10:09:51 +01:00
Alex
5576282bb6 Merge pull request #3747 from hornygranny/karmachameleon 
Fixes #3744
 2014-05-22 10:05:03 +01:00
Alex
2c577af52f Merge pull request #3741 from Rolan7/Issue3643-NoclientIcons 
Sets screenloc even if no client
 2014-05-22 10:04:21 +01:00
Cheridan
18ebcc0e45 Merge pull request #3720 from hornygranny/readingrainbow 
carved books now turn into storage items
 2014-05-21 22:16:45 -05:00
Cheridan
79a4de45e7 Merge pull request #3729 from Ikarrus/immovablerod 
Fixes Immovable Rod
 2014-05-21 21:45:14 -05:00
Miauw
3cf8624665 Finalizes the fixes. 2014-05-20 20:14:01 +02:00
Rolan7
08d5b5907a Fortune cookies can be made with blank or "blank" paper. Allows cult talisman paper to be baked into cookies, fixing the last bit of issue #298. 2014-05-19 18:21:17 -04:00
Hornygranny
2360d82c6a Fixes #3744 2014-05-19 12:43:04 -07:00
Miauw
8ac429ab9c Made slimes able to feed on simple_animals. 2014-05-19 21:03:26 +02:00
Miauw
b5f61f59d3 Fixed #3740, slimes now attack simple_animals in retaliation. 2014-05-19 19:33:38 +02:00
Rolan7
92d138533f Added the fix to the back slot, had overlooked it. 2014-05-19 13:30:49 -04:00
Rolan7
992ec337e6 Put the hud_used.hud_shown checks back for hideable inventory slots, preventing the placed items from floating in empty space above the closed inventory. 2014-05-19 05:37:46 -04:00
Rolan7
31d69ef4f5 Sets the screenloc property for items in update_icons even if there's no client at the moment (possibly because the player has lost the connection temporarily). 2014-05-19 02:48:53 -04:00
Rolan7
a36afba82a Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue236_Trays 
Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm (The map was deleted)
	code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison.  Went with my solution.)
 2014-05-18 20:50:38 -04:00
Kelenius
1d4a6c5d26 Merge branch 'master' into slimes 
Conflicts:
	code/modules/mob/living/carbon/metroid/metroid.dm
 2014-05-18 21:38:25 +04:00
Kelenius
ed5f8a0ee6 Fixes, part 1 2014-05-18 21:27:40 +04:00
Menshin
5f7875f4de Replaced the "not used anymore" command_alert with the new "priority_annonce" proc, making the code compilable again. 2014-05-18 11:50:25 +02:00
Alex
9066cccf9c Merge pull request #3645 from Ikarrus/announcements 
Priority Announcement Changes
 2014-05-18 02:07:55 +01:00
ikarrus
6dbdc37e04 Resolved Conflicts: 
code/modules/events/immovable_rod.dm
 2014-05-17 18:46:53 -06:00
Cheridan
36bb032957 Merge pull request #3509 from Cheridan/MeteorsSuck 
Meteor Stuff
 2014-05-17 18:42:16 -05:00
ikarrus
f861f12075 Fixes Immovable Rod 
-Rod no longer gets deleted after hitting a few objects
-Rod no longer gets stuck in the rare case it hits a shuttle at just the right angle. It now explodes.
 2014-05-17 14:30:24 -06:00
Hornygranny
d0015287de carved books now turn into storage items 2014-05-16 14:30:04 -07:00
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
ikarrus
56d5412e50 Merge branch 'master' of https://github.com/tgstation/-tg-station into announcements 2014-05-14 08:34:49 -06: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
Cheridan
3a0bd3de28 Merge branch 'master' of https://github.com/tgstation/-tg-station into MeteorsSuck 
Conflicts:
	code/game/turfs/simulated/walls.dm
 2014-05-13 14:03:42 -05: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