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

Merge branch 'master' into fourth_week_preparation_and_fixes

Browse Source 
# Conflicts:
#	code/game/jobs/faction/zavodskoi.dm
This commit is contained in:
alberyk
2022-02-10 13:36:46 -03:00
parent e09eed8339 785ccadd5b
commit beecb5f802
65 changed files with 561 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
View File

@@ -437,6 +437,7 @@
new /obj/item/gun/energy/xray(src)
new /obj/item/clothing/accessory/holster/armpit/brown(src)
new /obj/item/gun/energy/crossbow/largecrossbow(src)
new /obj/item/melee/energy/sword/red(src)
/obj/structure/closet/crate/secure/gear_loadout/ninja/techno
associated_hardsuit = /obj/item/rig/light/offworlder/techno/ninja