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

here we go again (#2456)

Browse Source
This commit is contained in:
LetterJay
2017-08-24 19:24:25 -07:00
committed by kevinz000
parent c7ed043fd5
commit 188193eb61
1107 changed files with 25420 additions and 25417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/exports/gear.dm
+1 -1
View File
@@ -39,7 +39,7 @@
/datum/export/gear/riot_shield
cost = 400
unit_name = "riot shield"
export_types = list(/obj/item/weapon/shield/riot)
export_types = list(/obj/item/shield/riot)
// Masks
code/modules/cargo/exports/large_objects.dm
+1 -1
View File
@@ -103,7 +103,7 @@
/datum/export/large/barrier
cost = 325
unit_name = "security barrier"
export_types = list(/obj/item/weapon/grenade/barrier, /obj/structure/barricade/security)
export_types = list(/obj/item/grenade/barrier, /obj/structure/barricade/security)
//Mecha
/datum/export/large/mech
code/modules/cargo/exports/manifest.dm
+11 -11
View File
@@ -4,13 +4,13 @@
cost = 200
k_elasticity = 0
unit_name = "approved manifest"
export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
/datum/export/manifest_correct/applies_to(obj/O)
if(!..())
return FALSE
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
if(M.is_approved() && !M.errors)
return TRUE
return FALSE
@@ -21,19 +21,19 @@
cost = -500
k_elasticity = 0
unit_name = "correctly denied manifest"
export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
/datum/export/manifest_error_denied/applies_to(obj/O)
if(!..())
return FALSE
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
if(M.is_denied() && M.errors)
return TRUE
return FALSE
/datum/export/manifest_error_denied/get_cost(obj/O)
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
return ..() + M.order_cost
@@ -41,19 +41,19 @@
// Substracts the package cost.
/datum/export/manifest_error
unit_name = "erroneously approved manifest"
export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
/datum/export/manifest_error/applies_to(obj/O)
if(!..())
return FALSE
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
if(M.is_approved() && M.errors)
return TRUE
return FALSE
/datum/export/manifest_error/get_cost(obj/O)
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
return -M.order_cost
@@ -62,17 +62,17 @@
/datum/export/manifest_correct_denied
cost = 500
unit_name = "erroneously denied manifest"
export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest)
/datum/export/manifest_correct_denied/applies_to(obj/O)
if(!..())
return FALSE
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
if(M.is_denied() && !M.errors)
return TRUE
return FALSE
/datum/export/manifest_correct_denied/get_cost(obj/O)
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
return ..() - M.order_cost
code/modules/cargo/exports/materials.dm
+5 -5
View File
@@ -4,7 +4,7 @@
var/material_id = null
export_types = list(
/obj/item/stack/sheet/mineral, /obj/item/stack/tile/mineral,
/obj/item/weapon/ore, /obj/item/weapon/coin)
/obj/item/ore, /obj/item/coin)
// Yes, it's a base type containing export_types.
// But it has no material_id, so any applies_to check will return false, and these types reduce amount of copypasta a lot
@@ -22,7 +22,7 @@
if(istype(I, /obj/item/stack))
var/obj/item/stack/S = I
amount *= S.amount
else if(istype(I, /obj/item/weapon/ore))
else if(istype(I, /obj/item/ore))
amount *= 0.8 // Station's ore redemption equipment is really goddamn good.
return round(amount/MINERAL_MATERIAL_AMOUNT)
@@ -84,11 +84,11 @@
material_id = MAT_METAL
export_types = list(
/obj/item/stack/sheet/metal, /obj/item/stack/tile/plasteel,
/obj/item/stack/rods, /obj/item/weapon/ore, /obj/item/weapon/coin)
/obj/item/stack/rods, /obj/item/ore, /obj/item/coin)
// Glass. Common building material.
/datum/export/material/glass
message = "cm3 of glass"
material_id = MAT_GLASS
export_types = list(/obj/item/stack/sheet/glass, /obj/item/weapon/ore,
/obj/item/weapon/shard)
export_types = list(/obj/item/stack/sheet/glass, /obj/item/ore,
/obj/item/shard)
code/modules/cargo/exports/parts.dm
+2 -2
View File
@@ -8,12 +8,12 @@
/datum/export/solar/tracker_board
cost = 100
unit_name = "solar tracker board"
export_types = list(/obj/item/weapon/electronics/tracker)
export_types = list(/obj/item/electronics/tracker)
/datum/export/solar/control_board
cost = 150
unit_name = "solar panel control board"
export_types = list(/obj/item/weapon/circuitboard/computer/solar_control)
export_types = list(/obj/item/circuitboard/computer/solar_control)
/datum/export/swarmer
cost = 2000
code/modules/cargo/exports/research.dm
+3 -3
View File
@@ -2,11 +2,11 @@
/datum/export/tech
cost = 500
unit_name = "technology data disk"
export_types = list(/obj/item/weapon/disk/tech_disk)
export_types = list(/obj/item/disk/tech_disk)
var/list/techLevels = list()
/datum/export/tech/get_cost(obj/O)
var/obj/item/weapon/disk/tech_disk/D = O
var/obj/item/disk/tech_disk/D = O
var/cost = 0
for(var/V in D.tech_stored)
if(!V)
@@ -17,7 +17,7 @@
/datum/export/tech/sell_object(obj/O)
..()
var/obj/item/weapon/disk/tech_disk/D = O
var/obj/item/disk/tech_disk/D = O
for(var/V in D.tech_stored)
if(!V)
continue
code/modules/cargo/exports/tools.dm
+13 -13
View File
@@ -3,7 +3,7 @@
/datum/export/toolbox
cost = 4
unit_name = "toolbox"
export_types = list(/obj/item/weapon/storage/toolbox)
export_types = list(/obj/item/storage/toolbox)
// mechanical toolbox: 22cr
// emergency toolbox: 17-20cr
@@ -14,55 +14,55 @@
/datum/export/screwdriver
cost = 2
unit_name = "screwdriver"
export_types = list(/obj/item/weapon/screwdriver)
export_types = list(/obj/item/screwdriver)
include_subtypes = FALSE
/datum/export/wrench
cost = 2
unit_name = "wrench"
export_types = list(/obj/item/weapon/wrench)
export_types = list(/obj/item/wrench)
/datum/export/crowbar
cost = 2
unit_name = "crowbar"
export_types = list(/obj/item/weapon/crowbar)
export_types = list(/obj/item/crowbar)
/datum/export/wirecutters
cost = 2
unit_name = "pair"
message = "of wirecutters"
export_types = list(/obj/item/weapon/wirecutters)
export_types = list(/obj/item/wirecutters)
// Welding tools
/datum/export/weldingtool
cost = 5
unit_name = "welding tool"
export_types = list(/obj/item/weapon/weldingtool)
export_types = list(/obj/item/weldingtool)
include_subtypes = FALSE
/datum/export/weldingtool/emergency
cost = 2
unit_name = "emergency welding tool"
export_types = list(/obj/item/weapon/weldingtool/mini)
export_types = list(/obj/item/weldingtool/mini)
/datum/export/weldingtool/industrial
cost = 10
unit_name = "industrial welding tool"
export_types = list(/obj/item/weapon/weldingtool/largetank, /obj/item/weapon/weldingtool/hugetank)
export_types = list(/obj/item/weldingtool/largetank, /obj/item/weldingtool/hugetank)
// Fire extinguishers
/datum/export/extinguisher
cost = 15
unit_name = "fire extinguisher"
export_types = list(/obj/item/weapon/extinguisher)
export_types = list(/obj/item/extinguisher)
include_subtypes = FALSE
/datum/export/extinguisher/mini
cost = 2
unit_name = "pocket fire extinguisher"
export_types = list(/obj/item/weapon/extinguisher/mini)
export_types = list(/obj/item/extinguisher/mini)
// Flashlights
@@ -106,14 +106,14 @@
/datum/export/rcd
cost = 100 // 15 metal -> 75 credits, +25 credits for production
unit_name = "rapid construction device"
export_types = list(/obj/item/weapon/construction/rcd)
export_types = list(/obj/item/construction/rcd)
/datum/export/rcd_ammo
cost = 60 // 6 metal, 4 glass -> 50 credits, +10 credits
unit_name = "compressed matter cardridge"
export_types = list(/obj/item/weapon/rcd_ammo)
export_types = list(/obj/item/rcd_ammo)
/datum/export/rpd
cost = 350 // 37.5 metal, 18.75 glass -> 281.25 credits, + some
unit_name = "rapid piping device"
export_types = list(/obj/item/weapon/pipe_dispenser)
export_types = list(/obj/item/pipe_dispenser)
code/modules/cargo/exports/weapons.dm
+12 -12
View File
@@ -6,57 +6,57 @@
/datum/export/weapon/baton
cost = 100
unit_name = "stun baton"
export_types = list(/obj/item/weapon/melee/baton)
exclude_types = list(/obj/item/weapon/melee/baton/cattleprod)
export_types = list(/obj/item/melee/baton)
exclude_types = list(/obj/item/melee/baton/cattleprod)
include_subtypes = TRUE
/datum/export/weapon/knife
cost = 750
unit_name = "combat knife"
export_types = list(/obj/item/weapon/kitchen/knife/combat)
export_types = list(/obj/item/kitchen/knife/combat)
/datum/export/weapon/taser
cost = 250
unit_name = "advanced taser"
export_types = list(/obj/item/weapon/gun/energy/e_gun/advtaser)
export_types = list(/obj/item/gun/energy/e_gun/advtaser)
/datum/export/weapon/laser
cost = 250
unit_name = "laser gun"
export_types = list(/obj/item/weapon/gun/energy/laser)
export_types = list(/obj/item/gun/energy/laser)
/datum/export/weapon/disabler
cost = 100
unit_name = "disabler"
export_types = list(/obj/item/weapon/gun/energy/disabler)
export_types = list(/obj/item/gun/energy/disabler)
/datum/export/weapon/energy_gun
cost = 900
unit_name = "energy gun"
export_types = list(/obj/item/weapon/gun/energy/e_gun)
export_types = list(/obj/item/gun/energy/e_gun)
/datum/export/weapon/wt550
cost = 1400
unit_name = "WT-550 automatic rifle"
export_types = list(/obj/item/weapon/gun/ballistic/automatic/wt550)
export_types = list(/obj/item/gun/ballistic/automatic/wt550)
/datum/export/weapon/shotgun
cost = 350
unit_name = "combat shotgun"
export_types = list(/obj/item/weapon/gun/ballistic/shotgun/automatic/combat)
export_types = list(/obj/item/gun/ballistic/shotgun/automatic/combat)
/datum/export/weapon/flashbang
cost = 15
unit_name = "flashbang grenade"
export_types = list(/obj/item/weapon/grenade/flashbang)
export_types = list(/obj/item/grenade/flashbang)
/datum/export/weapon/teargas
cost = 15
unit_name = "tear gas grenade"
export_types = list(/obj/item/weapon/grenade/chem_grenade/teargas)
export_types = list(/obj/item/grenade/chem_grenade/teargas)
/datum/export/weapon/flash
@@ -69,4 +69,4 @@
cost = 3
unit_name = "pair"
message = "of handcuffs"
export_types = list(/obj/item/weapon/restraints/handcuffs)
export_types = list(/obj/item/restraints/handcuffs)