cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-14 01:18:40 +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/modules/mining/abandonedcrates.dm
-1
View File
@@ -125,7 +125,6 @@
if(95)
new /obj/item/clothing/under/mime(src)
new /obj/item/clothing/shoes/black(src)
new /obj/item/modular_computer/handheld/pda/civilian/mime(src)
new /obj/item/clothing/gloves/white(src)
new /obj/item/clothing/mask/gas/mime(src)
new /obj/item/clothing/head/beret/red(src)