cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit

Browse Source 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
This commit is contained in:
Razharas
2014-12-16 02:52:08 +03:00
parent 570783d2c7 56ddfc1367
commit f0c8f2eeac
117 changed files with 7789 additions and 4608 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/surgery/lipoplasty.dm
+1 -1
View File
@@ -31,7 +31,7 @@
user.visible_message("<span class='notice'>[user] extracts [target]'s fat!</span>")
target.overeatduration = 0 //patient is unfatted
var/removednutriment = target.nutrition
target.nutrition = 450
target.nutrition = NUTRITION_LEVEL_WELL_FED
removednutriment -= 450 //whatever was removed goes into the meat
var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new
newmeat.name = "fatty meat"