mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
Adds virology goals! Something for the viro to do (Ready for review) (#23408)
* virus analyzer and WIP virology goals * bug fixes but not all * tgui update * fixed bug * runtime fix * small fix * misc * virology goals not showing required symptoms fix * virus analyzer code polish + animation tweak * removes virus analyzer + tweaks * adds the health analyzer back * code polish * comment edit * oops, this time resolves merge conflicts * bigger payout and more goals upon completion * adds the until now unused vial lockbox * more code tweaks * also code tweaks * yet another code polish * merge conflict resolve * virology job_objective * merge conflict resolve * grammar * code polish * another polish * forgot these * oops, how did i do this mapping error * some but not all code polish and moves vials to fridge because i forgot on map queue, sorry * finally merging some of the requested changes * forgot this * one reguested change left * merges last reguested change * failed check asks to rebuild tgui * most of the reviews * removes lazyremove, no idea why i used it there * reviews * grammar Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * more reviews * forgot to undef * deletes old tgui file * Contrabang reviews * some of DGamerL´s reviews * oops * DGamerL´s reviews * Update tgui.bundle.js * stealth virus virology goal now requires 4 symptoms instead of 5 --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
This commit is contained in:
co-authored by
Henri215
S34N
SteelSlayer
parent
38f009b763
commit
d6a48deac3
@@ -121,6 +121,7 @@
|
||||
var/credits_to_deposit = 0
|
||||
var/research_credits = 0
|
||||
var/service_credits = 0
|
||||
var/medical_credits = 0
|
||||
|
||||
for(var/atom/movable/MA in areaInstance)
|
||||
if(MA.anchored)
|
||||
@@ -187,6 +188,23 @@
|
||||
SSeconomy.research_designs += design.id
|
||||
msg += "<span class='good'>+[SSeconomy.credits_per_design]</span>: [design.name] design.<br>"
|
||||
|
||||
// Sell viral sample virology goals, those in vial lockboxes included
|
||||
if(istype(thing, /obj/item/reagent_containers) || istype(thing, /obj/item/storage/lockbox/vials))
|
||||
var/list/sold_containers = list()
|
||||
if(istype(thing, /obj/item/reagent_containers))
|
||||
sold_containers += thing
|
||||
if(istype(thing, /obj/item/storage/lockbox/vials))
|
||||
for(var/obj/item/reagent_containers/C in thing)
|
||||
sold_containers += C
|
||||
for(var/obj/item/reagent_containers/C in sold_containers)
|
||||
if(C.reagents?.reagent_list)
|
||||
for(var/datum/virology_goal/G in GLOB.virology_goals)
|
||||
if(G.completed)
|
||||
continue
|
||||
if(G.check_completion(C.reagents.reagent_list))
|
||||
medical_credits += SSeconomy.credits_per_virology_goal
|
||||
msg += "<span class='good'>+[SSeconomy.credits_per_virology_goal]</span>: [G.name] completion.<br>"
|
||||
|
||||
// Sell exotic plants
|
||||
if(istype(thing, /obj/item/seeds))
|
||||
var/obj/item/seeds/S = thing
|
||||
@@ -234,5 +252,7 @@
|
||||
GLOB.station_money_database.credit_account(GLOB.station_money_database.get_account_by_department(DEPARTMENT_SCIENCE), research_credits, "Supply Shuttle Exports Payment", "Central Command Supply Master", supress_log = FALSE)
|
||||
if(service_credits)
|
||||
GLOB.station_money_database.credit_account(GLOB.station_money_database.get_account_by_department(DEPARTMENT_SERVICE), service_credits, "Supply Shuttle Exports Payment", "Central Command Supply Master", supress_log = FALSE)
|
||||
if(medical_credits)
|
||||
GLOB.station_money_database.credit_account(GLOB.station_money_database.get_account_by_department(DEPARTMENT_MEDICAL), medical_credits, "Supply Shuttle Exports Payment", "Central Command Supply Master", supress_log = FALSE)
|
||||
|
||||
#undef MAX_CRATE_DELIVERY
|
||||
|
||||
Reference in New Issue
Block a user