cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

merges civilian and service departments (#50142)

Browse Source 
* merges the service and civilian departments

* yee haw
This commit is contained in:
Fikou
2020-03-26 22:05:28 +08:00
committed by GitHub
parent b76c239bed
commit a59e4fb1b5
23 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/item/laptop_presets.dm
+2 -2
View File
@@ -13,10 +13,10 @@
/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())
code/modules/modular_computers/file_system/programs/card.dm
+1 -1
View File
@@ -281,7 +281,7 @@
CARDCON_DEPARTMENT_SCIENCE = GLOB.science_positions,
CARDCON_DEPARTMENT_SECURITY = GLOB.security_positions,
CARDCON_DEPARTMENT_SUPPLY = GLOB.supply_positions,
CARDCON_DEPARTMENT_SERVICE = GLOB.civilian_positions
CARDCON_DEPARTMENT_SERVICE = GLOB.service_positions
)
data["jobs"] = list()
for(var/department in departments)