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
24,785 Commits 61 Branches 14 Tags
6f8659ce044654536df2a67f1868765fe285bee3
Commit Graph

6050 Commits

Author SHA1 Message Date
Razharas
8fd2f74d2b Merge pull request #12223 from phil235/BugFixBoogalooB 
Bug fix boogaloo, etc...
 2015-10-10 03:24:38 +03:00
Razharas
8d3b1ac018 Merge pull request #12202 from Xhuis/autorifle_removal 
Armory re-mapping and autorifle removal
 2015-10-10 03:21:52 +03:00
Razharas
9dec40d8d5 Removed colon 
Removed colon
 2015-10-10 02:31:19 +03:00
Razharas
880a9f0544 Merge branch 'cargonevergetsanything' of https://github.com/bgobandit/-tg-station into bgobandit-cargonevergetsanything 2015-10-10 02:28:24 +03:00
Razharas
effae76516 Merge branch 'bundlestuff' of https://github.com/bgobandit/-tg-station into bgobandit-bundlestuff 2015-10-10 02:04:43 +03:00
Razharas
5baaf06fce Merge pull request #12225 from phil235/BugFixBoogalooC 
Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
 2015-10-09 12:42:17 +03:00
Cheridan
136140614d Merge pull request #12151 from AnturK/larvafix 
Misc Fixes
 2015-10-08 07:20:30 -05:00
Xhuis
406f727ead Armory remap, autorifle removal 2015-10-08 08:03:58 -04:00
AnturK
75e82f15f2 Return for buckling procs 
Makes unbuckling priority over removing bag in janicart
Makes doors bumped in janicart open.
 2015-10-08 13:40:53 +02:00
phil235
832e650ffc Trashbag can pick up ammo casings and reagent_containers/food/drinks again. 
Dipping a lit cigarette into a reagent container heats up the liquid (like every other heat sources) and only unlit cigarette can be dipped to absorb the liquids now.
 2015-10-08 01:26:55 +02:00
phil235
0efb30434a Fixes not being able to move during jaunting if you are cuffed and pulled. 
Greenglow decal no longer disappears after 2 minutes.
Fixes runtime with explosive implant activation.
Fixes stunbaton infinite cell charge, the baton now turns off if you try using it after its cell has been deleted somehow.
Fixes bloody pulled mob leaving a blood trail in zero G.
Shortens the guardian battlecry message when attacking to lower chat spam.
Items in Morph now disperses a bit on death instead of being all on the same tile.
After reaching a limit of 50 items, morph swallowing items deletes them instead of putting them inside the morph.
Monkeys can no longer modify the hand labeller's text to communicate.
Fixes carbon,radium,uranium 's reaction_turf creating multiple decal on a tile, it now checks if there's already a decal of the relevant type and (for radium and uranium) only transfers reagent to it if it finds one.
 2015-10-08 00:48:00 +02:00
Razharas
7aae089d5a Merge pull request #12094 from AnturK/mapcase 
Adds support for custom showcases on the map
 2015-10-07 22:26:43 +03:00
Razharas
92523c03f2 Merge pull request #12137 from Xhuis/sleeping_carp_buff_2_please_dont_ban_me_from_the_repo 
Sleeping Carp changes
 2015-10-07 22:25:11 +03:00
Swag McYolosteinen
38f5c0c85a Merge pull request #12122 from Steelpoint/Magazine 
[MAP] Continuation Of Armoury Map PR + Magazine Removal
 2015-10-07 15:13:15 +02:00
Razharas
7242d12cb0 Merge pull request #12159 from Aranclanos/tanksuicide 
Changes the tank suicide act to bruteloss instead of gibbing.
 2015-10-06 21:52:49 +03:00
Razharas
9b710d7fcb Merge pull request #12153 from duncathan/destroyfixes 
Destroy() fixes
 2015-10-06 09:27:41 +03:00
Razharas
87c9960d6c Merge pull request #12102 from bgobandit/singlotips 
FIXES SINGULARITY BEACON AND POWERSINK TEXT, IT WORKS, I DON'T CARE, FUCK
 2015-10-05 22:16:00 +03:00
AnturK
b7a1ee7cfa Adds display case repair 2015-10-05 13:07:58 +02:00
Aranclanos
4d03f22943 Changes the tank suicide act to bruteloss instead of gibbing. 2015-10-04 20:16:39 -03:00
duncathan
4475824890 fixes #12143 2015-10-04 07:33:32 -06:00
Xhuis
1211ec4102 Some gang stuff 2015-10-04 00:26:26 -04:00
Razharas
653e5d18f3 Merge pull request #12027 from Fox-McCloud/advancedmop 
Re-Adds Advanced Mop, Adds in Bluespace Trashbag, and Suds up the Janitor
 2015-10-04 05:13:48 +03:00
