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

48 Commits

Author SHA1 Message Date
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
Delimusca
747ebbc78d added improvised heating 2015-02-28 20:51:39 -07:00
TheVekter
f6e18e9e45 Re-adds the shot glass sprites. 2015-02-27 17:14:50 -06:00
phil235
fa0e5344ef Removes sugar effects. 2015-02-27 19:01:32 +01:00
TheVekter
fa00cee00c Fixes that damn typo FOR REAL THIS TIME 2015-02-18 11:53:20 -06:00
Cheridan
2817785936 Merge pull request #7718 from TheVekter/shotglasseshowdotheywork 
Re-adds Toxins Special and B-52 to glasses.
 2015-02-14 18:33:00 -06:00
TheVekter
cd916eb1d9 Re-adds Toxins Special and B-52 to glasses. Oops. 2015-02-13 18:34:58 -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
TheVekter
3861126c2c Reverts drunkenness changes per #7439 
Fixes a typo
Makes players drink full shot no matter how much is in glass
 2015-02-10 15:54:15 -06:00
TheVekter
2b346676c1 Moved shotglasses back to drinkingglass.dm. Again. 
Added a bunch more iconstates for each drink in the booze-o-mat. Any drink the shot doesn't recognize comes up as a "shot of... what?"
 2015-02-10 11:50:28 -06:00
TheVekter
f26ceabf3a Made Toxins Special and B-52 exclusive to shot glasses. 
Tweaked drunkenness to make it less effective at lower booze levels, but moreso at higher.
Changelog.
 2015-02-10 02:21:50 -06:00
TheVekter
24ed9dd3e0 Wow apparently I broke the tequila sprite 2015-02-10 00:22:22 -06:00
TheVekter
f49abb5117 Adds multiple drinks to the shotglass list so they can be mixed within. 
Re-adds bottle of booze that got removed in a merge conflict a while back.
 2015-02-09 18:25:03 -06:00
TheVekter
ba18c0e925 Adds sprites and iconstates for shot glass. 2015-02-09 17:38:23 -06:00
TheVekter
e728185a49 Fixes shot glass sprite changing when something's poured in (TEMP FIX) 2015-02-09 16:55:11 -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
TheVekter
78c5c66afb Note: Compile before you commit ffs 2015-02-07 00:31:12 -06:00
TheVekter
4fb8b34ee0 Merge remote-tracking branch 'remotes/upstream/master' into changesafecontents 
Conflicts:
	code/modules/food&drinks/drinks/drinks/bottle.dm
 2015-02-07 00:18:39 -06:00
TheVekter
4e2b2fe20c Adds new top-shelf vodka to the safe (also there's a bottle hidden on the station see if you can find it~) 2015-02-06 02:29:23 -06:00
TheVekter
98465ea1dd Adds the new rare Vodka to the game and to the Safe. 2015-02-06 00:21:02 -06:00
TheVekter
4074037954 Adds shot glasses to the game. 2015-02-05 20:48:34 -06:00
TheVekter
9bc2137815 man fuck typos 
Whoops, might wanna update on my end before changing a path.

Fixed typo 'Tequilla'.
 2015-02-05 15:43:09 -06: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
Jordie0608
3d2da1b350 Fixed runtiming commas 2015-01-19 20:15:01 +11:00
Jordie0608
a643ecdfcc Food and drinks refactor 2015-01-19 18:06:15 +11:00
phil235
778a10688d Fixes feeding messages that was showing the attacker's message to the victim. 2015-01-14 19:57:39 +01:00
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
phil235
f87da5939a Making nutrition level values into defines. 
Adding a changelog.
Snack vending machine's chef compartment is locked with kitchen access but can be emagged or hacked.
Adding feedback message for the user when its metabolism_efficiency changes.
Negative satiety can make you jitter a little bit at times. (probability linked to your satiety)
 2014-12-13 17:15:35 +01:00
phil235
f9dff2f626 Balancing nutrition and fixing some nutrition stuff that I had missed. 2014-12-12 13:59:31 +01:00
phil235
7bd9b86652 Changes the hunger system in various ways. New hunger hud icons. Food w/o sugar can be loaded in snack vending machines by anyone. Adding two new var for mobs "satiety" and "metabolism efficiency". Rearranging datum/reagents, all "good" medical reagents are under datum/reagent/medicine/ and all food&drink reagents are under datum/reagent/consumable. Adding a pizza crate to cargo orders. Growns and cooked food are given vitamins while junk food are all given sugar. Removed some unnecessary code in Chemistry-Reagents.dm . 
high satiety+fed = higher metabolism_efficiency, lower if starving. Sugar digested drains satiety and vitamin raises satiety. Negative satiety means faster nutrition drop. Positive high satiety means lower chance to spread viruses. metabolism efficiency affect metabolization speed of healing and damaging reagents and the efficiency of bodytemp stabilization via calory use.
 2014-12-11 20:46:27 +01:00
Swag McYolosteinen
6f5b2cf7ea Merge pull request #6224 from fleure/gargleblaster 
Changes Gargle Blaster description
 2014-12-06 10:28:23 +01:00
Cheridan
f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat 
Standardizing attack messages to always show the attacker first
 2014-12-04 12:45:31 -06:00
fleure
571e3a4487 Changes Gargle Blaster description 2014-12-04 18:03:50 +00:00
Razharas
67c2ddb734 Fix for omnious reagent transfer error 2014-11-25 15:29:59 +03:00
phil235
86405fa8c0 Standardizes attack messages to always show the attacker first (when there is an attacker). 
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
 2014-11-24 01:49:34 +01:00
phil235
0bc84e120e Merge branch 'master' of https://github.com/tgstation/-tg-station into TorchFix 
Conflicts:
	icons/mob/items_lefthand.dmi

Adding PR 5829 to my PR so both can be merged now.
 2014-11-22 18:56:31 +01:00
Remie Richards
ea4e6f823c Merge pull request #5051 from paprka/rollingjsuit 
Ports and improves jumpsuit rolling (casual adjusting) and noir detective set
 2014-10-06 20:45:28 +01:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
paprka
0b605e7bdf more NT ports 2014-10-01 18:36:57 -07:00
Alex
8fff1aa0c7 Merge pull request #4701 from phil235/goldschlagerfix 
fixing the icon of goldschlager glass
 2014-09-06 19:08:02 +01:00
phil235
d3a6a793ee fixing the icon_state of goldschlager glass 2014-09-05 11:51:45 +02:00
MrPerson
a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor 
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-08-29 04:21:15 -07:00
Firecage
4198e61af1 This fixes the message issues 2014-08-22 01:15:13 +02:00
MrPerson
13b03a6d43 Hopefully final pass of object -> mob examine switch 2014-08-20 07:07:30 -07:00
Firecage
6db137fd2b absolute paths for kitchen and bar stuff 2014-08-15 23:06:05 +02:00
paprka
eea9ae50ad merging 2014-07-29 16:50:21 -07:00
Firecage
77d15a6c5b Moar restructuring 2014-07-23 06:10:21 +02:00