cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

Browse Source
This commit is contained in:
Ccomp5950
2014-05-24 19:02:16 -05:00
parent e71add0d26 3b8ee547c6
commit ff0d667337
6 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -561,7 +561,7 @@ datum/preferences
return
proc/SetAntagoptions(mob/user)
if(uplinklocation == "")
if(uplinklocation == "" || !uplinklocation)
uplinklocation = "PDA"
var/HTML = "<body>"
HTML += "<tt><center>"

2
code/modules/mob/living/carbon/human/human_defines.dm
View File

@@ -29,7 +29,7 @@
var/b_type = "A+" //Player's bloodtype
var/underwear = 1 //Which underwear the player wants
var/undershirt = 1 //Which undershirt the player wants.
var/undershirt = 0 //Which undershirt the player wants.
var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack.
//Equipment slots