cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 02:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Computer Stuff (#3932)

Browse Source 
This started out as just some stuff for cargo.
Then it grew.

Fixed tablets and laptops not working due to some changes in #3826 that caused some old ballast to haunt us.
Changed the beeping sound of the modular computers to respect the ambience sound preference.
Added a application that can be used to pay and verify that a cargo order has been received
Added a delivery pad to cargo and spawns one in the CTs and QMs lockers.

Further tweaks to tablets and device enrollment in general are incoming, but I dont want to bloat this pr any further.
(I dont like how the company/private device system is implemented right now; It should rather be based upon the hard disk than the device itself)

closes #3931
This commit is contained in:
Werner
2017-12-08 23:39:28 +01:00
committed by Erki
parent 5e33bd0e2c
commit 5b7d63af57
17 changed files with 507 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
View File

@@ -15,6 +15,7 @@
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/cargo_delivery(src)
// new /obj/item/weapon/cartridge/quartermaster(src)
/obj/structure/closet/secure_closet/quartermaster
@@ -38,6 +39,7 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/head/soft(src)
new /obj/item/modular_computer/tablet/preset/custom_loadout/advanced/cargo_delivery(src)
/obj/structure/closet/secure_closet/merchant
name = "merchant locker"