cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-01 13:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into computer_tweaks

Browse Source 
# Conflicts:
#	code/game/jobs/faction/eridani.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/civilian_chaplain.dm
#	code/game/jobs/job/science.dm
#	icons/obj/machines/shielding.dmi
This commit is contained in:
alberyk
2021-10-29 21:41:30 -03:00
parent f78e9f669f 67034ad04c
commit 2294b4f0c5
192 changed files with 1871 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/modular_computers/file_system/programs/generic/records.dm
View File

@@ -320,6 +320,12 @@
if("security")
if(!(edit_type & RECORD_SECURITY))
return FALSE
if("physical_status")
if(!((edit_type & RECORD_MEDICAL) || (edit_type & RECORD_GENERAL)))
return FALSE
if("mental_status")
if(!((edit_type & RECORD_MEDICAL) || (edit_type & RECORD_GENERAL)))
return FALSE
if("medical")
if(!(edit_type & RECORD_MEDICAL))
return FALSE

1
code/modules/modular_computers/laptop_vendor.dm
View File

@@ -305,6 +305,7 @@
fabricated_tablet.forceMove(src.loc)
fabricated_tablet = null
ping(message)
intent_message(MACHINE_SOUND)
state = 3
// Simplified payment processing, returns 1 on success.