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
18,573 Commits 61 Branches 14 Tags
15c10dd427fdf117fe7e7e9476ffdb8de8205e5c
Commit Graph

285 Commits

Author SHA1 Message Date
Razharas
926c2f7413 Merge pull request #8027 from Iamgoofball/patch-36 
I apparently added morphine to Deus. This was not intended.
 2015-02-28 07:00:27 +03:00
Razharas
78e504f33e Merge pull request #7994 from Incoming5643/colormesurprised 
Fixes podmen always being sickenly off white upon creation
 2015-02-27 11:10:55 +03:00
Iamgoofball
16f319bffd I apparently added morphine to Deus. This was not intended. 2015-02-26 20:27:14 -08:00
Incoming
55512a69e0 Fixes podmen always being sickenly off white 2015-02-25 20:06:18 -05:00
Razharas
4ba5161394 Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT 
Conflicts:
	code/modules/hydroponics/seeds.dm

Resolving dem conflicts
 2015-02-25 15:17:14 +03: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
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
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
Razharas
d775291bdf Made vines cultivatable 
Added special proc to all seeds that give plant anazyler special
information if needed in form of list of strings that will be displayed
to user one by one
Added special proc to seeds that make them have some special chem
interactions on growth if needed
Made vine mutations have quality of either good, bad or neutral
Made some chems remove the mutations of certain quality from growing
seeds
Made some chems tweak potency and production of the growing vine seeds
both ways so you can make unmutatable slowly growing vines if needed
Vine seeds now show mutations on the plant analyzing
Cut some copypaste in analyzer proc
 2015-02-18 01:27:52 +03:00
Razharas
5d0e800c3d Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT 
Conflicts:
	icons/turf/floors.dmi

Fixing merge conflicts
 2015-02-17 20:33:52 +03:00
Cheridan
15439b8c4e Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix 
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
 2015-02-15 10:27:50 -06:00
phil235
135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration. 
Fixes Alien embryo processing that was processed twice.
 2015-02-14 14:18:49 +01:00
Swag McYolosteinen
b2d6ce5481 Merge pull request #7668 from dannno/suicidefix 
Fixes #7647
 2015-02-14 12:12:38 +01:00
Iamgoofball
99cab4ddcb Changes 2015-02-13 18:05:03 -08:00
Razharas
7571189a35 More vines for the god of vines 
Added bluespace vines that are able to grow through walls, glass and
anything and everything
Added space-protective vines that change the space into "vineturfs"
which are basically resprited floors
Made vines be able to spread into space
Changed some vinecontroller vars, now you can adjust the speed of
spreading both by capping the max vines per tick and new-vines to
existing-vines spread ratio
Made the chance to mutate per spread be dependant on the potency of the
seed
Made the spreading speed be dependant on productivity of the seed(can be
both slower and faster then current one)
Fixed some potential runtimes with calling destroy() instead of qdel()
where needed
Removed the colon added by carn, its all checked in Enter call few lines
later anyway
I like vines
 2015-02-13 01:13:13 +03:00
Cheridan
216630f1db Merge pull request #7572 from phil235/CookingOverhaul 
Cooking overhaul
 2015-02-12 08:01:17 -06:00
dannno
b34c5180ae modifies and fixes suicide messages for guns and bananas 2015-02-11 22:39:11 -05:00
phil235
549b71a487 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul 
Conflicts:
	icons/obj/drinks.dmi

Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
 2015-02-11 16:13:04 +01:00
TZK13
8ae7a739dd Lowered maximum amount of possible fire stacks even more. 2015-02-11 06:51:23 -06:00
TZK13
2e919da8ab Lowered maximum amount of possible fire stacks. 2015-02-11 06:23:44 -06:00
TZK13
edf3364765 Novaflowers now ignite people with the amount of fire stacks applied depending on potency and you can now juice whole watermelons. 2015-02-10 06:26:03 -06:00
phil235
c70d17a8eb Rebalancing vitamin amounts in grown 
Fixing some sugar amounts in 2 growns
Fixing error from metastation z2 mapfile.
 2015-02-08 22:48:53 +01:00
