mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-28 02:21:53 +00:00
Makes Bounty Pads fireproof and prevents EconomySS from randomly opening UIs. (#52665)
* Makes pad fireproof and makes machines spam less * Update code/game/machinery/civilian_bountys.dm Co-authored-by: Rohesie <rohesie@gmail.com> Co-authored-by: Rohesie <rohesie@gmail.com>
This commit is contained in:
@@ -163,7 +163,6 @@ SUBSYSTEM_DEF(economy)
|
||||
if(!is_station_level(V.z))
|
||||
continue
|
||||
V.reset_prices(V.product_records, V.coin_records)
|
||||
V.updateUsrDialog()
|
||||
earning_report = "Sector Economic Report<br /> Sector price inflation is currently at [SSeconomy.inflation_value()*100]%.<br /> The station budget is currently <b>[station_total] Credits</b>, and the station's targeted allowance is at <b>[station_target] Credits</b>.<br /> That's all from the <i>Nanotrasen Economist Division</i>."
|
||||
GLOB.news_network.SubmitArticle(earning_report, "Station Earnings Report", "Station Announcements", null)
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
name = "civilian bounty pad"
|
||||
desc = "A machine designed to send civilian bounty targets to centcom."
|
||||
layer = TABLE_LAYER
|
||||
resistance_flags = FIRE_PROOF
|
||||
|
||||
///Computer for assigning new civilian bounties, and sending bounties for collection.
|
||||
/obj/machinery/computer/piratepad_control/civilian
|
||||
@@ -19,11 +20,11 @@
|
||||
pad = /obj/machinery/piratepad/civilian
|
||||
|
||||
/obj/machinery/computer/piratepad_control/civilian/attackby(obj/item/I, mob/living/user, params)
|
||||
. = ..()
|
||||
if(isidcard(I))
|
||||
if(id_insert(user, I, inserted_scan_id))
|
||||
inserted_scan_id = I
|
||||
return TRUE
|
||||
return ..()
|
||||
|
||||
/obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I)
|
||||
if(istype(I) && istype(I.buffer,/obj/machinery/piratepad/civilian))
|
||||
|
||||
Reference in New Issue
Block a user