mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 07:38:05 +01:00
- Makes additional batons cost 2 experiment points.
- Fixes typo in floors.dmi - Traitor panel buttons now grant objectives as well
This commit is contained in:
@@ -1401,6 +1401,10 @@
|
||||
|
||||
ticker.mode.abductors |= src
|
||||
|
||||
var/datum/objective/experiment/O = new
|
||||
O.owner = src
|
||||
objectives += O
|
||||
|
||||
var/mob/living/carbon/human/H = current
|
||||
|
||||
hardset_dna(H,null,null,null,null,/datum/species/abductor,null)
|
||||
|
||||
@@ -342,6 +342,19 @@ datum/objective/experiment/New()
|
||||
explanation_text = "Experiment on [target_amount] humans"
|
||||
|
||||
datum/objective/experiment/check_completion()
|
||||
if(!owner.current || !ishuman(owner.current))
|
||||
return 0
|
||||
var/mob/living/carbon/human/H = owner.current
|
||||
if(!H.dna || !H.dna.species || !(H.dna.species.id == "abductor"))
|
||||
return 0
|
||||
var/datum/species/abductor/S = H.dna.species
|
||||
var/ab_team = S.team
|
||||
for(var/obj/machinery/abductor/experiment/E in machines)
|
||||
if(E.team == ab_team)
|
||||
if(E.points >= target_amount)
|
||||
return 1
|
||||
else
|
||||
return 0
|
||||
return 0
|
||||
|
||||
datum/objective/abductee
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
else if(href_list["dispense"])
|
||||
switch(href_list["dispense"])
|
||||
if("baton")
|
||||
Dispense(/obj/item/weapon/abductor_baton)
|
||||
Dispense(/obj/item/weapon/abductor_baton,cost=2)
|
||||
if("helmet")
|
||||
Dispense(/obj/item/clothing/head/helmet/abductor)
|
||||
if("silencer")
|
||||
@@ -198,9 +198,9 @@
|
||||
else
|
||||
..()
|
||||
|
||||
/obj/machinery/abductor/console/proc/Dispense(var/item)
|
||||
if(experiment && experiment.points > 0)
|
||||
experiment.points--
|
||||
/obj/machinery/abductor/console/proc/Dispense(var/item,var/cost=1)
|
||||
if(experiment && experiment.points >= cost)
|
||||
experiment.points-=cost
|
||||
say("Incoming supply!")
|
||||
if(pad)
|
||||
flick("alien-pad", pad)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 349 KiB After Width: | Height: | Size: 377 KiB |
Reference in New Issue
Block a user