Coonflict fiiixeeess
This commit is contained in:
Artur
@@ -256,3 +256,19 @@
|
||||
materials = list(/datum/material/iron = 300, /datum/material/glass = 150)
|
||||
build_path = /obj/item/key/collar
|
||||
category = list("initial", "Misc")
|
||||
|
||||
/datum/design/price_tagger
|
||||
name = "Price Tagger"
|
||||
id = "price_tagger"
|
||||
build_type = AUTOLATHE
|
||||
materials = list(/datum/material/iron = 1500, /datum/material/glass = 500)
|
||||
build_path = /obj/item/price_tagger
|
||||
category = list("initial", "Misc")
|
||||
|
||||
/datum/design/custom_vendor_refill
|
||||
name = "Custom Vendor Refill"
|
||||
id = "custom_vendor_refill"
|
||||
build_type = AUTOLATHE
|
||||
materials = list(/datum/material/iron = 5000, /datum/material/glass = 2000)
|
||||
build_path = /obj/item/vending_refill/custom
|
||||
category = list("initial", "Misc")
|
||||
@@ -107,6 +107,14 @@
|
||||
departmental_flags = DEPARTMENTAL_FLAG_ALL
|
||||
category = list ("Medical Machinery")
|
||||
|
||||
/datum/design/board/paystand
|
||||
name = "Machine Design (Pay Stand)"
|
||||
desc = "The circuit board for a paystand."
|
||||
id = "paystand"
|
||||
build_path = /obj/item/circuitboard/machine/paystand
|
||||
category = list ("Misc. Machinery")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_ALL
|
||||
|
||||
/datum/design/board/autoylathe
|
||||
name = "Machine Design (Autoylathe)"
|
||||
desc = "The circuit board for an autoylathe."
|
||||
|
||||
@@ -144,7 +144,7 @@
|
||||
return ..()
|
||||
|
||||
/datum/nanite_program/metabolic_synthesis/active_effect()
|
||||
host_mob.nutrition -= 0.5
|
||||
host_mob.adjust_nutrition(-0.5)
|
||||
nanites.adjust_nanites(src, 0.5)
|
||||
|
||||
/datum/nanite_program/research
|
||||
|
||||
@@ -199,6 +199,10 @@
|
||||
researched_designs -= design.id
|
||||
return TRUE
|
||||
|
||||
/datum/techweb/proc/get_point_total(list/pointlist)
|
||||
for(var/i in pointlist)
|
||||
. += pointlist[i]
|
||||
|
||||
/datum/techweb/proc/can_afford(list/pointlist)
|
||||
for(var/i in pointlist)
|
||||
if(research_points[i] < pointlist[i])
|
||||
@@ -227,6 +231,10 @@
|
||||
for(var/id in node.design_ids)
|
||||
add_design_by_id(id)
|
||||
update_node_status(node)
|
||||
if(!istype(src, /datum/techweb/admin))
|
||||
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_SCI)
|
||||
if(D)
|
||||
D.adjust_money(SSeconomy.techweb_bounty)
|
||||
return TRUE
|
||||
|
||||
/datum/techweb/proc/unresearch_node_id(id)
|
||||
|
||||
@@ -102,6 +102,6 @@
|
||||
description = "NT default research technologies."
|
||||
// Default research tech, prevents bricking
|
||||
design_ids = list("basic_matter_bin", "basic_cell", "basic_scanning", "basic_capacitor", "basic_micro_laser", "micro_mani", "desttagger", "handlabel", "packagewrap",
|
||||
"destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab",
|
||||
"destructive_analyzer", "circuit_imprinter", "experimentor", "rdconsole", "design_disk", "tech_disk", "rdserver", "rdservercontrol", "mechfab", "paystand",
|
||||
"space_heater", "beaker", "large_beaker", "bucket", "xlarge_beaker", "sec_shellclip", "sec_beanbag", "sec_rshot", "sec_bshot", "sec_slug", "sec_islug", "sec_dart", "sec_38", "sec_38lethal",
|
||||
"rglass","plasteel","plastitanium","plasmaglass","plasmareinforcedglass","titaniumglass","plastitaniumglass")
|
||||
|
||||
@@ -917,7 +917,7 @@ datum/status_effect/stabilized/blue/on_remove()
|
||||
healing_types += CLONE
|
||||
if(length(healing_types))
|
||||
owner.apply_damage_type(-heal_amount, damagetype=pick(healing_types))
|
||||
owner.nutrition += 3
|
||||
owner.adjust_nutrition(3)
|
||||
M.adjustCloneLoss(heal_amount * 1.2) //This way, two people can't just convert each other's damage away.
|
||||
else
|
||||
messagedelivered = FALSE
|
||||
|
||||
@@ -35,7 +35,7 @@ Burning extracts:
|
||||
S.visible_message("<span class='danger'>A baby slime emerges from [src], and it nuzzles [user] before burbling hungrily!</span>")
|
||||
S.Friends[user] = 20 //Gas, gas, gas
|
||||
S.bodytemperature = T0C + 400 //We gonna step on the gas.
|
||||
S.nutrition = S.get_hunger_nutrition() //Tonight, we fight!
|
||||
S.set_nutrition(S.get_hunger_nutrition()) //Tonight, we fight!
|
||||
..()
|
||||
|
||||
/obj/item/slimecross/burning/orange
|
||||
|
||||
@@ -128,7 +128,7 @@ Regenerative extracts:
|
||||
colour = "silver"
|
||||
|
||||
/obj/item/slimecross/regenerative/silver/core_effect(mob/living/target, mob/user)
|
||||
target.nutrition = NUTRITION_LEVEL_FULL - 1
|
||||
target.set_nutrition(NUTRITION_LEVEL_FULL - 1)
|
||||
to_chat(target, "<span class='notice'>You feel satiated.</span>")
|
||||
|
||||
/obj/item/slimecross/regenerative/bluespace
|
||||
|
||||
@@ -186,7 +186,7 @@
|
||||
/obj/item/slime_extract/purple/activate(mob/living/carbon/human/user, datum/species/jelly/luminescent/species, activation_type)
|
||||
switch(activation_type)
|
||||
if(SLIME_ACTIVATE_MINOR)
|
||||
user.nutrition += 50
|
||||
user.adjust_nutrition(50)
|
||||
user.blood_volume += 50
|
||||
to_chat(user, "<span class='notice'>You activate [src], and your body is refilled with fresh slime jelly!</span>")
|
||||
return 150
|
||||
@@ -636,7 +636,7 @@
|
||||
qdel(src)
|
||||
return
|
||||
M.docile = 1
|
||||
M.nutrition = 700
|
||||
M.set_nutrition(700)
|
||||
to_chat(M, "<span class='warning'>You absorb the potion and feel your intense desire to feed melt away.</span>")
|
||||
to_chat(user, "<span class='notice'>You feed the slime the potion, removing its hunger and calming it.</span>")
|
||||
var/newname = reject_bad_name(stripped_input(user, "Would you like to give the slime a name?", "Name your new pet", "pet slime", MAX_NAME_LEN), TRUE)
|
||||
|
||||
Reference in New Issue
Block a user