shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gatofication2

Browse Source
This commit is contained in:
evilew
2024-11-21 22:11:24 +01:00
committed by GitHub
parent 4518a0b016 2dd9f92643
commit 9d9f805d7b
193 changed files with 4649 additions and 708 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/split_personality.dm
+8 -6
View File
@@ -163,12 +163,14 @@
if(_codeword)
codeword = _codeword
else
codeword = pick(strings("ion_laws.json", "ionabstract")\
| strings("ion_laws.json", "ionobjects")\
| strings("ion_laws.json", "ionadjectives")\
| strings("ion_laws.json", "ionthreats")\
| strings("ion_laws.json", "ionfood")\
| strings("ion_laws.json", "iondrinks"))
//GS13 Start: We're using our file
codeword = pick(strings("ion_laws_gs.json", "ionabstract")\
| strings("ion_laws_gs.json", "ionobjects")\
| strings("ion_laws_gs.json", "ionadjectives")\
| strings("ion_laws_gs.json", "ionthreats")\
| strings("ion_laws_gs.json", "ionfood")\
| strings("ion_laws_gs.json", "iondrinks"))
//GS13 End
/datum/brain_trauma/severe/split_personality/brainwashing/on_gain()
..()