Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Диски #1086

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Диски #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65bde3c
дандадандадандадандан
Discozavisim Oct 17, 2024
c79088e
a
Discozavisim Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions code/modules/research/designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,26 @@ other types of metals and chemistry for reagents).
pixel_y = base_pixel_y + rand(-5, 5)
if(design_name)
name = jointext(list(disk_name, design_name), " - ")
if(length(starting_blueprints))
for(var/design in starting_blueprints)
blueprints += new design()
//[CELADON-EDIT] -- CELADON_FIXES -- Превращаем обычный список в ассоциативный. Люммох пидарас. Вагабонд боженька. Чиним диски пупупу
// if(length(starting_blueprints))
// for(var/design in starting_blueprints)
// blueprints += new design()
var/list/new_designs = list()
var/list/previous_designs = starting_blueprints
var/maxim_shelby = length(previous_designs)
for(var/i in 1 to max_blueprints)
if(maxim_shelby >= i)
var/a = pick(previous_designs)
var/datum/design/b = new a()
new_designs += b
new_designs[b] = i
previous_designs -= a
else
var/c = null
new_designs += c
new_designs[c] = i
blueprints = new_designs
//[/CELADON-EDIT]

/obj/item/disk/design_disk/adv
name = "Advanced Component Design Disk"
Expand Down
13 changes: 3 additions & 10 deletions code/modules/research/rdconsole.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,17 +668,10 @@ Nothing else in the console has ID requirements.
RDSCREEN_UI_DDISK_CHECK
var/list/l = list()
l += "Disk Operations: <A href='?src=[REF(src)];clear_design=0'>Clear Disk</A><A href='?src=[REF(src)];updt_design=0'>Upload All</A><A href='?src=[REF(src)];eject_design=1'>Eject Disk</A>"
// [CELADON-EDIT] - CELADON_FIXES - Чиним диски
// for(var/i in 1 to d_disk.max_blueprints) // CELADON-EDIT - ORIGINAL
for(var/i in d_disk.blueprints)
// [/CELADON-EDIT]
for(var/i in 1 to d_disk.max_blueprints)
l += "<div class='statusDisplay'>"
// [CELADON-EDIT] - CELADON_FIXES - Чиним диски
// if(d_disk.blueprints[i])
// var/datum/design/D = d_disk.blueprints[i] // CELADON-EDIT - ORIGINAL
if(istype(i, /datum/design))
var/datum/design/D = i
// [/CELADON-EDIT]
if(d_disk.blueprints[i])
var/datum/design/D = d_disk.blueprints[i]
l += "[D.icon_html(usr)] <A href='?src=[REF(src)];view_design=[D.id]'>[D.name]</A>"
l += "Operations: <A href='?src=[REF(src)];updt_design=[i]'>Upload to database</A> <A href='?src=[REF(src)];clear_design=[i]'>Clear Slot</A>"
else
Expand Down
Loading