12/21 modernizations from TG live (#103)
* sync (#3) * shuttle auto call * Merge /vore into /master (#39) * progress * Compile errors fixed No idea if it's test worthy tho as conflicts with race overhaul and narky removal. * Update admins.txt * efforts continue Fuck grab code, seriously * grab code is cancer * Execute the Narkism Do not hesitate. Show no mercy. * holy shit grab code is awful * have I bitched about grab code My bitching, let me show you it * código de agarre es una mierda No really it is * yeah I don't even know anymore. * Lolnope. Fuck grab code * I'm not even sure what to fix anymore * Self eating is not an acceptable fate * Taste the void, son. * My code doesn't pass it's own sanity check. Maybe it's a sign of things to come. * uncommented and notes * It Works and I Don't Know Why (#38) * shuttle auto call * it works and I don't know why * Subsystem 12/21 Most Recent TG subsystem folder * globalvars 12/21 Tossed out the flavor_misc and parallax files * Onclick 12/21 as well as .dme updates * _defines 12/21 ommited old _MC.dm * _HELPERS 12/21 Preserved snowflake placement of furry sprites * _defeines/genetics reapplied narkism holdover for snowflake races. * Oops forgot mutant colors * modules porting 12/21 + Sounds/icons Admin, Client and most of mob life files ommitted * enviroment file * Admin optimizations ahelp log system kept * Mob ports 12/21 Flavor text preserved * datums ported 12/21 * Game ported 12/21 * batch of duplicate fixes/dogborg work Dogborgs need to be modernized to refractored borg standards. * moar fixes * Maps and futher compile fixes
This commit is contained in:
@@ -81,23 +81,11 @@
|
||||
unit_name = "pipe dispenser"
|
||||
export_types = list(/obj/machinery/pipedispenser)
|
||||
|
||||
|
||||
/datum/export/large/singularitygen
|
||||
cost = 4000 // If you have one left after engine setup, sell it.
|
||||
unit_name = "unused gravitational singularity generator"
|
||||
export_types = list(/obj/machinery/the_singularitygen)
|
||||
include_subtypes = FALSE
|
||||
|
||||
/datum/export/large/singularitygen/tesla
|
||||
unit_name = "unused energy ball generator"
|
||||
export_types = list(/obj/machinery/the_singularitygen/tesla)
|
||||
|
||||
/datum/export/large/supermatter
|
||||
cost = 9000
|
||||
unit_name = "supermatter shard"
|
||||
export_types = list(/obj/machinery/power/supermatter_shard)
|
||||
|
||||
|
||||
// Misc
|
||||
/datum/export/large/iv
|
||||
cost = 300
|
||||
|
||||
@@ -73,6 +73,12 @@
|
||||
material_id = MAT_SILVER
|
||||
message = "cm3 of silver"
|
||||
|
||||
// Titanium.
|
||||
/datum/export/material/titanium
|
||||
cost = 250
|
||||
material_id = MAT_TITANIUM
|
||||
message = "cm3 of titanium"
|
||||
|
||||
// Metal. Common building material.
|
||||
/datum/export/material/metal
|
||||
message = "cm3 of metal"
|
||||
|
||||
@@ -7,13 +7,19 @@
|
||||
|
||||
/datum/export/tech/get_cost(obj/O)
|
||||
var/obj/item/weapon/disk/tech_disk/D = O
|
||||
if(!D.stored)
|
||||
return 0
|
||||
var/datum/tech/tech = D.stored
|
||||
return ..() * tech.getCost(techLevels[tech.id])
|
||||
var/cost = 0
|
||||
for(var/V in D.tech_stored)
|
||||
if(!V)
|
||||
continue
|
||||
var/datum/tech/tech = V
|
||||
cost += tech.getCost(techLevels[tech.id])
|
||||
return ..() * cost
|
||||
|
||||
/datum/export/tech/sell_object(obj/O)
|
||||
..()
|
||||
var/obj/item/weapon/disk/tech_disk/D = O
|
||||
var/datum/tech/tech = D.stored
|
||||
techLevels[tech.id] = tech.level
|
||||
for(var/V in D.tech_stored)
|
||||
if(!V)
|
||||
continue
|
||||
var/datum/tech/tech = V
|
||||
techLevels[tech.id] = tech.level
|
||||
|
||||
@@ -31,6 +31,6 @@
|
||||
if(!cost)
|
||||
return 0
|
||||
|
||||
var/potDiff = max(S.potency - discoveredPlants[S.type], 0)
|
||||
|
||||
return round(..() * potDiff)
|
||||
var/potDiff = (S.potency - discoveredPlants[S.type])
|
||||
|
||||
return round(..() * potDiff)
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
/datum/export/weapon/taser
|
||||
cost = 250
|
||||
unit_name = "advanced taser"
|
||||
export_types = list(/obj/item/weapon/gun/energy/gun/advtaser)
|
||||
export_types = list(/obj/item/weapon/gun/energy/e_gun/advtaser)
|
||||
|
||||
/datum/export/weapon/laser
|
||||
cost = 250
|
||||
@@ -34,18 +34,18 @@
|
||||
/datum/export/weapon/energy_gun
|
||||
cost = 900
|
||||
unit_name = "energy gun"
|
||||
export_types = list(/obj/item/weapon/gun/energy/gun)
|
||||
export_types = list(/obj/item/weapon/gun/energy/e_gun)
|
||||
|
||||
|
||||
/datum/export/weapon/wt550
|
||||
cost = 1400
|
||||
unit_name = "WT-550 automatic rifle"
|
||||
export_types = list(/obj/item/weapon/gun/projectile/automatic/wt550)
|
||||
export_types = list(/obj/item/weapon/gun/ballistic/automatic/wt550)
|
||||
|
||||
/datum/export/weapon/shotgun
|
||||
cost = 350
|
||||
unit_name = "combat shotgun"
|
||||
export_types = list(/obj/item/weapon/gun/projectile/shotgun/automatic/combat)
|
||||
export_types = list(/obj/item/weapon/gun/ballistic/shotgun/automatic/combat)
|
||||
|
||||
|
||||
/datum/export/weapon/flashbang
|
||||
|
||||
Reference in New Issue
Block a user