cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 23:59:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
This commit is contained in:
Repede
2020-03-01 12:35:52 -05:00
parent 11221003cd c1e40acb74
commit c45d7c2196
432 changed files with 22074 additions and 5001 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/04_equipment.dm
+1 -1
View File
@@ -42,7 +42,7 @@
pref.backbag = 1 //Same as above
character.backbag = pref.backbag
if(pref.pdachoice > 4 || pref.pdachoice < 1)
if(pref.pdachoice > 5 || pref.pdachoice < 1)
pref.pdachoice = 1
character.pdachoice = pref.pdachoice