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

[MIRROR] Cleaned up paper varedits + tidied up paths (#2156)

Browse Source 
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
This commit is contained in:
CitadelStationBot
2017-08-02 03:17:32 -05:00
committed by Poojawa
parent f19a9e855a
commit 76f7fcef9a
77 changed files with 756 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/manifest)
export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
/datum/export/manifest_correct/applies_to(obj/O)
if(!..())
return FALSE
var/obj/item/weapon/paper/manifest/M = O
var/obj/item/weapon/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/manifest)
export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
/datum/export/manifest_error_denied/applies_to(obj/O)
if(!..())
return FALSE
var/obj/item/weapon/paper/manifest/M = O
var/obj/item/weapon/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/manifest/M = O
var/obj/item/weapon/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/manifest)
export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
/datum/export/manifest_error/applies_to(obj/O)
if(!..())
return FALSE
var/obj/item/weapon/paper/manifest/M = O
var/obj/item/weapon/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/manifest/M = O
var/obj/item/weapon/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/manifest)
export_types = list(/obj/item/weapon/paper/fluff/jobs/cargo/manifest)
/datum/export/manifest_correct_denied/applies_to(obj/O)
if(!..())
return FALSE
var/obj/item/weapon/paper/manifest/M = O
var/obj/item/weapon/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/manifest/M = O
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = O
return ..() - M.order_cost
code/modules/cargo/order.dm
+6 -6
View File
@@ -1,9 +1,9 @@
/obj/item/weapon/paper/manifest
/obj/item/weapon/paper/fluff/jobs/cargo/manifest
var/order_cost = 0
var/order_id = 0
var/errors = 0
/obj/item/weapon/paper/manifest/New(atom/A, id, cost)
/obj/item/weapon/paper/fluff/jobs/cargo/manifest/New(atom/A, id, cost)
..()
order_id = id
order_cost = cost
@@ -15,10 +15,10 @@
if(prob(MANIFEST_ERROR_CHANCE))
errors |= MANIFEST_ERROR_ITEM
/obj/item/weapon/paper/manifest/proc/is_approved()
/obj/item/weapon/paper/fluff/jobs/cargo/manifest/proc/is_approved()
return stamped && stamped.len && !is_denied()
/obj/item/weapon/paper/manifest/proc/is_denied()
/obj/item/weapon/paper/fluff/jobs/cargo/manifest/proc/is_denied()
return stamped && ("stamp-deny" in stamped)
/datum/supply_order
@@ -54,7 +54,7 @@
return P
/datum/supply_order/proc/generateManifest(obj/structure/closet/crate/C)
var/obj/item/weapon/paper/manifest/P = new(C, id, pack.cost)
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/P = new(C, id, pack.cost)
var/station_name = (P.errors & MANIFEST_ERROR_NAME) ? new_station_name() : station_name()
@@ -85,7 +85,7 @@
/datum/supply_order/proc/generate(turf/T)
var/obj/structure/closet/crate/C = pack.generate(T)
var/obj/item/weapon/paper/manifest/M = generateManifest(C)
var/obj/item/weapon/paper/fluff/jobs/cargo/manifest/M = generateManifest(C)
if(M.errors & MANIFEST_ERROR_ITEM)
if(istype(C, /obj/structure/closet/crate/secure) || istype(C, /obj/structure/closet/crate/large))
code/modules/cargo/packs.dm
+2 -2
View File
@@ -620,7 +620,7 @@
/obj/item/solar_assembly,
/obj/item/weapon/circuitboard/computer/solar_control,
/obj/item/weapon/electronics/tracker,
/obj/item/weapon/paper/solar)
/obj/item/weapon/paper/guides/jobs/engi/solars)
crate_name = "solar panel crate"
crate_type = /obj/structure/closet/crate/engineering/electrical
@@ -1336,7 +1336,7 @@
/obj/item/conveyor_construct,
/obj/item/conveyor_construct,
/obj/item/conveyor_switch_construct,
/obj/item/weapon/paper/conveyor)
/obj/item/weapon/paper/guides/conveyor)
crate_name = "conveyor assembly crate"
/datum/supply_pack/misc/watertank