Iamgoofball
fa32a61494 Loads of new chemicals and changes 2015-02-07 21:55:21 -08:00
Iamgoofball
0864e4a8dc Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs 
Conflicts:
	code/modules/reagents/Chemistry-Goon-Medicine.dm
	code/modules/reagents/reagent_containers/pill.dm
	icons/obj/drinks.dmi
 2015-02-07 15:46:12 -08:00
Cheridan
5610b46a0f Merge pull request #7528 from paprka/clothessec 
Some clothing changes
 2015-02-07 17:00:36 -06:00
phil235
35fb458293 Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul 
Conflicts:
	code/modules/food&drinks/food/snacks_other.dm
	icons/obj/drinks.dmi
 2015-02-07 20:22:49 +01:00
phil235
63456ef622 Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog. 2015-02-07 03:10:32 +01:00
TheVekter
ff65ec2018 Fixed "Chilli" -> "Chili" and "Coco" -> "Cocoa". Pray it passes Travis. 2015-02-06 05:22:53 -06:00
Iamgoofball
f6d7823fc2 Adds muriatic, caustic, and hydrochloride to maint loot 2015-02-05 18:57:58 -08:00
paprka
c527491f41 Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2015-02-05 17:44:22 -08:00
paprka
2ef8848c74 adds ability to store ammo and any type of revolver in holster 2015-02-05 17:41:10 -08:00
phil235
3456b017b6 repo update 2015-02-05 23:00:59 +01:00
phil235
a296e8f6a1 Updating the cook book. Finishing giving filling color to growns. More fixes 2015-02-05 22:34:11 +01:00
phil235
faba71fcca Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay) 
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
 2015-02-05 16:48:25 +01:00
dannno
c4fccf2651 remove redundant message 2015-02-01 16:35:14 -05:00
dannno
a8fd8d13fa how about i put you to sleep kraso 
with a banana
by killing you with it
 2015-02-01 16:33:50 -05:00
dannno
f2ccc18c5c kill yourself with banana my friend 2015-02-01 14:19:17 -05:00
pudl
08f8bb3ce8 replaces all instances of pacid with facid 2015-01-21 20:17:23 -06:00
Iamgoofball
b83ca5f8d1 Goon Chemistry: Addiction and Overdosing 2015-01-18 21:50:54 -08:00
Iamgoofball
38070820f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup 2015-01-16 17:25:50 -08:00
Iamgoofball
f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
tkdrg
ac3c413f24 Merge pull request #6969 from Firecage/Biogenerator_stuff 
Adds stuff to Biogenerator. STUFF!.
 2015-01-16 17:31:25 -03:00
Firecage
204fdb8b2f Update to biogenerator stuff PR 2015-01-16 09:24:39 +02:00
Firecage
2aa837f8f4 Wrench/unwrench messages only one for hydro trays 2015-01-15 09:27:03 +02:00
Firecage
e4e5c1ae62 This adds a delay to anchoring and unanchoring a hydroponics tray. 2015-01-15 02:45:51 +02:00
Firecage
c1368f6816 Fixes what Miauw said with the secbelt thing. 2015-01-11 21:31:21 +02:00
Firecage
2e20b8ea91 Biogenerator stuff. 2015-01-11 16:53:41 +02:00
tkdrg
652c8f5741 Merge pull request #6818 from Ergovisavi/more_pod_cloning 
Some replica pod cloning fixes
 2015-01-06 22:53:41 -03:00
Ergovisavi
1cd8dd90b7 Fixing an issue that would prevent pod cloning from working if the mob leaves its body before blood is drawn 2015-01-05 06:25:48 -08:00
carnie
a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-01-04 01:52:14 +00:00