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

Merge branch 'master' into updates_the_nbt

Browse Source 
# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm
This commit is contained in:
alberyk
2022-02-19 10:26:35 -03:00
parent 32601c50bf 82969930ff
commit 12a70b50b7
149 changed files with 2287 additions and 581 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/loadout/loadout_factions.dm
+2 -2
View File
@@ -262,7 +262,7 @@
faction = "Hephaestus Industries"
/datum/gear/faction/heph_passcard
display_name = "hephaestus burszia passcard"
path = /obj/item/clothing/accessory/badge/passcard/burszia
display_name = "hephaestus burzsia passcard"
path = /obj/item/clothing/accessory/badge/passcard/burzsia
slot = slot_tie
faction = "Hephaestus Industries"
code/modules/client/preference_setup/loadout/loadout_uniform.dm
+1
View File
@@ -202,6 +202,7 @@
colorpants["striped pants"] = /obj/item/clothing/under/pants/striped
colorpants["tailored jeans"] = /obj/item/clothing/under/pants/tailoredjeans
colorpants["mustang jeans"] = /obj/item/clothing/under/pants/musthangcolour
colorpants["shorts"] = /obj/item/clothing/under/shorts/color
gear_tweaks += new /datum/gear_tweak/path(colorpants)
/datum/gear/uniform/turtleneck