cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-12 09:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,986 Commits 61 Branches 14 Tags
f7be7fb7117cb08fc41b7385ed5d4b03d4eae686
Commit Graph

8504 Commits

Author SHA1 Message Date
Remie Richards
f7be7fb711 Merge pull request #8377 from Miauw62/AAAAA 
Fixes #8375
 2015-03-16 19:26:26 +00:00
Swag McYolosteinen
670aac5785 Should properly unfuck savefiles 2015-03-16 20:12:09 +01:00
Swag McYolosteinen
5242a08a2b Fixes #8375 
UNTESTED I DONT KNOW WHAT IS GOING ON AAAAAAA
 2015-03-16 20:03:05 +01:00
Jordie
9c148ff13e Merge pull request #8315 from phil235/BigUserdanger 
Makes the message when you're attacked slightly bigger
 2015-03-16 18:30:21 +11:00
Jordie
fb6aa85094 Merge pull request #8274 from Thunder12345/techshellening 
Shotgun party, new shells, an improvement and a fix
 2015-03-16 18:30:14 +11:00
Razharas
fcd6718c56 Merge pull request #8309 from phil235/BurgerSpriteFix 
Fixes burger and sandwich ingredient stacking and sprites.
 2015-03-16 01:40:15 +03:00
phil235
2830325e4e Merge pull request #8173 from AnturK/flagfix 
Fixes pref flags
 2015-03-15 23:02:58 +01:00
Cheridan
aaac85707f Merge pull request #8204 from Iamgoofball/patch-41 
Nerfs acid blob again
 2015-03-15 15:56:23 -05:00
Razharas
4f1e20bd84 Merge pull request #8348 from phil235/DoughHotfix 
Fix dough and cakebatter recipes.
 2015-03-15 16:30:20 +03:00
phil235
78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger 
Conflicts:
	code/modules/events/ninja.dm
 2015-03-15 12:30:27 +01:00
phil235
791b229388 Merge branch 'master' of https://github.com/tgstation/-tg-station into BurgerSpriteFix 
Conflicts:
	icons/obj/food.dmi
 2015-03-15 12:21:45 +01:00
Cheridan
d8b1cc36b7 Merge pull request #8328 from Miauw62/asdfjo 
Chat toggles are saved to the savefile properly again.
 2015-03-15 02:20:09 -05:00
Cheridan
3bc34e5383 Merge pull request #8310 from phil235/RussianRevolverFix 
Fixes russian revolver's special mechanism message
 2015-03-15 01:57:46 -05:00
Cheridan
da1e6f57f0 Merge pull request #8334 from MrPerson/cleanup_crew_comin_through 
Code cleanup
 2015-03-15 01:55:39 -05:00
Cheridan
8e2962c4ab Merge pull request #8255 from GunHog/SiliconVerbFix 
Fixes "Sensor Augmentation" showing in silicon verbs
 2015-03-14 23:08:19 -05:00
Cheridan
1732ab6b02 Merge pull request #8311 from phil235/SprayFix 
Fixes chemsprayer duplicating reagents. Simplifying its code.
 2015-03-14 22:59:49 -05:00
Cheridan
0b7be73f62 Merge pull request #8286 from phil235/SteelcapFix 
Steel cap, sandstone and welding fixes plus flashing refactor
 2015-03-14 22:56:37 -05:00
Cheridan
0cdffeecfb Merge pull request #8296 from phil235/TablecraftFix 
Tablecraft Fix and recipe detection
 2015-03-14 19:41:56 -05:00
phil235
0232afd05d Fix typo in catalyst. 
Fix flamethrower crafting recipe (now only use 1 rod, calls checkparts() to set up the weldingtool and igniter).
Fix lack of message when trying to turn on an unsecured welding tool.
Fix lack of icon update when clicking plasma tank with empty flamethrower.
 2015-03-15 00:23:47 +01:00
phil235
913d64b9a7 Fix dough and cakebatter recipes. 2015-03-14 23:59:56 +01:00
Cheridan
1027c7619c Merge pull request #8206 from RemieRichards/AILessProcessing 
Hostile Mob AI Optimisation
 2015-03-14 16:21:22 -05:00
Cheridan
52dfa42eb5 Merge pull request #8257 from phil235/ReflectFix 
Simplifies laser reflection code
 2015-03-14 16:15:52 -05:00
Cheridan
f70084ecab Merge pull request #8227 from phil235/HulkCritFix 
Hulk crit fixes
 2015-03-13 22:56:51 -05:00
Cheridan
ecb3a4e08f Merge pull request #8236 from phil235/DoughChange 
Dough change
 2015-03-13 15:34:39 -05:00
Cheridan
e5428c1519 Merge pull request #8256 from phil235/StrangenessTextFix 
Strangeness text, janicart, alien nest, weak golem fixes
 2015-03-13 15:23:30 -05:00
