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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real

Browse Source
This commit is contained in:
Putnam
2020-07-08 22:02:03 -07:00
parent b35e11788c d79e1cdb9d
commit a625d6562b
1515 changed files with 270775 additions and 326499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/exports/gear.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/export/gear
include_subtypes = FALSE
k_elasticity = 0 //We always want clothing/gear
//blanket
/datum/export/gear/hat
code/modules/cargo/exports/large_objects.dm
+4 -4
View File
@@ -111,7 +111,7 @@
include_subtypes = FALSE
/datum/export/large/am_control_unit
cost = 4000
cost = 2000
unit_name = "antimatter control unit"
export_types = list(/obj/machinery/power/am_control_unit)
@@ -169,10 +169,10 @@
/datum/export/large/gas_canister/get_cost(obj/O)
var/obj/machinery/portable_atmospherics/canister/C = O
var/worth = 10
worth += C.air_contents.get_moles(/datum/gas/bz)*4
worth += C.air_contents.get_moles(/datum/gas/bz)*3
worth += C.air_contents.get_moles(/datum/gas/stimulum)*25
worth += C.air_contents.get_moles(/datum/gas/hypernoblium)*1000
worth += C.air_contents.get_moles(/datum/gas/miasma)*4
worth += C.air_contents.get_moles(/datum/gas/miasma)*2
worth += C.air_contents.get_moles(/datum/gas/tritium)*7
worth += C.air_contents.get_moles(/datum/gas/pluoxium)*6
worth += C.air_contents.get_moles(/datum/gas/nitryl)*30
@@ -301,7 +301,7 @@
export_types = list(/obj/mecha/combat/durand)
/datum/export/large/mech/phazon
cost = 35000 //Little over half do to needing a core
cost = 35000 //Little over half due to needing a core
unit_name = "working phazon"
export_types = list(/obj/mecha/combat/phazon)
code/modules/cargo/exports/organs_robotics.dm
+2 -8
View File
@@ -2,15 +2,14 @@
/datum/export/robotics
include_subtypes = FALSE
k_elasticity = 0 //ALWAYS worth selling upgrades
k_elasticity = 1/50
/datum/export/implant
include_subtypes = FALSE
k_elasticity = 0 //ALWAYS worth selling upgrades
k_elasticity = 1/50
/datum/export/organs
include_subtypes = TRUE
k_elasticity = 0 //ALWAYS worth selling orgains
/datum/export/implant/autodoc
cost = 150
@@ -60,11 +59,6 @@
unit_name = "thrusters set implant"
export_types = list(/obj/item/organ/cyberimp/chest/thrusters)
/datum/export/implant/thrusters
cost = 150
unit_name = "thrusters set implant"
export_types = list(/obj/item/organ/cyberimp/chest/thrusters)
/datum/export/implant/arm
cost = 200
unit_name = "arm set implant"
code/modules/cargo/exports/parts.dm
+3 -3
View File
@@ -110,7 +110,7 @@
include_subtypes = FALSE
/datum/export/glasswork_lens
cost = 1800
cost = 1600
unit_name = "small glass lens"
export_types = list(/obj/item/glasswork/glass_base/lens)
@@ -133,13 +133,13 @@
include_subtypes = FALSE
/datum/export/glasswork_teaplate
cost = 1200
cost = 1000
unit_name = "tea gear"
export_types = list(/obj/item/tea_plate)
include_subtypes = FALSE
/datum/export/glasswork_teacup
cost = 1800
cost = 1600
unit_name = "tea gear"
export_types = list(/obj/item/tea_cup)
include_subtypes = FALSE
code/modules/cargo/exports/sheets.dm
-6
View File
@@ -120,12 +120,6 @@
message = "of cloth"
export_types = list(/obj/item/stack/sheet/cloth)
/datum/export/stack/silk
cost = 200 //The new plasma
unit_name = "sheets"
message = "of silk"
export_types = list(/obj/item/stack/sheet/silk)
/datum/export/stack/duracloth
cost = 40
unit_name = "sheets"
code/modules/cargo/exports/tools.dm
+30 -27
View File
@@ -1,4 +1,7 @@
/datum/export/toolbox
/datum/export/tool
k_elasticity = 1/500 //Tool selling almost always find a target
/datum/export/tool/toolbox
cost = 6
unit_name = "toolbox"
export_types = list(/obj/item/storage/toolbox)
@@ -29,93 +32,93 @@
// Lights/Eletronic
/datum/export/lights
/datum/export/tool/lights
cost = 10
unit_name = "light fixer"
export_types = list(/obj/item/wallframe/light_fixture)
include_subtypes = TRUE
/datum/export/apc_board
/datum/export/tool/apc_board
cost = 5
unit_name = "apc electronics"
export_types = list(/obj/item/electronics/apc)
include_subtypes = TRUE
/datum/export/apc_frame
/datum/export/tool/apc_frame
cost = 3
unit_name = "apc frame"
export_types = list(/obj/item/wallframe/apc)
include_subtypes = TRUE
/datum/export/floodlights
/datum/export/tool/floodlights
cost = 15
unit_name = "floodlight fixer"
export_types = list(/obj/structure/floodlight_frame)
include_subtypes = TRUE
/datum/export/bolbstubes
/datum/export/tool/bolbstubes
cost = 1 //Time
unit_name = "light replacement"
export_types = list(/obj/item/light/tube, /obj/item/light/bulb)
/datum/export/lightreplacer
/datum/export/tool/lightreplacer
cost = 20
unit_name = "lightreplacer"
export_types = list(/obj/item/lightreplacer)
// Basic tools
/datum/export/basicmining
/datum/export/tool/basicmining
cost = 30
unit_name = "basic mining tool"
export_types = list(/obj/item/pickaxe, /obj/item/pickaxe/mini, /obj/item/shovel, /obj/item/resonator)
include_subtypes = FALSE
/datum/export/upgradedmining
/datum/export/tool/upgradedmining
cost = 80
unit_name = "mining tool"
export_types = list(/obj/item/pickaxe/silver, /obj/item/pickaxe/drill, /obj/item/gun/energy/plasmacutter, /obj/item/resonator/upgraded)
include_subtypes = FALSE
/datum/export/advdmining
/datum/export/tool/advdmining
cost = 150
unit_name = "advanced mining tool"
export_types = list(/obj/item/pickaxe/diamond, /obj/item/pickaxe/drill/diamonddrill, /obj/item/pickaxe/drill/jackhammer, /obj/item/gun/energy/plasmacutter/adv)
include_subtypes = FALSE
/datum/export/screwdriver
/datum/export/tool/screwdriver
cost = 2
unit_name = "screwdriver"
export_types = list(/obj/item/screwdriver)
include_subtypes = FALSE
/datum/export/wrench
/datum/export/tool/wrench
cost = 2
unit_name = "wrench"
export_types = list(/obj/item/wrench)
/datum/export/crowbar
/datum/export/tool/crowbar
cost = 2
unit_name = "crowbar"
export_types = list(/obj/item/crowbar)
/datum/export/wirecutters
/datum/export/tool/wirecutters
cost = 2
unit_name = "pair"
message = "of wirecutters"
export_types = list(/obj/item/wirecutters)
/datum/export/weldingtool
/datum/export/tool/weldingtool
cost = 5
unit_name = "welding tool"
export_types = list(/obj/item/weldingtool)
include_subtypes = FALSE
/datum/export/weldingtool/emergency
/datum/export/tool/weldingtool/emergency
cost = 2
unit_name = "emergency welding tool"
export_types = list(/obj/item/weldingtool/mini)
/datum/export/weldingtool/industrial
/datum/export/tool/weldingtool/industrial
cost = 10
unit_name = "industrial welding tool"
export_types = list(/obj/item/weldingtool/largetank, /obj/item/weldingtool/hugetank)
@@ -131,23 +134,23 @@
unit_name = "pocket fire extinguisher"
export_types = list(/obj/item/extinguisher/mini)
/datum/export/flashlight
/datum/export/tool/flashlight
cost = 3
unit_name = "flashlight"
export_types = list(/obj/item/flashlight)
include_subtypes = FALSE
/datum/export/flashlight/flare
/datum/export/tool/flashlight/flare
cost = 2
unit_name = "flare"
export_types = list(/obj/item/flashlight/flare)
/datum/export/flashlight/seclite
/datum/export/tool/flashlight/seclite
cost = 5
unit_name = "seclite"
export_types = list(/obj/item/flashlight/seclite)
/datum/export/analyzer
/datum/export/tool/analyzer
cost = 5
unit_name = "analyzer"
export_types = list(/obj/item/analyzer)
@@ -163,32 +166,32 @@
export_types = list(/obj/item/radio)
exclude_types = list(/obj/item/radio/mech)
/datum/export/rcd
/datum/export/tool/rcd
cost = 100
unit_name = "rapid construction device"
export_types = list(/obj/item/construction/rcd)
/datum/export/rcd_ammo
/datum/export/tool/rcd_ammo
cost = 60
unit_name = "compressed matter cardridge"
export_types = list(/obj/item/rcd_ammo)
/datum/export/rpd
/datum/export/tool/rpd
cost = 100
unit_name = "rapid piping device"
export_types = list(/obj/item/pipe_dispenser)
/datum/export/rld
/datum/export/tool/rld
cost = 150
unit_name = "rapid light device"
export_types = list(/obj/item/construction/rld)
/datum/export/rped
/datum/export/tool/rped
cost = 100
unit_name = "rapid part exchange device"
export_types = list(/obj/item/storage/part_replacer)
/datum/export/bsrped
/datum/export/tool/bsrped
cost = 200
unit_name = "blue space part exchange device"
export_types = list(/obj/item/storage/part_replacer/bluespace)
code/modules/cargo/exports/weapons.dm
+1 -1
View File
@@ -267,7 +267,7 @@
/datum/export/weapon/duelsaber
cost = 360 //Get it?
unit_name = "energy saber"
export_types = list(/obj/item/twohanded/dualsaber)
export_types = list(/obj/item/dualsaber)
/datum/export/weapon/esword
cost = 130