mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-31 01:00:59 +01:00
[MIRROR] Fix a bunch of issues and runtimes (#11145)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
co-authored by
Kashargul
parent
199e857d15
commit
46c940fbdf
@@ -24,9 +24,9 @@
|
||||
return
|
||||
return list("title" = title, "message" = message)
|
||||
|
||||
/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/uplink/U, var/loc, var/mob/user, var/list/args)
|
||||
post_comm_message(args["title"], replacetext(args["message"], "\n", "<br/>"))
|
||||
command_announcement.Announce(args["message"], args["title"])
|
||||
/datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/uplink/U, var/location, var/mob/user, var/list/arguments)
|
||||
post_comm_message(arguments["title"], replacetext(arguments["message"], "\n", "<br/>"))
|
||||
command_announcement.Announce(arguments["message"], arguments["title"])
|
||||
return 1
|
||||
|
||||
/datum/uplink_item/abstract/announcements/fake_crew_arrival
|
||||
@@ -34,7 +34,7 @@
|
||||
desc = "Creates a fake crew arrival announcement as well as fake crew records, using your current appearance (including held items!) and worn id card. Trigger with care!"
|
||||
item_cost = 15
|
||||
|
||||
/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/uplink/U, var/loc, var/mob/user, var/list/args)
|
||||
/datum/uplink_item/abstract/announcements/fake_crew_arrival/get_goods(var/obj/item/uplink/U, var/location, var/mob/user, var/list/arguments)
|
||||
if(!user)
|
||||
return 0
|
||||
|
||||
@@ -93,7 +93,7 @@
|
||||
desc = "Interferes with the station's ion sensors. Triggers immediately upon investment."
|
||||
item_cost = 10
|
||||
|
||||
/datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/uplink/U, var/loc)
|
||||
/datum/uplink_item/abstract/announcements/fake_ion_storm/get_goods(var/obj/item/uplink/U, var/location)
|
||||
ion_storm_announcement()
|
||||
return 1
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
desc = "Interferes with the station's radiation sensors. Triggers immediately upon investment."
|
||||
item_cost = 15
|
||||
|
||||
/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/uplink/U, var/loc)
|
||||
/datum/uplink_item/abstract/announcements/fake_radiation/get_goods(var/obj/item/uplink/U, var/location)
|
||||
var/datum/event_meta/EM = new(EVENT_LEVEL_MUNDANE, "Fake Radiation Storm", add_to_queue = 0)
|
||||
new/datum/event/radiation_storm/syndicate(EM)
|
||||
return 1
|
||||
|
||||
@@ -35,11 +35,11 @@
|
||||
/datum/uplink_item/item/badassery/random_many/cost(obj/item/uplink/U, telecrystals)
|
||||
return max(1, telecrystals)
|
||||
|
||||
/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/uplink/U, var/loc, var/mob/M)
|
||||
/datum/uplink_item/item/badassery/random_many/get_goods(var/obj/item/uplink/U, var/location, var/mob/M)
|
||||
var/list/bought_items = list()
|
||||
for(var/datum/uplink_item/UI in get_random_uplink_items(U, M.mind.tcrystals, loc))
|
||||
for(var/datum/uplink_item/UI in get_random_uplink_items(U, M.mind.tcrystals, location))
|
||||
UI.purchase_log(U)
|
||||
var/obj/item/I = UI.get_goods(U, loc)
|
||||
var/obj/item/I = UI.get_goods(U, location)
|
||||
if(istype(I))
|
||||
bought_items += I
|
||||
|
||||
@@ -77,8 +77,8 @@
|
||||
..()
|
||||
desc = "A crate containing [item_worth] telecrystal\s worth of surplus leftovers."
|
||||
|
||||
/datum/uplink_item/item/badassery/surplus/get_goods(var/obj/item/uplink/U, var/loc)
|
||||
var/obj/structure/largecrate/C = new(loc)
|
||||
/datum/uplink_item/item/badassery/surplus/get_goods(var/obj/item/uplink/U, var/location)
|
||||
var/obj/structure/largecrate/C = new(location)
|
||||
var/random_items = get_surplus_items(null, item_worth, C)
|
||||
for(var/datum/uplink_item/I in random_items)
|
||||
I.purchase_log(U)
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
category = /datum/uplink_category/telecrystals
|
||||
blacklisted = 1
|
||||
|
||||
/datum/uplink_item/item/telecrystal/get_goods(obj/item/uplink/U, loc, mob/M)
|
||||
return new /obj/item/stack/telecrystal(loc, cost(U, M.mind.tcrystals))
|
||||
/datum/uplink_item/item/telecrystal/get_goods(obj/item/uplink/U, location, mob/M)
|
||||
return new /obj/item/stack/telecrystal(location, cost(U, M.mind.tcrystals))
|
||||
|
||||
/datum/uplink_item/item/telecrystal/one
|
||||
name = "Telecrystal - 01"
|
||||
|
||||
@@ -84,7 +84,7 @@ var/datum/uplink/uplink = new()
|
||||
return desc
|
||||
|
||||
// get_goods does not necessarily return physical objects, it is simply a way to acquire the uplink item without paying
|
||||
/datum/uplink_item/proc/get_goods(var/obj/item/uplink/U, var/loc, var/mob/user)
|
||||
/datum/uplink_item/proc/get_goods(var/obj/item/uplink/U, var/location, var/mob/user)
|
||||
return FALSE
|
||||
|
||||
/datum/uplink_item/proc/log_icon()
|
||||
@@ -117,8 +117,8 @@ var/datum/uplink/uplink = new()
|
||||
A.put_in_any_hand_if_possible(I)
|
||||
return I
|
||||
|
||||
/datum/uplink_item/item/get_goods(obj/item/uplink/U, loc, mob/user)
|
||||
var/obj/item/I = new path(loc)
|
||||
/datum/uplink_item/item/get_goods(obj/item/uplink/U, location, mob/user)
|
||||
var/obj/item/I = new path(location)
|
||||
return I
|
||||
|
||||
/datum/uplink_item/item/description()
|
||||
@@ -154,8 +154,8 @@ var/datum/uplink/uplink = new()
|
||||
var/crate_path = /obj/structure/largecrate
|
||||
var/list/paths = list() // List of paths to be spawned into the crate.
|
||||
|
||||
/datum/uplink_item/crated/get_goods(obj/item/uplink/U, loc, mob/user)
|
||||
var/obj/L = new crate_path(get_turf(loc))
|
||||
/datum/uplink_item/crated/get_goods(obj/item/uplink/U, location, mob/user)
|
||||
var/obj/L = new crate_path(get_turf(location))
|
||||
|
||||
L.adjust_scale(rand(9, 12) / 10, rand(9, 12) / 10) // Some variation in the crate / locker size.
|
||||
|
||||
@@ -179,7 +179,7 @@ var/datum/uplink/uplink = new()
|
||||
/****************
|
||||
* Support procs *
|
||||
****************/
|
||||
/proc/get_random_uplink_items(var/obj/item/uplink/U, var/remaining_TC, var/loc)
|
||||
/proc/get_random_uplink_items(var/obj/item/uplink/U, var/remaining_TC, var/location)
|
||||
var/list/bought_items = list()
|
||||
while(remaining_TC)
|
||||
var/datum/uplink_item/I = default_uplink_selection.get_random_item(remaining_TC, U, bought_items)
|
||||
@@ -190,7 +190,7 @@ var/datum/uplink/uplink = new()
|
||||
|
||||
return bought_items
|
||||
|
||||
/proc/get_surplus_items(var/obj/item/uplink/U, var/remaining_TC, var/loc)
|
||||
/proc/get_surplus_items(var/obj/item/uplink/U, var/remaining_TC, var/location)
|
||||
var/list/bought_items = list()
|
||||
var/override = TRUE
|
||||
while(remaining_TC)
|
||||
|
||||
Reference in New Issue
Block a user