Oh hey, all of those compile fixes

This commit is contained in:
Poojawa
2018-09-11 11:00:18 -05:00
parent 834a94b97d
commit b00a76476c
34 changed files with 3735 additions and 4028 deletions
-75
View File
@@ -1,75 +0,0 @@
// Drop the dox!
// Selling Syndicate docs to NT
/datum/export/intel
cost = 25000
k_elasticity = 0
unit_name = "original article"
message = "of enemy intelligence"
var/global/originals_recieved = list()
var/global/copies_recieved = list()
var/copy_path = null
export_types = list(/obj/item/documents/syndicate)
/datum/export/intel/applies_to(obj/O, contr = 0, emag = 0)
if(!..())
return FALSE
if(emagged != emag) // Emagging the console will stop you from selling Syndicate docs to NT.
return FALSE
// No docs double-selling!
if(istype(O, /obj/item/documents/photocopy))
var/obj/item/documents/photocopy/C = O
if(!C.copy_type)
return FALSE
if((C.copy_type in originals_recieved) || (C.copy_type in copies_recieved))
return FALSE
if(copy_path && !ispath(C.copy_type, copy_path))
return FALSE
else if(O.type in originals_recieved)
return FALSE
return TRUE
/datum/export/intel/get_cost(obj/O)
if(O.type in copies_recieved)
return ..() - 15000 // Already have a copy of it, deduce the cost.
return ..()
/datum/export/intel/sell_object(obj/O)
..()
if(istype(O, /obj/item/documents/photocopy))
var/obj/item/documents/photocopy/C = O
copies_recieved += C.copy_type
else
originals_recieved += O.type
/datum/export/intel/photocopy
cost = 15000 // Allows double agents to earn some cargo points without failing their objectives.
unit_name = "photocopied article"
export_types = list(/obj/item/documents/photocopy)
copy_path = /obj/item/documents/syndicate
// Selling NT docs to Syndicate
/datum/export/intel/syndie
message = "of Nanotrasen intelligence"
export_types = list(/obj/item/documents/nanotrasen)
emagged = TRUE
/datum/export/intel/syndie/photocopy
cost = 15000
unit_name = "photocopied article"
export_types = list(/obj/item/documents/photocopy)
copy_path = /obj/item/documents/nanotrasen
// Selling Syndicate docs to Syndicate, why not?
/datum/export/intel/syndie/recovered
cost = 15000
unit_name = "recovered article"
message = "of Syndicate intelligence"
export_types = list(/obj/item/documents/syndicate)
// Syndicate only wants originals of their docs recovered.
-65
View File
@@ -1,65 +0,0 @@
//Tendril chest artifacts and ruin loot. Includes ash drake loot since they drop two sets of armor + random item
//Consumable or one-use items like the magic D20 and gluttony's blessing are omitted
/datum/export/lavaland/minor
cost = 10000
unit_name = "minor lava planet artifact"
export_types = list(/obj/item/immortality_talisman,
/obj/item/book_of_babel,
/obj/item/gun/magic/hook,
/obj/item/wisp_lantern,
/obj/item/reagent_containers/glass/bottle/potion/flight,
/obj/item/katana/cursed,
/obj/item/clothing/glasses/godeye,
/obj/item/melee/ghost_sword,
/obj/item/clothing/suit/space/hardsuit/cult,
/obj/item/voodoo,
/obj/item/grenade/clusterbuster/inferno,
/obj/item/clothing/neck/necklace/memento_mori,
/obj/item/organ/heart/cursed/wizard,
/obj/item/clothing/suit/hooded/cloak/drake,
/obj/item/dragons_blood,
/obj/item/lava_staff,
/obj/item/ship_in_a_bottle,
/obj/item/clothing/shoes/clown_shoes/banana_shoes,
/obj/item/gun/magic/staff/honk,
/obj/item/kitchen/knife/envy,
/obj/item/gun/ballistic/revolver/russian/soul,
/obj/item/veilrender/vealrender)
/datum/export/lavaland/major //valuable chest/ruin loot and staff of storms
cost = 20000
unit_name = "lava planet artifact"
export_types = list(/obj/item/guardiancreator,
/obj/item/rod_of_asclepius,
/obj/item/clothing/suit/space/hardsuit/ert/paranormal,
/obj/item/prisoncube,
/obj/item/staff/storm)
//Megafauna loot, except for ash drakes and legion
/datum/export/lavaland/megafauna
cost = 40000
unit_name = "major lava planet artifact"
export_types = list(/obj/item/hierophant_club,
/obj/item/melee/transforming/cleaving_saw,
/obj/item/organ/vocal_cords/colossus,
/obj/machinery/anomalous_crystal,
/obj/item/mayhem,
/obj/item/blood_contract,
/obj/item/gun/magic/staff/spellblade)
/datum/export/lavaland/megafauna/total_printout(datum/export_report/ex, notes = TRUE) //in the unlikely case a miner feels like selling megafauna loot
. = ..()
if(. && notes)
. += " On behalf of the Nanotrasen RnD division: Thank you for your hard work."
/datum/export/lavaland/megafauna/hev/suit
cost = 30000
unit_name = "H.E.C.K. suit"
export_types = list(/obj/item/clothing/suit/space/hostile_environment)
/datum/export/lavaland/megafauna/hev/helmet
cost = 10000
unit_name = "H.E.C.K. helmet"
export_types = list(/obj/item/clothing/head/helmet/space/hostile_environment)
-123
View File
@@ -1,123 +0,0 @@
// Organs.
// Alien organs
/datum/export/organ/alien/get_cost(O, contr = 0, emag = 0)
. = ..()
if(emag) // Syndicate really wants some new bio-weapons.
. *= 2
/datum/export/organ/alien/brain
cost = 5000
unit_name = "alien brain"
export_types = list(/obj/item/organ/brain/alien)
/datum/export/organ/alien/acid
cost = 5000
unit_name = "alien acid gland"
export_types = list(/obj/item/organ/alien/acid)
/datum/export/organ/alien/hivenode
cost = 5000
unit_name = "alien hive node"
export_types = list(/obj/item/organ/alien/hivenode)
/datum/export/organ/alien/neurotoxin
cost = 5000
unit_name = "alien neurotoxin gland"
export_types = list(/obj/item/organ/alien/neurotoxin)
/datum/export/organ/alien/resinspinner
cost = 5000
unit_name = "alien resin spinner"
/datum/export/organ/alien/plasmavessel
cost = 5000
unit_name = "alien plasma vessel"
export_types = list(/obj/item/organ/alien/plasmavessel)
/datum/export/organ/alien/plasmavessel/get_cost(obj/item/organ/alien/plasmavessel/P)
return ..() + (P.max_plasma * 2) + (P.plasma_rate * 20)
/datum/export/organ/alien/embryo
cost = 5000 // Allows buyer to set up his own alien farm.
unit_name = "alien embryo"
export_types = list(/obj/item/organ/body_egg/alien_embryo)
/datum/export/organ/alien/eggsac
cost = 10000 // Even better than a single embryo.
unit_name = "alien egg sac"
export_types = list(/obj/item/organ/alien/eggsac)
// Other alien organs.
/datum/export/organ/alien/abductor
cost = 2500
unit_name = "abductor gland"
export_types = list(/obj/item/organ/heart/gland)
/datum/export/organ/alien/changeling_egg
cost = 50000 // Holy. Fuck.
unit_name = "changeling egg"
export_types = list(/obj/item/organ/body_egg/changeling_egg)
/datum/export/organ/hivelord
cost = 1500
unit_name = "active regenerative core"
export_types = list(/obj/item/organ/regenerative_core)
/datum/export/organ/alien/plasmavessel/get_cost(obj/item/organ/regenerative_core/C)
if(C.inert)
return ..() / 3
if(C.preserved)
return ..() * 2
return ..()
// Mutant race organs.
/datum/export/organ/mutant/cat_ears
cost = 1000
unit_name = "cat ears pair"
export_types = list(/obj/item/organ/ears/cat)
/datum/export/organ/mutant/cat_tail
cost = 1000
unit_name = "cat tail"
export_types = list(/obj/item/organ/tail/cat)
/datum/export/organ/mutant/lizard_tail
cost = 200
unit_name = "lizard tail"
export_types = list(/obj/item/organ/tail/lizard)
// Human organs.
// Do not put human brains here, they are not sellable for a purpose.
// If they would be sellable, X-Porter cannon's finishing move (selling victim's organs) will be instakill with no revive.
/datum/export/organ/human
contraband = TRUE
include_subtypes = FALSE
/datum/export/organ/human/heart
cost = 500
unit_name = "heart"
export_types = list(/obj/item/organ/heart)
/datum/export/organ/human/lungs
cost = 400
unit_name = "pair"
message = "of lungs"
export_types = list(/obj/item/organ/lungs)
/datum/export/organ/human/appendix
cost = 50
unit_name = "appendix"
export_types = list(/obj/item/organ/appendix)
/datum/export/organ/human/appendix/get_cost(obj/item/organ/appendix/O)
if(O.inflamed)
return 0
return ..()