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

part 3: do people even read commit logs

Browse Source
This commit is contained in:
Kraseo
2020-03-01 19:14:05 +01:00
parent d93ade7e03
commit ab48a6fa16
9 changed files with 162 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/antagonists/traitor/datum_traitor.dm
View File

@@ -31,14 +31,26 @@
..()
/datum/antagonist/traitor/proc/create_contracts()
var/contract_generation_quantity = 6
var/lowest_TC_threshold = 28 // We don't want the sum of all the payouts to be under this amount
// 6 contracts
var/list/to_generate = list(
CONTRACT_PAYOUT_LARGE,
CONTRACT_PAYOUT_MEDIUM,
CONTRACT_PAYOUT_SMALL,
CONTRACT_PAYOUT_SMALL,
CONTRACT_PAYOUT_SMALL,
CONTRACT_PAYOUT_SMALL
)
var/lowest_TC_threshold = 30 // We don't want the sum of all the payouts to be under this amount
var/total = 0
var/lowest_paying_sum = 0
var/datum/syndicate_contract/lowest_paying_contract
for(var/i = 1; i <= contract_generation_quantity; i++)
var/datum/syndicate_contract/contract_to_add = new(owner)
to_generate = shuffle(to_generate) // Randomise order, so we don't have contracts always in payout order.
var/list/assigned_targets = list()
for (var/i = 1; i <= to_generate.len; i++) // Generate contracts, and find the lowest paying.
var/datum/syndicate_contract/contract_to_add = new(owner, to_generate[i], assigned_targets)
var/contract_payout_total = contract_to_add.contract.payout + contract_to_add.contract.payout_bonus
assigned_targets.Add(contract_to_add.contract.target)
if(!lowest_paying_contract || (contract_payout_total < lowest_paying_sum))
lowest_paying_sum = contract_payout_total
lowest_paying_contract = contract_to_add

4
code/modules/cargo/supplypod.dm
View File

@@ -233,6 +233,10 @@
handleReturningClose(holder, TRUE)
/obj/structure/closet/supplypod/extractionpod/close(atom/movable/holder) //handles closing, and returns pod - deletes itself when returned
. = ..()
return
/obj/structure/closet/supplypod/extractionpod/proc/send_up(atom/movable/holder)
if(!holder)
holder = src
if(leavingSound)

2
code/modules/uplink/uplink_items/uplink_bundles.dm
View File

@@ -35,7 +35,7 @@
desc = "The Syndicate have offered you the chance to become a contractor, take on kidnapping contracts for TC and cash payouts. Upon purchase, \
you'll be granted your own contract uplink embedded within the supplied tablet computer. Additionally, you'll be granted \
standard contractor gear to help with your mission - comes supplied with the tablet, specialised space suit, chameleon jumpsuit and mask, \
agent card, and three randomly selected low cost items. Includes potentially otherwise unobtainable items."
specialised contractor baton, and three randomly selected low cost items. Can include otherwise unobtainable items."
item = /obj/item/storage/box/syndie_kit/contract_kit
cost = 20
player_minimum = 20