Razharas
d46f6b582f Merge pull request #12079 from bgobandit/boxshit 
Adds additional items to the storage of many coats and oversuits.
 2015-10-03 18:13:03 +03:00
Razharas
56cc5122bf Merge pull request #12092 from Xhuis/radical_changes 
Radiation pulse optimization
 2015-10-03 18:08:48 +03:00
Cheridan
207f6a6048 Merge pull request #12108 from Jordie0608/tilessolightyoucantevenseethem 
Fixes #11268, iconless wired glass tiles
 2015-10-03 09:24:07 -05:00
Steelpoint
b5ded1c9e8 InitalCommit 2015-10-03 21:22:29 +08:00
Jordie
c6627b3d70 Fixes iconless wired glass tiles 2015-10-02 21:28:19 +10:00
bgobandit
8e82cf324a Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit 
Conflicts:
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
 2015-10-02 00:41:19 -04:00
bgobandit
6c303a37cd THIS FUCKING SHIT RIGHT HERE FUCK 2015-10-01 23:12:40 -04:00
Razharas
54d9e6924d Merge pull request #11868 from bgobandit/diditallforthelewdbe 
Adds kitty mousey toys!
 2015-10-01 05:06:34 +03:00
AnturK
bc5d660fe0 Adds support for custom showcases on the map 2015-10-01 00:38:29 +02:00
phil235
4694616e6b Merge pull request #11922 from AnturK/corgiriders 
Moves buckling from obj to atom/movable
 2015-09-30 23:26:57 +02:00
Razharas
3bf8ae1f1a Merge pull request #12057 from Xhuis/it_worked_in_testing_3 
Fixes and tweaks to Syndicate medical cyborgs
 2015-09-30 23:14:58 +03:00
Razharas
e08ecefd18 Merge pull request #12066 from feemjmeem/12013-fix 
tank suicide now drops items in hand, shreds clothing
 2015-09-30 23:12:26 +03:00
Razharas
1aa0e911ae Merge pull request #11760 from Core0verload/selfrepair 
Cyborgs update
 2015-09-30 22:50:08 +03:00
Razharas
0108dad7db Merge pull request #11575 from Firecage/nospaceformining 
Xeno corrosive acid no longer spaces asteroid walls and floors.
 2015-09-30 22:49:10 +03:00
Xhuis
8f5a3a2688 they literally do the same thing 2015-09-30 13:25:31 -04:00
Xhuis
e1f815c5c6 Optimizes radiation pulse calculation 2015-09-30 13:19:05 -04:00
bgobandit
26b8112dea Adds additional items to the storage of many coats and oversuits. 2015-09-29 22:29:07 -04:00
Cheridan
7367ea771c Merge pull request #12054 from Incoming5643/Boxes_of_the_Spessmen 
Dials back the boxes [poll]
 2015-09-28 23:58:19 -05:00
Cheridan
8d12c310a4 Merge pull request #11994 from bustygoku/Param-Pointers 
Laser Pointers Use Pixel Params
 2015-09-28 15:35:09 -05:00
Marc R. Uchniat
2f6f8b7362 tank suicide now drops items in hand, shreds clothes to reduce chance of removing items from round 2015-09-28 12:23:40 -07:00
Xhuis
7a8c52b84f Merge remote-tracking branch 'remotes/upstream/master' into syndiborg_fix 2015-09-28 07:15:49 -04:00
Aranclanos
bc2febc021 Merge pull request #12029 from phil235/DeadDna 
Fixes not being able to save the dna of corpses in the dna console.
 2015-09-28 06:36:05 -03:00
Xhuis
129b7b9b2f Fixes & tweaks 2015-09-27 23:27:18 -04:00
Razharas
50dd1f6b67 Merge pull request #12031 from Xhuis/a_pretty_rad_pr 
Radiation changes
 2015-09-28 03:24:43 +03:00
Incoming
7a4be0e04f Merge branch 'master' of https://github.com/tgstation/-tg-station into Boxes_of_the_Spessmen 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-09-27 18:48:57 -04:00
Incoming
52123f879f There are no more random boxes 
Maps now have two guaranteed spawns, one in maint and one in the cargo warehouse. You can still build more boxes yourself.

The ! easter egg can now only ever proc once per box. Once it's triggered that's the end of it.
 2015-09-27 18:39:44 -04:00
Aranclanos
a135f12e3f Merge pull request #11990 from optimumtact/patch-1 
Comment war continues
 2015-09-27 17:31:48 -03:00
Fox-McCloud
32cd0d49bb soap for the janitor 2015-09-27 07:07:27 -04:00