Cheridan
9c3ed3da04 Merge pull request #8247 from Incoming5643/Welcome_to_ireland 
Explicitly passes a mobs mutant_color in blood samples
 2015-03-13 15:22:14 -05:00
Cheridan
6e26db3783 Merge pull request #8288 from Ahammer18/Sensors 
Toggle/Adjust suit sensors
 2015-03-13 14:45:08 -05:00
hornygranny
875313be9e Merge pull request #8279 from MrPerson/pull_rapidemente_ariba_ariba_vamanos 
Pulling icon en-speedening
 2015-03-13 12:22:17 -07:00
MrPerson
e7ba8df654 Moved all pull icon updating to update_icon(), to reduce copy+paste. 
Made the pull icon update_icon() as part of creation as requested by oranges.
 2015-03-13 12:10:13 -07:00
Cheridan
12f5f6ae20 Merge pull request #8290 from Ahammer18/droneassfinal 
Drone asses!
 2015-03-13 13:57:43 -05:00
Swag McYolosteinen
579736870c informative commit name 
proper, informative extended description
 2015-03-13 19:44:09 +01:00
Cheridan
24b2d03e0f Merge pull request #8283 from Miauw62/taserdelayymao 
Reduces the taser firing delay.
 2015-03-13 12:58:24 -05:00
Cheridan
7e011680ec Merge pull request #8237 from GunHog/CherryFlavoredPins 
Loyalty Implant Firing Pins
 2015-03-13 12:57:28 -05:00
MrPerson
9038fb15af Code cleanup 
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
 2015-03-13 10:41:00 -07:00
GunHog
1f400f6860 Increases requirements 
Reqs to make it are now Combat 6, Mats 6, Power 3.
 2015-03-13 12:15:49 -05:00
Miauw
6225ed8fb4 Chat toggles are saved to the savefile properly again. Fixes #8318 2015-03-13 16:39:28 +01:00
phil235
27cfbdcb2a Merge pull request #8235 from Incoming5643/you_wouldnt_download_a_car 
Fixes cavity implant surgery not respecting NODROP
 2015-03-13 12:23:44 +01:00
phil235
8248baee67 Merge pull request #8230 from norill/master 
fixed improper req_tech "power" -> "powerstorage"
 2015-03-13 12:16:06 +01:00
phil235
b3d9c9ca43 Merge pull request #8232 from Iamgoofball/patch-43 
Cyborgs no longer have flesh to knit.
 2015-03-13 12:12:39 +01:00
Cheridan
28f6aae00c Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup 
Conflicts:
	icons/mob/back.dmi

remie is a nerd btw
 2015-03-12 20:47:11 -05:00
phil235
29609457f5 Makes the message when you're attacked slightly bigger for better visibility." 
Changes two "for... show_message()" into "visible_message()".
 2015-03-12 23:15:54 +01:00
phil235
c04468576f Fixes chemsprayer duplicating reagents. Simplifying its code. 
Chem puff spray can no longer give more chems to mobs than it contains.
Mobs being in front of the chem puff shorten its total range.
Fixes using the spray at short range not showing the whole chemical puff animation.
For a given max range of a spray, aiming closer will now transfer more chemicals to each mobs/objs/turfs than aiming the furthest.
 2015-03-12 19:54:36 +01:00
phil235
921ed1330e Fixes russian revolver's special mechanism message appearing when placing it on a table or in your inventory. 
Fixes its description about auto spinning barrel.
Fixes its behavior when used as a melee weapon.
 2015-03-12 14:34:23 +01:00
phil235
a15adec48d Fixes burger and sandwich ingredient stacking and sprites. 2015-03-12 13:32:30 +01:00
phil235
82d9761f1f Fixes notasandwich and flamethrower tablecraft recipes 
Add a recipe detection to tablecrafting, if you have some of the things required for the recipe (50% of the amount of different things needed, i.e if less than 3 different things in the recipe then you need 1, otherwise 2+), it will now appear in grey in the tablecrafting window. The tablecrafting window will also lists the requirements for each recipes it shows.
 2015-03-11 19:36:51 +01:00
Thunder12345
8a780e89bf Overloading improvised shells 
Improvised shells can be overloaded with black powder to have a random
pellet count and damage for each pellet. Damage ranges from 0 to 80.
 2015-03-11 11:41:26 +00:00
Ahammer18
aa2cf3c469 Added drone asses 2015-03-10 20:35:11 -05:00
phil235
5d5c21266c Merge pull request #8262 from MMMiracles/usaneverdie 
Liberation Station 3: Patriotic Tears
 2015-03-11 00:26:33 +01:00
Ahammer18
d2b650ad44 Changed "Toggle Suit Sensors" to "Adjust Suit Sensors" because we now have a menu that pops up when you want to change your suit sensors. 2015-03-10 18:20:14 -05:00
phil235
1eba7b694b Merge pull request #8134 from Miauw62/ghostradios 
Adds a toggle so ghosts can hear radio chatter more easily.
 2015-03-10 23:56:28 +01:00