cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-23 12:06:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-16

Browse Source 
# Conflicts:
#	code/_onclick/hud/screen_objects.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/gloves/color.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/simple_animal/aliens/alien.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/goose.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_defines.dm
#	code/modules/projectiles/projectile/special.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	vorestation.dme
This commit is contained in:
Leshana
2018-02-17 00:35:29 -05:00
parent 039f29d86c ae974977f1
commit 7ed3d2c2f6
255 changed files with 4854 additions and 2785 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Machinery.dm
+4
View File
@@ -68,6 +68,10 @@
user.drop_item()
B.loc = src
user << "You add \the [loaded_pill_bottle] into the dispenser slot!"
else if(default_unfasten_wrench(user, B, 20))
return
return
/obj/machinery/chem_master/attack_hand(mob/user as mob)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
+2 -2
View File
@@ -461,11 +461,11 @@
if(M.ingested)
for(var/datum/reagent/R in M.ingested.reagent_list)
if(istype(R, /datum/reagent/ethanol))
R.dose = max(R.dose - removed * 5, 0)
R.remove_self(removed * 5)
if(M.bloodstr)
for(var/datum/reagent/R in M.bloodstr.reagent_list)
if(istype(R, /datum/reagent/ethanol))
R.dose = max(R.dose - removed * 15, 0)
R.remove_self(removed * 15)
/datum/reagent/hyronalin
name = "Hyronalin"
code/modules/reagents/Chemistry-Recipes.dm
+2 -3
View File
@@ -2215,9 +2215,8 @@
name = "Deuterium"
id = "deuterium"
result = null
required_reagents = list("water" = 10)
catalysts = list("hydrophoron" = 5)
result_amount = 1
required_reagents = list("hydrophoron" = 5, "water" = 10)
result_amount = 15
/datum/chemical_reaction/deuterium/on_reaction(var/datum/reagents/holder, var/created_volume)
var/turf/T = get_turf(holder.my_atom)
code/modules/reagents/reagent_containers/food/lunch.dm
+1 -1
View File
@@ -59,7 +59,7 @@ var/list/lunchables_drink_reagents_ = list(/datum/reagent/drink/nothing,
/datum/reagent/drink/hell_ramen,
/datum/reagent/drink/hot_ramen,
/datum/reagent/drink/soda/nuka_cola)
// This default list is a bit different, it contains items we don't want
var/list/lunchables_ethanol_reagents_ = list(/datum/reagent/ethanol/acid_spit,
code/modules/reagents/reagent_containers/food/snacks.dm
+30 -7
View File
@@ -390,6 +390,29 @@
reagents.add_reagent("coco", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chocolatepiece
name = "chocolate piece"
desc = "A luscious milk chocolate piece filled with gooey caramel."
icon_state = "chocolatepiece"
filling_color = "#7D5F46"
center_of_mass = list("x"=15, "y"=15)
nutriment_amt = 1
nutriment_desc = list("chocolate" = 3, "caramel" = 2, "lusciousness" = 1)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/white
name = "white chocolate piece"
desc = "A creamy white chocolate piece drizzled in milk chocolate."
icon_state = "chocolatepiece_white"
filling_color = "#E2DAD3"
nutriment_desc = list("white chocolate" = 3, "creaminess" = 1)
/obj/item/weapon/reagent_containers/food/snacks/chocolatepiece/truffle
name = "chocolate truffle"
desc = "A bite-sized milk chocolate truffle that could buy anyone's love."
icon_state = "chocolatepiece_truffle"
nutriment_desc = list("chocolate" = 3, "undying devotion" = 3)
/obj/item/weapon/reagent_containers/food/snacks/chocolateegg
name = "Chocolate Egg"
desc = "Such sweet, fattening food."
@@ -2459,9 +2482,9 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
name = "meatbread loaf"
desc = "The culinary base of every self-respecting eloquen/tg/entleman."
desc = "The culinary base of every self-respecting eloquent gentleman."
icon_state = "meatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled
slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/meatbread
slices_num = 5
filling_color = "#FF7575"
center_of_mass = list("x"=19, "y"=9)
@@ -2473,7 +2496,7 @@
reagents.add_reagent("protein", 20)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled
/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread
name = "meatbread slice"
desc = "A slice of delicious meatbread."
icon_state = "meatbreadslice"
@@ -2483,14 +2506,14 @@
center_of_mass = list("x"=16, "y"=16)
whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled/filled
/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled
filled = TRUE
/obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread
name = "xenomeatbread loaf"
desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical."
icon_state = "xenomeatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread/filled
slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread
slices_num = 5
filling_color = "#8AFF75"
center_of_mass = list("x"=16, "y"=9)
@@ -2502,7 +2525,7 @@
reagents.add_reagent("protein", 20)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread/filled
/obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
icon_state = "xenobreadslice"
@@ -2513,7 +2536,7 @@
whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread
/obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread/filled/filled
/obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread/filled
filled = TRUE
/obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread