cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-14 19:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,143 Commits 62 Branches 14 Tags
dc4c4ea90beff7be7b0177cb945d725eeccf8450
Commit Graph

1083 Commits

Author SHA1 Message Date
paprka
dc4c4ea90b Merge branch 'master' of https://github.com/tgstation/-tg-station into megaphoney 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
 2015-02-18 23:15:15 -08:00
Cheridan
116143006e Merge pull request #7746 from Incoming5643/BuyOneGetOneFreePets 
Fixes the horrible injustice of getting too many pets
 2015-02-18 09:38:24 -06: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
Incoming
136b3ed67b Fixes the horrible injustice of getting too many pets 2015-02-14 23:54:20 -05:00
Cheridan
76f101de63 Merge pull request #7614 from paprka/preffer 
Hard-light hazard holotape
 2015-02-14 21:59:14 -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
paprka
c66327318d adds megaphones 2015-02-13 15:07:15 -08:00
Cheridan
216630f1db Merge pull request #7572 from phil235/CookingOverhaul 
Cooking overhaul
 2015-02-12 08:01:17 -06: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
Cheridan
65e8a4ce31 Merge pull request #7624 from paprka/defibfuckupv2 
Defib changes
 2015-02-11 08:37:28 -06:00
paprka
3e61bba236 defib changes 2015-02-08 17:06:34 -08:00
Kraseo
91c1a54abd closes the open() 2015-02-08 23:33:33 +01:00
phil235
732a54fe63 Making all meat subtypes of snacks/meat 
Adding specific cutlets and raw cutlets for a lot of types of meat.
Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting
Adjusting tablecraft food recipes reagents accordingly.
Adding raw pastry base and pastry base food and including it into certain recipes.
 2015-02-08 21:36:54 +01:00
paprka
424dd37782 hard-light holotape 2015-02-08 07:29:10 -08:00
Kraseo
4e18859e7b fixes lockers/bodybags/etc. shielding you from explosions. whoops! 2015-02-08 15:13:04 +01:00
Kraseo
08e7911f57 fixes a bunch of bugs 2015-02-08 13:27:55 +01: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
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
Cheridan
fdb9c92736 Merge pull request #7494 from paprka/dirsigns 
Adds directional signs from bay
 2015-02-05 16:28:26 -06:00
phil235
e4464b3b9f Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul 2015-02-05 22:35:00 +01:00
Swag McYolosteinen
6fab02e7cd Merge pull request #7546 from TZK13/Purple-Shorts 
Adds purple shorts
 2015-02-05 18:16:14 +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
TZK13
01bf5b343f Adds purple shorts. 2015-02-04 01:23:58 -06:00
TZK13
8400ec9800 Adds work boots and fixes character setup previews. 2015-02-04 00:32:15 -06:00
paprka
495ae29ab8 helmet, armor, and corgi changes 2015-02-03 19:12:38 -08:00
paprka
11463998e6 Merge branch 'master' of https://github.com/tgstation/-tg-station into dirsigns 2015-02-03 14:56:23 -08:00
Cheridan
80913f143b Merge pull request #7239 from paprka/ointmentandshit 
BLOOD FOR THE BLOOD GOD
 2015-02-03 16:30:42 -06:00
Cheridan
784766e8cc Merge pull request #7509 from paprka/gunstuff 
Improves pulse guns, ERT, and centcomm areas
 2015-02-03 16:14:48 -06:00
paprka
890b3800e6 some clothing changes 2015-02-03 09:00:51 -08:00
hornygranny
bbfad5b137 Merge pull request #7488 from paprka/memetiersprioite 
fixes janicart
 2015-02-02 19:37:28 -08:00
paprka
6de33d4063 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 
Conflicts:
	_maps/map_files/generic/z2.dmm
 2015-02-02 19:13:49 -08:00
Swag McYolosteinen
9bddcb3df4 Merge pull request #7492 from xxalpha/spacesuit_storage 
Repath all non jetpack tank types to tank/internals
 2015-02-02 18:52:51 +01:00
paprka
18a90495b2 updates to ERT stuff 2015-02-02 03:33:37 -08:00
paprka
a5dcd1abd8 improves ert spawning and centcomm 2015-02-01 21:16:11 -08:00
paprka
55bdca20da Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 2015-02-01 18:22:02 -08:00
xxalpha
a9c181bbcc Repath all non jetpack tank types to tank/internals 
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
 2015-02-01 18:25:39 +00:00
paprka
95e4cf1ffa adds directional signs from bay 2015-02-01 06:13:21 -08:00
paprka
77dabb02fe fixes janicart 2015-02-01 03:09:09 -08:00
paprka
a661e58281 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
 2015-01-31 22:03:00 -08:00
Remie Richards
b1ff5dd6de Merge pull request #7418 from paprka/kekwalk 
Some catwalk fixes
 2015-02-01 03:32:43 +00:00
paprka
453a3db196 etc 2015-01-30 23:18:02 -08:00
Incoming
c8e3b33687 (｡´>д<)っ彡☆ 
Y'all making me do actual refactoring in a silly pull
 2015-01-29 18:59:25 -05:00
Incoming
b5ec328983 New contraband supply item: 50 butterflies 
(◕‿◕✿)
 2015-01-29 18:07:34 -05:00
paprka
ac85775b02 catwalk fixes 2015-01-28 19:30:21 -08:00
paprka
b830f77ea2 Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-01-26 15:37:33 -08:00
paprka
c43092efa9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit 2015-01-25 21:56:39 -08:00
Remie Richards
f7730eeaef Merge pull request #7087 from paprka/readdjanikart 
Improves janicart and adds secway
 2015-01-26 00:31:30 +00:00
paprka
a5a9e297d4 new hood system 2015-01-25 00:22:52 -08:00
Swag McYolosteinen
d26e40a6ee Merge pull request #7282 from Firecage/SkinningMonkeysXenos 
Adds the ability to remove monkey/xeno skins and make costumes with them
 2015-01-24 14:06:13 +01:00
paprka
be925ebd62 adds a check for the buffer upgrade 2015-01-24 01:49:07 -08:00