cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-21 07:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #3998 and #3992 (#4000)

Browse Source 
Fixes #3998
Fixes #3992
This commit is contained in:
Werner
2017-12-23 20:28:22 +01:00
committed by Erki
parent bb5a34eaf8
commit 855562c7c2
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/controllers/subsystems/supply.dm
View File

@@ -709,9 +709,10 @@ var/datum/controller/subsystem/cargo/SScargo
//Shuttle is loaded now - Charge cargo for it //Shuttle is loaded now - Charge cargo for it
charge_cargo("Shipment #[current_shipment.shipment_num] - Expense",current_shipment.shipment_cost_purchase) charge_cargo("Shipment #[current_shipment.shipment_num] - Expense",current_shipment.shipment_cost_purchase)
//Now calculate the aliquot shipment cost for the orders and add it to each order if(current_shipment.orders.len)
var/aliquot_shipment_cost = current_shipment.shuttle_fee / current_shipment.orders.len //Now calculate the aliquot shipment cost for the orders and add it to each order
for(var/datum/cargo_order/co in current_shipment.orders) var/aliquot_shipment_cost = current_shipment.shuttle_fee / current_shipment.orders.len
co.partial_shipment_fee = aliquot_shipment_cost for(var/datum/cargo_order/co in current_shipment.orders)
co.partial_shipment_fee = aliquot_shipment_cost
return 1 return 1

6
code/modules/mob/living/silicon/ai/ai.dm
View File

@@ -279,6 +279,12 @@ var/list/ai_verbs_default = list(
aiPDA.owner = pickedName aiPDA.owner = pickedName
aiPDA.name = pickedName + " (" + aiPDA.ownjob + ")" aiPDA.name = pickedName + " (" + aiPDA.ownjob + ")"
//Set the ID Name
if(idcard)
idcard.registered_name = pickedName
idcard.assignment = "AI"
idcard.update_name()
setup_icon() //this is because the ai custom name is related to the ai name, so, we just call the setup icon after someone named their ai setup_icon() //this is because the ai custom name is related to the ai name, so, we just call the setup icon after someone named their ai
/* /*

6
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -336,6 +336,12 @@
// if we've changed our name, we also need to update the display name for our PDA // if we've changed our name, we also need to update the display name for our PDA
setup_PDA() setup_PDA()
// We also need to update our internal ID
if(idcard)
idcard.assignment = prefix
idcard.registered_name = changed_name
idcard.update_name()
//We also need to update name of internal camera. //We also need to update name of internal camera.
if (camera) if (camera)
camera.c_tag = changed_name camera.c_tag = changed_name