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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup

Browse Source
This commit is contained in:
Seris02
2020-01-27 08:33:38 +08:00
parent 0d1e458e9c 27cd7745ed
commit e45cc4933c
296 changed files with 16424 additions and 11376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/modular_computers/computers/item/computer_damage.dm
View File

@@ -23,6 +23,8 @@
new /obj/item/stack/sheet/metal(newloc, round(steel_sheet_cost/2))
for(var/C in all_components)
var/obj/item/computer_hardware/H = all_components[C]
if(QDELETED(H))
return
uninstall_component(H)
H.forceMove(newloc)
if(prob(25))

6
code/modules/modular_computers/computers/item/laptop_presets.dm
View File

@@ -13,11 +13,11 @@
/obj/item/modular_computer/laptop/preset/civillian
/obj/item/modular_computer/laptop/preset/civilian
desc = "A low-end laptop often used for personal recreation."
/obj/item/modular_computer/laptop/preset/civillian/install_programs()
/obj/item/modular_computer/laptop/preset/civilian/install_programs()
var/obj/item/computer_hardware/hard_drive/hard_drive = all_components[MC_HDD]
hard_drive.store_file(new/datum/computer_file/program/chatclient())
hard_drive.store_file(new/datum/computer_file/program/nttransfer())
hard_drive.store_file(new/datum/computer_file/program/nttransfer())