diff --git a/_maps/icebox.json b/_maps/icebox.json index 9593c1cf53b..d6c897abef2 100644 --- a/_maps/icebox.json +++ b/_maps/icebox.json @@ -10,7 +10,7 @@ "space_ruin_levels": 0, "space_empty_levels": 0, "shuttles": { - "cargo": "cargo_skyrat", + "cargo": "cargo_box", "ferry": "ferry_fancy", "whiteship": "whiteship_box", "emergency": "emergency_box" diff --git a/_maps/map_files/generic/CentCom_skyrat.dmm b/_maps/map_files/generic/CentCom_skyrat.dmm index 21ba0b61093..71d78d50053 100644 --- a/_maps/map_files/generic/CentCom_skyrat.dmm +++ b/_maps/map_files/generic/CentCom_skyrat.dmm @@ -7233,6 +7233,18 @@ }, /turf/open/floor/iron, /area/syndicate_mothership/control) +"xa" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 8; + height = 7; + id = "supply_away"; + json_key = "cargo"; + name = "CentCom"; + width = 20 + }, +/turf/open/space, +/area/space) "xc" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -54065,7 +54077,7 @@ aa aa aa aa -ad +xa aa aa aa diff --git a/_maps/map_files/generic/CentCom_skyrat_z2.dmm b/_maps/map_files/generic/CentCom_skyrat_z2.dmm index 227dc57329a..cb9b72bae19 100644 --- a/_maps/map_files/generic/CentCom_skyrat_z2.dmm +++ b/_maps/map_files/generic/CentCom_skyrat_z2.dmm @@ -6273,7 +6273,6 @@ /obj/effect/turf_decal/siding/red{ dir = 10 }, -/obj/effect/landmark/start/bridge_officer, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) "cvG" = ( @@ -6525,18 +6524,6 @@ }, /turf/open/floor/iron, /area/centcom/interlink) -"dHt" = ( -/obj/docking_port/stationary{ - dir = 8; - dwidth = 8; - height = 7; - id = "supply_away"; - name = "NCV Titan Dock 2"; - roundstart_template = /datum/map_template/shuttle/cargo; - width = 20 - }, -/turf/open/floor/plating, -/area/centcom/ncvtitan) "dKt" = ( /obj/structure/table/reinforced, /obj/item/flashlight/seclite, @@ -6762,7 +6749,6 @@ /obj/structure/chair/office/light{ dir = 1 }, -/obj/effect/landmark/start/deck_crew, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "eoq" = ( @@ -6833,7 +6819,6 @@ /obj/structure/chair/office/light{ dir = 1 }, -/obj/effect/landmark/start/deck_crew, /turf/open/floor/iron/textured, /area/centcom/ncvtitan) "eLV" = ( @@ -7165,15 +7150,6 @@ }, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) -"gkP" = ( -/obj/machinery/status_display/supply{ - pixel_y = -32 - }, -/obj/machinery/computer/cargo_control_console{ - dir = 1 - }, -/turf/open/floor/iron/smooth_large, -/area/centcom/ncvtitan) "gmX" = ( /obj/machinery/door/airlock/silver{ name = "Bathroom" @@ -7184,7 +7160,6 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/effect/landmark/start/deck_crew, /turf/open/floor/iron/smooth, /area/centcom/ncvtitan) "gpK" = ( @@ -7671,16 +7646,6 @@ /obj/structure/cable, /turf/open/floor/circuit/green, /area/centcom/ncvtitan) -"ity" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 4 - }, -/obj/effect/turf_decal/siding/red{ - dir = 8 - }, -/obj/effect/landmark/start/bridge_officer, -/turf/open/floor/iron/dark, -/area/centcom/ncvtitan) "ivg" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -7881,13 +7846,8 @@ /obj/effect/turf_decal/siding/red{ dir = 9 }, -/obj/effect/landmark/start/bridge_officer, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) -"jwb" = ( -/obj/effect/landmark/start/deck_crew, -/turf/open/floor/iron/cafeteria, -/area/centcom/ncvtitan) "jwv" = ( /obj/structure/toilet{ pixel_y = 8 @@ -9624,7 +9584,6 @@ /obj/structure/chair/office{ dir = 4 }, -/obj/effect/landmark/start/fleetmaster, /turf/open/floor/carpet/executive, /area/centcom/ncvtitan) "qei" = ( @@ -9736,11 +9695,6 @@ /obj/machinery/recharger, /turf/open/floor/iron/smooth_large, /area/centcom/ncvtitan) -"qua" = ( -/obj/effect/landmark/start/deck_crew, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/centcom/ncvtitan) "quD" = ( /obj/structure/railing{ dir = 8 @@ -10448,10 +10402,6 @@ /obj/effect/spawner/structure/window/shuttle, /turf/open/floor/plating, /area/centcom/ncvtitan) -"tcX" = ( -/obj/effect/landmark/start/deck_crew, -/turf/open/floor/iron/dark, -/area/centcom/ncvtitan) "thU" = ( /obj/machinery/door/poddoor/ert, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -10682,10 +10632,6 @@ /obj/machinery/cryopod, /turf/open/floor/iron/dark, /area/centcom/ncvtitan) -"tVf" = ( -/obj/machinery/computer/market_link, -/turf/open/floor/iron/dark, -/area/centcom/ncvtitan) "tWh" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating/airless, @@ -11793,7 +11739,6 @@ /turf/open/floor/carpet/orange, /area/centcom/interlink) "yao" = ( -/obj/effect/landmark/start/operations_inspector, /obj/structure/chair/office{ dir = 1 }, @@ -18621,7 +18566,7 @@ uQr gpK rKz pUv -qua +hhq dyB dyB ufa @@ -19906,7 +19851,7 @@ uQr fBr rKz mZH -tcX +dyB dyB dyB xHl @@ -22711,7 +22656,7 @@ leI rtY leI rKz -tVf +dyB gkq dyB dyB @@ -22982,7 +22927,7 @@ uQr uQr uQr uQr -dHt +uQr uQr uQr uQr @@ -23760,7 +23705,7 @@ okl okl okl xYo -gkP +ijL rKz hQR bxC @@ -26054,7 +25999,7 @@ rKz rKz gTR bHP -jwb +bHP bHP bHP trq @@ -29918,11 +29863,11 @@ dPq dPq rKz nap -ity +wtv uwL wtv uwL -ity +wtv mrJ rKz dPq diff --git a/_maps/metastation.json b/_maps/metastation.json index ab218d8696b..451f1793c4b 100644 --- a/_maps/metastation.json +++ b/_maps/metastation.json @@ -4,7 +4,7 @@ "map_path": "map_files/MetaStation", "map_file": "MetaStation_skyrat.dmm", "shuttles": { - "cargo": "cargo_skyrat", + "cargo": "cargo_box", "ferry": "ferry_fancy", "whiteship": "whiteship_meta", "emergency": "emergency_meta" diff --git a/_maps/nssjourney.json b/_maps/nssjourney.json index d74f4355da7..7d58d06886b 100644 --- a/_maps/nssjourney.json +++ b/_maps/nssjourney.json @@ -6,7 +6,7 @@ "shuttles": { "emergency": "emergency_box", "ferry": "ferry_fancy", - "cargo": "cargo_skyrat", + "cargo": "cargo_box", "whiteship": "whiteship_box" }, "job_changes": { diff --git a/_maps/tramstation.json b/_maps/tramstation.json index 2a6f383fca0..9bd60e72861 100644 --- a/_maps/tramstation.json +++ b/_maps/tramstation.json @@ -4,7 +4,7 @@ "map_path": "map_files/tramstation", "map_file": "tramstation_skyrat.dmm", "shuttles": { - "cargo": "cargo_skyrat", + "cargo": "cargo_box", "ferry": "ferry_fancy", "whiteship": "whiteship_tram", "emergency": "emergency_tram" diff --git a/code/__DEFINES/economy.dm b/code/__DEFINES/economy.dm index 6a8b4955a28..2ae34a583cf 100644 --- a/code/__DEFINES/economy.dm +++ b/code/__DEFINES/economy.dm @@ -14,7 +14,6 @@ #define PAYCHECK_MEDIUM 100 //SKYRAT EDIT ORIGINAL = (75) - Pay Raise #define PAYCHECK_HARD 125 //SKYRAT EDIT ORIGINAL = (100) - Pay Raise #define PAYCHECK_COMMAND 200 -#define PAYCHECK_NANOTRASEN_FLEET_COMMAND 600 //SKYRAT EDIT ADDITION #define STATION_TARGET_BUFFER 40 @@ -39,8 +38,6 @@ #define ACCOUNT_SEC_NAME "Defense Budget" #define ACCOUNT_CMD "CMD" // SKYRAT EDIT #define ACCOUNT_CMD_NAME "Command Budget" // SKYRAT EDIT -#define ACCOUNT_CCM "CCM" // SKYRAT EDIT -#define ACCOUNT_CCM_NAME "Central Command Budget" // SKYRAT EDIT #define NO_FREEBIES "commies go home" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index c2e9ee0716f..3ed03a43157 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -51,12 +51,8 @@ #define JOB_DISPLAY_ORDER_SECURITY_MEDIC 38 //SKYRAT EDIT ADDITON #define JOB_DISPLAY_ORDER_PRISONER 39 #define JOB_DISPLAY_ORDER_BRIGOFF 40 //SKYRAT EDIT ADDITON -#define JOB_DISPLAY_ORDER_FLEETMASTER 41 //SKYRAT EDIT ADDITON - CENTRAL ROLES BELOW HERE! -#define JOB_DISPLAY_ORDER_BRIDGE_OFFICER 42 -#define JOB_DISPLAY_ORDER_OPERATIONS_INSPECTOR 43 -#define JOB_DISPLAY_ORDER_DECK_CREW 44 -#define JOB_DISPLAY_ORDER_NANOTRASEN_REPRESENTATIVE 45 -#define JOB_DISPLAY_ORDER_BLUESHIELD 46 +#define JOB_DISPLAY_ORDER_NANOTRASEN_REPRESENTATIVE 41 //SKYRAT EDIT ADDITON +#define JOB_DISPLAY_ORDER_BLUESHIELD 42 //SKYRAT EDIT ADDITON #define DEPARTMENT_UNASSIGNED "No department assigned" @@ -76,8 +72,8 @@ #define DEPARTMENT_MEDICAL "Medical" #define DEPARTMENT_BITFLAG_SILICON (1<<7) #define DEPARTMENT_SILICON "Silicon" -#define DEPARTMENT_BITFLAG_NANOTRASEN_FLEET_COMMAND (1<<8) //SKYRAT EDIT CHANGE -#define DEPARTMENT_NANOTRASEN_FLEET_COMMAND "Nanotrasen Fleet Command" //SKYRAT EDIT CHANGE +#define DEPARTMENT_BITFLAG_CENTRAL_COMMAND (1<<8) //SKYRAT EDIT CHANGE +#define DEPARTMENT_CENTRAL_COMMAND "Central Command" //SKYRAT EDIT CHANGE /* Job datum job_flags */ /// Whether the mob is announced on arrival. diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index fa17b408598..83f80e063d4 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -68,7 +68,7 @@ // Playtime tracking system, see jobs_exp.dm #define EXP_TYPE_LIVING "Living" #define EXP_TYPE_CREW "Crew" -#define EXP_TYPE_NANOTRASEN_FLEET_COMMAND "Nanotrasen Fleet Command" +#define EXP_TYPE_CENTRAL_COMMAND "Central Command" #define EXP_TYPE_COMMAND "Command" #define EXP_TYPE_ENGINEERING "Engineering" #define EXP_TYPE_MEDICAL "Medical" diff --git a/code/controllers/subsystem/economy.dm b/code/controllers/subsystem/economy.dm index 2d146a1370c..134f81f338d 100644 --- a/code/controllers/subsystem/economy.dm +++ b/code/controllers/subsystem/economy.dm @@ -13,7 +13,6 @@ SUBSYSTEM_DEF(economy) ACCOUNT_CAR = ACCOUNT_CAR_NAME, ACCOUNT_SEC = ACCOUNT_SEC_NAME, ACCOUNT_CMD = ACCOUNT_CMD_NAME, // SKYRAT EDIT - ACCOUNT_CCM = ACCOUNT_CCM_NAME, // SKYRAT EDIT ) var/list/generated_accounts = list() var/full_ancap = FALSE // Enables extra money charges for things that normally would be free, such as sleepers/cryo/cloning. diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 5e9b090b949..55ddfc985c0 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -276,7 +276,7 @@ SUBSYSTEM_DEF(job) continue //SKYRAT EDIT ADDITION - if(job.departments_bitflags & DEPARTMENT_BITFLAG_NANOTRASEN_FLEET_COMMAND) //If you want a CC position, select it! + if(job.departments_bitflags & DEPARTMENT_BITFLAG_CENTRAL_COMMAND) //If you want a CC position, select it! continue //SKYRAT EDIT END diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 2b2c523caaa..180b311b9c6 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -111,7 +111,6 @@ suffix = "skyrat" //SKYRAT EDIT CHANGE name = "Base Shuttle Template (Emergency)" -/* //SKYRAT EDIT REMOVAL - MOVED TO MODULAR /datum/map_template/shuttle/cargo port_id = "cargo" name = "Base Shuttle Template (Cargo)" @@ -120,7 +119,6 @@ /datum/map_template/shuttle/ferry port_id = "ferry" name = "Base Shuttle Template (Ferry)" -*/ /datum/map_template/shuttle/whiteship port_id = "whiteship" diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 2a85769c44d..15a5deedef9 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -219,7 +219,7 @@ /obj/item/banner/command/Initialize() . = ..() - job_loyalties = DEPARTMENT_BITFLAG_COMMAND | DEPARTMENT_BITFLAG_NANOTRASEN_FLEET_COMMAND //SKYRAT EDIT ADDITION + job_loyalties = DEPARTMENT_BITFLAG_COMMAND | DEPARTMENT_BITFLAG_CENTRAL_COMMAND //SKYRAT EDIT ADDITION /obj/item/banner/command/mundane inspiration_available = FALSE diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 722178363c6..8d486bbb573 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -22,7 +22,7 @@ /datum/antagonist/rev/can_be_owned(datum/mind/new_owner) . = ..() if(.) - if(new_owner.assigned_role.departments_bitflags & (DEPARTMENT_BITFLAG_COMMAND|DEPARTMENT_BITFLAG_NANOTRASEN_FLEET_COMMAND))//SKYRAT EDIT CHANGE + if(new_owner.assigned_role.departments_bitflags & (DEPARTMENT_BITFLAG_COMMAND|DEPARTMENT_BITFLAG_CENTRAL_COMMAND))//SKYRAT EDIT CHANGE return FALSE if(new_owner.unconvertable) return FALSE @@ -459,7 +459,7 @@ if (isnull(mind)) continue - if (!(mind.assigned_role.departments_bitflags & (DEPARTMENT_BITFLAG_SECURITY|DEPARTMENT_BITFLAG_COMMAND|DEPARTMENT_BITFLAG_NANOTRASEN_FLEET_COMMAND)))//SKYRAT EDIT CHANGE + if (!(mind.assigned_role.departments_bitflags & (DEPARTMENT_BITFLAG_SECURITY|DEPARTMENT_BITFLAG_COMMAND|DEPARTMENT_BITFLAG_CENTRAL_COMMAND)))//SKYRAT EDIT CHANGE continue if (mind in ex_revs + ex_headrevs) @@ -478,7 +478,7 @@ mind.announce_objectives() for(var/datum/job/job as anything in SSjob.joinable_occupations) - if(!(job.departments_bitflags & (DEPARTMENT_BITFLAG_SECURITY|DEPARTMENT_BITFLAG_COMMAND|DEPARTMENT_BITFLAG_NANOTRASEN_FLEET_COMMAND)))//SKYRAT EDIT CHANGE + if(!(job.departments_bitflags & (DEPARTMENT_BITFLAG_SECURITY|DEPARTMENT_BITFLAG_COMMAND|DEPARTMENT_BITFLAG_CENTRAL_COMMAND)))//SKYRAT EDIT CHANGE continue job.allow_bureaucratic_error = FALSE job.total_positions = 0 diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm index 579f3112672..87ad7b5eed1 100644 --- a/code/modules/cargo/orderconsole.dm +++ b/code/modules/cargo/orderconsole.dm @@ -165,11 +165,6 @@ return switch(action) if("send") - //SKYRAT EDIT CHANGE - if(SSshuttle.supply.manual_operation) - say("The supply shuttle is currently being manually operated.") - return - //SKYRAT EDIT END if(!SSshuttle.supply.canMove()) say(safety_warning) return @@ -273,10 +268,6 @@ if(requestonly && message_cooldown < world.time) radio.talk_into(src, "A new order has been requested.", RADIO_CHANNEL_SUPPLY) message_cooldown = world.time + 30 SECONDS - //SKYRAT EDIT ADDITION - for(var/obj/machinery/computer/cargo_control_console/iterating_console in GLOB.cargo_control_consoles) - iterating_console.notify_order(SO) - //SKYRAT EDIT END . = TRUE if("remove") var/id = text2num(params["id"]) diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 018a81349a0..65a4125dfa2 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -1,4 +1,3 @@ -/* SKYRAT EDIT REMOVAL - MOVED TO MODULAR GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( /mob/living, /obj/structure/blob, @@ -262,4 +261,3 @@ GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( #undef GOODY_FREE_SHIPPING_MAX #undef CRATE_TAX -*/ diff --git a/modular_skyrat/master_files/code/modules/jobs/departments/departments.dm b/modular_skyrat/master_files/code/modules/jobs/departments/departments.dm index 43ec406eecc..10ed5ce01da 100644 --- a/modular_skyrat/master_files/code/modules/jobs/departments/departments.dm +++ b/modular_skyrat/master_files/code/modules/jobs/departments/departments.dm @@ -1,8 +1,8 @@ -/datum/job_department/nanotrasen_fleet_command - department_name = DEPARTMENT_NANOTRASEN_FLEET_COMMAND - department_bitflags = DEPARTMENT_BITFLAG_NANOTRASEN_FLEET_COMMAND - department_head = /datum/job/fleetmaster - department_experience_type = EXP_TYPE_NANOTRASEN_FLEET_COMMAND +/datum/job_department/central_command + department_name = DEPARTMENT_CENTRAL_COMMAND + department_bitflags = DEPARTMENT_BITFLAG_CENTRAL_COMMAND + department_head = /datum/job/captain + department_experience_type = EXP_TYPE_CENTRAL_COMMAND display_order = 1 label_class = "command" latejoin_color = "#86ff82" diff --git a/modular_skyrat/master_files/code/modules/shuttle/supply.dm b/modular_skyrat/master_files/code/modules/shuttle/supply.dm deleted file mode 100644 index c89c936ba74..00000000000 --- a/modular_skyrat/master_files/code/modules/shuttle/supply.dm +++ /dev/null @@ -1,272 +0,0 @@ -GLOBAL_LIST_INIT(blacklisted_cargo_types, typecacheof(list( - /obj/structure/blob, - /obj/effect/rune, - /obj/structure/spider/spiderling, - /obj/item/disk/nuclear, - /obj/machinery/nuclearbomb, - /obj/item/beacon, - /obj/narsie, - /obj/tear_in_reality, - /obj/machinery/teleport/station, - /obj/machinery/teleport/hub, - /obj/machinery/quantumpad, - /obj/effect/mob_spawn, - /obj/effect/hierophant, - /obj/structure/receiving_pad, - /obj/item/warp_cube, - /obj/machinery/rnd/production, //print tracking beacons, send shuttle - /obj/machinery/autolathe, //same - /obj/projectile/beam/wormhole, - /obj/effect/portal, - /obj/item/shared_storage, - /obj/structure/extraction_point, - /obj/machinery/syndicatebomb, - /obj/item/hilbertshotel, - /obj/item/swapper, - /obj/docking_port, - /obj/machinery/launchpad, - /obj/machinery/disposal, - /obj/structure/disposalpipe, - /obj/item/mail, - /obj/item/hilbertshotel, - /obj/machinery/camera, - /obj/item/gps, - /obj/structure/checkoutmachine - ))) - -/// How many goody orders we can fit in a lockbox before we upgrade to a crate -#define GOODY_FREE_SHIPPING_MAX 5 -/// How much to charge oversized goody orders -#define CRATE_TAX 700 - -/obj/docking_port/mobile/supply - name = "supply shuttle" - id = "supply" - callTime = 600 - - dir = WEST - port_direction = EAST - width = 12 - dwidth = 5 - height = 7 - movement_force = list("KNOCKDOWN" = 0, "THROW" = 0) - - - //Export categories for this run, this is set by console sending the shuttle. - var/export_categories = EXPORT_CARGO - - var/manual_operation = FALSE - -/obj/docking_port/mobile/supply/register() - . = ..() - SSshuttle.supply = src - -/obj/docking_port/mobile/supply/canMove() - if(is_station_level(z)) - return check_blacklist(shuttle_areas) - return ..() - -/obj/docking_port/mobile/supply/proc/check_blacklist(areaInstances) - for(var/place in areaInstances) - var/area/shuttle/shuttle_area = place - for(var/turf/shuttle_turf in shuttle_area) - for(var/atom/passenger in shuttle_turf.GetAllContents()) - if((is_type_in_typecache(passenger, GLOB.blacklisted_cargo_types) || HAS_TRAIT(passenger, TRAIT_BANNED_FROM_CARGO_SHUTTLE)) && !istype(passenger, /obj/docking_port)) - return FALSE - return TRUE - -/obj/docking_port/mobile/supply/request(obj/docking_port/stationary/S) - if(mode != SHUTTLE_IDLE) - return 2 - return ..() - -/obj/docking_port/mobile/supply/initiate_docking() - if(getDockedId() == "supply_away" && !manual_operation) // Buy when we leave home. - buy() - create_mail() - . = ..() // Fly/enter transit. - if(. != DOCKING_SUCCESS) - return - if(getDockedId() == "supply_away" && !manual_operation) // Sell when we get home - sell() - -/obj/docking_port/mobile/supply/proc/buy() - var/list/obj/miscboxes = list() //miscboxes are combo boxes that contain all goody orders grouped - var/list/misc_order_num = list() //list of strings of order numbers, so that the manifest can show all orders in a box - var/list/misc_contents = list() //list of lists of items that each box will contain - var/list/misc_costs = list() //list of overall costs sustained by each buyer. - - var/list/empty_turfs = list() - for(var/place in shuttle_areas) - if(istype(place, /area/shuttle/supply/cockpit)) - continue - var/area/shuttle/shuttle_area = place - for(var/turf/open/floor/T in shuttle_area) - if(T.is_blocked_turf()) - continue - empty_turfs += T - - //quickly and greedily handle chef's grocery runs first, there are a few reasons why this isn't attached to the rest of cargo... - //but the biggest reason is that the chef requires produce to cook and do their job, and if they are using this system they - //already got let down by the botanists. So to open a new chance for cargo to also screw them over any more than is necessary is bad. - if(SSshuttle.chef_groceries.len) - var/obj/structure/closet/crate/freezer/grocery_crate = new(pick_n_take(empty_turfs)) - grocery_crate.name = "kitchen produce freezer" - investigate_log("Chef's [SSshuttle.chef_groceries.len] sized produce order arrived. Cost was deducted from orderer, not cargo.", INVESTIGATE_CARGO) - for(var/datum/orderable_item/item as anything in SSshuttle.chef_groceries)//every order - for(var/amt in 1 to SSshuttle.chef_groceries[item])//every order amount - new item.item_instance.type(grocery_crate) - SSshuttle.chef_groceries.Cut() //This lets the console know it can order another round. - - if(!SSshuttle.shoppinglist.len) - return - - var/value = 0 - var/purchases = 0 - var/list/goodies_by_buyer = list() // if someone orders more than GOODY_FREE_SHIPPING_MAX goodies, we upcharge to a normal crate so they can't carry around 20 combat shotties - - for(var/datum/supply_order/SO in SSshuttle.shoppinglist) - if(!empty_turfs.len) - break - var/price = SO.pack.get_cost() - if(SO.applied_coupon) - price *= (1 - SO.applied_coupon.discount_pct_off) - - var/datum/bank_account/D - if(SO.paying_account) //Someone paid out of pocket - D = SO.paying_account - var/list/current_buyer_orders = goodies_by_buyer[SO.paying_account] // so we can access the length a few lines down - if(!SO.pack.goody) - price *= 1.1 //TODO make this customizable by the quartermaster - - // note this is before we increment, so this is the GOODY_FREE_SHIPPING_MAX + 1th goody to ship. also note we only increment off this step if they successfully pay the fee, so there's no way around it - else if(LAZYLEN(current_buyer_orders) == GOODY_FREE_SHIPPING_MAX) - price += CRATE_TAX - D.bank_card_talk("Goody order size exceeds free shipping limit: Assessing [CRATE_TAX] credit S&H fee.") - else - D = SSeconomy.get_dep_account(ACCOUNT_CAR) - if(D) - if(!D.adjust_money(-price)) - if(SO.paying_account) - D.bank_card_talk("Cargo order #[SO.id] rejected due to lack of funds. Credits required: [price]") - continue - - if(SO.paying_account) - if(SO.pack.goody) - LAZYADD(goodies_by_buyer[SO.paying_account], SO) - D.bank_card_talk("Cargo order #[SO.id] has shipped. [price] credits have been charged to your bank account.") - var/datum/bank_account/department/cargo = SSeconomy.get_dep_account(ACCOUNT_CAR) - cargo.adjust_money(price - SO.pack.get_cost()) //Cargo gets the handling fee - value += SO.pack.get_cost() - SSshuttle.shoppinglist -= SO - SSshuttle.orderhistory += SO - QDEL_NULL(SO.applied_coupon) - - if(!SO.pack.goody) //we handle goody crates below - SO.generate(pick_n_take(empty_turfs)) - - SSblackbox.record_feedback("nested tally", "cargo_imports", 1, list("[SO.pack.get_cost()]", "[SO.pack.name]")) - investigate_log("Order #[SO.id] ([SO.pack.name], placed by [key_name(SO.orderer_ckey)]), paid by [D.account_holder] has shipped.", INVESTIGATE_CARGO) - if(SO.pack.dangerous) - message_admins("\A [SO.pack.name] ordered by [ADMIN_LOOKUPFLW(SO.orderer_ckey)], paid by [D.account_holder] has shipped.") - purchases++ - - // we handle packing all the goodies last, since the type of crate we use depends on how many goodies they ordered. If it's more than GOODY_FREE_SHIPPING_MAX - // then we send it in a crate (including the CRATE_TAX cost), otherwise send it in a free shipping case - for(var/D in goodies_by_buyer) - var/list/buying_account_orders = goodies_by_buyer[D] - var/datum/bank_account/buying_account = D - var/buyer = buying_account.account_holder - - if(buying_account_orders.len > GOODY_FREE_SHIPPING_MAX) // no free shipping, send a crate - var/obj/structure/closet/crate/secure/owned/our_crate = new /obj/structure/closet/crate/secure/owned(pick_n_take(empty_turfs)) - our_crate.buyer_account = buying_account - our_crate.name = "goody crate - purchased by [buyer]" - miscboxes[buyer] = our_crate - else //free shipping in a case - miscboxes[buyer] = new /obj/item/storage/lockbox/order(pick_n_take(empty_turfs)) - var/obj/item/storage/lockbox/order/our_case = miscboxes[buyer] - our_case.buyer_account = buying_account - miscboxes[buyer].name = "goody case - purchased by [buyer]" - misc_contents[buyer] = list() - - for(var/O in buying_account_orders) - var/datum/supply_order/our_order = O - for (var/item in our_order.pack.contains) - misc_contents[buyer] += item - misc_costs[buyer] += our_order.pack.cost - misc_order_num[buyer] = "[misc_order_num[buyer]]#[our_order.id] " - - for(var/I in miscboxes) - var/datum/supply_order/SO = new/datum/supply_order() - SO.id = misc_order_num[I] - SO.generateCombo(miscboxes[I], I, misc_contents[I], misc_costs[I]) - qdel(SO) - - SSeconomy.import_total += value - var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR) - investigate_log("[purchases] orders in this shipment, worth [value] credits. [cargo_budget.account_balance] credits left.", INVESTIGATE_CARGO) - -/obj/docking_port/mobile/supply/proc/sell() - var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) - var/presale_points = D.account_balance - - if(!GLOB.exports_list.len) // No exports list? Generate it! - setupExports() - - var/msg = "" - - var/datum/export_report/ex = new - - for(var/place in shuttle_areas) - var/area/shuttle/shuttle_area = place - if(istype(place, /area/shuttle/supply/cockpit)) - continue - for(var/atom/movable/AM in shuttle_area) - if(iscameramob(AM)) - continue - if(isliving(AM)) - continue - if(!AM.anchored || istype(AM, /obj/vehicle/sealed/mecha)) - export_item_and_contents(AM, export_categories , dry_run = FALSE, external_report = ex) - - if(ex.exported_atoms) - ex.exported_atoms += "." //ugh - - for(var/datum/export/E in ex.total_amount) - var/export_text = E.total_printout(ex) - if(!export_text) - continue - - msg += export_text + "\n" - D.adjust_money(ex.total_value[E]) - - SSeconomy.export_total += (D.account_balance - presale_points) - SSshuttle.centcom_message = msg - investigate_log("Shuttle contents sold for [D.account_balance - presale_points] credits. Contents: [ex.exported_atoms ? ex.exported_atoms.Join(",") + "." : "none."] Message: [SSshuttle.centcom_message || "none."]", INVESTIGATE_CARGO) - -/* - Generates a box of mail depending on our exports and imports. - Applied in the cargo shuttle sending/arriving, by building the crate if the round is ready to introduce mail based on the economy subsystem. - Then, fills the mail crate with mail, by picking applicable crew who can recieve mail at the time to sending. -*/ -/obj/docking_port/mobile/supply/proc/create_mail() - //Early return if there's no mail waiting to prevent taking up a slot. We also don't send mails on sundays or holidays. - if(!SSeconomy.mail_waiting || SSeconomy.mail_blocked) - return - - //spawn crate - var/list/empty_turfs = list() - for(var/place as anything in shuttle_areas) - if(istype(place, /area/shuttle/supply/cockpit)) - continue - var/area/shuttle/shuttle_area = place - for(var/turf/open/floor/shuttle_floor in shuttle_area) - if(shuttle_floor.is_blocked_turf()) - continue - empty_turfs += shuttle_floor - - new /obj/structure/closet/crate/mail/economy(pick(empty_turfs)) - -#undef GOODY_FREE_SHIPPING_MAX -#undef CRATE_TAX diff --git a/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm b/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm index 49d1fec102a..fed2f7d3f32 100644 --- a/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/modules/jobs/job_types/blueshield.dm @@ -14,14 +14,14 @@ exp_granted_type = EXP_TYPE_CREW paycheck = PAYCHECK_HARD - paycheck_department = ACCOUNT_CCM + paycheck_department = ACCOUNT_CMD outfit = /datum/outfit/job/blueshield plasmaman_outfit = /datum/outfit/plasmaman/blueshield display_order = JOB_DISPLAY_ORDER_BLUESHIELD bounty_types = CIV_JOB_SEC departments_list = list( - /datum/job_department/nanotrasen_fleet_command, + /datum/job_department/central_command, /datum/job_department/command, ) liver_traits = list(TRAIT_PRETENDER_ROYAL_METABOLISM) diff --git a/modular_skyrat/modules/central_command_module/code/computers/cargo_shuttle_console.dm b/modular_skyrat/modules/central_command_module/code/computers/cargo_shuttle_console.dm deleted file mode 100644 index b1d07d13ec3..00000000000 --- a/modular_skyrat/modules/central_command_module/code/computers/cargo_shuttle_console.dm +++ /dev/null @@ -1,111 +0,0 @@ -/obj/machinery/computer/cargo_shuttle_console - name = "NLV Consign Flight Console" - desc = "A console used for controlling the NLV Consign." - icon_screen = "comm" - icon_keyboard = "tech_key" - req_access = list(ACCESS_CENT_CAPTAIN) - circuit = /obj/item/circuitboard/computer/cargo_shuttle_console - light_color = LIGHT_COLOR_BLUE - - ///The name of the shuttle template being used as the cargo shuttle. 'supply' is default and contains critical code. Don't change this unless you know what you're doing. - var/cargo_shuttle = "supply" - ///The docking port called when returning to the station. - var/docking_home = "supply_home" - ///The docking port called when leaving the station. - var/docking_away = "supply_away" - - var/safety_warning = "For safety and ethical reasons, the automated supply shuttle \ - cannot transport human remains, classified nuclear weaponry, mail \ - homing beacons, unstable eigenstates or machinery housing any form of artificial intelligence." - var/blockade_warning = "Bluespace instability detected. Shuttle movement impossible." - - var/export_categories = EXPORT_CARGO | EXPORT_CONTRABAND | EXPORT_EMAG - - var/last_autopilot_change = 0 - - /// radio used by the console to send messages on supply channel - var/obj/item/radio/headset/radio - -/obj/machinery/computer/cargo_shuttle_console/Initialize() - . = ..() - radio = new /obj/item/radio/headset/headset_cargo(src) - -/obj/item/circuitboard/computer/cargo_shuttle_console - name = "Flight Control (Computer Board)" - greyscale_colors = CIRCUIT_COLOR_ENGINEERING - build_path = /obj/machinery/computer/cargo_shuttle_console - -/obj/machinery/computer/cargo_shuttle_console/ui_interact(mob/user) - var/list/dat = list("SHUTTLE CONTROL SYSTEMS") - var/manual_operation = SSshuttle.supply.manual_operation - dat += "STATUS: [SSshuttle.supply.getStatusText()]" - if(manual_operation) - dat += "AUTOPILOT OFFLINE - SWITCH TO AUTOPILOT" - dat += "Flight control:" - if(SSshuttle.supply.getDockedId() == docking_away) - dat += "Navigate to [station_name()]" - else - dat += "Navigate to NCV Titan" - dat += "Bolt doors" - dat += "Unbolt doors" - else - dat += "AUTOPILOT ONLINE - SWITCH TO MANUAL OPERATION" - - - var/datum/browser/popup = new(user, "flight_control","FLIGHT CONTROL", 400, 400, src) - popup.set_content(dat.Join("
")) - popup.open() - onclose(user, "flight_control") - -/obj/machinery/computer/cargo_shuttle_console/Topic(href, href_list) - if(..()) - return - - if(machine_stat & (NOPOWER|BROKEN|MAINT)) - return - - usr.set_machine(src) - - var/function = href_list["function"] - - if(href_list["close"]) - usr << browse(null, "window=flight_control") - return - - switch(function) - if("autopilot") - if((last_autopilot_change + 1 MINUTES) > world.time) - say("Autopilot system in cooldown.") - return - SSshuttle.supply.manual_operation = !SSshuttle.supply.manual_operation - say("Autopilot [SSshuttle.supply.manual_operation ? "disengaged" : "engaged"].") - minor_announce("Cargo shuttle is now in [SSshuttle.supply.manual_operation ? "manual" : "automatic"] operation.", "Cargo Shuttle") - last_autopilot_change = world.time - if("takeoff") - if(!SSshuttle.supply.canMove()) - say(safety_warning) - return - if(SSshuttle.supplyBlocked) - say(blockade_warning) - return - if(SSshuttle.supply.getDockedId() == docking_home) - SSshuttle.supply.export_categories = export_categories - SSshuttle.moveShuttle(cargo_shuttle, docking_away, TRUE) - say("Shuttle departing, ETA [SSshuttle.supply.timeLeft(600)] minutes.") - radio.talk_into(src, "NLV Consign departing the station.", RADIO_CHANNEL_SUPPLY) - investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO) - else - investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO) - radio.talk_into(src, "NLV Consign departing towards the station, ETA: [SSshuttle.supply.timeLeft(600)] minutes.", RADIO_CHANNEL_SUPPLY) - say("Shuttle departing, ETA [SSshuttle.supply.timeLeft(600)] minutes.") - SSshuttle.moveShuttle(cargo_shuttle, docking_home, TRUE) - if("lockdoors") - for(var/area/place in SSshuttle.supply.shuttle_areas) - for(var/obj/machinery/door/airlock/iterating_airlock in place) - iterating_airlock.close() - iterating_airlock.bolt() - if("unlockdoors") - for(var/area/place in SSshuttle.supply.shuttle_areas) - for(var/obj/machinery/door/airlock/iterating_airlock in place) - iterating_airlock.unbolt() - updateUsrDialog() diff --git a/modular_skyrat/modules/central_command_module/code/computers/export_console.dm b/modular_skyrat/modules/central_command_module/code/computers/export_console.dm deleted file mode 100644 index af2003253ef..00000000000 --- a/modular_skyrat/modules/central_command_module/code/computers/export_console.dm +++ /dev/null @@ -1,124 +0,0 @@ -/obj/machinery/computer/market_link - name = "Nanotrasen Market Link" - desc = "A console used for selling items to the space market." - icon_screen = "comm" - icon_keyboard = "tech_key" - req_access = list(ACCESS_CENT_CAPTAIN) - circuit = /obj/item/circuitboard/computer/market_link - light_color = LIGHT_COLOR_BLUE - - /// radio used by the console to send messages on supply channel - var/obj/item/radio/headset/radio - - var/list/bay_items = list() - var/list/possible_areas = list() - - //Export categories for this run, this is set by console sending the shuttle. - var/export_categories = EXPORT_CARGO - -/obj/machinery/computer/market_link/Initialize() - . = ..() - radio = new /obj/item/radio/headset/headset_cargo(src) - for(var/area/centcom/ncvtitan/export_bay/iterating_export_bay in world) - possible_areas += iterating_export_bay - -/obj/item/circuitboard/computer/market_link - name = "Market Link (Computer Board)" - greyscale_colors = CIRCUIT_COLOR_ENGINEERING - build_path = /obj/machinery/computer/market_link - -/obj/machinery/computer/market_link/ui_interact(mob/user) - var/list/dat = list("Nanotrasen Market Link") - var/manual_operation = SSshuttle.supply.manual_operation - if(manual_operation) - dat += "Scan Loading Area" - dat += "CARGO SELLING AREA:" - if(bay_items.len) - dat += "" - dat += "EXPORT ITEMS" - else - dat += "NOTHING" - else - dat += "MANUAL SHUTTLE OPERATION IS REQUIRED TO USE THIS TERMINAL." - - - var/datum/browser/popup = new(user, "export_console","Export Console", 600, 800, src) - popup.set_content(dat.Join("
")) - popup.open() - onclose(user, "export_console") - -/obj/machinery/computer/market_link/Topic(href, href_list) - if(..()) - return - - if(machine_stat & (NOPOWER|BROKEN|MAINT)) - return - - usr.set_machine(src) - - var/function = href_list["function"] - - if(href_list["close"]) - usr << browse(null, "window=export_console") - return - - switch(function) - if("scan") - if(!SSshuttle.supply.manual_operation) - say("Manual shuttle operation required.") - return - bay_items.Cut() - for(var/place in possible_areas) - var/area/centcom/ncvtitan/export_bay/exporting_bay = place - for(var/atom/movable/moveable_atom in exporting_bay) - bay_items += moveable_atom - - say("Area scanned.") - if("sell") - if(!SSshuttle.supply.manual_operation) - say("Manual shuttle operation required.") - return - sell() - say("Export complete.") - radio.talk_into(src, "NCV Titan has exported your recieved items and credited you accordingly.", RADIO_CHANNEL_SUPPLY) - updateUsrDialog() - -/obj/machinery/computer/market_link/proc/sell() - var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR) - var/presale_points = D.account_balance - - if(!GLOB.exports_list.len) // No exports list? Generate it! - setupExports() - - var/msg = "" - - var/datum/export_report/ex = new - for(var/place in possible_areas) - var/area/centcom/ncvtitan/export_bay/exporting_bay = place - for(var/atom/movable/AM in exporting_bay) - if(isliving(AM)) - say("Biological material detected in export area. Halting.") - return - if(iscameramob(AM)) - continue - if(!AM.anchored || istype(AM, /obj/vehicle/sealed/mecha)) - bay_items -= AM - export_item_and_contents(AM, export_categories , dry_run = FALSE, external_report = ex) - - if(ex.exported_atoms) - ex.exported_atoms += "." //ugh - - for(var/datum/export/E in ex.total_amount) - var/export_text = E.total_printout(ex) - if(!export_text) - continue - - msg += export_text + "\n" - D.adjust_money(ex.total_value[E]) - - SSeconomy.export_total += (D.account_balance - presale_points) - SSshuttle.centcom_message = msg - investigate_log("Shuttle contents sold for [D.account_balance - presale_points] credits. Contents: [ex.exported_atoms ? ex.exported_atoms.Join(",") + "." : "none."] Message: [SSshuttle.centcom_message || "none."]", INVESTIGATE_CARGO) diff --git a/modular_skyrat/modules/central_command_module/code/computers/import_console.dm b/modular_skyrat/modules/central_command_module/code/computers/import_console.dm deleted file mode 100644 index 3857df59ba5..00000000000 --- a/modular_skyrat/modules/central_command_module/code/computers/import_console.dm +++ /dev/null @@ -1,225 +0,0 @@ -GLOBAL_LIST_EMPTY(cargo_control_consoles) - -/obj/machinery/computer/cargo_control_console - name = "NCV Titan Cargo Console" - desc = "A console used for processing requests from the staton." - icon_screen = "comm" - icon_keyboard = "tech_key" - req_access = list(ACCESS_CENT_CAPTAIN) - circuit = /obj/item/circuitboard/computer/cargo_control_console - light_color = LIGHT_COLOR_BLUE - - /// radio used by the console to send messages on supply channel - var/obj/item/radio/headset/radio - - var/list/possible_floors = list() - -/obj/machinery/computer/cargo_control_console/Initialize() - . = ..() - radio = new /obj/item/radio/headset/headset_cargo(src) - GLOB.cargo_control_consoles += src - for(var/area/centcom/ncvtitan/import_bay/iterating_import_bay in world) - for(var/turf/open/floor/iterating_floor in iterating_import_bay) - possible_floors += iterating_floor - -/obj/machinery/computer/cargo_control_console/Destroy() - if(radio) - QDEL_NULL(radio) - GLOB.cargo_control_consoles -= src - possible_floors = null - . = ..() - - -/obj/item/circuitboard/computer/cargo_control_console - name = "Cargo Console (Computer Board)" - greyscale_colors = CIRCUIT_COLOR_ENGINEERING - build_path = /obj/machinery/computer/cargo_control_console - -/obj/machinery/computer/cargo_control_console/ui_interact(mob/user) - var/list/dat = list("CARGOSYS 3000") - var/manual_operation = SSshuttle.supply.manual_operation - if(manual_operation) - dat += "REQUESTED ITEMS:" - if(SSshuttle.requestlist.len) - dat += "" - else - dat += " - NONE" - dat += "PURCHASED ITEMS:" - if(SSshuttle.shoppinglist.len) - dat += "" - dat += "PROCESS PURCHASE LIST" - else - dat += " - NONE" - else - dat += "MANUAL SHUTTLE OPERATION IS REQUIRED TO USE THIS TERMINAL." - - - var/datum/browser/popup = new(user, "cargo_console","Cargo Console", 600, 400, src) - popup.set_content(dat.Join("
")) - popup.open() - onclose(user, "cargo_console") - -/obj/machinery/computer/cargo_control_console/Topic(href, href_list) - if(..()) - return - - if(machine_stat & (NOPOWER|BROKEN|MAINT)) - return - - usr.set_machine(src) - - var/function = href_list["function"] - - if(href_list["close"]) - usr << browse(null, "window=cargo_console") - return - - switch(function) - if("purchase") - if(!SSshuttle.supply.manual_operation) - say("Manual shuttle operation required.") - return - buy() - create_mail() - radio.talk_into(src, "NCV Titan has processed your purchase list, they will deliver it shortly.", RADIO_CHANNEL_SUPPLY) - updateUsrDialog() - -/obj/machinery/computer/cargo_control_console/proc/create_mail() - //Early return if there's no mail waiting to prevent taking up a slot. We also don't send mails on sundays or holidays. - if(!SSeconomy.mail_waiting || SSeconomy.mail_blocked) - return - - //spawn crate - var/list/empty_turfs = list() - for(var/turf/open/floor/iterating_floor in possible_floors) - if(iterating_floor.is_blocked_turf()) - continue - empty_turfs += iterating_floor - - - new /obj/structure/closet/crate/mail/economy(pick(empty_turfs)) - - -/obj/machinery/computer/cargo_control_console/proc/buy() - var/list/obj/miscboxes = list() //miscboxes are combo boxes that contain all goody orders grouped - var/list/misc_order_num = list() //list of strings of order numbers, so that the manifest can show all orders in a box - var/list/misc_contents = list() //list of lists of items that each box will contain - var/list/misc_costs = list() //list of overall costs sustained by each buyer. - - var/list/empty_turfs = list() - for(var/turf/open/floor/iterating_floor in possible_floors) - if(iterating_floor.is_blocked_turf()) - continue - empty_turfs += iterating_floor - - //quickly and greedily handle chef's grocery runs first, there are a few reasons why this isn't attached to the rest of cargo... - //but the biggest reason is that the chef requires produce to cook and do their job, and if they are using this system they - //already got let down by the botanists. So to open a new chance for cargo to also screw them over any more than is necessary is bad. - if(SSshuttle.chef_groceries.len) - var/obj/structure/closet/crate/freezer/grocery_crate = new(pick_n_take(empty_turfs)) - grocery_crate.name = "kitchen produce freezer" - investigate_log("Chef's [SSshuttle.chef_groceries.len] sized produce order arrived. Cost was deducted from orderer, not cargo.", INVESTIGATE_CARGO) - for(var/datum/orderable_item/item as anything in SSshuttle.chef_groceries)//every order - for(var/amt in 1 to SSshuttle.chef_groceries[item])//every order amount - new item.item_instance.type(grocery_crate) - SSshuttle.chef_groceries.Cut() //This lets the console know it can order another round. - - if(!SSshuttle.shoppinglist.len) - return - - var/value = 0 - var/purchases = 0 - var/list/goodies_by_buyer = list() // if someone orders more than GOODY_FREE_SHIPPING_MAX goodies, we upcharge to a normal crate so they can't carry around 20 combat shotties - - for(var/datum/supply_order/SO in SSshuttle.shoppinglist) - if(!empty_turfs.len) - break - var/price = SO.pack.get_cost() - if(SO.applied_coupon) - price *= (1 - SO.applied_coupon.discount_pct_off) - - var/datum/bank_account/D - if(SO.paying_account) //Someone paid out of pocket - D = SO.paying_account - var/list/current_buyer_orders = goodies_by_buyer[SO.paying_account] // so we can access the length a few lines down - if(!SO.pack.goody) - price *= 1.1 //TODO make this customizable by the quartermaster - - // note this is before we increment, so this is the GOODY_FREE_SHIPPING_MAX + 1th goody to ship. also note we only increment off this step if they successfully pay the fee, so there's no way around it - else if(LAZYLEN(current_buyer_orders) == 5) - price += 700 - D.bank_card_talk("Goody order size exceeds free shipping limit: Assessing [700] credit S&H fee.") - else - D = SSeconomy.get_dep_account(ACCOUNT_CAR) - if(D) - if(!D.adjust_money(-price)) - if(SO.paying_account) - D.bank_card_talk("Cargo order #[SO.id] rejected due to lack of funds. Credits required: [price]") - continue - - if(SO.paying_account) - if(SO.pack.goody) - LAZYADD(goodies_by_buyer[SO.paying_account], SO) - D.bank_card_talk("Cargo order #[SO.id] has shipped. [price] credits have been charged to your bank account.") - var/datum/bank_account/department/cargo = SSeconomy.get_dep_account(ACCOUNT_CAR) - cargo.adjust_money(price - SO.pack.get_cost()) //Cargo gets the handling fee - value += SO.pack.get_cost() - SSshuttle.shoppinglist -= SO - SSshuttle.orderhistory += SO - QDEL_NULL(SO.applied_coupon) - - if(!SO.pack.goody) //we handle goody crates below - SO.generate(pick_n_take(empty_turfs)) - - SSblackbox.record_feedback("nested tally", "cargo_imports", 1, list("[SO.pack.get_cost()]", "[SO.pack.name]")) - investigate_log("Order #[SO.id] ([SO.pack.name], placed by [key_name(SO.orderer_ckey)]), paid by [D.account_holder] has shipped.", INVESTIGATE_CARGO) - if(SO.pack.dangerous) - message_admins("\A [SO.pack.name] ordered by [ADMIN_LOOKUPFLW(SO.orderer_ckey)], paid by [D.account_holder] has shipped.") - purchases++ - - // we handle packing all the goodies last, since the type of crate we use depends on how many goodies they ordered. If it's more than GOODY_FREE_SHIPPING_MAX - // then we send it in a crate (including the CRATE_TAX cost), otherwise send it in a free shipping case - for(var/D in goodies_by_buyer) - var/list/buying_account_orders = goodies_by_buyer[D] - var/datum/bank_account/buying_account = D - var/buyer = buying_account.account_holder - - if(buying_account_orders.len > 5) // no free shipping, send a crate - var/obj/structure/closet/crate/secure/owned/our_crate = new /obj/structure/closet/crate/secure/owned(pick_n_take(empty_turfs)) - our_crate.buyer_account = buying_account - our_crate.name = "goody crate - purchased by [buyer]" - miscboxes[buyer] = our_crate - else //free shipping in a case - miscboxes[buyer] = new /obj/item/storage/lockbox/order(pick_n_take(empty_turfs)) - var/obj/item/storage/lockbox/order/our_case = miscboxes[buyer] - our_case.buyer_account = buying_account - miscboxes[buyer].name = "goody case - purchased by [buyer]" - misc_contents[buyer] = list() - - for(var/O in buying_account_orders) - var/datum/supply_order/our_order = O - for (var/item in our_order.pack.contains) - misc_contents[buyer] += item - misc_costs[buyer] += our_order.pack.cost - misc_order_num[buyer] = "[misc_order_num[buyer]]#[our_order.id] " - - for(var/I in miscboxes) - var/datum/supply_order/SO = new/datum/supply_order() - SO.id = misc_order_num[I] - SO.generateCombo(miscboxes[I], I, misc_contents[I], misc_costs[I]) - qdel(SO) - - SSeconomy.import_total += value - var/datum/bank_account/cargo_budget = SSeconomy.get_dep_account(ACCOUNT_CAR) - investigate_log("[purchases] orders in this shipment, worth [value] credits. [cargo_budget.account_balance] credits left.", INVESTIGATE_CARGO) - -/obj/machinery/computer/cargo_control_console/proc/notify_order(datum/supply_order/SO) - say("New order recieved!") - playsound(src, 'sound/machines/ping.ogg') - SO.generateRequisition(get_turf(src)) diff --git a/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm b/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm deleted file mode 100644 index 3f0b8b387aa..00000000000 --- a/modular_skyrat/modules/central_command_module/code/jobs/bridge_officer.dm +++ /dev/null @@ -1,84 +0,0 @@ -/datum/job/bridge_officer - title = "Bridge Officer" - auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY - department_head = list("Fleetmaster") - faction = FACTION_STATION - total_positions = 3 - spawn_positions = 3 - supervisors = "Fleetmaster" - selection_color = "#6969f8" - req_admin_notify = 1 - minimal_player_age = 14 - exp_requirements = 6000 - exp_required_type = EXP_TYPE_CREW - exp_required_type_department = EXP_TYPE_COMMAND - exp_granted_type = EXP_TYPE_NANOTRASEN_FLEET_COMMAND - - outfit = /datum/outfit/job/bridge_officer - plasmaman_outfit = /datum/outfit/plasmaman/centcom_official - - paycheck = PAYCHECK_NANOTRASEN_FLEET_COMMAND - paycheck_department = ACCOUNT_CCM - - liver_traits = list(TRAIT_ROYAL_METABOLISM) - - display_order = JOB_DISPLAY_ORDER_BRIDGE_OFFICER - departments_list = list( - /datum/job_department/nanotrasen_fleet_command, - ) - - family_heirlooms = list(/obj/item/reagent_containers/food/drinks/flask/gold) - - mail_goodies = list( - /obj/item/clothing/mask/cigarette/cigar/havana = 20, - /obj/item/storage/fancy/cigarettes/cigars/havana = 15, - /obj/item/reagent_containers/food/drinks/bottle/champagne = 10 - ) - - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS - - veteran_only = TRUE - -/datum/outfit/job/bridge_officer - name = "Bridge Officer" - - jobtype = /datum/job/bridge_officer - - implants = list(/obj/item/implant/mindshield) - - id = /obj/item/card/id/advanced/centcom - belt = /obj/item/pda/nanotrasen_representative - glasses = /obj/item/clothing/glasses/sunglasses - ears = /obj/item/radio/headset/headset_cent/alt_with_Key - gloves = /obj/item/clothing/gloves/color/black - uniform = /obj/item/clothing/under/rank/centcom/officer - suit = /obj/item/clothing/suit/armor/vest - suit_store = /obj/item/gun/energy/e_gun/cfa_phalanx - shoes = /obj/item/clothing/shoes/combat/swat - head = /obj/item/clothing/head/soft/enclaveo - back = /obj/item/storage/backpack/satchel/leather - box = /obj/item/storage/box/survival/security - - chameleon_extras = list(/obj/item/gun/energy/e_gun) - - id_trim = /datum/id_trim/centcom/bridge_officer - -/datum/id_trim/centcom/bridge_officer - access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_WEAPONS) - assignment = "Bridge Officer" - -/obj/item/radio/headset/headset_cent/alt_with_Key - name = "\improper CentCom bowman headset" - desc = "A headset especially for emergency response personnel. Protects ears from flashbangs." - icon_state = "cent_headset_alt" - inhand_icon_state = "cent_headset_alt" - -/obj/item/radio/headset/headset_cent/alt_with_Key/ComponentInitialize() - . = ..() - AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) - -/obj/effect/landmark/start/bridge_officer - name = "Bridge Officer" - icon_state = "Captain" - delete_after_roundstart = FALSE - jobspawn_override = TRUE diff --git a/modular_skyrat/modules/central_command_module/code/jobs/deck_crew.dm b/modular_skyrat/modules/central_command_module/code/jobs/deck_crew.dm deleted file mode 100644 index db5b59346be..00000000000 --- a/modular_skyrat/modules/central_command_module/code/jobs/deck_crew.dm +++ /dev/null @@ -1,80 +0,0 @@ - -/datum/job/deck_crew - title = "Deck Crewman" - auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY - department_head = list("Fleetmaster", "Bridge Officer") - faction = FACTION_STATION - total_positions = 5 - spawn_positions = 5 - supervisors = "Fleetmaster" - selection_color = "#6969f8" - req_admin_notify = 1 - minimal_player_age = 14 - exp_requirements = 600 - exp_required_type = EXP_TYPE_CREW - exp_required_type_department = EXP_TYPE_COMMAND - exp_granted_type = EXP_TYPE_NANOTRASEN_FLEET_COMMAND - - outfit = /datum/outfit/job/deck_crew - plasmaman_outfit = /datum/outfit/plasmaman/centcom_official - - paycheck = PAYCHECK_NANOTRASEN_FLEET_COMMAND - paycheck_department = ACCOUNT_CCM - - liver_traits = list(TRAIT_ROYAL_METABOLISM) - - display_order = JOB_DISPLAY_ORDER_DECK_CREW - departments_list = list( - /datum/job_department/nanotrasen_fleet_command, - ) - - family_heirlooms = list(/obj/item/wrench) - - mail_goodies = list( - /obj/item/wrench/combat, - ) - - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS - - -/datum/outfit/job/deck_crew - name = "Deck Crewman" - - jobtype = /datum/job/deck_crew - - implants = list(/obj/item/implant/mindshield) - - id = /obj/item/card/id/advanced/centcom - belt = /obj/item/pda/nanotrasen_representative - glasses = /obj/item/clothing/glasses/sunglasses - ears = /obj/item/radio/headset/headset_cent/alt_with_Key/cargo - gloves = /obj/item/clothing/gloves/color/black - uniform = /obj/item/clothing/under/utility/cargo - shoes = /obj/item/clothing/shoes/jackboots - head = /obj/item/clothing/head/soft/enclave - back = /obj/item/storage/backpack/satchel/leather - - implants = list(/obj/item/implant/mindshield) - - id_trim = /datum/id_trim/centcom/deck_crew - -/datum/id_trim/centcom/deck_crew - access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_WEAPONS, ACCESS_CARGO, ACCESS_MAILSORTING) - assignment = "Deck Crewman" - -/obj/item/radio/headset/headset_cent/alt_with_Key/cargo - keyslot = new /obj/item/encryptionkey/headset_cargo - -/obj/effect/landmark/start/deck_crew - name = "Deck Crewman" - icon_state = "Captain" - delete_after_roundstart = FALSE - jobspawn_override = TRUE - -/obj/structure/closet/pilot - name = "Pilots closet" - desc = "For the deck crewman that decides to take up piloting." - -/obj/structure/closet/pilot/PopulateContents() - new /obj/item/clothing/head/helmet/alt - new /obj/item/clothing/suit/armor/vest diff --git a/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm b/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm deleted file mode 100644 index ef72469251e..00000000000 --- a/modular_skyrat/modules/central_command_module/code/jobs/fleetmaster.dm +++ /dev/null @@ -1,106 +0,0 @@ -/datum/job/fleetmaster - title = "Fleetmaster" - auto_deadmin_role_flags = DEADMIN_POSITION_HEAD|DEADMIN_POSITION_SECURITY - department_head = list("Nanotrasen Fleet Command") - faction = FACTION_STATION - total_positions = 1 - spawn_positions = 1 - supervisors = "Nanotrasen Fleet Command and God himself" - selection_color = "#6969f8" - req_admin_notify = 1 - minimal_player_age = 14 - exp_requirements = 6000 - exp_required_type = EXP_TYPE_CREW - exp_required_type_department = EXP_TYPE_NANOTRASEN_FLEET_COMMAND - exp_granted_type = EXP_TYPE_CREW - - outfit = /datum/outfit/job/fleetmaster - plasmaman_outfit = /datum/outfit/plasmaman/centcom_commander - - paycheck = PAYCHECK_NANOTRASEN_FLEET_COMMAND - paycheck_department = ACCOUNT_CCM - - liver_traits = list(TRAIT_ROYAL_METABOLISM) - - display_order = JOB_DISPLAY_ORDER_FLEETMASTER - departments_list = list( - /datum/job_department/command, - /datum/job_department/nanotrasen_fleet_command, - ) - - family_heirlooms = list(/obj/item/reagent_containers/food/drinks/flask/gold) - - mail_goodies = list( - /obj/item/clothing/mask/cigarette/cigar/havana = 20, - /obj/item/storage/fancy/cigarettes/cigars/havana = 15, - /obj/item/reagent_containers/food/drinks/bottle/champagne = 10 - ) - - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_BOLD_SELECT_TEXT | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS - - voice_of_god_power = 1.4 //Command staff has authority - - veteran_only = TRUE - - -/datum/job/fleetmaster/get_captaincy_announcement(mob/living/captain) - return "Fleetmaster [captain.real_name] on deck!" - -/datum/outfit/job/fleetmaster - name = "Fleetmaster" - - jobtype = /datum/job/fleetmaster - - implants = list(/obj/item/implant/mindshield) - - id = /obj/item/card/id/advanced/centcom - belt = /obj/item/pda/nanotrasen_representative - glasses = /obj/item/clothing/glasses/eyepatch - mask = /obj/item/clothing/mask/cigarette/cigar/cohiba - ears = /obj/item/radio/headset/headset_cent/fleetmaster - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - uniform = /obj/item/clothing/under/rank/centcom/commander - suit = /obj/item/clothing/suit/toggle/armor/vest/centcom_formal - suit_store = /obj/item/gun/ballistic/revolver/mateba - shoes = /obj/item/clothing/shoes/combat/swat - head = /obj/item/clothing/head/centhat - back = /obj/item/storage/backpack/satchel/leather - box = /obj/item/storage/box/survival/security - backpack_contents = list(/obj/item/melee/baton/security/loaded , /obj/item/ammo_box/a357 = 4) - - skillchips = list(/obj/item/skillchip/disk_verifier) - - implants = list(/obj/item/implant/mindshield) - accessory = /obj/item/clothing/accessory/medal/gold/heroism - - chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/centcom) - - id_trim = /datum/id_trim/centcom/fleetmaster - - -/datum/id_trim/centcom/fleetmaster - assignment = "Fleetmaster" - -/datum/id_trim/centcom/fleetmaster/New() - . = ..() - - access = SSid_access.get_region_access_list(list(REGION_CENTCOM, REGION_ALL_STATION)) - -/obj/effect/landmark/start/fleetmaster - name = "Fleetmaster" - icon_state = "Captain" - delete_after_roundstart = FALSE - jobspawn_override = TRUE - -/obj/item/radio/headset/headset_cent/fleetmaster - name = "\improper CentCom bowman headset" - desc = "A headset used by the upper echelons of Nanotrasen." - icon_state = "cent_headset_alt" - inhand_icon_state = "cent_headset_alt" - keyslot = new /obj/item/encryptionkey/heads/captain - keyslot2 = new /obj/item/encryptionkey/headset_cent - command = TRUE - -/obj/item/radio/headset/headset_cent/fleetmaster/ComponentInitialize() - . = ..() - AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm b/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm deleted file mode 100644 index 768b9b50ad0..00000000000 --- a/modular_skyrat/modules/central_command_module/code/jobs/operations_inspector.dm +++ /dev/null @@ -1,72 +0,0 @@ -/datum/job/operations_inspector - title = "Operations Inspector" - auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY - department_head = list("Fleetmaster") - faction = FACTION_STATION - total_positions = 1 - spawn_positions = 1 - supervisors = "Fleetmaster" - selection_color = "#6969f8" - req_admin_notify = 1 - minimal_player_age = 14 - exp_requirements = 6000 - exp_required_type = EXP_TYPE_CREW - exp_required_type_department = EXP_TYPE_COMMAND - exp_granted_type = EXP_TYPE_NANOTRASEN_FLEET_COMMAND - - outfit = /datum/outfit/job/operations_inspector - plasmaman_outfit = /datum/outfit/plasmaman/centcom_official - - paycheck = PAYCHECK_NANOTRASEN_FLEET_COMMAND - paycheck_department = ACCOUNT_CCM - - liver_traits = list(TRAIT_ROYAL_METABOLISM) - - display_order = JOB_DISPLAY_ORDER_OPERATIONS_INSPECTOR - departments_list = list( - /datum/job_department/nanotrasen_fleet_command, - ) - - family_heirlooms = list(/obj/item/reagent_containers/food/drinks/flask/gold) - - mail_goodies = list( - /obj/item/clothing/mask/cigarette/cigar/havana = 20, - /obj/item/storage/fancy/cigarettes/cigars/havana = 15, - /obj/item/reagent_containers/food/drinks/bottle/champagne = 10 - ) - - job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS - - veteran_only = TRUE - -/datum/outfit/job/operations_inspector - name = "Operations Inspector" - - jobtype = /datum/job/operations_inspector - - implants = list(/obj/item/implant/mindshield) - - id = /obj/item/card/id/advanced/centcom - belt = /obj/item/pda/nanotrasen_representative - glasses = /obj/item/clothing/glasses/sunglasses - ears = /obj/item/radio/headset/headset_cent/alt_with_Key - gloves = /obj/item/clothing/gloves/color/black - uniform = /obj/item/clothing/under/rank/centcom/officer - suit = /obj/item/clothing/suit/toggle/ - shoes = /obj/item/clothing/shoes/combat/swat - back = /obj/item/storage/backpack/satchel/leather - box = /obj/item/storage/box/survival/security - - chameleon_extras = list(/obj/item/gun/energy/e_gun) - - id_trim = /datum/id_trim/centcom/operations_inspector - -/datum/id_trim/centcom/operations_inspector - access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_WEAPONS) - assignment = "Operations Inspector" - -/obj/effect/landmark/start/operations_inspector - name = "Operations Inspector" - icon_state = "Captain" - delete_after_roundstart = FALSE - jobspawn_override = TRUE diff --git a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_representative.dm b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_representative.dm index 81765a8919a..4a61d08cd6f 100644 --- a/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_representative.dm +++ b/modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_representative.dm @@ -14,14 +14,14 @@ departments_list = list( /datum/job_department/command, - /datum/job_department/nanotrasen_fleet_command + /datum/job_department/central_command ) outfit = /datum/outfit/job/nanotrasen_representative plasmaman_outfit = /datum/outfit/plasmaman/nanotrasen_representative paycheck = PAYCHECK_HARD - paycheck_department = ACCOUNT_CCM + paycheck_department = ACCOUNT_CMD display_order = JOB_DISPLAY_ORDER_NANOTRASEN_REPRESENTATIVE bounty_types = CIV_JOB_SEC diff --git a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm index a5d7761bd49..6b6c6d7b6c7 100644 --- a/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm +++ b/modular_skyrat/modules/sec_haul/code/junior_officer/junior_officer.dm @@ -16,7 +16,7 @@ plasmaman_outfit = /datum/outfit/plasmaman/security paycheck = PAYCHECK_EASY - paycheck_department = ACCOUNT_CCM + paycheck_department = ACCOUNT_SEC mind_traits = list(TRAIT_DONUT_LOVER) liver_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM) diff --git a/tgstation.dme b/tgstation.dme index 3f2d3849f38..37004f59091 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4036,7 +4036,6 @@ #include "modular_skyrat\master_files\code\modules\research\designs\biogenerator_designs.dm" #include "modular_skyrat\master_files\code\modules\research\designs\misc_designs.dm" #include "modular_skyrat\master_files\code\modules\shuttle\shuttle.dm" -#include "modular_skyrat\master_files\code\modules\shuttle\supply.dm" #include "modular_skyrat\master_files\code\modules\spells\wizard.dm" #include "modular_skyrat\master_files\code\modules\uplink\uplink_items.dm" #include "modular_skyrat\modules\3516\code\3516.dm" @@ -4233,16 +4232,9 @@ #include "modular_skyrat\modules\cargo\code\packs.dm" #include "modular_skyrat\modules\cell_component\code\cell_component.dm" #include "modular_skyrat\modules\cell_component\code\flashlight.dm" -#include "modular_skyrat\modules\central_command_module\code\computers\cargo_shuttle_console.dm" #include "modular_skyrat\modules\central_command_module\code\computers\command_report_computer.dm" #include "modular_skyrat\modules\central_command_module\code\computers\ert_control_computer.dm" -#include "modular_skyrat\modules\central_command_module\code\computers\export_console.dm" -#include "modular_skyrat\modules\central_command_module\code\computers\import_console.dm" #include "modular_skyrat\modules\central_command_module\code\computers\station_goal_computer.dm" -#include "modular_skyrat\modules\central_command_module\code\jobs\bridge_officer.dm" -#include "modular_skyrat\modules\central_command_module\code\jobs\deck_crew.dm" -#include "modular_skyrat\modules\central_command_module\code\jobs\fleetmaster.dm" -#include "modular_skyrat\modules\central_command_module\code\jobs\operations_inspector.dm" #include "modular_skyrat\modules\central_command_module\code\obj\wall.dm" #include "modular_skyrat\modules\chaplain\code\game\objects\items\implants\mortis.dm" #include "modular_skyrat\modules\cme\code\_cme_defines.dm"