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

Merge branch 'master' into final_away_maps_additions

Browse Source 
# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm
This commit is contained in:
alberyk
2022-04-04 19:47:58 -03:00
parent 61118d6774 b44b124575
commit 8c1d2a7cde
100 changed files with 1824 additions and 447407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+1 -1
View File
@@ -119,7 +119,7 @@
new /obj/item/device/gps(src)
new /obj/item/reagent_containers/hypospray(src)
new /obj/item/taperoll/medical(src)
new /obj/item/device/radio(src)
new /obj/item/device/radio/med(src)
new /obj/item/roller(src)
new /obj/item/crowbar/red(src)
new /obj/item/clothing/mask/gas/alt(src)