cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-16 03:56:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,764 Commits 61 Branches 14 Tags
643de0c922473f9ee721be207a024676121294de
Commit Graph

942 Commits

Author SHA1 Message Date
Cheridan
6b512f663a Merge pull request #8137 from Incoming5643/so_misunderstood 
Removes the Spooky
 2015-03-06 00:09:25 -06:00
Incoming
8192ea7e06 Removes the paths to get skeletons and zombies in normal play but also does not nerf them. They can still be found through a few very rare mutation chances (I think?) and wizbiz. 2015-03-03 16:55:02 -05:00
phil235
bb10824737 Improvised heating fix: Fixes dough recipe from egg + 15u flour beaker. 
Adds a limit to how hot the beaker reagents can be heated. (no hotter than the heat source)
moving reagent_containers/attackby() to reagents/reagent_containers.dm for better visibility.
 2015-03-03 22:35:11 +01:00
Swag McYolosteinen
c2290c6c5c Merge pull request #7913 from phil235/NewPlants 
Adds new plants to botany
 2015-03-03 11:23:32 +01:00
Swag McYolosteinen
daffcdf075 Merge pull request #7987 from phil235/SugarSatietyRemoval 
Remove sugar satiety effect
 2015-03-02 18:17:40 +01:00
Cheridan
2be30eb89e Merge pull request #8083 from Delimusca/getochemboyz 
added improvised heating
 2015-03-02 08:58:12 -06:00
phil235
d856e240c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-03-02 13:45:15 +01:00
Swag McYolosteinen
7c0e24f692 Merge pull request #7454 from Iamgoofball/patch-24 
Makes water wash colorful reagent off too
 2015-03-02 13:28:26 +01:00
Cheridan
6ca5a89025 Merge pull request #8036 from paprka/fixfueltank 
Fixes practice lasers exploding fuel tanks
 2015-03-02 05:54:09 -06:00
Cheridan
6e68c4cb67 Merge pull request #8030 from Iamgoofball/patch-37 
Nerfs Beepsky Smash (rip in peace)
 2015-03-02 01:00:28 -06:00
Delimusca
747ebbc78d added improvised heating 2015-02-28 20:51:39 -07:00
Iamgoofball
86fa3c113c Buffs Oxygen Blob 2015-02-28 15:49:23 -08:00
Razharas
1b866bad83 Merge pull request #8024 from Iamgoofball/patch-35 
Fixes the meth recipe
 2015-02-28 06:59:56 +03:00
paprka
8807c433ae modifies dark matter 2015-02-27 04:21:56 -08:00
paprka
5938cc7325 fixes practice lasers exploding fuel tanks 2015-02-27 03:58:25 -08:00
Iamgoofball
081b957a48 Nerfs Beepsky Smash 2015-02-26 20:52:31 -08:00
Iamgoofball
7a990a0a28 Fixes the meth recipe 
phosphorus
 2015-02-26 18:22:22 -08:00
Cheridan
e4eeed69bc Merge pull request #7976 from Jordie0608/bioterrorreportedasleastpopularformasspaceterrorism 
Fixes bioterror chemsprayer
 2015-02-26 02:08:24 -06:00
Jordie0608
e89e925fef removes empty new 2015-02-26 18:53:23 +11:00
hornygranny
f7342415c1 Merge pull request #7959 from phil235/AttackSelfTKFix 
A bunch of fixes
 2015-02-25 19:54:36 -08:00
hornygranny
6cd1942bb2 Merge pull request #7949 from Iamgoofball/patch-33 
Fixes blobs flinging/pulling themselves and anchored objects
 2015-02-25 19:53:00 -08:00
phil235
809a1be279 Merge branch 'master' of https://github.com/tgstation/-tg-station into NewPlants 
Conflicts:
	icons/mob/head.dmi
 2015-02-25 18:50:42 +01:00
phil235
5a5eae0f44 Remove sugar satiety effect that goofball readded by mistake. 2015-02-25 18:32:17 +01:00
Razharas
588c79873f Merge pull request #7562 from Iamgoofball/drugs 
GOONCHEM: Part 4: Pyrotechnics, Drugs, and Misc. Chemicals
 2015-02-25 08:26:21 +03:00
