cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "SS13: Pacifist route (#31928)" (#32008)

Browse Source 
This reverts commit b8a107a053.
This commit is contained in:
DamianX
2022-02-06 08:57:28 +01:00
committed by GitHub
parent 50c441671a
commit 21d9fe7daa
6 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/client/preferences.dm
View File

@@ -674,8 +674,8 @@ var/const/MAX_SAVE_SLOTS = 16
HTML += ShowDisabilityState(user,DISABILITY_FLAG_LACTOSE, "Lactose Intolerant")
HTML += ShowDisabilityState(user,DISABILITY_FLAG_LISP, "Lisp")
HTML += ShowDisabilityState(user,DISABILITY_FLAG_ANEMIA, "Anemia")
HTML += ShowDisabilityState(user,DISABILITY_FLAG_PACIFIST, "Pacifism")
HTML += ShowDisabilityState(user,DISABILITY_FLAG_TOURETTES, "Tourettes")
/*HTML += ShowDisabilityState(user,DISABILITY_FLAG_COUGHING, "Coughing")
HTML += ShowDisabilityState(user,DISABILITY_FLAG_TOURETTES, "Tourettes") Still working on it! -Angelite*/
HTML += {"</ul>
@@ -1507,8 +1507,10 @@ Values up to 1000 are allowed.", "FPS", fps) as null|num
character.sdisabilities|=DEAF
if(disabilities & DISABILITY_FLAG_BLIND)
character.sdisabilities|=BLIND
/*if(disabilities & DISABILITY_FLAG_COUGHING)
character.sdisabilities|=COUGHING
if(disabilities & DISABILITY_FLAG_TOURETTES)
character.sdisabilities|=TOURETTES
character.sdisabilities|=TOURETTES Still working on it. - Angelite */
if(underwear > underwear_m.len || underwear < 1)
underwear = 0 //I'm sure this is 100% unnecessary, but I'm paranoid... sue me. //HAH NOW NO MORE MAGIC CLONING UNDIES