shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5797 from Citadel-Station-13/upstream-merge-36071

Browse Source 
[MIRROR] Advanced roasting sticks, for cooking sausages
This commit is contained in:
deathride58
2018-03-05 02:45:33 +00:00
committed by GitHub
parent 5f742c446e 0bb93619b9
commit fc4612fe93
6 changed files with 126 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/food/snacks_meat.dm
+2 -1
View File
@@ -113,6 +113,7 @@
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("meat" = 1)
foodtype = MEAT
var/roasted = FALSE
/obj/item/reagent_containers/food/snacks/sausage/Initialize()
. = ..()
@@ -187,7 +188,7 @@
visible_message("<span class='notice'>[src] expands!</span>")
var/mob/spammer = get_mob_by_key(fingerprintslast)
var/mob/living/carbon/monkey/bananas = new(drop_location())
bananas.log_message("Spawned via [src] at [COORD(src)], Last attached mob: [key_name(spammer)].", INDIVIDUAL_ATTACK_LOG)
bananas.log_message("Spawned via [src] at [COORD(src)], Last attached mob: [key_name(spammer)].", INDIVIDUAL_ATTACK_LOG)
qdel(src)
/obj/item/reagent_containers/food/snacks/enchiladas
code/modules/power/supermatter/supermatter.dm
+4 -2
View File
@@ -276,7 +276,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
if(!removed || !removed.total_moles() || isspaceturf(T)) //we're in space or there is no gas to process
if(takes_damage)
damage += max((power / 1000) * DAMAGE_INCREASE_MULTIPLIER, 0.1) // always does at least some damage
else
else
if(takes_damage)
//causing damage
damage = max(damage + (max(removed.temperature - ((T0C + HEAT_PENALTY_THRESHOLD)*dynamic_heat_resistance), 0) * mole_heat_penalty / 150 ) * DAMAGE_INCREASE_MULTIPLIER, 0)
@@ -435,7 +435,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
L.rad_act(rads)
explode()
return 1
/obj/machinery/power/supermatter_shard/bullet_act(obj/item/projectile/Proj)
@@ -530,6 +530,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
/obj/machinery/power/supermatter_shard/attackby(obj/item/W, mob/living/user, params)
if(!istype(W) || (W.flags_1 & ABSTRACT_1) || !istype(user))
return
if (istype(W, /obj/item/melee/roastingstick))
return ..()
if(istype(W, /obj/item/scalpel/supermatter))
to_chat(user, "<span class='notice'>You carefully begin to scrape \the [src] with \the [W]...</span>")
if(W.use_tool(src, user, 60, volume=100))
code/modules/research/designs/misc_designs.dm
+10
View File
@@ -257,6 +257,16 @@
category = list("Electronics")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/datum/design/roastingstick
name = "Advanced roasting stick"
desc = "A roasting stick for cooking sausages in exotic ovens."
id = "roastingstick"
build_type = PROTOLATHE
materials = list(MAT_METAL=1000, MAT_GLASS=500, MAT_BLUESPACE = 250)
build_path = /obj/item/melee/roastingstick
category = list("Equipment")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
/////////////////////////////////////////
////////////Janitor Designs//////////////
/////////////////////////////////////////
code/modules/research/techweb/all_nodes.dm
+1 -1
View File
@@ -148,7 +148,7 @@
display_name = "Applied Bluespace Research"
description = "Using bluespace to make things faster and better."
prereq_ids = list("bluespace_basic", "engineering")
design_ids = list("bs_rped","minerbag_holding", "telesci_gps", "bluespacebeaker", "bluespacesyringe", "bluespacebodybag", "phasic_scanning")
design_ids = list("bs_rped","minerbag_holding", "telesci_gps", "bluespacebeaker", "bluespacesyringe", "bluespacebodybag", "phasic_scanning", "roastingstick")
research_cost = 5000
export_price = 5000