Jordie0608
b931c66f2c fixes bioterror chemsprayer 2015-02-25 16:08:59 +11:00
Iamgoofball
765ae220fa fixes blackpowder bombcap shit 2015-02-24 20:35:47 -08:00
Iamgoofball
1ac844073a carpet fixes 2015-02-24 20:25:57 -08:00
Iamgoofball
c0ae53a566 changes and shit, adds prespawn colorful smoke grenade for fun times and adminning 2015-02-24 20:15:06 -08:00
Iamgoofball
704cf6ed37 Finally nerfs Salglu, changes salt recipe to water+sodium+chlorine 2015-02-24 18:51:12 -08:00
Remie Richards
b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams 
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
 2015-02-24 22:16:53 +00:00
phil235
79de9615dc Fixes not being able to prime grenade, toggle lamps and other attack_self things with TK. 
Fixes the blobbernaut death animation looping.
Fixes armchair layer being above ghost layer.
Fixes chloral hydrate metabolization rate (and 2 other reagents)
Fixes a typo in closet/attack_self() .
 2015-02-24 16:36:40 +01:00
Iamgoofball
c9a713a5fd Fixes blobs flinging/pulling themselves 2015-02-23 19:58:52 -08:00
Iamgoofball
722c4cb1ef re-adds GOTTAGOFAST, renames the current gottagofast to IGNORESLOWDOWN, adds GOTTAGOREALLYFAST for meth 2015-02-23 19:35:58 -08:00
Iamgoofball
4735e1c02a Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 2015-02-23 18:47:21 -08:00
hornygranny
7f95f869a0 Merge pull request #7874 from phil235/SlimecoreMobSpawnFix 
Gold slime reaction fixes.
 2015-02-22 20:17:55 -08:00
hornygranny
c0c8a739e2 Merge pull request #7721 from paprka/miening 
Mining & mine-related chem changes
 2015-02-22 20:17:24 -08:00
phil235
bd870d649c Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice). 2015-02-22 22:10:25 +01:00
Iamgoofball
b7e7d5a877 final fixes and changes 2015-02-22 06:35:49 -08:00
hornygranny
44e3c104e3 Merge pull request #7857 from Delimusca/heatermaths 
fixes heater rounding, lowered heater coefficient
 2015-02-21 23:37:33 -08:00
Iamgoofball
31491a5e27 quick push of everything I have now, fucking foam 2015-02-21 13:36:16 -08:00
phil235
ca57c1070f Fixes goldslime+blood reaction spawning a hostile mob and goldslime+plasma only spawning 1 mob. 2015-02-21 20:45:34 +01:00
Delimusca
0f8fc471d3 fixes heater rounding, coeff. lowered to .10 2015-02-21 01:03:30 -07:00
Iamgoofball
ac6bf07b17 go away untable mutagen 2015-02-20 22:04:26 -08:00
Iamgoofball
e24e94544e Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 
Conflicts:
	code/modules/food&drinks/food/snacks_meat.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
	icons/obj/drinks.dmi
	icons/obj/food.dmi
 2015-02-20 22:00:53 -08:00
Mandurrrh
3e43beab29 Fixes issue #7841 2015-02-20 09:15:20 -05:00
Razharas
452aa3d961 Merge pull request #7791 from Mandurrrh/Booze 
Adds fountain machines for bar.
 2015-02-20 09:19:42 +03:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
hornygranny
c99ee72b55 Merge pull request #7788 from phil235/NeurotoxinReactionFix 
Fixes neurotoxin reaction's required temperature.
 2015-02-18 21:49:01 -08:00
hornygranny
dbee9709d1 Merge pull request #7790 from phil235/CryoStingExploitFix 
Fixes cryosting detection exploit
 2015-02-18 21:48:45 -08:00
hornygranny
da4f8e74d8 Merge pull request #7733 from Cheridan/reagent_foam 
Reagent Foam
 2015-02-18 21:43:50 -08:00