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

Merge branch 'master' into final_shuttle_touches_and_stuff

Browse Source 
# Conflicts:
#	code/modules/power/breaker_box.dm
This commit is contained in:
alberyk
2022-01-17 19:36:22 -03:00
parent d78a20afd8 918d43972e
commit cf3b089df4
54 changed files with 407 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/filingcabinet.dm
+2 -1
View File
@@ -33,7 +33,8 @@
/obj/item/clothing/accessory/badge,
/obj/item/pack,
/obj/item/hand,
/obj/item/key
/obj/item/key,
/obj/item/paper_scanner
)